Version Bump; fix subslots to soname

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

5 files changed, 162 insertions, 37 deletions

diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog
index 727f4641f7ad..752c366dff32 100644
--- a/net-libs/zeromq/ChangeLog
+++ b/net-libs/zeromq/ChangeLog
@@ -1,6 +1,13 @@
 # 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.66 2015/04/07 14:31:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.67 2015/06/04 10:58:58 jlec Exp $
+
+*zeromq-3.2.5 (04 Jun 2015)
+*zeromq-4.1.1 (04 Jun 2015)
+
+  04 Jun 2015; Justin Lecher <jlec@gentoo.org> +zeromq-3.2.5.ebuild,
+  +zeromq-4.1.1.ebuild, zeromq-3.2.3.ebuild:
+  Version Bump; fix subslots to soname
 
   07 Apr 2015; Justin Lecher <jlec@gentoo.org> zeromq-2.2.0.ebuild:
   Block net-libs/cppzmq due to file collision, bug #545226
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 98b04c13176b..edaec01f18f6 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -4,28 +4,32 @@ Hash: SHA512
 AUX zeromq-3.2.3-unused-variable.patch 4012 SHA256 f80558d4bd5557128d2ebb44d075f4e32925fbcc5a726498184b0fa2721d672f SHA512 c54ee2ff1d11c33c734b7696a3fa98be8e0a5025678ac31599c652a4f0e2b507f41de3aae8d6808086bbe72fd0d485945ed2b822f984c2053f1f6f69b62a7b1f WHIRLPOOL 56113c224b01d7f300e1c6a1cb4bec2d297a3a285fe5ee3849c1f1cc82a984b8170869c67c1979a575042412e26675f8d5bfbbb4f531411d6243fc9b81309e95
 DIST zeromq-2.2.0.tar.gz 1899104 SHA256 6e2f4183e5259eeb67025b00116d900491fb71581e8e085373b51c3bc9571ae1 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e WHIRLPOOL b35a6f0cdcff34ec188c989354fb53ee44f22ebb8d830f904447b4fa32ddd17de157998c2733a42ff0a6c1355f0ab2e0639e7666c7e983839e1dbde2188dcef5
 DIST zeromq-3.2.3.tar.gz 2072758 SHA256 e134c1aaf829dd77bca9dc0fa199ba31095a581bd0d3dda5fc59523b9f401238 SHA512 34ffb6aa645f62bd1158a8f2888bf92929ccf90917a6c50ed51ed1240732f498522e164d1536f26480c87ad5457fe614a93bf0e15f2f89b0b168e64a30de68ca WHIRLPOOL 14ba025abe6db59d6e8d1dd9df23f88e0171721bb046b9e2cf0cd7a5a6e9034980808d346fe10e755e367302cfbb670912576071345233148711815237fa176e
+DIST zeromq-3.2.5.tar.gz 2082960 SHA256 09653e56a466683edb2f87ee025c4de55b8740df69481b9d7da98748f0c92124 SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f WHIRLPOOL a8afa70760fa1fa9382f4694beabfe50f5c8098b1f81d5c62c926cd3073fd25946f6b8d1236e903e6644a9fff783116e131f1f87a5b92d16a6e91e05bd7f6e75
 DIST zeromq-4.0.5.tar.gz 2153667 SHA256 3bc93c5f67370341428364ce007d448f4bb58a0eaabd0a60697d8086bc43342b SHA512 0d928ed688ed940d460fa8f8d574a9819dccc4e030d735a8c7db71b59287ee50fa741a08249e356c78356b03c2174f2f2699f05aa7dc3d380ed47d8d7bab5408 WHIRLPOOL 6fc32962e38b47dd93c31da797db457e3c283e44e4b6f59fae5fd6eb6127840906f030140b63623f96d0d86a922b5274201e3a1ebee4a369d1b52ca04c554bbb
