net-libs/zeromq: Drop Werror, #485774; add dev-libs/libsodium to deps because of automagic otherwise; fix RDEPENDs; general style improvements (indention, sorting, usage of default phase functions); use prune_libtool_files() from eutils.eclass instead of manual cleaning

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 75 insertions, 15 deletions

diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog
index f0eba6157e30..609a29258e29 100644
--- a/net-libs/zeromq/ChangeLog
+++ b/net-libs/zeromq/ChangeLog
@@ -1,6 +1,14 @@
 # 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.49 2013/10/26 10:54:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.50 2013/10/26 11:19:16 jlec Exp $
+
+*zeromq-4.0.1-r1 (26 Oct 2013)
+
+  26 Oct 2013; Justin Lecher <jlec@gentoo.org> +zeromq-4.0.1-r1.ebuild:
+  Drop Werror, #485774; add dev-libs/libsodium to deps because of automagic
+  otherwise; fix RDEPENDs; general style improvements (indention, sorting,
+  usage of default phase functions); use prune_libtool_files() from
+  eutils.eclass instead of manual cleaning
 
   26 Oct 2013; Justin Lecher <jlec@gentoo.org> zeromq-4.0.1.ebuild,
   metadata.xml:
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 39638d14962b..d39157bd9411 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -11,23 +11,24 @@ EBUILD zeromq-2.1.11.ebuild 1325 SHA256 054ad8d7d1d0bc7ac0ba677dcca02520fdaca7a4
 EBUILD zeromq-2.2.0.ebuild 1404 SHA256 d639a74b0e8c4058f8f286b7f9420ca295794605c650ec0cbb60d658614986e5 SHA512 040e88e2c864d990fb94ba38b4a081d8d5c3755590510708675f194e9a110c99b2a253eebda4d6d17641172920ef15a4d8a3d9a4af1a8aa3216345e2866e403e WHIRLPOOL b8772c6069c19d4d5138c2e295222b29546e1446ae28985ecb75266614dddd3707e08eb8ea3081fef12ba6c71263acc7e2adb6917c7369b739c165943067a69d
 EBUILD zeromq-3.2.3.ebuild 1713 SHA256 bec823e0414004fbd5da10e693ce324d40880d6526af3fc5610edeaecfeab6f5 SHA512 ec22cef41690b2d5aa3f75e8d5da7aff45f399ad545e270667f704f4bfbd1298db5c41c7ff79e3d994f12c5f4d82762a051c8df12e08f1110d4b8163a19831fa WHIRLPOOL 2ef410b18874dfe8efd3f396f23bbcff432de2e0368d483b5fe802d3270264c8d92fb96f9eb5c1c81859806a312d6a6736818741a816c0caf6acc24893c31164
 EBUILD zeromq-3.2.4.ebuild 1663 SHA256 a3b382a66c2c24e3834b41eb3ecddd71c4cc8ca71408e73cf1767af43a7cf818 SHA512 f10b2e270bdbf3c93b2c476c67ef6a78ff7821354f947c169e003c3ef6c5ce247f638f7ea5aa316001e631a7288590c88813e5c0e0127a3b03bdd277bd2edfdc WHIRLPOOL 91009577be6f4367c855356adb9121893ffc4bc7bb3e4bedc5ad8783a87eecccbd4289a362051cb2114b64101261a4dc1199c40e6255aa0855ff70b6886608b9
+EBUILD zeromq-4.0.1-r1.ebuild 1147 SHA256 346f476fb561532927328280f0b60542cf96b4216b0f6c3bd7d147408c0c6ced SHA512 0e56cedb7e90870ab21203642b29968696fb438664b6fbe64bebc526f8ad4239f66d299b0199df39eab0efdaece3a0552254ef66db6a5d140655286a5ea213c5 WHIRLPOOL f31697530d67741e753dbb744b2ed3d8e70b5d4e557012f2522c727c049731732489c40d73502858185be8b2d2b567d1a81e85ce2f081386b8bdeb02c4111b64
 EBUILD zeromq-4.0.1.ebuild 1322 SHA256 1dec1e000489a0f3ae893a319b7d38149339ae393f1066c2f726221b760fbda9 SHA512 5948e764cbc2f19cea95c84821bb4a287708f8886b6449266be3d8f8fea21dd393b974c562e37de1bd844ab9fe45b865fcb81da92f8d60867b06b4cbc5e1f924 WHIRLPOOL 588742192eafa5dba2478b88670a61a368718b7107d168bd335f88b3ccbcecf69fafdc2333024cee8879b0826716978e42fea90e36d02cde79d17046fb5b7950
