net-libs/zeromq: Version BUmp; restrict test to serial execution, #489844

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 74 insertions, 12 deletions

diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog
index 2907e107a57c..d7b161027d96 100644
--- a/net-libs/zeromq/ChangeLog
+++ b/net-libs/zeromq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/zeromq
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.52 2013/12/07 13:34:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.53 2013/12/24 11:14:32 jlec Exp $
+
+*zeromq-4.0.3 (24 Dec 2013)
+
+  24 Dec 2013; Justin Lecher <jlec@gentoo.org> zeromq-4.0.1.ebuild,
+  zeromq-4.0.1-r1.ebuild, +zeromq-4.0.3.ebuild:
+  Version BUmp; restrict test to serial execution, #489844
 
   07 Dec 2013; Markus Meier <maekke@gentoo.org> zeromq-4.0.1-r1.ebuild:
   add ~arm, bug #489452
diff --git a/net-libs/zeromq/zeromq-4.0.1-r1.ebuild b/net-libs/zeromq/zeromq-4.0.1-r1.ebuild
index 65a55643f39e..c489552c6233 100644
--- a/net-libs/zeromq/zeromq-4.0.1-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.1-r1.ebuild,v 1.3 2013/12/07 13:34:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.1-r1.ebuild,v 1.4 2013/12/24 11:14:32 jlec Exp $
 
 EAPI=5
 
@@ -9,7 +9,6 @@ inherit autotools eutils
 DESCRIPTION="ZeroMQ is a brokerless kernel"
 HOMEPAGE="http://www.zeromq.org/"
 SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-RESTRICT="mirror"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -42,6 +41,10 @@ src_configure() {
 		$myconf
 }
 
+src_test() {
+	emake -j1 check
+}
+
 src_install() {
 	default
 
diff --git a/net-libs/zeromq/zeromq-4.0.1.ebuild b/net-libs/zeromq/zeromq-4.0.1.ebuild
index 83119cd9ac77..67cc7a7ded18 100644
--- a/net-libs/zeromq/zeromq-4.0.1.ebuild
+++ b/net-libs/zeromq/zeromq-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.1.ebuild,v 1.2 2013/10/26 10:54:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.1.ebuild,v 1.3 2013/12/24 11:14:32 jlec Exp $
 
 EAPI=5
 
@@ -9,19 +9,18 @@ inherit autotools
 DESCRIPTION="ZeroMQ is a brokerless kernel"
 HOMEPAGE="http://www.zeromq.org/"
 SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-RESTRICT="mirror"
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="pgm test static-libs elibc_glibc"
 
-DEPEND="sys-devel/gcc
-		pgm? (
-		  virtual/pkgconfig
-		  =net-libs/openpgm-5.1.118
+DEPEND="
+	pgm? (
+		virtual/pkgconfig
+		=net-libs/openpgm-5.1.118
 		)
-		sys-apps/util-linux"
+	sys-apps/util-linux"
 RDEPEND=""
 
 src_prepare() {
@@ -35,8 +34,12 @@ src_configure() {
 	local myconf
 	use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
 	econf \
-	  $(use_enable static-libs static) \
-	  $myconf
+		$(use_enable static-libs static) \
+		$myconf
+}
+
+src_test() {
+	emake -j1 check
 }
 
 src_install() {
diff --git a/net-libs/zeromq/zeromq-4.0.3.ebuild b/net-libs/zeromq/zeromq-4.0.3.ebuild
new file mode 100644
index 000000000000..87819a0b826b
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.0.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.3.ebuild,v 1.1 2013/12/24 11:14:32 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
+IUSE="pgm static-libs test"
+
+RDEPEND="
+	dev-libs/libsodium
+	pgm? ( =net-libs/openpgm-5.1.118 )"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux
+	pgm? ( virtual/pkgconfig )"
+
+src_prepare() {
+	einfo "Removing bundled OpenPGM library"
+	rm -fr "${S}"/foreign/openpgm/libpgm* || die
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=()
+	use pgm && myeconfargs+=( --with-system-pgm ) || myeconfargs+=( --without-pgm )
+	autotools-utils_src_configure
+}
+
+src_test() {
+	autotools-utils_src_test -j1
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	doman doc/*.[1-9]
+}