bunch of bug fixes and dep updates, dropping ~arm due to needing keywords on scipy (working on it)

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

7 files changed, 76 insertions, 449 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 085c23edf51d..4d3800f49569 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,14 @@
 # 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.41 2014/03/09 14:13:47 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.42 2014/07/22 15:28:39 zerochaos Exp $
+
+*gnuradio-3.7.4 (22 Jul 2014)
+
+  22 Jul 2014; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.7.4.ebuild,
+  -gnuradio-3.7.2.1-r2.ebuild, -gnuradio-3.7.2.2.ebuild, -gnuradio-3.7.3.ebuild,
+  gnuradio-9999.ebuild, metadata.xml:
+  bunch of bug fixes and dep updates, dropping ~arm due to needing keywords on
+  scipy (working on it)
 
 *gnuradio-3.7.3 (09 Mar 2014)
 *gnuradio-3.7.2.2 (09 Mar 2014)
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index eca34beb0dd7..9ea048ae825e 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -3,30 +3,26 @@ Hash: SHA512
 
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 SHA256 3e65981e8e8e9c2fc5e8223bf7e93956d6f802bbd9df15277283e9d44b7c5a2b SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768 WHIRLPOOL 363650437161e68f056229315f1d0b52fa409ba9b284196c16e7acf96b68e2e036930db45188f61b5b0bb0e4f51bd3007d8fee622476eb605c72f2ff4b6c24c7
 DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 WHIRLPOOL 7cf55be5fac7891a737d228d83718bbc43f9069c6275c5ac465ae11088559dca5e7fa31239e281271b529aa8b9ae1a0efe3850a16a40e53c0f1fe57e351ff2a8
-DIST gnuradio-3.7.2.1.tar.gz 2925751 SHA256 8c6b7e1fda31e9228bdd62a137af901b28757d7e1b044de2e985b96e53c83c80 SHA512 0a0fc63bc233628384535f3741282fd699db95656e8ef30960976823648ef1584c4b46055ab0294fb25028c0a5a9c10547586ca8e25b0692872128c5243c9a08 WHIRLPOOL e9d51839023c589691240ce36faf1cd470bf3018766f60c76288c9af93d6f95ec70f344098109acf5490af9f69cdc37537688a6f1997f8174803d9e022c0b86d
-DIST gnuradio-3.7.2.2.tar.gz 2963986 SHA256 e5aa0790b63bf7f5da35c67116f574ee033f75a3b9af3b32f11e135f9d59c491 SHA512 6884b7b8e655dfe78e2388ecf489e2bc94908e19c5f1bd0648e88f223907bf13350f641c4636e1a9ad13cab89627e24384957342ef3c336d439bb3634e36ada4 WHIRLPOOL 0f24fcbb9b8e5d118658ce75c6c1cedde7f63106371050d5e8665f44df96a7849f313235c068837704629bf3826a72eebcb4daf82a83aa66830bd458a026b955
-DIST gnuradio-3.7.3.tar.gz 2986331 SHA256 1c71d1819a67bac4148c619fc2a7d2c0ea0b0d08aa4660a11d65ab7b713b5231 SHA512 f0eb7f11c8a84cccc6c466ad3e56b49475bf9055681dd23cd4adf92c4d08d28080b97afc034e84f1c6c5086c754bb25556a42ce3879b3ba2352791bf41cbb5bd WHIRLPOOL 803533e7d07a71bdd855ec9bc0b36f85c715f9527d2e94fc35c0ea39ff24e0329fc77fb8aedbd1d728b25337fd6743ce953710d721a551dbd172c093988c20f4
+DIST gnuradio-3.7.4.tar.gz 3461336 SHA256 681da0e8694cc88be2dc168756418f21fef3666231d7b21bcfd6cbddd9a9406d SHA512 8a7d6abb4c0065bcd735ef0962619220708078b84fdf07955f6fdfed830a6d35ade15d2620ee915416e439b9eeed4371f847bf33690820f780c77eaf0cf80ad7 WHIRLPOOL 8d4ef9b475f431b38da1b67c94fcd22e04de0967eb89ca1eb88cf99eccf38cfac588621b7211a8acae73927d1c2231760df94a498139a272b7b5f6e19230c7f6
 EBUILD gnuradio-3.6.5.1-r2.ebuild 5583 SHA256 5540842f65142861c5144fd494d8e8d47d7ef72746cb753f747afcd31387487f SHA512 91e151bf28e1d21e2d9da822cae7c02d4985498c5c7a4548b913fafed9898e7266e0268ecd7b0ae9f3a5ed15fdff5cc912b67f7475af72f59ad2761b512f0b68 WHIRLPOOL 605e0ea1da8bd38616c6751540ace9c174aedd6d87352dbea7acd26215efa20c6671367d96c5d61f154b7de8cf60079e690a11ca63f99c9dce4a2989f691243f
