merge all versions together, remove base.eclass inherit and migrate, migrate from python to python-single-r1

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

5 files changed, 446 insertions, 47 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 64a5e7af343c..0765e9c67518 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.37 2014/03/02 18:56:35 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.38 2014/03/03 04:35:27 zerochaos Exp $
+
+*gnuradio-3.7.2.1-r1 (03 Mar 2014)
+*gnuradio-3.6.5.1-r1 (03 Mar 2014)
+
+  03 Mar 2014; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.6.5.1-r1.ebuild,
+  +gnuradio-3.7.2.1-r1.ebuild, gnuradio-9999.ebuild:
+  merge all versions together, remove base.eclass inherit and migrate, migrate
+  from python to python-single-r1
 
   02 Mar 2014; Rick Farina <zerochaos@gentoo.org> -gnuradio-3.7.1.1.ebuild,
   -gnuradio-3.7.2.ebuild:
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 4cbd904c5683..ad61d573e65c 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -4,25 +4,27 @@ 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
+EBUILD gnuradio-3.6.5.1-r1.ebuild 5341 SHA256 37fff7f4ae1847818110bd75f264810a59ffe0c506435ce741729ec4f7be41f3 SHA512 ff7c96364512cdfb7ad9e5588dfde8e1f47d573183a2107059b19e76e1b403debfd167a34995d58010eb13c031fca0b2c614f5b1823c9c15d03f5c14a5b4dd33 WHIRLPOOL 71fe0be5ccaf12031ecddb712f64bdb07aa904d3e4b7ed26361368aad5e738d6b0476b5d7ea1bcf2fda36101853f7d121a0e8f50a5e1be07eec35d238323d356
 EBUILD gnuradio-3.6.5.1.ebuild 5234 SHA256 adf83b3fe7d2f84096470cdaccc95e8f16f9c9e3b13e9fa3c590c2de5d97ad32 SHA512 3816b34df44f5d4100948032c26fa025417bb5ec604590fe8da98d8037b8001246e11eaf924524d3bec82e4e0a130f4d00313fdd5cde986cc715bd66af77043c WHIRLPOOL e54a3cf4ebad5e4faba5ab43931937826ee0b6f22b60fb0f931de78efa0ba23f83708594b4a4e78b8abbe5a58375f0b24822943c34f44f0e63b98f62d94d34fe
+EBUILD gnuradio-3.7.2.1-r1.ebuild 5371 SHA256 eda57010709361bc331718ec6c73a442cd859ba95c8ffeca9af6839b45e6bdb0 SHA512 a0482e215d2c3ed7d85e2940736afad9fd3fbe4e9098312827cfd0e0c508e8e35cc062ac8d0cf4e5dad678a2353cc481015e1ca558d9fb357f1e4a93ddd35cc5 WHIRLPOOL 7c926c8a0219ee0d59f4a0c03ca509805cd7fb4eae91af89ea1b2d59e9c92c3d146a453d59b3e9d4fc346af0c4cd8acc9a0e715cd0096bdbb1a831de6b98ef94
 EBUILD gnuradio-3.7.2.1.ebuild 5675 SHA256 fcfa0237a20157d4d953cdd38194c585971fdc14d563320d0c20a12d81a00043 SHA512 33b81b72d6b8517aa71df25cb967fd04f9ef818a012f5c51d2aaaa83af8d6b9292b172c0c7c41a7e416f5310c98b0daad08009eef19ac99cb60e81782514d772 WHIRLPOOL 91ef295c0d40fcd0569ca0716aee8b4de40f5815e9c74f27527352bcddbf737ffbeeea3fa43a8e899f620f06feb03f3dadb6324f518279a7aa8d3a1a67b7d37e
