Take upstream fix for bad assertion.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 72 insertions, 1 deletions

diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog
index 2e728b088062..81653362208b 100644
--- a/net-libs/zeromq/ChangeLog
+++ b/net-libs/zeromq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/zeromq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.9 2011/04/26 20:24:04 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.10 2011/05/04 08:29:13 djc Exp $
+
+*zeromq-2.1.6-r1 (04 May 2011)
+
+  04 May 2011; Dirkjan Ochtman <djc@gentoo.org> +files/2.1.6-msg-mask.patch,
+  +zeromq-2.1.6-r1.ebuild:
+  Take upstream fix for bad assertion.
 
 *zeromq-2.1.6 (26 Apr 2011)
 
diff --git a/net-libs/zeromq/files/2.1.6-msg-mask.patch b/net-libs/zeromq/files/2.1.6-msg-mask.patch
new file mode 100644
index 000000000000..a8d3da568748
--- /dev/null
+++ b/net-libs/zeromq/files/2.1.6-msg-mask.patch
@@ -0,0 +1,12 @@
+https://github.com/zeromq/zeromq2-1/commit/71cb36d04bd74ca82aca3868e665831733995be7
+--- src/decoder.cpp.bak	2011-05-04 10:19:21.000000000 +0200
++++ src/decoder.cpp	2011-05-04 10:18:50.000000000 +0200
+@@ -109,7 +109,7 @@
+ bool zmq::decoder_t::flags_ready ()
+ {
+     //  Store the flags from the wire into the message structure.
+-    in_progress.flags = tmpbuf [0];
++    in_progress.flags = tmpbuf [0] | ~ZMQ_MSG_MASK;
+ 
+     next_step (zmq_msg_data (&in_progress), zmq_msg_size (&in_progress),
+         &decoder_t::message_ready);
diff --git a/net-libs/zeromq/zeromq-2.1.6-r1.ebuild b/net-libs/zeromq/zeromq-2.1.6-r1.ebuild
new file mode 100644
index 000000000000..fd632800337d
--- /dev/null
+++ b/net-libs/zeromq/zeromq-2.1.6-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-2.1.6-r1.ebuild,v 1.1 2011/05/04 08:29:13 djc Exp $
+
+# NOTES:
+# 1- use flag 'pgm' (OpenPGM support) must be masked by profiles for ARM archs;
+
+EAPI=3
+WANT_AUTOCONF="2.5"
+inherit autotools
+
+DESCRIPTION="ZeroMQ is a brokerless messaging kernel with extremely high performance."
+HOMEPAGE="http://www.zeromq.org"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pgm test static-libs"
+
+RDEPEND=""
+DEPEND="pgm? (
+		dev-util/pkgconfig
+		=net-libs/openpgm-5.1.116
+	)
+	sys-apps/util-linux"
+
+src_prepare() {
+	einfo "Removing bundled OpenPGM library"
+	rm -r "${S}"/foreign/openpgm/libpgm* || die
+	epatch "${FILESDIR}/${PV}-msg-mask.patch"
+	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
+}