+DIST zeromq-4.1.1.tar.gz 1383196 SHA256 43d61e5706b43946aad4a661400627bcde9c63cc25816d4749c67b64c3dab8db SHA512 6f626c89e573900d3b094ea6058693dee290eb9e4039a8a03d61d41b1d8976ed5596027ca76a43f371dbf86820edfbd56a84ecfab6864adfeee73035df7b5353 WHIRLPOOL b72f9118a0422bb2a6cc99e490085715739e7438fe88fb556b85e6da70a995c92ad0cdde296e02e31c02979458ad4bb6962ff0acd4f5642273659c29b43892e9
 EBUILD zeromq-2.2.0.ebuild 1418 SHA256 ef6b097f03d4963c40ad2af6d163da586747c28b70cf3585f6f0f100d3522fe1 SHA512 a0c333e3654e3dd10bfa2ec30f0d3292a7a1cbaa91bbbd7c0fa4aab732408aa8b9abd002323b904ce7a0fc2d09613a2ceeb1d09c9fcdaa0646346e3aaf14574e WHIRLPOOL d3654397a45358b13475f99018db6d32f8a9dfe610adcd3a278dde4a9da6697fe8a6da35a32e168ffa30a3590ea3ef87bddcf3fa9320581af79a036c7eaf2000
-EBUILD zeromq-3.2.3.ebuild 1716 SHA256 112a941a11a42fd1992ba9971cc0e8fb4afda2a95ca19627cbb3c775a2ec9a87 SHA512 01367c503193b6a48d2f76663fd539a952c0a28a303db223a5e9c37419060d30370891440428bd48af7aef87b4ec59ab549add5c8e0ae19b0208b1bdf4bb4d53 WHIRLPOOL db2e3a5cbe65dda171c95386a4c278bc5825c13b6a1606602e44281727f84b71bde81d5eed6c75c027d0e29989599ef42d1e9fbad57f327289992580631112a6
+EBUILD zeromq-3.2.3.ebuild 1631 SHA256 3c15fc0d8bf511a0380fd2d830811ae8d30b588ae8551f12faa19e43e2b0162a SHA512 c1ae27d47cb7e3f23669cbc76cb39719279c3cb671bacda95ab5819d14d9a5ddaab171fd350a0a453429642d386bb58a0f32cb798260084523e8957f9a1bc731 WHIRLPOOL 936c07fd2c5117d6165c023821a2d79aa53890e11177224bc500f10d4bbcca033e37355e0faafd20c4ade5f0d9a5c6fc5521133c142ee7395b721618cadb47e8
+EBUILD zeromq-3.2.5.ebuild 1577 SHA256 0e8a74d094c93fed98b55856d7252aca1f525803eaccf81967b9c0ece724af81 SHA512 e8e876328fb6d9c45b641c4370a61914e64db8d219d0622333102441f2116fd3cf54902eb15ea62bfdfc343743ce71fac19fe56c37e4bbacda141367ad62e518 WHIRLPOOL c584be5b20269a3967cc86d36ff6a4d52ba7a917925cb402828b2b32408f6a35ff0e02f9797b147935d9cb8424acba161121cf8777607c43a41d1284e287450e
 EBUILD zeromq-4.0.5.ebuild 1148 SHA256 5ca8d878df7db980c2e73fe3ae80032da7b4cc4e099a62f0b2ae76288e423056 SHA512 997fd65cccc859f48bcdd9611c0fc30584408744dbcccdd6f8fb1dbe3e65032d599ab05aa14803e70795261cb7a5cf0fa4a9b972cb9c0c0449f4be0c9ba0298e WHIRLPOOL af1a502f5666be1f67c119549fc8e8b44e13f5a102135ba9cb14815f741132456d11755259fcb2e36915b087e1fe14b5132d6b48e9bfaa108df12c3236a29e56
