final fix for bug #483318, patch taken from upstream

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xEAD50D64D8D3571A!)

3 files changed, 88 insertions, 9 deletions

diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog
index 41b0fa5ddb7d..8db1e3ca1b26 100644
--- a/net-libs/zeromq/ChangeLog
+++ b/net-libs/zeromq/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2013/09/14 04:40:40 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.41 2013/09/14 04:58:29 qnikst Exp $
+
+  14 Sep 2013; Alexander Vershilov <qnikst@gentoo.org>
+  files/zeromq-3.2.3-unused-variable.patch, zeromq-3.2.3.ebuild:
+  final fix for bug #483318, patch taken from upstream
 
   14 Sep 2013; Alexander Vershilov <qnikst@gentoo.org>
   +files/zeromq-3.2.3-unused-variable.patch, zeromq-3.2.3.ebuild:
diff --git a/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
index 8307cf12bdff..9fb86fa7d5c2 100644
--- a/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
+++ b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
@@ -1,7 +1,58 @@
-diff -Nur zeromq-3.2.3/tests/test_disconnect_inproc.cpp zeromq-3.2.3a/tests/test_disconnect_inproc.cpp
---- zeromq-3.2.3/tests/test_disconnect_inproc.cpp	2013-09-12 16:45:38.204739478 +0200
-+++ zeromq-3.2.3a/tests/test_disconnect_inproc.cpp	2013-09-12 17:13:06.487156998 +0200
-@@ -40,13 +40,13 @@
+Fix building with -Wall.
+
+Description from upstream repo:
+    Author: Pieter Hintjens <ph@imatix.com>
+    Date:   Wed Jan 30 23:53:23 2013 +0100
+
+        Various cleanups to test programs
+        
+         - Patch applied using git am from libzmq commit 5f009e52
+         - tests/test_raw_sock.cpp doesn't exist in zeromq3-x, so that
+           file was manually removed from the patch before 'git am'
+        
+        Signed-off-by: AJ Lewis <aj.lewis@quantum.com>
+X-GENTOO-BUG:     483318
+X-GENTOO-BUG-URL: https://bugs.gentoo.org/show_bug.cgi?id=483318
+X-UPSTREAM-URL:   https://github.com/zeromq/zeromq3-x/commit/bdd72826c96fa7cb6a8d2e5cf688c973a8e8d42f
+
+--- a/tests/test_connect_delay.cpp
++++ b/tests/test_connect_delay.cpp
+@@ -61,12 +61,12 @@ int main (void)
+     assert(from);
+ 
+     val = 0;
+-    zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof(val));
++    zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val));
+     // This pipe will not connect
+     rc = zmq_connect (from, "tcp://localhost:5556");
+     assert (rc == 0);
+     // This pipe will 
+-    rc = zmq_connect (from, "tcp://localhost:5555");
++    rc = zmq_connect (from, "tcp://localhost:6555");
+     assert (rc == 0);
+ 
+     // We send 10 messages, 5 should just get stuck in the queue
+@@ -112,7 +112,6 @@ int main (void)
+     // cause the pipe attachment to be delayed until the connection
+     // succeeds. 
+     context = zmq_ctx_new();
+-    fprintf (stderr, " Rerunning with DELAY_ATTACH_ON_CONNECT\n");
+ 
+     // Bind the valid socket
+     to = zmq_socket (context, ZMQ_PULL);
+@@ -182,7 +181,6 @@ int main (void)
+     // block. Then we reconnect and verify messages flow again.
+     context = zmq_ctx_new();
+     void *context2 = zmq_ctx_new();
+-    fprintf (stderr, " Running DELAY_ATTACH_ON_CONNECT with disconnect\n");
+ 
+     to = zmq_socket (context2, ZMQ_PULL);
+     assert (to);
+diff --git a/tests/test_disconnect_inproc.cpp b/tests/test_disconnect_inproc.cpp
+index 7875083..d6b68c6 100644
+--- a/tests/test_disconnect_inproc.cpp
++++ b/tests/test_disconnect_inproc.cpp
+@@ -40,16 +40,14 @@ int main(int argc, char** argv) {
                  zmq_msg_t msg;
                  zmq_msg_init (&msg);
                  zmq_msg_recv (&msg, pubSocket, 0);
@@ -10,21 +61,45 @@ diff -Nur zeromq-3.2.3/tests/test_disconnect_inproc.cpp zeromq-3.2.3a/tests/test
  
                  if (buffer[0] == 0) {
                      assert(isSubscribed);
+-                    printf("unsubscribing from '%s'\n", strndup(buffer + 1, msgSize - 1));
                      isSubscribed = false;
 -                } else {
 +                } 
 +                else {
                      assert(!isSubscribed);
+-                    printf("subscribing on '%s'\n", strndup(buffer + 1, msgSize - 1));
                      isSubscribed = true;
                  }
-@@ -64,10 +64,6 @@
+ 
+@@ -66,11 +64,6 @@ int main(int argc, char** argv) {
                  zmq_msg_t msg;
                  zmq_msg_init (&msg);
                  zmq_msg_recv (&msg, subSocket, 0);
 -                int msgSize = zmq_msg_size(&msg);
 -                char* buffer = (char*)zmq_msg_data(&msg);
 -        
+-                printf("received on subscriber '%s'\n", strndup(buffer, msgSize));
 -        
                  zmq_getsockopt (subSocket, ZMQ_RCVMORE, &more, &more_size);
                  zmq_msg_close (&msg);
          
+diff --git a/tests/test_last_endpoint.cpp b/tests/test_last_endpoint.cpp
+index 5f121c4..ef3230b 100644
+--- a/tests/test_last_endpoint.cpp
++++ b/tests/test_last_endpoint.cpp
+@@ -29,11 +29,10 @@ static void do_bind_and_verify (void *s, const char *endpoint)
+ {
+     int rc = zmq_bind (s, endpoint);
+     assert (rc == 0);
+-
+-    char test [255];
+-    size_t siz = 255;
+-    rc = zmq_getsockopt (s, ZMQ_LAST_ENDPOINT, test, &siz);
+-    assert (rc == 0 && strcmp (test, endpoint) == 0);
++    char reported [255];
++    size_t size = 255;
++    rc = zmq_getsockopt (s, ZMQ_LAST_ENDPOINT, reported, &size);
++    assert (rc == 0 && strcmp (reported, endpoint) == 0);
+ }
+ 
+ int main (void)
diff --git a/net-libs/zeromq/zeromq-3.2.3.ebuild b/net-libs/zeromq/zeromq-3.2.3.ebuild
index d4159a54eb22..b6d3806bd818 100644
--- a/net-libs/zeromq/zeromq-3.2.3.ebuild
+++ b/net-libs/zeromq/zeromq-3.2.3.ebuild
@@ -1,10 +1,10 @@
 # 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-3.2.3.ebuild,v 1.5 2013/09/14 04:40:40 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-3.2.3.ebuild,v 1.6 2013/09/14 04:58:29 qnikst Exp $
 
 EAPI=5
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="ZeroMQ is a brokerless kernel"
 HOMEPAGE="http://www.zeromq.org/"
@@ -24,7 +24,7 @@ DEPEND="|| ( sys-devel/gcc sys-devel/gcc-apple )
 RDEPEND=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-unused-variable.patch
+	epatch "${FILESDIR}"/${P}-unused-variable.patch || die
 	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