fix bug #483318, thanks to Joerg Neikes

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

4 files changed, 50 insertions, 8 deletions

diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog
index b42ab939ee81..41b0fa5ddb7d 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.39 2013/09/01 15:56:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.40 2013/09/14 04:40:40 qnikst Exp $
+
+  14 Sep 2013; Alexander Vershilov <qnikst@gentoo.org>
+  +files/zeromq-3.2.3-unused-variable.patch, zeromq-3.2.3.ebuild:
+  fix bug #483318, thanks to Joerg Neikes
 
   01 Sep 2013; Fabian Groffen <grobian@gentoo.org> zeromq-3.2.2.ebuild,
   zeromq-3.2.3.ebuild:
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 0f5298a3cf19..ce04a3773124 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX zeromq-3.2.3-unused-variable.patch 1227 SHA256 76193fc18e1604980497ede5838fc988780100832177e27050b743716849340f SHA512 6701afff606f5b8e2adc85918ce5c965d6991bbb073450b284161e729f796e55fab9f4c8465228311f4d55af6732b5e72af1c53e768694702237a8339e930b89 WHIRLPOOL cdc7e8c96c748b31730973fb9e9514e68c2117e9f7b3e97a91e6c63cd8f2c3bc98c43374de7ebf07d8292c8f14a9ea7139f348dbab631ce7f3f705a6c170da00
 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
@@ -14,13 +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 1657 SHA256 c1ba50a91b312ae01ed236072d3c8b756b5b7f72f6993ed26c24707c2a86a937 SHA512 b0316155a5737d46307d294a59406e3ee3366b470c4a393ed26a5f3f472150226c07c0f270c42a96e15b34702e4c18c74d54abe92cd8a61ac4c32d82234e8c63 WHIRLPOOL 24bf317c5795e1dacaf7eb951e664f4144b0906e3dd0b99edf5f265fd5405a495a283d6feb21bdb67396716f2e0a79aacf1dc1f4a797e505d94a84e072ec7bc9
-MISC ChangeLog 4974 SHA256 17c5ee461f46436c3f5ba426070c73cb30a2e29057d2dee296889a867e12a63d SHA512 cfec0610519b6f5e08b0fd1b4a80deb48717f18b3cc3d244945e15d706059f6f0c85e77523a421ef719ae526068ef62bfa583a15a44615b96903fb6e1b28c14c WHIRLPOOL 534e56cffe1e66c206f15bbd7b6b90779d0106b32123d40cba17e0f8f3c2ddb91269de5cf42b34a434427f8b8fd60ab7c2c9db1a111cd3712782a239b02cc7ec
+EBUILD zeromq-3.2.3.ebuild 1705 SHA256 36e5d4f7474e05365e3047a951525af5402b2f7e06c519dd02a796b7e4ff07c3 SHA512 41840501ce18ee6613c77215cdc6f599b1605717d33dbfe6cca1c0d1831646cf92e30675cadb34f395f14d4b7f1413f6d45e03077530ac5283b82b97c5b75892 WHIRLPOOL 40c1821613885d4da12abb19d04bf477199cae8ae7abec4785801c5f7fa3f087a30f1a8dc18572faa86798e88fafb2886d57eb906372ee4e640a7bc12c78df2a
+MISC ChangeLog 5137 SHA256 ebaaa34e026a64e6fc85a1c04211390a079b74944fc5e67386016daf216cfa6f SHA512 834b80bec9a9ca66adb87f0149c4c1718953984935b5f1c9ad19182676fba2fe64772515b64919639463058b01f78ec9d528b62ec38afea60ad9646e1612cba6 WHIRLPOOL 23fd0f5469530b11140f12cd8490b3b451677d33b16f2e14f858f41c459d8f5180a476725175119146c86cb6462d83cb001ad8d58b29796eeca0b3f7a99fdcc4
 MISC metadata.xml 1266 SHA256 7fe94a3436340035cc866a83e486dcb2b36de7a7030b4886e408ee3f2843062e SHA512 401e8e3aed04a9e33a73cde0130e7fbe06226973e474b4b171cc68b28ae16a927ff3666b38807e381e46c2b85b181115f134aa05cb4735fb3b718f30f0979b52 WHIRLPOOL 69c6bb1c08cdcc7cf531c312da2800e5f43d2f1ec285e07903253b76efed81021f4a6433d334f8b0f4e20479b3b9e298a5daa9eda4b129a22d3b805a94aab078
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (SunOS)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIjY6MACgkQX3X2B8XHTomviQCdFVQMkKueB8uq1P+t+QPPpZf3
-ZE8AoIYDR2OvBNSXtbFnlZYJTX8sFbjh
-=hze3
+iQF8BAEBCABmBQJSM+jNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
+QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01cazs8H/0dUPl/jyWRDHk+ezpOhId9Z
+KNEskweJ1w03zL8i7IKzm7t++MARgDtSq4OCoT8HOTBFwqX7KbvgxZBjpFLH27g1
+JHoh3K71Ph41J6WYyJ2QtJwlDuBgKE7eADJq74C4YoH7UgcgFtFu5yxD/tp8IpJm
+IaBaHi9FIJOmSOUM50mdDJViiJCEgGiWgzNjFxjymhGflxmWLDQymIFFcvxMDDMP
+HHiiVaOmRZIE3jScJXjT+U07Uri/KK3btuio8rQNtDREvI5gbEP4XDXn1QHTb09H
+qdaY3gNPwP2XecGDzSz2BtmWE9GoU1kU/6wPvNHH3TlkA1SEiPbHb7rvou/UXfM=
+=xCxv
 -----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
new file mode 100644
index 000000000000..8307cf12bdff
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
@@ -0,0 +1,30 @@
+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 @@
+                 zmq_msg_t msg;
+                 zmq_msg_init (&msg);
+                 zmq_msg_recv (&msg, pubSocket, 0);
+-                int msgSize = zmq_msg_size(&msg);
+                 char* buffer = (char*)zmq_msg_data(&msg);
+ 
+                 if (buffer[0] == 0) {
+                     assert(isSubscribed);
+                     isSubscribed = false;
+-                } else {
++                } 
++                else {
+                     assert(!isSubscribed);
+                     isSubscribed = true;
+                 }
+@@ -64,10 +64,6 @@
+                 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);
+-        
+-        
+                 zmq_getsockopt (subSocket, ZMQ_RCVMORE, &more, &more_size);
+                 zmq_msg_close (&msg);
+         
diff --git a/net-libs/zeromq/zeromq-3.2.3.ebuild b/net-libs/zeromq/zeromq-3.2.3.ebuild
index ec05acf3502d..d4159a54eb22 100644
--- a/net-libs/zeromq/zeromq-3.2.3.ebuild
+++ b/net-libs/zeromq/zeromq-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2013/09/01 15:56:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-3.2.3.ebuild,v 1.5 2013/09/14 04:40:40 qnikst Exp $
 
 EAPI=5
 
@@ -24,6 +24,7 @@ DEPEND="|| ( sys-devel/gcc sys-devel/gcc-apple )
 RDEPEND=""
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-unused-variable.patch
 	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