7 files changed, 26 insertions, 195 deletions
diff --git a/net-libs/czmq/ChangeLog b/net-libs/czmq/ChangeLog
index d269a82088e5..bc404a07a1e9 100644
--- a/net-libs/czmq/ChangeLog
+++ b/net-libs/czmq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/czmq
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/ChangeLog,v 1.17 2014/09/15 19:09:20 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/ChangeLog,v 1.18 2015/02/11 10:42:44 jlec Exp $
+
+  11 Feb 2015; Justin Lecher <jlec@gentoo.org> -czmq-1.4.1.ebuild,
+  -czmq-2.0.3.ebuild, -czmq-2.1.0.ebuild, -czmq-2.2.0-r1.ebuild,
+  czmq-2.2.0-r2.ebuild:
+  Drop old
 
 *czmq-2.2.0-r2 (15 Sep 2014)
 
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 83cf011c8555..a95742461a8b 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -3,35 +3,28 @@ Hash: SHA512
 
 AUX version.sh 736 SHA256 5da73f6e4f6a7a66d1d91e8a5b184a4a03e50d063a8742601e28bd2ddbb69a3f SHA512 e7c0c49477a7bc8e01bb84a133bef817a5942e8c13db3cbab05f8fd1a5abcbd821dab4016634363b077c869b93becce4ec1431b3e1d28fa969169cf0b9f6051a WHIRLPOOL 30866f4dc515df42d98e405bb66553a09bb1d4380fa4648632c0c1a41bd7913c54872acf3b1e73f8317b7a5022eb08ac1d7fdd5ecbb95062b522ab703532ba9d
 DIST czmq-1.2.0.tar.gz 418301 SHA256 fe1d92f13ad0ca0d40a540c2b776f158b13782dcf2d2348dd7e3d33337193039 SHA512 c1d6fef16af3ad53498076a0dfce30d6092e14ff362238e4d91653c3575b618ff8f9a046c70736c763f3b2c1ba9abf0eb6b036d7656d99eaedcd586265eba762 WHIRLPOOL fd4a126e72b80f2612fd5a46d811ff31bc727f4b2044582ab426e857667db9531ac5c7e650ff3dc61101940a986021ccdb6d956e4d00c9f601582002a2005587
-DIST czmq-1.4.1.tar.gz 440955 SHA256 7b2074a3b753459a6fdb88d9cc52b725142783793bdbce35d0bfa52fad64425c SHA512 01614da6e3f98b1b123aab828e7b8a4eb3ad75d3308d67d30400871071a70a67d2cd29bcb51023da564f0849aa5fab12de126480205aec673961a82b3c4872a4 WHIRLPOOL a6d3862fe999e8ca1fabadb29cf115b592f031370494935c1f9e547600eb34a61f7011966f2c838ff918d43b4da8508d91e3dca04faaa17a987199636f795487
-DIST czmq-2.0.3.tar.gz 533845 SHA256 adaac33f03d58c3a2ab48be9095df3c4bc876d331c115965b5c48830fa7cd84c SHA512 5ac01dfbb2b0907729d42a807a267812ca1ab22104fc22f440d71264ecae75489d5c9385019da1e77c280735528e3cea677ff27fb823d9debcb26223eb8cf987 WHIRLPOOL 01889dc537f2931111d155641b2c52d2367e6638e1f92f3ca868ed32885d53d820945b8c957a5efa3e561a39a2c8206664d7fbdd1cfdcf176ed0af6713009531
-DIST czmq-2.1.0.tar.gz 585871 SHA256 d6f30b4b5def57496e7ca665ff306090f7c23c32eb0f3b41188a742933361ea5 SHA512 dfe83b9924f3c199550f2d077982055ead4727ce714ec91c75f2f6547f12adf5e2a7940bf7d31f49f8beec4b220a6336dec0131bab5f9e2c8ff0f5f112a05d17 WHIRLPOOL 74575591eeb80cdd7d2b4cc994469e69a412a1d973c5abbee29720f721232a27db4b206a362808ad4a5d12d7d517403e74199c78eb319103720ea8ca379b22c7
 DIST czmq-2.2.0.tar.gz 592293 SHA256 eaf86f935da6ff9c5e273313d2c59ec90ca19b2339cc7e588a1fa0b4296829e7 SHA512 51825e8a62a53cb3ac5fcf95b217e7dceb1745d31e243679e3c6ad0c7cce26e5844119bd054312e3764f0299df7e26bf9373a68cb1e7afc675966aa616a90ab6 WHIRLPOOL 7f1044029a7648d18206410efba74a7613619630a02bab0425aa9faf27c43d73306820db702764686ecd22021ace09d21422f717ed1f631b8d4db95f51e8df0c
 EBUILD czmq-1.2.0-r1.ebuild 968 SHA256 e6a70321f03d800cdd2c6e452cd9b5202fd88c771cadb4367fd596f0d4d2a572 SHA512 f73a78268289e249afea42fcad547e2c169edc346caa33b9e7873f1d615c4bde97438ac9aa3ff19e23fb8a6021f29cbe06d9087f2b43791362a98da13f06766a WHIRLPOOL c246cb7000e0deb5b08c1a5a642f627bf061a0a51276120a9a1fd8ff1ced30e057d45176a707346a72f7cd864345bbd88a766f65cf82981509175e3eeb1a69e3
 EBUILD czmq-1.2.0.ebuild 953 SHA256 671f747fd8c9ce742cca3ac80de7766a35762e6733fca318e80a0b9189df542f SHA512 12a5381ab58ae4d1b2192e5ca6b827be1bf9ee23c8c7e2ec6e2c3d96fdc10f09a84a518b5112e0abbe8182d802007879f08a7f536b9217d5fa6b9ccfc6acc8e1 WHIRLPOOL b31250a6ed79ed722de724cede83aef9784f623c1e3d7f0321adc33e1321d0f09c7f07b20367f739921e3bda77118f9ff1dd05805370a066f85318826828bad4
