6 files changed, 14 insertions, 183 deletions
diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog
index 97d53d1c622a..81e512702265 100644
--- a/net-libs/zeromq/ChangeLog
+++ b/net-libs/zeromq/ChangeLog
@@ -1,6 +1,14 @@
 # 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.63 2015/02/09 13:02:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.64 2015/02/11 10:26:47 jlec Exp $
+
+*zeromq-4.0.5 (11 Feb 2015)
+
+  11 Feb 2015; Justin Lecher <jlec@gentoo.org> +zeromq-4.0.5.ebuild,
+  -zeromq-3.2.4-r1.ebuild, -zeromq-4.0.1-r1.ebuild, -zeromq-4.0.1.ebuild,
+  -zeromq-4.0.4-r1.ebuild, metadata.xml:
+  Version Bump, #539440; drop old, fixes two security problems, #523850; Add
+  SLOT operators, #511526; improve USE description, #507948
 
   09 Feb 2015; Anthony G. Basile <blueness@gentoo.org> zeromq-4.0.1-r1.ebuild,
   zeromq-4.0.4-r1.ebuild:
diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
index a2ae5afd41ba..833cfe98b466 100644
--- a/net-libs/zeromq/metadata.xml
+++ b/net-libs/zeromq/metadata.xml
@@ -26,8 +26,8 @@
 	</longdescription>
   <use>
     <flag name="pgm">
-			0MQ is build with 'Pragmatic General Multicast' (RFC 3208) support
-			using the excellent OpenPGM implementation.
+Build PGM (Pragmatic General Multicast)extention, a protocol for reliable 
+multicast transport of data over IP networks.
 		</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/zeromq/zeromq-3.2.4-r1.ebuild b/net-libs/zeromq/zeromq-3.2.4-r1.ebuild
deleted file mode 100644
index da3136c240c5..000000000000
--- a/net-libs/zeromq/zeromq-3.2.4-r1.ebuild
+++ /dev/null
@@ -1,58 +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/zeromq/zeromq-3.2.4-r1.ebuild,v 1.1 2014/06/18 08:21:16 qnikst 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"
-
-LICENSE="LGPL-3"
-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.2.122
-		)
-		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
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
-	econf \
-	  $(use_enable static-libs static) \
-	  $myconf
-}
-
-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"
-
-	# 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
-}
-
-src_test() {
-	emake -j1 check
-}
diff --git a/net-libs/zeromq/zeromq-4.0.1-r1.ebuild b/net-libs/zeromq/zeromq-4.0.1-r1.ebuild
deleted file mode 100644
index 94a59fa4ad68..000000000000
--- a/net-libs/zeromq/zeromq-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.0.1-r1.ebuild,v 1.7 2015/02/09 13:02:40 blueness 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"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~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_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	doman doc/*.[1-9]
-
-	prune_libtool_files
-}
-
-src_test() {
-	emake -j1 check
-}
diff --git a/net-libs/zeromq/zeromq-4.0.1.ebuild b/net-libs/zeromq/zeromq-4.0.1.ebuild
deleted file mode 100644
index 67cc7a7ded18..000000000000
--- a/net-libs/zeromq/zeromq-4.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.3 2013/12/24 11:14:32 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"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="pgm test static-libs elibc_glibc"
-
-DEPEND="
-	pgm? (
-		virtual/pkgconfig
-		=net-libs/openpgm-5.1.118
-		)
-	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
-	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() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS AUTHORS ChangeLog
-	doman doc/*.[1-9]
-
-	# remove useless .la files
-	find "${D}" -name '*.la' -delete || die
-
-	# remove useless .a (only for non static compilation)
-	if use static-libs; then
-		find "${D}" -name '*.a' -delete || die
-	fi
-}
-
-src_test() {
-	emake -j1 check
-}
diff --git a/net-libs/zeromq/zeromq-4.0.4-r1.ebuild b/net-libs/zeromq/zeromq-4.0.5.ebuild
index 6f5a4085dcba..c15df4189392 100644
--- a/net-libs/zeromq/zeromq-4.0.4-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.0.5.ebuild
@@ -1,6 +1,6 @@
 # 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.0.4-r1.ebuild,v 1.3 2015/02/09 13:02:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.5.ebuild,v 1.1 2015/02/11 10:26:47 jlec Exp $
 
 EAPI=5
 
@@ -13,12 +13,12 @@ HOMEPAGE="http://www.zeromq.org/"
 SRC_URI="http://download.zeromq.org/${P}.tar.gz"
 
 LICENSE="LGPL-3"
-SLOT="0"
+SLOT="0/4.0.0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="pgm static-libs test"
 
 RDEPEND="
-	dev-libs/libsodium
+	dev-libs/libsodium:=
 	pgm? ( =net-libs/openpgm-5.2.122 )"
 DEPEND="${RDEPEND}
 	sys-apps/util-linux