-MISC ChangeLog 6286 SHA256 268b0172f9d635dc40679497d40c67836a6dbd6009792dcb08f6f2fe53bfa303 SHA512 5ce49ac0a979e44b5f298d042e1349f546293f5fb312e3a76d91392f79e478ce5f9f21c28f36edb58f5dd8bf29d66720c9dfc58b8728d387a88f5c2390a93a6d WHIRLPOOL 87db6e4f9e9756347b4632abfb5b2223d84f7b107f573923a94b889c4c3e642c1a8fdcc0725ee5af1c8169b9d51258caba9f8bb741770b9606b14c171dd324c3
+MISC ChangeLog 6653 SHA256 1f7cc5713ded58186e8c28df4e0b34e5c238c0ce39747cf48bd0d94777ae1638 SHA512 2b00e556e1b4cce4196b5de9f2b59937822656c82ae2e7722da794c5824353266a63a99de4099c5531268d7d5c65e2ea31a5a3bb17557a5530e9ccbad12aac03 WHIRLPOOL cfcd5a28c4f370bf8157fecfa26872482de835644460755171189ab49146d17f340ec299ecddba0b31ca03f14309979de86dcb3dc804cd2af91921ca0f82a8b7
 MISC metadata.xml 1205 SHA256 aa5d3cf383d233fb3dcc987ee1defb5145452603fa7559712cd6a6b65c490699 SHA512 28c8088cae0dbc58fd5cf32bf76e6f7e234595467416864dcc3e57df4271b02c50c1cf4de5ae9bad271f3b1833644653c0d63c3a81da5364c5c9f26766ca2f0f WHIRLPOOL 22aec7996be27f1b54223f3dda9910786290315bb62013de8a87c29ed36e2c94c265f4ed11d11a03e160c0c28d617badfc7222303e7f1af203dffad6ce4a4ba4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSa59iAAoJELnU8jG9FViri1cQAI7Oyt3IX9i7pBZmGMdE25UU
-Ei+30zDJUhMP/iK4x2/KoKOopmuiyEM3reW6qdsSGeVnINrZeLH20aVSXMresd+k
-/+v4uCVCv+BGzgxZv5IqTOGd3HiAWwF1d4DhWsRt1z1756cos/ODp28P9OFHfR4v
-Hyk1yazK3HrE2/8St1TfbDyknej4zK+mAALIkjo8uu6Bn1GYmEviSWe1mLxDvPh3
-uIPTJ3AD/Uke9JIXNeLTOJUchA/luhp8jvj75CPUhfqWInNJEIH0nqMkIdx7kjlr
-HGYzCKm1KLuceJ8hniQHaHbbiM9UKZZ/lFV5GNhPDF5kC2wYXGtyGwkSL3NQ3IJ9
-XR9Wu1SnU/ZVjBWOcNZFumr10OiM4nc/K5AY3ug2ECy7hxLRvE1mTocZD9mkFws6
-4g19xF7b27vN297Or1v8/98EiEckJMwOZkx8pd0++m9+wYCUJU2fECq1ixmGHmOk
-zZtYb6zR1DFdgduKmABjaV5arSXMDMJknDUUcTcA3YU2k0RnYvOW3JaQB62gikrA
-5xcBBKT/MIXZAlOV5IUPX5sZxjw1K8aaj7b2aZmuSldv1Iin4nf/+5tTBYyKwt/d
-dQQ6h2cBOzXPtJgBCd1WGw50VrquoAiow0ud3AhHBG41UJXOWVvxhCCYoArrW5uH
-dZrwSzrGNvMghSLWJj+J
-=Voea
+iQIcBAEBCgAGBQJSa6U1AAoJELnU8jG9FVirjK0P/Rk9P3BFXoQxGwHr8WfWlRaQ
+obh/62RnQJL0jJuQFHP9jQK8AOi1RJtZ0oY2hsOAD/Z7WR989muTiDGHKqRK+ILJ
+FwvyFyfIEOULYDl6zxGIjI/z8lkDaJxCyF4iM+osq1PzcMsfI0gse1yDWJNyQjld
+OIiTbWRtzCHZ1zGA19lMESbuWVfbaU9i4WUPd7Pkw1ds00Rex4bTLKGveNNiDD0r
+PyjEGAZnN7HsMt3JPWZd9pJGH87AIkMYxhY+GqE5FlmlWLNX5d/IyOgjTLwMxM3x
+kY/WMhfKn5Ml2Ux8u4pLUJQoqxu9DhqGVRMciC5vpl0HlXXd3eFsCQpJAH0A9/sq
+YS38CUDbXz2OAqcch5AcwaEI/tHNw8Y7izi8Am2lIQTsltwgChUXbBIbc+3JEDVd
+ZoHrEsQUcK5mEIsKBJ6GRMSl1OScERF7klFGN2s9F1X1FplLGzSiZz0A18TMmaqR
+dANY0XtH0ssCsSHBNjywqHos3LiJEQ3+XaQ69fjTEuTOwOvF3hCM7sduCTCb2meG
+rJb4vZRGqRctPGHNeCZw2gmx26b/qrRSfoKNYx3FK3LSMYxWtgeqWhbvYpo9z6bF
+J9/WfPGFWr5/MrlbnyUE2t1ZiFT+QGch+RCUxZhie+d7ijIB/C9Jft/HqmxHR1Wh
+HLJSXOBchM+KbkLajjwd
+=Uq7P
 -----END PGP SIGNATURE-----
diff --git a/net-libs/zeromq/zeromq-4.0.1-r1.ebuild b/net-libs/zeromq/zeromq-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..95ac4e87eb21
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# 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.1 2013/10/26 11:19:16 jlec Exp $
+
+EAPI=5
+
+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"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="elibc_glibc pgm static-libs test"
+
+RDEPEND="
+	dev-libs/libsodium
+	pgm? ( =net-libs/openpgm-5.1.118 )"
+DEPEND="${RDEPEND}
+	sys-devel/gcc
+	pgm? ( virtual/pkgconfig )
+	sys-apps/util-linux"
+
+src_prepare() {
+	einfo "Removing bundled OpenPGM library"
+#	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+	rm -r "${S}"/foreign/openpgm/libpgm* || die
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
+	econf \
+		$(use_enable static-libs static) \
+		$myconf
+}
+
+src_install() {
+	default
+
+	doman doc/*.[1-9]
+
+	prune_libtool_files
+}