proper full fix for bug #540658, backporting patch accepted by upstream

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

5 files changed, 54 insertions, 21 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 88276338a1f1..7163dd941ccd 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.63 2015/02/20 18:35:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.64 2015/02/21 04:18:42 zerochaos Exp $
+
+*gnuradio-3.7.6.1-r1 (21 Feb 2015)
+
+  21 Feb 2015; Rick Farina <zerochaos@gentoo.org>
+  +files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch,
+  +gnuradio-3.7.6.1-r1.ebuild, -gnuradio-3.7.6.1.ebuild, gnuradio-9999.ebuild:
+  proper full fix for bug #540658, backporting patch accepted by upstream
 
   20 Feb 2015; Rick Farina <zerochaos@gentoo.org> gnuradio-3.7.6.1.ebuild,
   gnuradio-9999.ebuild:
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index c91f5abbb8a1..38cc0d2153ff 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -3,28 +3,29 @@ Hash: SHA256
 
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 SHA256 3e65981e8e8e9c2fc5e8223bf7e93956d6f802bbd9df15277283e9d44b7c5a2b SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768 WHIRLPOOL 363650437161e68f056229315f1d0b52fa409ba9b284196c16e7acf96b68e2e036930db45188f61b5b0bb0e4f51bd3007d8fee622476eb605c72f2ff4b6c24c7
 AUX gnuradio-3.7.4-include_stringh.patch 589 SHA256 ccee0348b73fa5d761e77bde23de3fe7e73abb8124cd5b0afc3c9575e4990be0 SHA512 49b60804927e5557390977dac24bec6f063455303d7e94db270ab1f6176f0c0cbcc000e0909ab206915713fcab73fab00dab8666e0489dc93e91b24df1bfa71d WHIRLPOOL 4846c418f13e424e7471b3204d67cfd70557316268d2db47dc3f7d0d98402efc3d53d0b3d616d0dddf49ff80edb7640ce70f2bb0b7c97ac9613fbe01e2824c45
+AUX gnuradio-3.7.6.1-qwt-with-qt5-support.patch 961 SHA256 46d4518b9bd4fae238bcf6fd4ef61fad0aa721daab53b6cac0e4357d9b3f6e9a SHA512 021dfd17426081dd8ec8bb2cd7e7f6a185f2c36f85c83bfa9099c157bffb2d63831241175547f5ad1838ae46e089fa5054fcadbddefb59fa1f34f8c0fa2d4075 WHIRLPOOL f2d34e07c275f7af4ff800728194b775ab22189569785448a1802835f0db828ac21468a74a215e0300890b36c234f683e671df65d1762d7d78c630e5a25dd34b
 AUX gnuradio-9999-build-type-nonfatal.patch 619 SHA256 35fb7fe91213537f89224249d4dcafaf3d250d64747f32ac51c7ee80eadc9dfa SHA512 dde528d32c214c1725e737de2247d2744367d1f47dd416543dc4a74f2ea63f127a14d0ff8ba8d8de2a0a119c35ff7d86b590c14f0f69fd6e23b3f417e3ccd675 WHIRLPOOL e2edeb12cdfd9b9b51ce90cbfea6d075563167301d2ff364eb517bf9b2f9f02e2067e929629fba9d7f783f3aa4286b547e75dcf47bb56725284bf33d661dcaba
 DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 WHIRLPOOL 7cf55be5fac7891a737d228d83718bbc43f9069c6275c5ac465ae11088559dca5e7fa31239e281271b529aa8b9ae1a0efe3850a16a40e53c0f1fe57e351ff2a8
 DIST gnuradio-3.7.6.1.tar.gz 3588833 SHA256 39dede70eec36f430c4895900bbd7ed266aa9e846d0a362987e806b7197c4c0b SHA512 88ec30b2bd93ca032c29f4606856a8e70b0123474fd84115657804429f381dea78f97a7523c9684acad6a27b357ddf876632e957de5c6e0170045dc38d121939 WHIRLPOOL 97d70e403fe46b0afbd1e6f0812f8d9de4ea506dcb2190a23d9a0f0499662f9e2bbaa86d1b624f7c621ae1675094f92cd295bc273db0759b2647e2dfb2a49b43
 EBUILD gnuradio-3.6.5.1-r2.ebuild 5601 SHA256 93cf9a2d92ecf28f7147343279ce2b8a8a66aa27fed53099f9d9873106a2159d SHA512 fe77be87f2f17ed2d28a311f0c8c16147c790b04e92c36ab9e2b181b94c535afe3d3122a15531277049384dac17c83cd0d9fe47a4e007f899ee608a5f1a5abaa WHIRLPOOL de62e59571dfdd082b545a4ec90541f2db9971f586b95f74c2af48076e96c51c9a249ce4ce9ef30c191be631fe23574559a7e230c98466af9529a7d69ecb0ac5