-EBUILD czmq-1.4.1.ebuild 945 SHA256 20d81116887f12baae54f871782b5f224ab1d7008cd962b2ee37d4c84ce7bfaf SHA512 a51972491a3dd02707a4ba120498839d6caa2edeecc05a94ed83d72be80bf292c7a137def416fe0a67002737a13dd4b6e591cf0437514b749ee8928b5fee8cc5 WHIRLPOOL 44ecc8f6f3fd49e13fb73e3415a3ab045389580a8082683b738893dc05f10f377d344dceebe2f44bd5538bf09ce1c87692195a67dfbf5b577b3e43814382025b
-EBUILD czmq-2.0.3.ebuild 860 SHA256 e2a6fbc174126ebab5e5bdf0b3b533dcbb883b96513f9d53944e6f7d7b406c9f SHA512 65e04d27bf141a2f3078b383a8dd1d5092921c980f413fbd7c8c6be1966b0a0b7ed519b07f7dccd2dd37cde30b7cda4314a56cf2972e9b9234c94a8d1ec6733e WHIRLPOOL e90abc6a6be46357fb4b5ca1e7d79b594bde0cb3dbbda362d9ea618b275c8c35d10de706dc5db13c113eb577c4671724aedbe3ed2064ba25dc045d161787d6bf
-EBUILD czmq-2.1.0.ebuild 895 SHA256 64a9b4e1d721f5fb15a3d5d6eb1468bf8742fe6685000bca6544aa4a085a66ff SHA512 b90d2fd67fb7f3ef358644fddf76e9f8e0386257d01aa6fcb8f8662312c753a9bd9ab1fbe87db006644f785e085c9eee195739fe46ddc4ebbdd91a601a8a26c6 WHIRLPOOL a33c625969d92d80e53482c5ba8df11824c9448f4ff63793311cbe9cd7ec4a3b969604c30f2b7768013b0b85b80b49b1232d5963438c329ba56d8821f8ab56f9
-EBUILD czmq-2.2.0-r1.ebuild 753 SHA256 1aa0ec4d19de064cd8f8e1354d1c04b9106a87b14285b736c36dd24f80df6e56 SHA512 23caab3387d92258d39240d7d5645748170f2ec5866e7cf80574e468590a72b11812af2d74b8c54d00bb0d2577ae329bb8cb6186faa07de662af8135347183cf WHIRLPOOL 2b3b72626ae354115402fbd445720cfa4dbb325dd43fedabde575ab0524e16f05f8a5f344cd2607e518cf273034e6462b8d7c111adaed1c34532af0e0f671235
-EBUILD czmq-2.2.0-r2.ebuild 940 SHA256 6b10d061e2f1c0513e36d44cbe2b834e0943e1f609570951662b320c8e2e998c SHA512 b6aa00c36e8bb1635096b510000e7ee0f1205af2fc9135e8c3f81e062f31a8de33e3ceacdad358ece689b2a603eb6ef40caa146ee9db2efda1dea3f66a0790e2 WHIRLPOOL ed8e656eeaef76c1f299895c9c52cabea03071782de83d532f83c5522081073f76c724dce4e3cf24748582fe0ca6739981814259b8dac90ecd0abf0df1904634
-MISC ChangeLog 2544 SHA256 dba6b82e67a3d5104f5d6f7f897681f5dc1d868dc8dfc23ff1ed5651e9d44896 SHA512 16d5c598aa2f2a25e11caa8ef6f945ede857573bdb0e1c775484120fe05c70b45df9660fa762c6317c5e19e34b71ab88d06d14ba0807523588bcd8c5d9eaa5b6 WHIRLPOOL c6d90c97ea17358b881759cee95bf30a43bea2caa322ad06fc34bdc159e405b20d51b0a5a017ce2b9170b3ffb16cd0882828c56b5d381c42eea29dd4a95a5a46
+EBUILD czmq-2.2.0-r2.ebuild 942 SHA256 045ec8438ee5ccefe52746963cab78fdfc6b4b1afecdfef7468f5b0c078a40bb SHA512 6d74ac41374f553253298b56882afa6a019c1b0ea793ebe3c33417fb7888508fa4c532c1b45f10b4fe1dafa29597e1679a79bce899c0cd8493024efbb46cbd40 WHIRLPOOL 2bffd360649eb800d4aa925a617b5d515d2b7d6eabbf15e6e92f92206a7e1b13c49db5352d460cc18ae12cafdc78fdfe800a323c5c55882b8870ae01b8aab7b0
+MISC ChangeLog 2712 SHA256 df3a1fac59cb7cca6845d34f15e8b794598e780ad8f1fb7ca44a383744d69eda SHA512 a328397840aa54a1e0eb6b139607d5945f6f3009213fd4b162631ec67362aa7aedaaeba0a2a077414277d0e58784ce7dfa41efa2ed08f8b6ed4891ed05c24071 WHIRLPOOL ea7ce6a7caf5440477fb14eab082e757d69426152c4b9ebd732f235f85b4886792d52f880a36ac13854c263af4eaa647e8d3d6a0936766e01aa9bf2f8d70cd86
 MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUFzlUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU2zMaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir7CgP+QGL6zsRz/aDAxOQ7OUsGhhk
