remove ctrlport use flag as upstream has, bug #529498. additional minor dep cleanup per depcheck

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

5 files changed, 37 insertions, 44 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 7163dd941ccd..aa44d3eddc76 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.64 2015/02/21 04:18:42 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.65 2015/02/21 22:14:24 zerochaos Exp $
+
+*gnuradio-3.7.6.1-r2 (21 Feb 2015)
+
+  21 Feb 2015; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.7.6.1-r2.ebuild,
+  -gnuradio-3.7.6.1-r1.ebuild, gnuradio-9999.ebuild, metadata.xml:
+  remove ctrlport use flag as upstream has, bug #529498.  additional minor dep
+  cleanup per depcheck
 
 *gnuradio-3.7.6.1-r1 (21 Feb 2015)
 
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 38cc0d2153ff..63c42bd1f992 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -8,24 +8,24 @@ AUX gnuradio-9999-build-type-nonfatal.patch 619 SHA256 35fb7fe91213537f89224249d
 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-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
+EBUILD gnuradio-3.7.6.1-r2.ebuild 7009 SHA256 b350f5579cf433a21b90d24857f3d7f70fa74ceb9744ec5d84affc66ca78a764 SHA512 bfdfcbbcd13f6a52b1dcc2be19e0d0d92d20c68d94f8ba9a98baf6d0822743d9905cd60be518467edb131ba30cfb88af2c50a105dc581f61a22d05f5208414cc WHIRLPOOL 81b60353c89e1f8173e98f7c2d5fc9609e7bda588581c1a2526119a6f123a0e840ca7edfaa350d2eeb58f567d98808bb1c79b635100ba4548c73b850bb1d6c33
+EBUILD gnuradio-9999.ebuild 6957 SHA256 96b705c4f278dad00c03fe08062ce9521b8f2ac9d3b08c9dda65ac4cdcc96364 SHA512 79830e65441e773f4d72f71fc20f08a8b654072ae5955309810d7a56781e0160f7d40369e9748d2ac84472837ee365d72655074d461fc4abc9e307e27132d91d WHIRLPOOL 8124926eae2b14b06343d9491044eb1207e92ce5e5f73f3559df7ccab68e1283f9f9b897e60f397aeec4cff8aa691a9b6af96d2eb1bb91906939ac954f544841
+MISC ChangeLog 12435 SHA256 56e3f9cfb053ba59706a5d331897c3b77df7c2b2d9e751f4b557bb2ae86e9ccb SHA512 8f5ac12a1c9e970338ea6c48c82f34a1053654f0880eecf8e0185e36882f8d03229f25f18029a92381e73709656050d9ac8092884d60525431bb155de5370486 WHIRLPOOL 7323f0de9ba79bb626852cfdf9d5c9ce6c30b53b38812def62e923525ee2900062ffba3afe425077267e76f3941245b141af25c670d0bc0dab879abbcd8d1a39
+MISC metadata.xml 1696 SHA256 9fe983b3a2691e135844e8001885e822be07f4aa675424ed1ea3408dff48b012 SHA512 3fa9a8aa9b6c673f1ce33ddd9f366dc565e7206a4dfed818f2b56ba20a78c2f49760d75c995490ea4c22a708e5c0c28bf67c4c78521a79dd32d616686f2c79d6 WHIRLPOOL 3fe461e8a457c585b5ec58253757ad6ef812b0249f1f250e52cf43c6c12f9b65b6f304e0d42a999d9caccaa6fcd17aa9f87ced1a27975796ead2e03f3750bc4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJU6QNKAAoJEKXdFCfdEflKWK0P/3DH+3yi2+bay0GfRNN8MGJA
+Ww2easW0RefVcb67q5Qm/Mox9DQjpYf20C02u/JvugOAIxOPBiDN94hRxmGBeKEM
+KIN09IyFa+PKa6TZUBxghEz9aalEhcXnAJ3BLl6mjnEcAIV9fOZIoLsLB4nwO6p6
+uBxodulxcN46HSJ3HdU3jSs9kke5EAQQM2o6ESpyr6uEay5/HyA+8MVyGutPgT9l
+HaYzeHeQ5VAUZVEtrXFjqWSOs4V0IuCMWYtqelD2Iz8gwqBxRL1pWB+sxlHrXEC7
+eLjp1oQK/T4rNiadrSJkdFjRu9yIKjK/i4fvxVueTC3vCyZJvSRYzWgTP7542PI9
+IlJVpnWmcRxYnjB0ZGStvuwheYi9NM46MbgDH3ik4oJEZC8LC3VopB2lxnG4LpdW
+YoSb2/xp9QVb3UsRuLRkaU5cYgitdfzkdL1JPo+anWyMEyJ4mmXOMUuMGOzDH/fu
+C1X9gRekZ+nm03H9jT/s2HRWGExwg3wd68LAJW2Dw/HNVKO3Q5GUifTYR+wLQze7
+Ia10BtDyL9CPfPTCpaiOk+rgC/k4a/4pRWaJp8WA+ULDPAzLHNkrg+4JRePWDJj0
+DGbmwvjyIWrPNY4B+fgoumAzSD9Wa6AZhZQ7orrkHMykipbIELA0jFOHu2iU985s
+cQX8feYy+LJK89OFvl39
+=6k3m
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.7.6.1-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild
index 364bbc21d251..bece73dbf229 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.6.1-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.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-r1.ebuild,v 1.1 2015/02/21 04:18:42 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild,v 1.1 2015/02/21 22:14:24 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="+audio +alsa atsc +analog +digital channels +ctrlport doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		audio? ( || ( alsa oss jack portaudio ) )
@@ -52,7 +52,6 @@ RDEPEND="${PYTHON_DEPS}
 	alsa? (
 		media-libs/alsa-lib[${PYTHON_USEDEP}]
 	)