-EBUILD gnuradio-9999.ebuild 5231 SHA256 fb9b65ba306f442067bcf98963831d264da5306c455b58516c3b575caa6bcd6a SHA512 7353235cddc0b9c87d3f36ebb5ae576501490cec9628bab5b22e5aa96f95a364d72915799af06e1ccba402c30b1ec20fa760d58060ecbe1f0c412f60d1fc63ff WHIRLPOOL ea5af3a7e6778b80d9b309d4bcaca1a67b25ad005cefdd37e2dfdea5a50967e96d1472c56d3f241b6df431ce6c90b601ef39f7261d33d1df843f9322cccb1d99
-MISC ChangeLog 6874 SHA256 d72afe0f49c02db0222db0e3785aba0e3c501d19a880707cd83c490d65e36715 SHA512 1b2ccf0144d33380d334ff07adac5aef63b476de1f3bdf508c3470dca79a35613c1fcf69dfd1b51e03e2264900627b82ff8df50500553d38d2fbe1fd514e211e WHIRLPOOL 14ed11d023bf6afa322c37de705fc812e6c089347c307da8602fd3a32863e30ab9a1631ababfcd645153bf27b4512e1a85c64d214eb60bb89230c47de36eb9ca
+EBUILD gnuradio-9999.ebuild 5366 SHA256 29fcab67a7cd2e321d64c5ed0be51c62fd3ad8f5444a047b937bbf6c22a161e7 SHA512 a6697a2e3fa113e79864ddf557aa3620d79d242f21f0758f0f309ceeaf59cb2796ba10c845cb3e61da22a06dea60985f910063a4a34caaf69a3f998eca160623 WHIRLPOOL b7dca3fb146cdbfc3668447620e625ec055d258c177a5b265a29d12ddc136269ad10d212d9ba73f4e01e36b9c788b09d9e0efd1d3094a9a037480e186497ea13
+MISC ChangeLog 7191 SHA256 707f0047de0abb8f13353d2f12af6c94fa8dc43454f1e5dc572ce4ef1eb6e5ce SHA512 0a278b365eb45db326ff0d8089a5eb568f023c17722522510f30d2693a5b6b78a8d1a7218e5d8e8823877feeeefd50f3f5bffd40dd7c93bf69a227240d27702d WHIRLPOOL 8b05761c9e997241a3665b6a53210fa07d66b70d2f33b3878e6bec10d95c3415b0d2a1c0a89a53685103925c3871336b1ce845fee98d7b5b1d47d354dfddf76c
 MISC metadata.xml 932 SHA256 95bbb6d405dcad3e6493fd0ac72f6d6265ed76d2d7b3c71fcc50526571cc765d SHA512 33cf8b1561849cc735d43f6567f00af613e44e777cdd4235d01784d7eb7bae07040b1a7eff237a90b0b69e906e099f9dbabc2545b3b35c738653ca9c73cde7cc WHIRLPOOL 0dbb103c57e7ec0d8cbfd77b69193dbdf8d9762249a0df4304ee0e9b178c1b6000605525512429f09196bfc3b009f35f77eb1cad9043a65d8927ba7dfb5f678e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJTE39aAAoJEKXdFCfdEflKs88P/0xv69w9MpSpBLycT0Xv/Fz5
