jlec 15/04/07 11:13:51 Modified: zeromq-2.2.0.ebuild ChangeLog Log: Block net-libs/cppzmq due to file collision, bug #545226 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.16 net-libs/zeromq/zeromq-2.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/zeromq-2.2.0.ebuild?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/zeromq-2.2.0.ebuild?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/zeromq-2.2.0.ebuild?r1=1.15&r2=1.16 Index: zeromq-2.2.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-2.2.0.ebuild,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- zeromq-2.2.0.ebuild 10 Aug 2014 20:50:54 -0000 1.15 +++ zeromq-2.2.0.ebuild 7 Apr 2015 11:13:51 -0000 1.16 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-2.2.0.ebuild,v 1.15 2014/08/10 20:50:54 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-2.2.0.ebuild,v 1.16 2015/04/07 11:13:51 jlec Exp $ # NOTES: # 1- use flag 'pgm' (OpenPGM support) must be masked by profiles for ARM archs; @@ -18,7 +18,7 @@ KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="pgm test static-libs" -RDEPEND="" +RDEPEND="!net-libs/cppzmq" DEPEND="pgm? ( virtual/pkgconfig =net-libs/openpgm-5.1.118 1.65 net-libs/zeromq/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/ChangeLog?rev=1.65&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/ChangeLog?rev=1.65&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/zeromq/ChangeLog?r1=1.64&r2=1.65 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ChangeLog 11 Feb 2015 10:26:47 -0000 1.64 +++ ChangeLog 7 Apr 2015 11:13:51 -0000 1.65 @@ -1,6 +1,9 @@ # ChangeLog for net-libs/zeromq # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.64 2015/02/11 10:26:47 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.65 2015/04/07 11:13:51 jlec Exp $ + + 07 Apr 2015; Justin Lecher <[email protected]> zeromq-2.2.0.ebuild: + Block net-libs/cppzmq due to file collision, bug #545226 *zeromq-4.0.5 (11 Feb 2015)
