diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-04-07 11:13:51 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-04-07 11:13:51 +0000 |
| commit | 6bf66d1f283ab640eb118dfecdf56ad0837fa59d (patch) | |
| tree | 675d75ef44b4c1346000606166f48245542dfa35 /net-libs/zeromq | |
| parent | correction to revbump wrt Bug #539712 (diff) | |
| download | gentoo-2-6bf66d1f283ab640eb118dfecdf56ad0837fa59d.tar.gz gentoo-2-6bf66d1f283ab640eb118dfecdf56ad0837fa59d.tar.bz2 gentoo-2-6bf66d1f283ab640eb118dfecdf56ad0837fa59d.zip | |
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!)
Diffstat (limited to 'net-libs/zeromq')
| -rw-r--r-- | net-libs/zeromq/ChangeLog | 5 | ||||
| -rw-r--r-- | net-libs/zeromq/zeromq-2.2.0.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog index 81e512702265..6748eaad0b75 100644 --- a/net-libs/zeromq/ChangeLog +++ b/net-libs/zeromq/ChangeLog @@ -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 <jlec@gentoo.org> zeromq-2.2.0.ebuild: + Block net-libs/cppzmq due to file collision, bug #545226 *zeromq-4.0.5 (11 Feb 2015) diff --git a/net-libs/zeromq/zeromq-2.2.0.ebuild b/net-libs/zeromq/zeromq-2.2.0.ebuild index e1d58a1cbe48..f4f1febce519 100644 --- a/net-libs/zeromq/zeromq-2.2.0.ebuild +++ b/net-libs/zeromq/zeromq-2.2.0.ebuild @@ -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 @@ SLOT="0" 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 |