-EBUILD gnuradio-3.7.6.1.ebuild 7071 SHA256 28f6aa13d94c85231501ab8c9e653d9de03dcd0db698ebf737ae261df9874a40 SHA512 26350f681bcba799539237443881e3d933952add951416dd46546c989d7386c49c68ef99b6948aeb52fa63ac2ad8e0dda45cbba984251d81495fadb5926de653 WHIRLPOOL 695b613d499d9ca9637ecf4877815d908f2ab338310c6f265a7a7529ecd5363145b72fdfe870cce28dd44d97d6573af6c13e250de3bd74ae1430c4c886d61115
-EBUILD gnuradio-9999.ebuild 7076 SHA256 0dc0205e0bf6000ce02c5f7f439d727024bb0c9877db36859177e7fe35893ae7 SHA512 9acc715ab8f3daa665ab3af2fc1784aebb45d1f89f75e7893f96599fa1bfe9047cae2e73cef720c1d3f81bae517dccfcff6c4eda4fff61d2baa47823c80d260e WHIRLPOOL b31752b17a0f34ed30625a07468f4fc62fa7fdb1b9e0d845ee560b25409c86caa30f87589b34c9deb632410d5b5779596a06896f0bf9aceae58c75badbeb9564
-MISC ChangeLog 11856 SHA256 73455a2078bc8c63ae8d90a16a5ef96e0dec3bd6e9510ab997de59664290d698 SHA512 601aa7bcc2ee97d5ef8bfe57e9926d091ca00bcb4258a494d45a4e36b26d8d15b4ccd1a385621b12ec7ea0b35598cb05467a3a2950b3792d29bbf2084c9fdf71 WHIRLPOOL 1405f9fe3e5216839095369dca2f8c2c25f4c14c068201c92d31c2c29ec7e22a7fb790ffc0b1fed260e5debaca90830f9c083df51514ef64aab6bc512c52e49a
+EBUILD gnuradio-3.7.6.1-r1.ebuild 7118 SHA256 09c0e2e5ad4bb7fe8ccac183e2133b227db71bfa063d6e40e0141171ed0b3ea1 SHA512 f5e252a55ddb8cc20e25aacda000129adfae12b1278f20f52af4ece156faf88f09eeb74f95aaf47d7e2928cd101998ee6f96db28302829f670862e28ce858f51 WHIRLPOOL acf78ccc892ed36886cc0d5e3454b120111ebef65bd29bc4e472dd5ca2fe34dbc0090e49e1f0a9c42828d849f8da24ef8020f70955aaafc33d59a32404565a4e
+EBUILD gnuradio-9999.ebuild 7124 SHA256 e89adda3671b47cf4f783bd25212f49703ba309c1911c014e5147a7309ef0e54 SHA512 7af6b07c361bf7102e01f0fc2f284423d59cc5f40d2becd7ae2163d81c54ae0ee8c1cfce4cc4bd2fdc8c32759ccd456c519096ae8d80b3cc5c954fd2428413ed WHIRLPOOL 774322d349a7fcf315d7e7f1d86f93371c5a781f38468e81d560dbfef5ddb2bb91dbcdc0118cabbab0c0227ce5cf7a9a82829111198fad0ffc0d5761cda7d03c
+MISC ChangeLog 12150 SHA256 0607dd7c67679bd895b4c855523462806afc27228a28dda436e8e632f5519144 SHA512 0e9b7df5344278d41ed9b09e4e14931603d27dd01dfb07a5055d5218c53894191aaef45055d36656d5da3394d12f456d20b43d2a950bc773cbfb945d33285fcf WHIRLPOOL 2abfd3b3b1dc09aa05634cdfa0ddeefd710dd913b89451d8bf473191f509c906888b0fef79ee5c42089fca35a305a0adc57a9b5ac86828cac457caf23e321cc1
 MISC metadata.xml 1750 SHA256 d8fc5305ded243faf3b60e63f3e36779d6ba44238cf6a3ec6ab605413f3a5b13 SHA512 598b4cd9d9090906f039f1d90e2c5f6cea5b5d0faca0dd3cb5e71adf6597c997d3bc36d21a92d532968be9885af96291e8a5ad6b67f1c41e5a2e89fb015481fc WHIRLPOOL 5b5cea4f525c11540f7c91fcf23c8fa01e50b14f879c0e8480b2a96ccd308e22aea9dda61f72ad5ceb5dc82922e4d6b5acc823a890e5aaa1cfbc5b0c8883a122
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU535gAAoJEKXdFCfdEflKVPUP/3oZeEUj0iKe+0R8FgGjpau3
-MmL4nwwuDL3lW0i57rRPMIEd1tjVy3FuKMk74mJdOCQKilt+8okgkycsbfpGBQ8i
-+nvg92O8eX+4mLhPOLs74X1y9+PmgcbB7b2ENVl+kui9GChlvtTp2oY9VBaEKsKF
-passa/0vgdofcsKALB5UgA+nyflDMiv498I5oPXWodA4yrwAxn3fz+xsFI08RXNr
-g7u5VCvzaOstb6PGcYhsS81QoKpgURiG14Y7z4CP6YTyUjMeOkKAe+AJP5oiY5Ul
-Snx9Z6mkWMFhRjBOvNOirPyNHwPj3hlE0FWpQ09mzskiPXROAemCaDm8IFeH4c84
-7uL6rl7AXsv7nriGCPv319JXuFG+PAPBuUynaLNOnwis5hdwCI7siiggmZqyY11j
-jyVrFH1MSmMhOsiImHXOgll1q723kZSdknsRmfm00GtkKRvSdNhysYS0EkR8HYnm
-QrHJZg0PT22LTytQU/pb6c9TOKRk6P/xC9aV+Oor+xfEbleh/2+zkmAyUku77aIX
-Il0gW6lbZUwqtY0L0ebBHmUE3jWmE+XmWwyrCthNMOfRVS6WlqL/zX647MrArTJZ
-8S5gagoAbA+dRmd6MvDsxNs2t7QmraFq6TVO/gt0RpPqa7bUvwKMUihGUfMI/Tqq
-Lqss5wy7EJ1vOnT7yGIN
-=9rbL
+iQIcBAEBCAAGBQJU6AcsAAoJEKXdFCfdEflKUHAP/AyMfFz8pkVrzL/c185HH3wP
+cWJcU+bJdkj9WdzVb53Penmnjs57n5A/OXICBqxKQFUxIXbONMVxFYjtg9m2RNoO
+66fW4axwcHAHgXP6HV7lsaq9/tV9UGvfALs6iQvVAaoNLcFcszllS5jhVwaepyF6
+qfxn5NNDyH3LuBN2TgOD+9gl4ZUGvtuBsb2WlijsDz1puwXscKcXQuzeHnHsmvej
+pGsoRdEc6lQcGiUcJG8u03U12B3D9zfxZPX1VVTP3Cbgx0lW0cA1utwBVnHk6PII
+9+ua5kjeR0jfqoTBWxmbqX1kfrG3SGzYkQoE4M97MUkjf7XybTaqwq6cNP8H88p8
+sU3QXyB8tndx0q62csL+xZNBtUS1KSc8MKM2+BZ16ztmDs1BqhpYyRpvIiD+30ax
+1koV7D0jS6AThr+Yy4TbBvkA15UjWrTFY8pZXwmcs2OupKsCiw3kgtgZUp6UKZn+
+ekCGJD0Z7KZEgTEy02thJ6ozVyEYephTAdqbydyeQ+Yj3nCfaXebnJrZlOhF5xr7
+SWNtelsxlakJF3FvZVf8HhOBWW+H8qOl2mcEbnEiN8ZxmK9BRHDhFWEZBY93jZAr
+8a9/1ewWRAd6HO6jnWh+XVco6jPlf2C0ERBPuIQQ4IFjby9roPy4cEQ6pQqgISbT
+4vU/vq4TFxu4yap2BkUT
+=UMNz
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch b/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch
new file mode 100644
index 000000000000..f155ed51db73
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch
@@ -0,0 +1,23 @@
+From b3bdd301debb2eb859473a25b23d068fa66f6cb1 Mon Sep 17 00:00:00 2001
+From: Zero_Chaos <sidhayn@gmail.com>
+Date: Fri, 20 Feb 2015 15:54:00 -0500
+Subject: [PATCH] Update FindQwt.cmake to support qwt6-qt4
+
+allow finding qwt6-qt4 library.  Some distros have added support for both qt4 and qt5 in qwt6, the common name the library uses appears to be qwt6-qt4.  The pre-existance of the qwt-qt4 entry suggests this naming convention is reasonably standard (or at least this isn't a unique hack)
+---
+ cmake/Modules/FindQwt.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
+index 68f55bf..3ce49aa 100644
+--- a/cmake/Modules/FindQwt.cmake
++++ b/cmake/Modules/FindQwt.cmake
+@@ -22,7 +22,7 @@ find_path(QWT_INCLUDE_DIRS
+ )
+ 
+ find_library (QWT_LIBRARIES
+-  NAMES qwt6 qwt qwt-qt4
++  NAMES qwt6 qwt6-qt4 qwt qwt-qt4
+   HINTS
+   ${CMAKE_INSTALL_PREFIX}/lib
+   ${CMAKE_INSTALL_PREFIX}/lib64
diff --git a/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.6.1-r1.ebuild
index f02037723c0b..364bbc21d251 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.6.1-r1.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-wireless/gnuradio/gnuradio-3.7.6.1.ebuild,v 1.2 2015/02/20 18:35:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.1-r1.ebuild,v 1.1 2015/02/21 04:18:42 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -72,7 +72,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
 		>=dev-qt/qtcore-4.4:4
 		>=dev-qt/qtgui-4.4:4
-		<x11-libs/qwt-6.1.2-r1:6
+		x11-libs/qwt:6
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
@@ -113,6 +113,7 @@ src_prepare() {
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	#epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
 	#epatch "${FILESDIR}/${P}-build-type-nonfatal.patch"
+	epatch "${FILESDIR}/${P}-qwt-with-qt5-support.patch"
 }
 
 src_configure() {
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 2e8de326133d..5a493964a41e 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.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-wireless/gnuradio/gnuradio-9999.ebuild,v 1.29 2015/02/20 18:35:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.30 2015/02/21 04:18:42 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -72,7 +72,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
 		>=dev-qt/qtcore-4.4:4
 		>=dev-qt/qtgui-4.4:4
-		<x11-libs/qwt-6.1.2-r1:6
+		x11-libs/qwt:6
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
@@ -113,6 +113,7 @@ src_prepare() {
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	#epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
 	#epatch "${FILESDIR}/${P}-build-type-nonfatal.patch"
+	epatch "${FILESDIR}"/gnuradio-qwt-with-qt5-support.patch
 }
 
 src_configure() {