-fmv8lTaeB4OHbeaxqhKfqfgM/XmwIYSV0sRsvInKfdlkuCZvPNRlFWwgjPLR11Eu
-UIth6REI32JTXc/Qdv9kV8ZlHSF8/9pPMPgyTBP3Zrv4XlbZxTNCy6ASBbF5K72t
-tQ7SzNCytVOH+1FGalT/AftBxAZ8f+RELr8XlkS5mkkmaWtbra0nDVXeVZ3FphKB
-EOpnpf8ER6RGihNT82H9H3ITEHiz4kUM1jF+Kz2PgESrwCP28pHDHBMfeJry8e9l
-CYjodqGhyaaMjii0pA2xMduoRZoxfYSK2b2z0+62tZpQ/cRmMPo0P39mEUdRbAy8
-jGR/IZiyHcnEAUU+FFvfPOeP0PZMxeyEg9wMH6+oLDIvH1sOnQrS/dNITWZxpMjc
-RceoVNDTPqX/+DK17l8qLbKOFFJESW59pfQN8tC2e2i69HGrvYm1J7uDvfMayptZ
-WBVDfl/Y6QPld2L7Zk5rZELcSo4OAehWTsJ+Ka4jdro9I3DeFyeo+6IzttwSxHBW
-T7TwcQfCNVbAhhD2stCz80Mj2R5D7fCDRs6KvopqM+GRNVYuRy0jRaCxN9MymuAf
-JDTH495o17PGjZxfydK3QKDrsvAELhU9DcLUogaNoISujRs+ZlRZdDkKzcfxjOW2
-/Y+sOGROxTYS1uKkOXxI
-=q4En
+iQIcBAEBCgAGBQJTFAcHAAoJEKXdFCfdEflKsZ0P/12+PbtE2e8wlWcF/fTL+kqy
+3BU3kj7m8hq5fsGmGQEShHb95wI1gk9xbLsbFt7DJbYJm+StAZ6STlEqCBCHwYWX
+wzk+bfZxiDR9xcV3hoQn+k6Nt/w9ExS6t2Gt7msJq3PkMRSfEVdiN0jgQk4GBBXE
+2c2/IUAQ9JKva8hEzHd6kGAilrg0lOkPCABExGTu9uuIubWA6rDPWhfAalWGe3p4
+G60TGHE2gaHjBXIkU81oiaZftLbC4gM9WRu0R2Z43zRSRME931Et2BlQ0C06i4cq
+kl1fNgAKtJVC6I+LfVGc1YiruT438zV/8IlZw2ewG/X0+zUu4Vj8x3QHhpgmT7Rx
+CbZ7Io1QIgQ7II+LI8IIyUbcbCtyYCqKFUGctWoIl6m+uYtp7I0aAUiyzmuLwsFh
+oIc6zdZnA24UkJ8E1bz+p2OPKyD9b8TsR4X/BrmJuC89BNiFXu3JNqeL38T5p6Gh
+Y+tEBcCGrH4fMQqP6n3ebber0iuEFzG0MIt3439WbpwPTbrT0+b+Z6MD4Nqn13R+
+21SuKcMvliB96oF/npqUYSQ7Z0SerQUZjj5fjomAT/fqIu1SoWFTFjtmvtBfMuf/
+fMNciU45Ns+ssLn4lJPLfsiv6tN2KtQAg/a3d/TvL29c/jlKt6PhvVB2PsuYUS+4
+djA+k9a5z9ERjQZavxFR
+=4c09
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild
new file mode 100644
index 000000000000..e3cd04fe391f
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild
@@ -0,0 +1,193 @@
+# 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.6.5.1-r1.ebuild,v 1.1 2014/03/03 04:35:27 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 performance-counters pager portaudio qt4 sdl uhd +utils wavelet wxwidgets"
+
+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
+RDEPEND=">=dev-lang/orc-0.4.12
+	dev-libs/boost:0=
+	!<=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
+	)
+	grc? (
+		dev-python/lxml
+		dev-python/numpy
+		dev-python/pygtk:2
+	)
+	jack? (
+		media-sound/jack-audio-connection-kit
+	)
+	portaudio? (
+		>=media-libs/portaudio-19_pre
+	)
+	qt4? (
+		dev-python/PyQt4[X,opengl]
+		dev-python/pyqwt:5
+		dev-qt/qtgui:4
+	)
+	sdl? ( media-libs/libsdl )
+	uhd? ( >=net-wireless/uhd-3.4.3-r1:= )
+	wavelet? (
+		sci-libs/gsl
+	)
+	wxwidgets? (
+		dev-python/wxpython:2.8
+		dev-python/numpy
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+		dev-python/sphinx
+	)
+	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
+	)
+	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}"usr/share/${PN}/
+}
+
+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-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.2.1-r1.ebuild
new file mode 100644
index 000000000000..f188264098c3
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.7.2.1-r1.ebuild
@@ -0,0 +1,194 @@
+# 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-r1.ebuild,v 1.1 2014/03/03 04:35:27 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 performance-counters pager portaudio qt4 sdl uhd +utils wavelet wxwidgets"
+
+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=">=dev-lang/orc-0.4.12
+	dev-libs/boost:0=
+	!<=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
+	)
+	grc? (
+		dev-python/lxml
+		dev-python/numpy
+		dev-python/pygtk:2
+	)
+	jack? (
+		media-sound/jack-audio-connection-kit
+	)
+	portaudio? (
+		>=media-libs/portaudio-19_pre
+	)
+	qt4? (
+		dev-python/PyQt4[X,opengl]
+		dev-python/pyqwt:5
+		dev-qt/qtgui:4
+	)
+	sdl? ( media-libs/libsdl )
+	uhd? ( >=net-wireless/uhd-3.4.3-r1:= )
+	wavelet? (
+		sci-libs/gsl
+	)
+	wxwidgets? (
+		dev-python/wxpython:2.8
+		dev-python/numpy
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+		dev-python/sphinx
+	)
+	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
+	)
+	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}"usr/share/${PN}/
+}
+
+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-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index f4fe91fcabd6..45265ff73122 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.9 2013/11/18 15:49:30 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.10 2014/03/03 04:35:27 zerochaos Exp $
 
 EAPI=5
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python2_7 )
 
