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

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

4 files changed, 20 insertions, 27 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/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>