-po7jhehH4T02BsxbqfQcwkTNU11WAm/dCG5MrGedtXZItsefa5NWks22R2/PmgxM
-PzJsnBGQuJnT/4id0R5G9ABtucc75IJAmNqzZM7LFzfMIlSzXjJFQ78g5I669iEm
-8Ig/LltdDYiapLAYRNEvitM3oaWt9ieiQidgNqC5mq78PE/IcdXw8vsETZt7evUC
-biEfzhPZG2cZHaGDAOuvVamA9vDadrtOC8Jfc2r56zbqfaCFZ4yYHS6dx6TBvubx
-gZkos40TCtpvWWgu5rEp/fM6H1ftjXooyJxcgWXQeWbePByERw8aLMgCb+6Cv842
-9p0P2nkN4NzPapw6/IhEecx2E9ZNWqnJ0nAI3wovd4fe2WZY/b6ZDXDmhrmRlWc3
-CSsubLLuzwJKQhL2vkoC1i1M9TNPYw2jIsXS/dcx7ZjtVfzhb/BxWWyRrONB+jlJ
-Ks9CFF5s8EscSueQpftWt0qYeLVGrPLgrYqrw+Cx6lqvBEr+K390WgSIzB85KVi4
-ApaGMambPc4NHuXs+pyjEBp6E09DSKHT9+pqMtSZaAQkwmeTlmyRpOytZiGqSQQg
-xFGiAxOgt9tGEmIfuZ66V7cWCw7Z8DSLCrfmj75zByKxcWTb7bDj047s/4I35kG3
-ns0b9N0EIftp6ywF6bfH
-=f3+m
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirpVwP+wfxl+RtwSyw8x2WJgYByHS6
+RxTI69NzG64WEVucAg9sUJy/dItlglBiZg5R9cUdIyKg8uAwZLPa4JEMOhs6aBvn
+Nm/tY0Isb4CBOjyLeLDJcO7bwZmdzrabNsf5tC404Xr5a7b2j6psinFOMf31IHVH
+/cpTYeo4vwOrib8bZ2DpY3XuPI4sIMznxafLPZn3riYGzm/q7mAUKXWPiSVfx/nQ
+YK6fxtp3Np0Nx52+W1j7y/4ZV8U4Zwz2F5vC9lEyApBxudA8H900LdNi7SRSqpO3
+uUF3CDI+fLsNUg7rwACYtPijx9L6zrWhH6DLVdtUymgL6UDD1VyOs3rD2c9CUXU6
+8GJgsesjukQjspDSDh/TzJvfmu9vElE6NWSJYZBwhB7AEUU5lxTZSEBd96cDDZ+e
+/iE5vhwPOaWCT8RT7TzfH5naWnnpevreAvUddlUqrRtpj+Pj7yiVLhfWz3vmFTot
+1BUBDEpjD5ltBcEvuUQe1DgSLuLKKnC0nXWnb43FsqXzKcgCQbzzKo437g3vBWcp
+k1NCILLVrs/9WgO9V18qbKPQyF8WMiJyFb0HCfQCqnrTvpoQIFee6X27C2K8L465
+cfuQ779DYVur8WInLPfDtmXObUwqLRquGk6PSC/O3E9z68aGpq1TODHNeDDEApDb
+q0K6WtdveJ9nSDFGaAIe
+=IuLJ
 -----END PGP SIGNATURE-----