-	ctrlport? ( dev-libs/Ice[python,${PYTHON_USEDEP}] )
 	fcd? ( virtual/libusb:1 )
 	filter? ( sci-libs/scipy )
 	grc? (
@@ -86,8 +85,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
 	)
-	zeromq? ( >=net-libs/zeromq-2.1.11
-		net-libs/cppzmq )
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
 
 DEPEND="${RDEPEND}
@@ -98,12 +96,9 @@ DEPEND="${RDEPEND}
 		>=app-doc/doxygen-1.5.7.1
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
-	grc? (
-		x11-misc/xdg-utils
-	)
-	oss? (
-		virtual/os-headers
-	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	zeromq? ( net-libs/cppzmq )
 "
 
 src_prepare() {
@@ -133,7 +128,6 @@ src_configure() {
 		$(cmake-utils_use_enable analog GR_ANALOG) \
 		$(cmake-utils_use_enable atsc GR_ATSC) \
 		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable ctrlport GR_CTRLPORT) \
 		$(cmake-utils_use_enable digital GR_DIGITAL) \
 		$(cmake-utils_use_enable doc DOXYGEN) \
 		$(cmake-utils_use_enable doc SPHINX) \
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 5a493964a41e..c7258612bb1c 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.30 2015/02/21 04:18:42 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.31 2015/02/21 22:14:24 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="+audio +alsa atsc +analog +digital channels +ctrlport doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		audio? ( || ( alsa oss jack portaudio ) )
@@ -52,7 +52,6 @@ RDEPEND="${PYTHON_DEPS}
 	alsa? (
 		media-libs/alsa-lib[${PYTHON_USEDEP}]
 	)
-	ctrlport? ( dev-libs/Ice[python,${PYTHON_USEDEP}] )
 	fcd? ( virtual/libusb:1 )
 	filter? ( sci-libs/scipy )
 	grc? (
@@ -86,8 +85,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
 	)
-	zeromq? ( >=net-libs/zeromq-2.1.11
-		net-libs/cppzmq )
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
 
 DEPEND="${RDEPEND}
@@ -98,12 +96,9 @@ DEPEND="${RDEPEND}
 		>=app-doc/doxygen-1.5.7.1
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
-	grc? (
-		x11-misc/xdg-utils
-	)
-	oss? (
-		virtual/os-headers
-	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	zeromq? ( net-libs/cppzmq )
 "
 
 src_prepare() {
@@ -113,7 +108,6 @@ 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() {
@@ -133,7 +127,6 @@ src_configure() {
 		$(cmake-utils_use_enable analog GR_ANALOG) \
 		$(cmake-utils_use_enable atsc GR_ATSC) \
 		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable ctrlport GR_CTRLPORT) \
 		$(cmake-utils_use_enable digital GR_DIGITAL) \
 		$(cmake-utils_use_enable doc DOXYGEN) \
 		$(cmake-utils_use_enable doc SPHINX) \
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index 90cb7ef2a54a..a9d64fbfe5ff 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -6,7 +6,6 @@
 		<flag name='analog'>enable analog signal processing blocks</flag>
 		<flag name='atsc'>enable ATSC (HDTV) transmitter and receiver blocks</flag>
 		<flag name='audio'>enable blocks to connect to audio sources (mic-in) and sinks (speaker-out) ports on a computer</flag>
-		<flag name='ctrlport'>enable ControlPort rpc</flag>
 		<flag name='channels'>enable channel mode blocks</flag>
 		<flag name='digital'>enable digital signal processing blocks</flag>
 		<flag name='dtv'>enable digital tv signal processing blocks</flag>