-EBUILD gnuradio-3.7.2.1-r2.ebuild 5613 SHA256 13842ba703819c4ec69f8c33ed1fd0a105c2ccbf2220c69aa40ef879a3b147fd SHA512 d5e527c93bcd8b8953f96feb262dce567cc153db3727260ba082a46cfd3a38fd0c4176b0cf1481feac07ac4e1668868ff0a4a7139aeba0f4cf6871a71cdde1da WHIRLPOOL c8a63da32f3d5e516c4375eb4dc55d6dbb063a4f875434612d56342f82af32a9d3addfdb19dfb94fd91bed9290cc02850bd66369c81f8cfe01ca934bbff71b9e
-EBUILD gnuradio-3.7.2.2.ebuild 5610 SHA256 6e669af4f62de013e3ff7c78f731c337e1b3ba5c098eb2455e0486fb29c5f42a SHA512 fcbdab6305f530cc822ddfbdc68d25c9e0620f504ab39c784a4b9df7db73a324ca78795a5056c52af31eb61ae04a77092c2db4caddfd84b43c28a82e3468294b WHIRLPOOL 4927e91a3a970cc32bb444ec295a9229602570e779cf5a9ce17a92eca042de5d3ee12f2d8affd7e1bb4162c2618c8f52845e333139cac2b6ba1b56e076226f6e
-EBUILD gnuradio-3.7.3.ebuild 5608 SHA256 d94425d21bd8675188de494ab3ecc96dfaea5807a93792953b3349e346e1dee5 SHA512 735c39f913f4517d829beac05a0f95a60679fb094d52d9a4f85a186dd6217f145d504b2b065f21a34932e058e1d357b0e345bb9d38bfeb346e351efcafebc6ba WHIRLPOOL c71112815e96ac6d5b1511dfb01929c5f54539133d9940c9c44294f2ecab70ca2979a790f0226e03a945b59e5aeabc36298fc7c7ab7075f086a9498e6416a621
-EBUILD gnuradio-9999.ebuild 5608 SHA256 7406c5a3b612bc0f142efa93eddaba0e42d856230f0cf3dea472f87fb7c1d26b SHA512 dcd0657501fc31a72bac4d9ec127a8e8476df533d81b621af91f63cd5a47eadbca70140134d53d811dd88b6f0f4e990fd2173ba9f1d3328d9a61e9594be79ac0 WHIRLPOOL c9aa58e1eb0895a85f342a7500db1288a4e1bde86ec5f233b66ac48b184a2952655ffa1b5559921e864b05a9b03bbcbb66de2655d5816e8f91c01884b30a6e5d
-MISC ChangeLog 7957 SHA256 e9cd290447bc1da01950cdde30b4eb7bf2cae4f4fdbf955150a87fb2393ad5b6 SHA512 87417c3f91cbdb85771da9916b9375862881bc5c560a963c51c4681fd9f86292500e507fa79d03331d945c4937126380a1f0339653a811545de08c78ddf0b829 WHIRLPOOL 52b789793f42e6cb80092fc9346e85c51dc7f81bef8dc3e1f3a7198940355752676587bd7a929fca6febb9261a9c853aeb7c553bc3cce1dd1aa32e1c7321ac13
-MISC metadata.xml 932 SHA256 95bbb6d405dcad3e6493fd0ac72f6d6265ed76d2d7b3c71fcc50526571cc765d SHA512 33cf8b1561849cc735d43f6567f00af613e44e777cdd4235d01784d7eb7bae07040b1a7eff237a90b0b69e906e099f9dbabc2545b3b35c738653ca9c73cde7cc WHIRLPOOL 0dbb103c57e7ec0d8cbfd77b69193dbdf8d9762249a0df4304ee0e9b178c1b6000605525512429f09196bfc3b009f35f77eb1cad9043a65d8927ba7dfb5f678e
+EBUILD gnuradio-3.7.4.ebuild 5923 SHA256 8647c6db646bf14055a7d4686aec34523ff8669d915657a5bb588734db0a0fb8 SHA512 a5f740366eccbfa34c6c07a99f2274ab7da780350bae15fbdd6b397381bbd6e07e9b770cf0fdec00b66ab306e8d61f207117c0c9f154bd24c51cb0d8d440fc43 WHIRLPOOL 954455a4033095e3e4ec0e0d158810eb0fbc5535661ef02d108546e512fceeb1781b7c57d5131cb4ebeb5cbeab7876f4705b2ab35b450300707ced0e5467e26e
+EBUILD gnuradio-9999.ebuild 5928 SHA256 a10f128b43de8de502f69dd624013ab81be25abd9d09b33fbb2df48a04efe4db SHA512 990536bf7dfdfa182cfefb4a47bae06d5c2be26f21e69ba1c3d26fbca535a31672652d2eb5aac5106a438b338280003d8868e46359e0d51266717cfc74767577 WHIRLPOOL 65b7392a5343179a33c27f11a8f22cde382e3a31b312e922914700ba913b0a479b662da2d058d6b86a65f9807e30ed255c156c214bc1b2935cb424f17d3a2c88
+MISC ChangeLog 8285 SHA256 5415df41d71855f9cc3b273972c536d519e4b963b1261334cb6d754c1e126142 SHA512 84f9bc79f85f0d79559ef95590fc9169ddb5e5a28bba87f096556a3181240eb733a7b9051658222954685eca2de6a165c5c3b9d3e2d977a158952a6ff1b0c723 WHIRLPOOL 23735eef8612229d9838c1a1712cfc61534ab2648539ee32508f3c1acada2fdff1aeb0c21f3825e93ea641f1a0ac99e7195f410c4957454051eaad3fb3caf0f8
+MISC metadata.xml 1106 SHA256 605ea7e5c4c20b665b7d4143545338d3d69f97fe908c52e9d6ab68c6a5b143b9 SHA512 ad1e3cbc1e0d8992203cc007900b4b9cb007597cb55e836be57766951c823dc77f4d68ecbb041a9a1fda7d2dd3438258e4c8045192d36d1594ed023948cdc589 WHIRLPOOL a5d0abe6a92c13f315bc7c4fba9e5cdcef50f26e58d682fef2325b1293fa2047de5f8aa79e04ba3f5b05c6ba8e1eede4a59e68ce71e2727aa90bfe3c787e9c0a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCgAGBQJTHHexAAoJEKXdFCfdEflKAcgQAIDJ8JRW2tNtMPvx1Yxaew3S
-WreEb+hdpp4mWPeNRAsiVmNSMQTxlF9iTjVoZDkiLpaMEac7AisUlI08lSwVwc63
-OTSOiBRc7Rdl4Hd+YgFQTowjY+kAI0oZll49REVVLXHJay8UjkXmhYrjRZilTQ3a
-Eb7KR8nYmY9z3ybvI6A0myjaMXUFV5qspB0v/lZc4XbI4OAO0ICWVEYgxTi4V2Zu
-KecM/5BAtYQK82qiV4jQF+IlCajpLPcuH9l4EzABjPkdNnvuHl6UXxa4KlF0Tlo1
-tgNgdWVcVTGo0VorW2pvolxTKt+1G7Nwv72R+ZgdLbSQzlLssIFgyxPW9mxforR1
-acQwfjevPKCyQgN2ZZ4pPicQzt+AIKq03sGukzOWBWOcgdVnSM7zyt3DeG+1EB4o
-BlaRk814FJw6NRYYgNas/9XddOs6Vlbd4VdgoCtNuCIG90jBV7lSJFz8MRWxzlMH
-HIcSSxgL1hXjW4iOO/ZHRV2SNXBf6TNeevdCgGgmR9hFAfQG2KkNAQ5XZjvE7huS
-+0PDKY2aTF9bE3J1d7CZCye9DEpVnCZVlMIG7LveMRPnhFkpPV4cTemMl7Gr77kF
-7mpBDKeQJy8FL8DYdD8sM5kChg4xnNx5brXsVz6KX6BuV/JZi9pjSEYaOGDGtdDB
-I9L861ELOqP1IQoqHr+X
-=UE1s
+iQIcBAEBCgAGBQJTzoQHAAoJEKXdFCfdEflKx24QAKvZT+kAscBUdQDem2CWGRoi
+Yuq9zQAAPXNGVEhBGNrZYOIakT87V5l72ASi7A4pAex3KBRxF/OJGvSGenN1PLto
+hlNcBb79Yy35fdoNpQPAcD1/JahpL0L0J5PTGf2r+2ifY/80OhoocYa9flHws5el
+RfeLQ0h1e06TlCoaUTyVY0eIqVTSOSY22sREIqwAkodcCG20nmN4l8wosRJkDbEK
+s3/GY5JClIHNwelDHOPA9QyA3ErWmuIze+WDXFr569LcYmgsAxuxjorn9I/XDxiX
+T3fP6bqXe2KbModtBqHSVGiKcEawsJt82zag+q3cXWEUWzRTIhNTVvGNiNo25mU6
+xbjVRjGglLNafBTBqENzm7V0WKjWcKeLa4UT7fRsgOwu4xYq/wPAEKzNsG5FH1Gu
+k6MO8mlP//fgNTOJPkS88WsiWgtqiYq1kyMrOPiW7s2pgUJkV3t1h7hLbrayJRuv
+6kCUo/oVucwoC7KSJhzWpV8a079FoznRWC6x4qXIyeuv/s2/VdN7OjusNS9RqfPl
+7DLxXzetj71xDj0HhUGFRQCI7jFf7Lk7NfvABbZcLz7KN+LsIBYdhGXTGZ+GONaS
+lQ9dhbHwauAn411mF+j8qLuVthbee5HS5qMv35WTu8TbIudJCDTPUKyPo+d6eLKt
+yJ4efExNpe8y9vGFdBqA
+=xjAY
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.7.2.2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.2.2.ebuild
deleted file mode 100644
index 7907a0cf2185..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.2.2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# 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-3.7.2.2.ebuild,v 1.1 2014/03/09 14:13:47 zerochaos Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils fdo-mime python-single-r1
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet wxwidgets"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		analog? ( filter )
-		digital? ( filter analog )
-		pager? ( filter analog )
-		qt4? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.7 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-# gr-ctrlport needs "ice 3.5"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/cheetah
-	dev-util/cppunit
-	sci-libs/fftw:3.0=
-	fcd? ( virtual/libusb:1 )
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	grc? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		dev-python/PyQt4[X,opengl,${PYTHON_USEDEP}]
-		dev-python/pyqwt:5
-		dev-qt/qtgui:4
-	)
-	sdl? ( media-libs/libsdl )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
-	wavelet? (
-		sci-libs/gsl
-	)
-	wxwidgets? (
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	grc? (
-		x11-misc/xdg-utils
-	)
-	oss? (
-		virtual/os-headers
-	)
-"
-
-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
-}
-
-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
-	mycmakeargs=(
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(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 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 uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(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) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.3.ebuild
deleted file mode 100644
index a093e00788dd..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.3.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# 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-3.7.3.ebuild,v 1.1 2014/03/09 14:13:47 zerochaos Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils fdo-mime python-single-r1
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet wxwidgets"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		analog? ( filter )
-		digital? ( filter analog )
-		pager? ( filter analog )
-		qt4? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.7 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-# gr-ctrlport needs "ice 3.5"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/cheetah
-	dev-util/cppunit
-	sci-libs/fftw:3.0=
-	fcd? ( virtual/libusb:1 )
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	grc? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		dev-python/PyQt4[X,opengl,${PYTHON_USEDEP}]
-		dev-python/pyqwt:5
-		dev-qt/qtgui:4
-	)
-	sdl? ( media-libs/libsdl )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
-	wavelet? (
-		sci-libs/gsl
-	)
-	wxwidgets? (
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	grc? (
-		x11-misc/xdg-utils
-	)
-	oss? (
-		virtual/os-headers
-	)
-"
-
-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
-}
-
-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
-	mycmakeargs=(
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(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 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 uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(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) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.2.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.4.ebuild
index e72a43da1468..c4a623e14f3c 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.2.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.4.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-3.7.2.1-r2.ebuild,v 1.1 2014/03/05 16:18:40 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.4.ebuild,v 1.1 2014/07/22 15:28:39 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -18,10 +18,10 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet wxwidgets"
+IUSE="alsa +analog +digital channels +ctrlport doc examples fcd +filter grc jack log oss pager performance-counters portaudio +qt4 sdl uhd +utils wavelet wxwidgets"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		analog? ( filter )
@@ -34,44 +34,48 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		wxwidgets? ( filter analog )"
 
 # bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.7 )
+# comedi? ( >=sci-electronics/comedilib-0.8 )
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-# gr-ctrlport needs "ice 3.5"
 RDEPEND="${PYTHON_DEPS}
 	>=dev-lang/orc-0.4.12
 	dev-libs/boost:0=[${PYTHON_USEDEP}]
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/cheetah
-	dev-util/cppunit
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-util/cppunit-1.9.14
 	sci-libs/fftw:3.0=
-	fcd? ( virtual/libusb:1 )
 	alsa? (
 		media-libs/alsa-lib[${PYTHON_USEDEP}]
 	)
+	fcd? ( virtual/libusb:1 )
+	filter? ( sci-libs/scipy )
 	grc? (
+		dev-python/cheetah
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
 	)
 	jack? (
 		media-sound/jack-audio-connection-kit
 	)
+	log? ( dev-libs/log4cpp )
 	portaudio? (
 		>=media-libs/portaudio-19_pre
 	)
 	qt4? (
-		dev-python/PyQt4[X,opengl,${PYTHON_USEDEP}]
-		dev-python/pyqwt:5
-		dev-qt/qtgui:4
+		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
+		>=dev-python/pyqwt-5.2:5
+		>=dev-qt/qtcore-4.4
+		>=dev-qt/qtgui-4.4:4
+		>=x11-libs/qwt-5.2
 	)
-	sdl? ( media-libs/libsdl )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
 	wavelet? (
-		sci-libs/gsl
+		>=sci-libs/gsl-1.10
 	)
 	wxwidgets? (
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
@@ -101,6 +105,8 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
 		$(cmake-utils_use_enable analog GR_ANALOG) \
+		$(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) \
@@ -108,6 +114,7 @@ src_configure() {
 		$(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 oss GR_AUDIO_OSS) \
 		$(cmake-utils_use_enable pager GR_PAGER) \
 		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 9f5704c8df8d..157b05b7bba9 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.12 2014/03/05 16:18:40 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.13 2014/07/22 15:28:39 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -21,7 +21,7 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet wxwidgets"
+IUSE="alsa +analog +digital channels +ctrlport doc examples fcd +filter grc jack log oss pager performance-counters portaudio +qt4 sdl uhd +utils wavelet wxwidgets"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		analog? ( filter )
@@ -34,44 +34,48 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		wxwidgets? ( filter analog )"
 
 # bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.7 )
+# comedi? ( >=sci-electronics/comedilib-0.8 )
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-# gr-ctrlport needs "ice 3.5"
 RDEPEND="${PYTHON_DEPS}
 	>=dev-lang/orc-0.4.12
 	dev-libs/boost:0=[${PYTHON_USEDEP}]
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/cheetah
-	dev-util/cppunit
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-util/cppunit-1.9.14
 	sci-libs/fftw:3.0=
-	fcd? ( virtual/libusb:1 )
 	alsa? (
 		media-libs/alsa-lib[${PYTHON_USEDEP}]
 	)
+	fcd? ( virtual/libusb:1 )
+	filter? ( sci-libs/scipy )
 	grc? (
+		dev-python/cheetah
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
 	)
 	jack? (
 		media-sound/jack-audio-connection-kit
 	)
+	log? ( dev-libs/log4cpp )
 	portaudio? (
 		>=media-libs/portaudio-19_pre
 	)
 	qt4? (
-		dev-python/PyQt4[X,opengl,${PYTHON_USEDEP}]
-		dev-python/pyqwt:5
-		dev-qt/qtgui:4
+		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
+		>=dev-python/pyqwt-5.2:5
+		>=dev-qt/qtcore-4.4
+		>=dev-qt/qtgui-4.4:4
+		>=x11-libs/qwt-5.2
 	)
-	sdl? ( media-libs/libsdl )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
 	wavelet? (
-		sci-libs/gsl
+		>=sci-libs/gsl-1.10
 	)
 	wxwidgets? (
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
@@ -101,6 +105,8 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
 		$(cmake-utils_use_enable analog GR_ANALOG) \
+		$(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) \
@@ -108,6 +114,7 @@ src_configure() {
 		$(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 oss GR_AUDIO_OSS) \
 		$(cmake-utils_use_enable pager GR_PAGER) \
 		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index 425a889d06ef..dba7d5dedc54 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -4,10 +4,13 @@
 	<herd>radio</herd>
 	<use>
 		<flag name='analog'>enable analog signal processing blocks</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='fcd'>enable Funcube Dongle source block</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='pager'>enable pager signal processing blocks</flag>
 		<flag name='performance-counters'>enable block performance counters</flag>
 		<flag name='uhd'>install UHD source and sink blocks</flag>