diff --git a/net-libs/czmq/czmq-1.4.1.ebuild b/net-libs/czmq/czmq-1.4.1.ebuild
deleted file mode 100644
index 56c9be110f4d..000000000000
--- a/net-libs/czmq/czmq-1.4.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-1.4.1.ebuild,v 1.2 2014/04/24 12:58:26 jlec Exp $
-
-EAPI=5
-inherit autotools
-
-DESCRIPTION=" High-level C Binding for ZeroMQ"
-HOMEPAGE="http://czmq.zeromq.org"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="doc? (
-			app-text/asciidoc
-			app-text/xmlto
-		)
-		<net-libs/zeromq-4
-		"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
-
-src_prepare() {
-	sed -i -e 's|-Werror||g' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	doman doc/*.[1-9]
-
-	# remove useless .la files
-	find "${D}" -name '*.la' -delete
-
-	# remove useless .a (only for non static compilation)
-	use static-libs || find "${D}" -name '*.a' -delete
-}
diff --git a/net-libs/czmq/czmq-2.0.3.ebuild b/net-libs/czmq/czmq-2.0.3.ebuild
deleted file mode 100644
index ca5d15d7d772..000000000000
--- a/net-libs/czmq/czmq-2.0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.0.3.ebuild,v 1.4 2014/04/27 15:56:46 jlec Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION=" High-level C Binding for ZeroMQ"
-HOMEPAGE="http://czmq.zeromq.org"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="
-	>=net-libs/zeromq-2.1
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
-
-src_prepare() {
-	sed -i -e 's|-Werror||g' configure.ac || die
-	cp "${FILESDIR}"/version.sh "${S}" || die
-	chmod 775 "${S}"/version.sh || die
-	autotools-utils_src_prepare
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	doman doc/*.[1-9]
-}
diff --git a/net-libs/czmq/czmq-2.1.0.ebuild b/net-libs/czmq/czmq-2.1.0.ebuild
deleted file mode 100644
index 8849d2b3245f..000000000000
--- a/net-libs/czmq/czmq-2.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.1.0.ebuild,v 1.3 2014/05/27 13:03:31 jlec Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION=" High-level C Binding for ZeroMQ"
-HOMEPAGE="http://czmq.zeromq.org"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/libsodium
-	sys-apps/util-linux
-	>=net-libs/zeromq-2.1
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-
-DOCS=( NEWS AUTHORS )
-
-src_prepare() {
-	sed -i -e 's|-Werror||g' configure.ac || die
-	cp "${FILESDIR}"/version.sh "${S}" || die
-	chmod 775 "${S}"/version.sh || die
-	autotools-utils_src_prepare
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	doman doc/*.[1-9]
-}
diff --git a/net-libs/czmq/czmq-2.2.0-r1.ebuild b/net-libs/czmq/czmq-2.2.0-r1.ebuild
deleted file mode 100644
index d2c0ad6cc1ed..000000000000
--- a/net-libs/czmq/czmq-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.2.0-r1.ebuild,v 1.2 2014/09/15 18:51:10 jlec Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION=" High-level C Binding for ZeroMQ"
-HOMEPAGE="http://czmq.zeromq.org"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/libsodium:=
-	sys-apps/util-linux
-	>=net-libs/zeromq-2.1
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-
-DOCS=( NEWS AUTHORS )
-
-src_prepare() {
-	sed -i -e 's|-Werror||g' configure.ac || die
-	autotools-utils_src_prepare
-}
diff --git a/net-libs/czmq/czmq-2.2.0-r2.ebuild b/net-libs/czmq/czmq-2.2.0-r2.ebuild
index 0f6486ae2f3a..e2afedff84a4 100644
--- a/net-libs/czmq/czmq-2.2.0-r2.ebuild
+++ b/net-libs/czmq/czmq-2.2.0-r2.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/czmq/czmq-2.2.0-r2.ebuild,v 1.1 2014/09/15 19:09:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.2.0-r2.ebuild,v 1.2 2015/02/11 10:42:44 jlec Exp $
 
 EAPI=5
 
@@ -41,5 +41,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Due to file collisions we move the makecert tool to makecert-${PN}"
+	elog "Due to file collisions we moved the makecert tool to makecert-${PN}."
 }