-MISC ChangeLog 8859 SHA256 09e5792d8a2bbd436553a1795eac777a90385606db6952315952556e70061988 SHA512 0a6ce91bdec58e52f64aece3296616e0ba617caf84161bd9096d316f860dba3d3feda2aec1109fb6aebc0b433033d7bccfad1e65b55f4a717c447f54664f5ae8 WHIRLPOOL d3330dc29fc3b54ac922a831d7e73519b8d4371e8a2b40322dfa4cc76c4564afcf4089b40c46d6a3258855665048096ed5097c9f660dea666b57be47a10f190c
+EBUILD zeromq-4.1.1.ebuild 1144 SHA256 fd216ac7af6001db4a50f00a4c9089681995390dbcbca37ba4d045c39ebd5448 SHA512 02efeb1f1b08ac3a790155f860f82d3ce4f7446ccd22e2441b84cb2877fc6f54c495ed7e63c6319ea7bafb9eaf3dd4572fbcf167da4bcee588010f28ff75117a WHIRLPOOL fc95e39b15f39572ad9d0061e5fc6e48440ad2f98fdcb99d7ae765db8a2408298eaf5ec158117fc2433b84c10681b024ba87f51cf3db910d78a423d27ef1186a
+MISC ChangeLog 9070 SHA256 8299c3c09c9fe967b96fc383d4baf417eb6d6e028d3b256cc688dcd3d832a5fc SHA512 e6129761cd9e309481d0fb26fca46f4c1b33b7721c6a23c836a0f16057a07e8962506e744d3dc6af81602250240e24f1efefd3180248eb400f8284a4dac08455 WHIRLPOOL 841e33ef411be25d071da78dec627be3cad3037a9b329f7c1e859942f56981b334042cbcc01c2004519046deb55d04c803fd7874feeac4bf000f75c57a2549cf
 MISC metadata.xml 1209 SHA256 d06047a6724ec60967cf4f3a8b06a2c9dbeacadad7d2173c9ed57d8ab135c14f SHA512 ecf94c881c6ae3a35c856a30129240b90b70eeadea44dce1c0c9290d713d8a4f1d2b4587e86351a3ab5e32d26474307ec30297453bbdd72707643ee7332725b5 WHIRLPOOL cab7706c40c6c396141d5d4e3038e68ab248b5d9089fce21f872d5d5d0f7e14a45f7b6faf402181ddb8ce9f797958d5eb5f369fc13e499ce1b75a250fcbf36a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVI+onXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVircXgP/ioG8oUkgaWxMvkwyD3VEmJI
-r+q7c9dVypQ0BoVIgpHKkOzsttifaqmG3frAadKiBuUrt4WvjBFt9DiL56JRFMSM
-aUgJ9IYm8Y+e2/sSpCnxWXcUwRAwxo2rEj7EVKVLuUo5JzhgLLuK536H7nVS4hwt
-N0yi7FTuSyWF2HlaysraKruHbdpnBdeY5oCbE6hynTFt7v/G/dmLlaLqRunLTnE8
-dhfowV0P/jjDOSon/rhK5koCAGM554VFAw33ZLsHTVhkrAv4ILsb78U2qFjB5IEq
-VFGt+U8fakAhydhciL13R5MTpYidwl/Rc4sZ3SFWVLT+u7vNf8d2pFNtcC9jNJM7
-+Pw2+rTh2Chz7PreSingFwJ7aJ4maXlgjh4xcs+zQ517bg1dG1eUW7JtyEFK9dzn
-DyRgl/SjYkC21bojpFbqOUvrKKMDLHBSM6aVN0AHjgRX0178UtQSS76bke4IIz9e
-lZcBL9A49cU7sWiM8rdKICzzeow1wVAMkd/K1pF7Tw9r9wcJZ1thJbI70mOEAV7X
-YSmO04L7uDKooeb44myqIAgVTreXRVetimZhkFI18fN8qSn6uTOwLecIR3hjjkpj
-IW8RG2NG37rEKdpSerbN4fOZ+w9W3AiSVg1xfxE6RUtTgXXjQSkq5iypftM+C29E
-qdqR8C65uE5gpC2hCeip
-=IdPa
+iQJ8BAEBCgBmBQJVcC93XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisNEQAJ4NnxIsQvs2B+cHHHUQiGSA
+NdsQ/+uz5NAIDlSkHuYVQppkA2JXaQ9gGEI3I2Zgc5zwG29LdraJ9+xY8m2wjr3/
+NgVO+EH0DA/eCMQ1T4qINkJUCOixACiZ4H+yZD+1Mv/8ewmwRVIj2bdJXIazknLK
+OrvzIBdmT24NZ0+KQAzaRr2QMpnX9vZKH25WRYwMApAr2MiGRjgs7HtC4Z1NCvUD
+wSvxQcjhxIwhzPtpEp2yjTdBFLHp0of9Ek7y37WMEQyfPeT1faEmzBSR8DNC77KM
+B/7hL7rMtj5sB5G62kQiJCCHWdw2OCstA0CXWy4RZRQqqNto7IUtAGsMMfjL5X3a
+DveEo1ZfPEg+tC0+Fb1v1HhpPTKa/YJf7nEkWR1QH8+YXeo28zA4NUZ0/lcIudCF
+3kVzH5kzoBTtwjJHPWkR83xUWtoJEaSBo1x41sGa9unRdWFSe7MMM8k44w9QydoA
+7y+McpTvRwCPTYRQd60jp1NK4dqnafivSGvuULtQsnl4rNiBlTeyGiAOYOxSGJ+A
+/TjjrTDzFc1Tth2KmxewD8PL/W+hT4tp4Yd1NZri5MUsz2BjgkDIzCpFNsR5dv1j
+im0aNw7gAtXDGdYCXfAQLlG1hUwZVtmCsvdTHgAdblBfgNUOlbYAMHiNSkRllFCw
++0cgP2Kgjvaa3I/xCIUn
+=gH6G
 -----END PGP SIGNATURE-----
