summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-08-01 16:46:37 +0000
committerJustin Lecher <jlec@gentoo.org>2013-08-01 16:46:37 +0000
commitadce2c8b2849f1f4141270770351f49063fcf531 (patch)
tree410ee856d36bba39a6a0dbf03de89a62ec7156b2 /net-libs/cppzmq
parentdrop custom-cflags useflag, bug #473816 (diff)
downloadgentoo-2-adce2c8b2849f1f4141270770351f49063fcf531.tar.gz
gentoo-2-adce2c8b2849f1f4141270770351f49063fcf531.tar.bz2
gentoo-2-adce2c8b2849f1f4141270770351f49063fcf531.zip
net-libs/cppzmq: Fix file collision, thanks ercpe for reporting
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'net-libs/cppzmq')
-rw-r--r--net-libs/cppzmq/ChangeLog6
-rw-r--r--net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild6
-rw-r--r--net-libs/cppzmq/cppzmq-0_pre130717.ebuild6
3 files changed, 11 insertions, 7 deletions
diff --git a/net-libs/cppzmq/ChangeLog b/net-libs/cppzmq/ChangeLog
index a8e983e9ac6d..280e532f3fe9 100644
--- a/net-libs/cppzmq/ChangeLog
+++ b/net-libs/cppzmq/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/cppzmq
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cppzmq/ChangeLog,v 1.2 2013/07/22 14:07:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cppzmq/ChangeLog,v 1.3 2013/08/01 16:46:37 jlec Exp $
+
+ 01 Aug 2013; Justin Lecher <jlec@gentoo.org> cppzmq-0_pre130717.ebuild,
+ cppzmq-0_pre130717-r1.ebuild:
+ Fix file collision, thanks ercpe for reporting
*cppzmq-0_pre130717-r1 (22 Jul 2013)
diff --git a/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild b/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild
index e87cdd120c4c..afb6889a91b7 100644
--- a/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild
+++ b/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild,v 1.1 2013/07/22 14:07:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild,v 1.2 2013/08/01 16:46:37 jlec Exp $
EAPI=5
-DESCRIPTION="CPPZMQ - High-level C Binding for ZeroMQ"
+DESCRIPTION="CPPZMQ - High-level CPP Binding for ZeroMQ"
HOMEPAGE="https://github.com/zeromq/cppzmq"
SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
@@ -13,7 +13,7 @@ LICENSE="MIT"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
-RDEPEND="net-libs/zeromq"
+RDEPEND=">=net-libs/zeromq-3"
DEPEND=""
src_install() {
diff --git a/net-libs/cppzmq/cppzmq-0_pre130717.ebuild b/net-libs/cppzmq/cppzmq-0_pre130717.ebuild
index 266a7c0a7257..3602c698914c 100644
--- a/net-libs/cppzmq/cppzmq-0_pre130717.ebuild
+++ b/net-libs/cppzmq/cppzmq-0_pre130717.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cppzmq/cppzmq-0_pre130717.ebuild,v 1.2 2013/07/22 14:07:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cppzmq/cppzmq-0_pre130717.ebuild,v 1.3 2013/08/01 16:46:37 jlec Exp $
EAPI=5
-DESCRIPTION="CPPZMQ - High-level C Binding for ZeroMQ"
+DESCRIPTION="CPPZMQ - High-level CPP Binding for ZeroMQ"
HOMEPAGE="https://github.com/zeromq/cppzmq"
SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
@@ -13,7 +13,7 @@ LICENSE="MIT"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
-RDEPEND="net-libs/zeromq"
+RDEPEND=">=net-libs/zeromq-3"
DEPEND=""
src_install() {