-inherit base cmake-utils fdo-mime python
+inherit cmake-utils fdo-mime python-single-r1
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -21,17 +21,27 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="alsa doc examples fcd filter grc jack oss performance-counters portaudio qt4 sdl uhd utils wavelet wxwidgets"
+IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss performance-counters pager portaudio qt4 sdl uhd +utils wavelet wxwidgets"
+
+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=">=dev-lang/orc-0.4.12
 	dev-libs/boost:0=
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
 	dev-python/cheetah
 	dev-util/cppunit
-	sci-libs/fftw:3.0
+	sci-libs/fftw:3.0=
 	fcd? ( virtual/libusb:1 )
 	alsa? (
 		media-libs/alsa-lib
@@ -53,7 +63,7 @@ RDEPEND=">=dev-lang/orc-0.4.12
 		dev-qt/qtgui:4
 	)
 	sdl? ( media-libs/libsdl )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1 )
+	uhd? ( >=net-wireless/uhd-3.4.3-r1:= )
 	wavelet? (
 		sci-libs/gsl
 	)
@@ -77,36 +87,29 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
-	python_convert_shebangs -q -r 2 "${S}"
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	base_src_prepare
+	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 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 performance-counters ENABLE_PERFORMANCE_COUNTERS)
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO)
+		$(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) \
@@ -123,12 +126,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	python_clean_installation_image -q
-
-	# Remove bad shebangs that creep back in during install
-	sed -i '\|#!/usr/bin/python|d' "${ED}"/usr/bin/* || die
-
-	# Install examples to /usr/share/doc/$PF
 	if use examples ; then
 		dodir /usr/share/doc/${PF}/
 		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
@@ -150,12 +147,18 @@ src_install() {
 		domenu "${fd_path}/"*.desktop
 		doicon "${fd_path}/"*.png
 	fi
+
+	python_fix_shebang "${ED}"usr/share/${PN}/
+}
+
+src_test()
+{
+	ctest -E qtgui
 }
 
 pkg_postinst()
 {
 	local GRC_ICON_SIZES="32 48 64 128 256"
-	python_mod_optimize gnuradio
 
 	if use grc ; then
 		fdo-mime_desktop_database_update
@@ -175,7 +178,6 @@ pkg_postinst()
 pkg_postrm()
 {
 	local GRC_ICON_SIZES="32 48 64 128 256"
-	python_mod_cleanup gnuradio
 
 	if use grc ; then
 		fdo-mime_desktop_database_update