update VCS ebuild to remove as much automagic as possible, audio is still automagic

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

4 files changed, 53 insertions, 7 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 12425e3f2451..4ef972379d8b 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.50 2014/08/19 02:31:49 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.51 2014/08/24 21:49:25 zerochaos Exp $
+
+  24 Aug 2014; Rick Farina <zerochaos@gentoo.org> +files/include_stringh.patch,
+  gnuradio-3.7.4.ebuild, gnuradio-9999.ebuild, metadata.xml:
+  update VCS ebuild to remove as much automagic as possible, audio is still
+  automagic
 
   18 Aug 2014; Rick Farina <zerochaos@gentoo.org> gnuradio-3.7.4.ebuild,
   gnuradio-9999.ebuild:
diff --git a/net-wireless/gnuradio/files/include_stringh.patch b/net-wireless/gnuradio/files/include_stringh.patch
new file mode 100644
index 000000000000..1450e101cd05
--- /dev/null
+++ b/net-wireless/gnuradio/files/include_stringh.patch
@@ -0,0 +1,18 @@
+commit 09ba248d3fc6afbebb784edfaf5e61413cd05255
+Author: Tom Rondeau <tom@trondeau.com>
+Date:   Sun Jul 27 10:50:17 2014 -0400
+
+    volk: adding string.h to puppet for memset calls.
+
+diff --git a/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h b/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h
+index fef9db5..8d31e46 100644
+--- a/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h
++++ b/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h
+@@ -3,6 +3,7 @@
+ 
+ #include <volk/volk.h>
+ #include <volk/volk_8u_x4_conv_k7_r2_8u.h>
++#include <string.h>
+ 
+ typedef union {
+   //decision_t is a BIT vector
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 475da8ae433a..db0f9a9d4b11 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.20 2014/08/19 02:31:49 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.21 2014/08/24 21:49:25 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -22,9 +22,10 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="alsa +analog +digital channels +ctrlport doc examples fcd +filter grc jack log oss pager performance-counters portaudio +qt4 sdl uhd +utils wavelet wxwidgets zeromq"
+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"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		audio? ( || ( alsa oss jack portaudio ) )
 		analog? ( filter )
 		digital? ( filter analog )
 		pager? ( filter analog )
@@ -64,7 +65,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	qt4? (
 		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5
+		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
 		>=dev-qt/qtcore-4.4
 		>=dev-qt/qtgui-4.4:4
 		>=x11-libs/qwt-5.2
@@ -101,38 +102,53 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
+	#epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
 	#epatch "${FILESDIR}/${P}-build-type-nonfatal.patch"
 }
 
 src_configure() {
 	# TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF}
 	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-		#this flag breaks everything, but more likely it's a sign we need to work on this
-		#-DENABLE_DEFAULT=OFF
+	#audio provider is still automagic
+	#zeromq missing deps isn't fatal
 	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_VOLK=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
 		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
 		$(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) \
+		$(cmake-utils_use_enable dtv GR_DTV) \
 		$(cmake-utils_use_enable fcd GR_FCD) \
+		$(cmake-utils_use_enable fec GR_FEC) \
 		$(cmake-utils_use_enable filter GR_FILTER) \
 		$(cmake-utils_use_enable grc GRC) \
 		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
 		$(cmake-utils_use_enable log GR_LOG) \
+		$(cmake-utils_use_enable noaa GR_NOAA) \
 		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
 		$(cmake-utils_use_enable pager GR_PAGER) \
 		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
 		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
+		$(cmake-utils_use_enable test TESTING) \
+		$(cmake-utils_use_enable trellis GR_TRELLIS) \
 		$(cmake-utils_use_enable uhd GR_UHD) \
 		$(cmake-utils_use_enable utils GR_UTILS) \
+		$(cmake-utils_use_enable vocoder GR_VOCODER) \
 		$(cmake-utils_use_enable wavelet GR_WAVELET) \
 		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
 		$(cmake-utils_use_enable qt4 GR_QTGUI) \
 		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
+		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
 		-DENABLE_GR_CORE=ON \
 		-DSYSCONFDIR="${EPREFIX}"/etc \
 		-DPYTHON_EXECUTABLE="${PYTHON}"
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index d636725abf00..90cb7ef2a54a 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -4,17 +4,24 @@
 	<herd>radio</herd>
 	<use>
 		<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>
 		<flag name='fcd'>enable Funcube Dongle source block</flag>
+		<flag name='fec'>enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")</flag>
 		<flag name='filter'>enable filter signal processing blocks</flag>
 		<flag name='grc'>enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>
 		<flag name='log'>enable logging to console and files</flag>
+		<flag name='noaa'>enable NOAA POES HRPT receiver blocks</flag>
 		<flag name='pager'>enable pager signal processing blocks</flag>
 		<flag name='performance-counters'>enable block performance counters</flag>
+		<flag name='trellis'>enable trellis blocks for FSM</flag>
 		<flag name='uhd'>install UHD source and sink blocks</flag>
 		<flag name='utils'>install scripts to enable viewing and analysis of files produced by flow graphs</flag>
+		<flag name='vocoder'>enable blocks for audio voice encoders</flag>
 		<flag name='wavelet'>enable wavelet signal processing blocks</flag>
 		<flag name='zeromq'>enable zeromq message passing blocks</flag>
 	</use>