final fix for bug #483318, patch taken from upstream

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEAD50D64D8D3571A!

4 files changed, 99 insertions, 20 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/Manifest b/net-libs/zeromq/Manifest
index ce04a3773124..a43ee71ba89b 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX zeromq-3.2.3-unused-variable.patch 1227 SHA256 76193fc18e1604980497ede5838fc988780100832177e27050b743716849340f SHA512 6701afff606f5b8e2adc85918ce5c965d6991bbb073450b284161e729f796e55fab9f4c8465228311f4d55af6732b5e72af1c53e768694702237a8339e930b89 WHIRLPOOL cdc7e8c96c748b31730973fb9e9514e68c2117e9f7b3e97a91e6c63cd8f2c3bc98c43374de7ebf07d8292c8f14a9ea7139f348dbab631ce7f3f705a6c170da00
+AUX zeromq-3.2.3-unused-variable.patch 4012 SHA256 f80558d4bd5557128d2ebb44d075f4e32925fbcc5a726498184b0fa2721d672f SHA512 c54ee2ff1d11c33c734b7696a3fa98be8e0a5025678ac31599c652a4f0e2b507f41de3aae8d6808086bbe72fd0d485945ed2b822f984c2053f1f6f69b62a7b1f WHIRLPOOL 56113c224b01d7f300e1c6a1cb4bec2d297a3a285fe5ee3849c1f1cc82a984b8170869c67c1979a575042412e26675f8d5bfbbb4f531411d6243fc9b81309e95
 DIST zeromq-2.1.10.tar.gz 1879075 SHA256 c6727ee334b572b25269c7fed24a926cde236b3655e22f21c057aad4df5a4b79 SHA512 9c52a64882b9198fd7a42cc3590eb83b2607b9408343426a01c1afa1b7922c7eab84a9fe08eb4639d2dda451d0e5731dd7d55cef14a033c2deef747d38b2b853 WHIRLPOOL c96bd8534068765b068f8c61e0232d62c885ec045cfee59aa38e8d810a8043a2dcd7fcd67eb591ef9f87cb2968657c69e78f153d0af3854be808c0519688f614
 DIST zeromq-2.1.11.tar.gz 1891038 SHA256 e1cd4abbe353d3d72df42a2ee05593047915987024a4baf965745d29832eb214 SHA512 a014e75975c959ccefbee1cfd8663f6a186b179f248a2d95167bf36fd468cd5d49967d352f2f515e7a8b94df8b2bcaa6ba5311e82b7604b7db34f42a2c44ff84 WHIRLPOOL 1d7ae9e68630f8896d39ef8e0911e1fe24b3cc0db9c12f2a53b23e2207cc9727a976f728de3f44793aad8ecf78ed9f2c16f3847c4b08a68a2aa5a13b596fc8c8
 DIST zeromq-2.1.7.tar.gz 1877380 SHA256 2a1416d0a3ea55ae17d43417fd9bd193412cc9101e144bc8d3bd19fe36816e0d SHA512 4e8ac3529398448686d06d44693d9e3a372697576bbe3f91c89baffa42a4cde6af9d63210522a8f51e4b62f4ab151153fe504a42632dafebbaaa4576a2263fa4 WHIRLPOOL 557bab8df704e044c90ab01cce332e84d78e553d83f5e6cad27f9cf9c359608333edfb2afc3bba0a549e37d08304c6a40ff2103b29eab473a75df076059098c1
@@ -15,19 +15,19 @@ EBUILD zeromq-2.1.7.ebuild 1324 SHA256 2207ab11cf604fbec7c9429fe843b35aeb9892dfc
 EBUILD zeromq-2.1.9.ebuild 1326 SHA256 0a647bedeb613db96e443bb771e5f809e63586d095f5e6b304070a209a380a73 SHA512 26b4306b6c741290e7657e9435d06de038c5d3ee656e193754b7e2ae94405ac8a9b3ce866c69ff30509a997b72bd64811282e9876ea05252c5e0410e7b6c17b1 WHIRLPOOL 977601d4c948348a50e15421cf4d4658732f3add145010f3585430eac8a52ba9f0243d81bd7df5c7b3ff533eeaf0c565effb058be53cd6bbeeda991bf1906d8c
 EBUILD zeromq-2.2.0.ebuild 1404 SHA256 d639a74b0e8c4058f8f286b7f9420ca295794605c650ec0cbb60d658614986e5 SHA512 040e88e2c864d990fb94ba38b4a081d8d5c3755590510708675f194e9a110c99b2a253eebda4d6d17641172920ef15a4d8a3d9a4af1a8aa3216345e2866e403e WHIRLPOOL b8772c6069c19d4d5138c2e295222b29546e1446ae28985ecb75266614dddd3707e08eb8ea3081fef12ba6c71263acc7e2adb6917c7369b739c165943067a69d
 EBUILD zeromq-3.2.2.ebuild 1315 SHA256 af2afc1bc7f8258b5f968cb30501610bfbe9020317d2d05123d085421d0cd23b SHA512 d25e981290618f13b60e25284a99d0c846b76f9f071f2474e61760ec8d08242ef560202e2f79333c515c682be2e0064c2f2281f85aacbebb639d4166bcb19b14 WHIRLPOOL a0537be8f122f581f3ca4c78900e6e4a8deca27b04209fa7c7b5d8f773f4279f89ef82052a53d123c38785097e060513c2a3b9fd72e293ec9258534f0f44a01e