diff --git a/net-libs/zeromq/zeromq-3.2.3.ebuild b/net-libs/zeromq/zeromq-3.2.3.ebuild
index 73c3ded69ba5..5ec6d2f52197 100644
--- a/net-libs/zeromq/zeromq-3.2.3.ebuild
+++ b/net-libs/zeromq/zeromq-3.2.3.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-3.2.3.ebuild,v 1.10 2014/02/16 19:56:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-3.2.3.ebuild,v 1.11 2015/06/04 10:58:58 jlec Exp $
 
 EAPI=5
 
@@ -15,22 +15,24 @@ SLOT="0"
 KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="pgm test static-libs elibc_glibc"
 
-DEPEND="|| ( sys-devel/gcc sys-devel/gcc-apple )
-		pgm? (
-		  virtual/pkgconfig
-		  =net-libs/openpgm-5.1.118
-		)
-		elibc_glibc? ( sys-apps/util-linux )"
+DEPEND="
+	|| ( sys-devel/gcc sys-devel/gcc-apple )
+	pgm? (
+		virtual/pkgconfig
+		=net-libs/openpgm-5.1.118
+	)
+	elibc_glibc? ( sys-apps/util-linux )"
 RDEPEND=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-unused-variable.patch || die
+	epatch "${FILESDIR}"/${P}-unused-variable.patch
 	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
 	# apply effective bit of below commit to fix compilation on Darwin
 	# https://github.com/zeromq/zeromq3-x/commit/400cbc208a768c4df5039f401dd2688eede6e1ca
 	sed -i -e '/strndup/d' tests/test_disconnect_inproc.cpp || die
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -39,21 +41,22 @@ src_configure() {
 	use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
 	econf \
 	  $(use_enable static-libs static) \
-	  $myconf
+	  ${myconf}
+}
+
+src_test() {
+	emake -j1 check
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README AUTHORS ChangeLog || die "dodoc failed"
-	doman doc/*.[1-9] || die "doman failed"
+	default
+	doman doc/*.[1-9]
 
 	# remove useless .la files
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 
 	# remove useless .a (only for non static compilation)
-	use static-libs || find "${D}" -name '*.a' -delete
-}
-
-src_test() {
-	emake -j1 check
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
 }
diff --git a/net-libs/zeromq/zeromq-3.2.5.ebuild b/net-libs/zeromq/zeromq-3.2.5.ebuild
new file mode 100644
index 000000000000..8e92f0116961
--- /dev/null
+++ b/net-libs/zeromq/zeromq-3.2.5.ebuild
@@ -0,0 +1,61 @@
+# 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-3.2.5.ebuild,v 1.1 2015/06/04 10:58:58 jlec Exp $
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="ZeroMQ is a brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="pgm test static-libs elibc_glibc"
+
+DEPEND="
+	|| ( sys-devel/gcc sys-devel/gcc-apple )
+	pgm? (
+		virtual/pkgconfig
+		>=net-libs/openpgm-5.2
+	)
+	elibc_glibc? ( sys-apps/util-linux )"
+RDEPEND=""
+
+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
+	# apply effective bit of below commit to fix compilation on Darwin
+	# https://github.com/zeromq/zeromq3-x/commit/400cbc208a768c4df5039f401dd2688eede6e1ca
+	sed -i -e '/strndup/d' tests/test_disconnect_inproc.cpp || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
+	econf \
+	  $(use_enable static-libs static) \
+	  ${myconf}
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+	doman doc/*.[1-9]
+
+	# remove useless .la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# remove useless .a (only for non static compilation)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/net-libs/zeromq/zeromq-4.1.1.ebuild b/net-libs/zeromq/zeromq-4.1.1.ebuild
new file mode 100644
index 000000000000..c7cb822b5c36
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.1.1.ebuild
@@ -0,0 +1,50 @@
+# 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-4.1.1.ebuild,v 1.1 2015/06/04 10:58:58 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/4"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="pgm static-libs test"
+
+RDEPEND="
+	dev-libs/libsodium:=
+	pgm? ( =net-libs/openpgm-5.2.122 )"
+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]
+}