-EBUILD zeromq-3.2.3.ebuild 1705 SHA256 36e5d4f7474e05365e3047a951525af5402b2f7e06c519dd02a796b7e4ff07c3 SHA512 41840501ce18ee6613c77215cdc6f599b1605717d33dbfe6cca1c0d1831646cf92e30675cadb34f395f14d4b7f1413f6d45e03077530ac5283b82b97c5b75892 WHIRLPOOL 40c1821613885d4da12abb19d04bf477199cae8ae7abec4785801c5f7fa3f087a30f1a8dc18572faa86798e88fafb2886d57eb906372ee4e640a7bc12c78df2a
-MISC ChangeLog 5137 SHA256 ebaaa34e026a64e6fc85a1c04211390a079b74944fc5e67386016daf216cfa6f SHA512 834b80bec9a9ca66adb87f0149c4c1718953984935b5f1c9ad19182676fba2fe64772515b64919639463058b01f78ec9d528b62ec38afea60ad9646e1612cba6 WHIRLPOOL 23fd0f5469530b11140f12cd8490b3b451677d33b16f2e14f858f41c459d8f5180a476725175119146c86cb6462d83cb001ad8d58b29796eeca0b3f7a99fdcc4
+EBUILD zeromq-3.2.3.ebuild 1719 SHA256 e64c702cf97565a50f3f059cffaa19475f7c6b0cfde79c5943f01400771b9fa0 SHA512 6da69ebda7fa87fbe77afaccdcc1f884e2721ec164a570e3663b9c6402816749c49c84d8e05db40ac39b17cb79be234b19eb72587a3f0eda2d15a5807b855e1c WHIRLPOOL 5fa34bee0eceadebf6eb7a92e10e531621d67718b97f6bec68ee902f2786e7f1329344c6b0246bd7baae6c72df5c3f8c5666f029999a8ecf253ec833d4c1d14a
+MISC ChangeLog 5313 SHA256 db37afefe059bbb5eda414654d20d0934c102dd7416274ed55627e90d1007804 SHA512 587ddaa33f77957efff630078bc68e0d8ea5448539d2a96594b245486e5806e8808362abdfcf6a1698939ae4fdda02f95e1b384ae04c7701bffc6fe4a64edca2 WHIRLPOOL 51febea42cb3d0a801efc61a6af2ef56f004c83e69b62f0e9ec33adf965711ece651132ef77ff011dcbc7955a6fc60e0d86cfcfdcba1c54526e69259c354a4b0
 MISC metadata.xml 1266 SHA256 7fe94a3436340035cc866a83e486dcb2b36de7a7030b4886e408ee3f2843062e SHA512 401e8e3aed04a9e33a73cde0130e7fbe06226973e474b4b171cc68b28ae16a927ff3666b38807e381e46c2b85b181115f134aa05cb4735fb3b718f30f0979b52 WHIRLPOOL 69c6bb1c08cdcc7cf531c312da2800e5f43d2f1ec285e07903253b76efed81021f4a6433d334f8b0f4e20479b3b9e298a5daa9eda4b129a22d3b805a94aab078
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQF8BAEBCABmBQJSM+jNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJSM+z6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
-QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01cazs8H/0dUPl/jyWRDHk+ezpOhId9Z
-KNEskweJ1w03zL8i7IKzm7t++MARgDtSq4OCoT8HOTBFwqX7KbvgxZBjpFLH27g1
-JHoh3K71Ph41J6WYyJ2QtJwlDuBgKE7eADJq74C4YoH7UgcgFtFu5yxD/tp8IpJm
-IaBaHi9FIJOmSOUM50mdDJViiJCEgGiWgzNjFxjymhGflxmWLDQymIFFcvxMDDMP
-HHiiVaOmRZIE3jScJXjT+U07Uri/KK3btuio8rQNtDREvI5gbEP4XDXn1QHTb09H
-qdaY3gNPwP2XecGDzSz2BtmWE9GoU1kU/6wPvNHH3TlkA1SEiPbHb7rvou/UXfM=
-=xCxv
+QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01ca+j8H/iN8vrgp0nVAka5pp5B64c9U
+M7hGAdZXPAHm/sClo6Thib/reC/UtjiR5Oxc5WtxfN11w5uUkJqdfL1Hlss4sbAI
+ITio1FOLyyYQv2xiMGsybFHmwf7c7KIsd7Mp5LVxz3IjwCidEbjR9jJZApKy8XBY
+Sghb27rUV/OA9vWvG6SrmaZ2jxWo6ephI0Yqys7iwUT7GmvN8pjPVdlXdVTUqTCE
+AzVPxsbBmC3xtLiwzx69sIiBxpwoQYOutN1uJFcOD3uuQUBpnCznR+p7O7UTfVL3
+jqx5yCIxdvvLYeUQjo51UVGsquSkE/q3k+s7L148Q3V4ADGeWECL/kiJVxdLlOM=
+=f+4f
 -----END PGP SIGNATURE-----
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