add uhd use flag for ettus hardware support

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

5 files changed, 218 insertions, 7 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index d6a666d9bcd3..30b3023bfc72 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.18 2012/09/30 14:57:10 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.19 2012/10/09 21:29:53 zerochaos Exp $
+
+*gnuradio-3.6.2-r1 (09 Oct 2012)
+
+  09 Oct 2012; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.6.2-r1.ebuild,
+  gnuradio-9999.ebuild, metadata.xml:
+  add uhd use flag for ettus hardware support
 
   30 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   -files/gnuradio-3.6.0-cmake-sysconfdir.patch, -gnuradio-3.6.0-r1.ebuild,
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 9db6b29341a6..994497d425a3 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 SHA256 3e65981e8e8e9c2fc5e8223bf7e93956d6f802bbd9df15277283e9d44b7c5a2b SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768 WHIRLPOOL 363650437161e68f056229315f1d0b52fa409ba9b284196c16e7acf96b68e2e036930db45188f61b5b0bb0e4f51bd3007d8fee622476eb605c72f2ff4b6c24c7
 DIST gnuradio-3.5.3.2.tar.gz 4315336 SHA256 e559a07de634de350fcf370daca2c2931231da25370001129de34a2865843f24
 DIST gnuradio-3.6.2.tar.gz 2604075 SHA256 4ce84bf9c6591b5ddc2c384e03e40fc2f0cb8cd1add485ee2d6f26052cc6de35 SHA512 7c0dd55db478500a1e79592a4f1e1a7b938672d46f9298c8ff4edd67a919f19f0c6107d4419a3698a1fc95759871b03e441a778fcf718dd518171b01f2d35589 WHIRLPOOL 26eccc1eaadc8361be8bb79dc8768abe5f02001e07909f693eeffb1494eaad6d3355e2f780f1480737f8315aed83423beb83ab2d0e967173d1398255aab58d50
 EBUILD gnuradio-3.5.3.2.ebuild 5135 SHA256 a9f769a5ab1b363adbdce06ec54ae45927ae1345f7f94e80ee49aa1beec9a12f SHA512 4730d264ff24c38efb6657ed1f5bfa24adfa41601a4fdb6c0f881ed5173c0d57d53fc71df7899afddf36eaed1795dfe5ea17e0569c197445f46f9a456203e20c WHIRLPOOL c28f622d322462f6e071e535ff170711ce04794d596741bd850cbc52f456d4d18038ab1e503f422991cbae62941a667719fed7c7bc86264befa0c830daeb9e03
+EBUILD gnuradio-3.6.2-r1.ebuild 4867 SHA256 c404c6011be4dda3c63996447693089f2fefdfb00e8ca3da0ba3596628431e7b SHA512 742fac40b1526fe25667f808048ca65361974bc775321ffccab9cb15a06058160780e38c0605d3427ae7b78a0bbd02be91910c378618a1138c72925c2c951518 WHIRLPOOL 4f443b1b5614af94eb8f3bab2956b6a179478fa1b63229cb30887f9bdd88c8392e89d34dc1fa76b14ee7d55dd6c60b3cb31165452c33036ebb7632552660c254
 EBUILD gnuradio-3.6.2.ebuild 4804 SHA256 c2ed07d119748920d07e7e7627bb16fcad5f42046aa697b0440235e393fd3136 SHA512 59514b3c731997a16e4256e8b1ffcf4d4afe2e1a02a4a951a9b7742badeb902e6939b97ae276f1c9ddc1d775d48f37000ad2293faa87852c6c8969863d11ed77 WHIRLPOOL 6114b5c0b8f46698ad35e70dea82205a052ce98cde2f083f8f0b253adaaab2a01b8189ed603e7d0f3797a55d0a71c1abdfaa72bfb6ced160bb2b3d2e1e546908
-EBUILD gnuradio-9999.ebuild 4853 SHA256 03ee20ed105878fc4a8c6b6ae6e1e85a61e3d7bdc63f3863b99b50076a31512a SHA512 90be25c00250b9c5b03cf9aae240f8cb364772f1d27f5dbcc2508f9f79d96114a631690ca5e60ca7072417694681a58752c809a95a5ea199316786bfbfc70ce2 WHIRLPOOL 5c746d297221405df85a402a13e5d82a3328cbed6c3b8dac4b96543fc8cfe169929c49ade178d104b8ff81b17c0cfa6abc4aece94c080c16480e81cc554f75c8
-MISC ChangeLog 3418 SHA256 98752cc5a1e133efb5b532ff372c98600fa4dcb82c1596853aad908c6cb89bb5 SHA512 584a9b86285d912ee7e47ba8d14894a2266722568c58ce405c1c296c77c2ba5bdbe7139b9a2ddfd54f5d95694f6c97a979ba95bfecf6a4767a55400f7f0fd73c WHIRLPOOL f121b0ac298a0937f483c7cc8fd91a4398d148df7d2f17ce6c154a32701e017830630e959eae6a91189f4095bb47e7bda6e378358c31e815921a8d2a64f320a9
-MISC metadata.xml 699 SHA256 b706bc8e1655fad90c4a2b68d96de3a37659abfe486e886b6563064f74340ae8 SHA512 a6b175ba6035c870a846913f41cbc4767a4f03ab85b2e8b861a2454096e44636dc66905bd274bb3782dc4ef7f54573e675d7d333d6b5cb30907968a7506ce289 WHIRLPOOL 82df69dbb09419083b303fc08b0ed59f8ccd8d33d5d761a65c623ca13a19315b756ed91b9efdfd8722f90efc7fc012d03f13c196c77b90187e9cd5d134886297
+EBUILD gnuradio-9999.ebuild 4912 SHA256 807557bfe277aa1fc92371b25ec99ce1b8377d3c01b96d8512809440c687be7d SHA512 7b847b2365fa301c28be92f555d2066d502476c0fdd2f3997b988d23368dcef9443f89f23604ae49dac4abcdfd2f65a4252eb23dd7b9402d98147e66efa143d6 WHIRLPOOL 091ea0ce8721b84edc7e24c2394367d1b968cce159b40016524d820d8bd326c20b38b6723b4dba7872b5713fa71e2b193181cc1699232ffc1ced9664dfdb8e4a
+MISC ChangeLog 3615 SHA256 263bfd6115ae3bf45e4f59d82db74a019caaa9212f39d6e3675184cc170ec7eb SHA512 6516af383e13c5bcb40ea9094db6570792fd284a6557d0676ee90050b1e1e97a622243d7307e09ad5b25b2f0f2a8a7d91df4d30cf039486aecae948f93a010f9 WHIRLPOOL 8cd7f4a6f064592f4e279c6f23416c5fe3a53d007aa01a8d222f824bc2cebba6469fd27beea9e24a581de6f5b986f66fcaf3312247d8b1802aa3a3f97ae756bc
+MISC metadata.xml 760 SHA256 7b4c66887819529699e1d406eddedfea177c89fc3eca20e116252e5661048833 SHA512 43203e82858497e8a5873b67d053d53ff5bdf96840ba97b6aa257ded90a48eeba46d45c067648df88198d66b83e1df347daaa4fd2d6ed36d8384becd21037233 WHIRLPOOL b417c04aefbfa79330cc29054aa77ff299e6e3927f1057a81810111b8e2e43c25b23ab446aac58508ad738eb53d14678be2af8019f9242677a3bb5fcab2ef7a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJQdJeQAAoJEKXdFCfdEflKOjoP/iksDac/cbKqT1+H3mtX2X2x
+CWC02RqXt97kw3z/NDQnW6sZhV1ug7uClBEMfljojyW266VQn91uz6L0p+1IDi9J
+jMvYae1pNb85Ji3H/ZWibTsXWkgbiJwFVpsXnLtkdOkaXw/7yGxUOgevWXasnbMU
+3Hl/0XdDO8v/S8FyXqaptyIDNz+UUTVhheSOXEO1u8y69Q5c2mkBgQMwUENLZQ0g
+z+a2dtdeOGFhzwzENMriL3yxvaLPs9Xilf8u90iOX1+9QTMQaGH/q9pqv8lZ49G9
+yY25Tp+eT2/XXVXm4aPazTRe+KWPBiktbLmg0dYPA/TvzW3PYNfFc/8WCs72cJgD
+4sYsxAHzBWMksV/2Dpxkax81CgKpbguOKfZVQNzaFvpOe2MP//TmW4M8unPpducD
+kFqBiD03ttUERks+5U5csCcAqGhapyT7nkA5e4bMnHgwPQq0wfWLWuqltLgBReiP
+c9H0NcEWrNnhYBwdkPhUf0TwLyV9x1XshOkauKDKnM9nK1lHiTNwXjXvNRN6fK2R
+4i1DEKZe1+Xj7xMY8i2r7ixH3hzXzyB5osW5jam9vgSR2lsbSJxG0suNHBbBMBFQ
+iGbqW/QDbSB47A9RO0HCcwGnFn1DatdqZTGHjtqwQS1drbW/NAF1HEdjE/yAYEHY
+ADq8gpH8FLGIx8kOSlSL
+=iTld
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.6.2-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..83044bb5f967
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.6.2-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.2-r1.ebuild,v 1.1 2012/10/09 21:29:53 zerochaos Exp $
+
+EAPI=4
+PYTHON_DEPEND="2"
+
+inherit base cmake-utils fdo-mime python
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="http://gnuradio.org/"
+SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc examples fcd filter grc jack oss portaudio qt4 sdl uhd utils wavelet wxwidgets"
+
+# bug #348206
+# comedi? ( >=sci-electronics/comedilib-0.7 )
+RDEPEND=">=dev-lang/orc-0.4.12
+	dev-libs/boost
+	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
+		x11-libs/qt-gui: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
+	)
+"
+
+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
+}
+
+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 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 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
+		-DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5
+		-DSYSCONFDIR="${EPREFIX}"/etc
+	)
+	cmake-utils_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
+	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
+}
+
+pkg_postinst()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+	python_mod_optimize gnuradio
+
+	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"
+	python_mod_cleanup gnuradio
+
+	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 b97927b688a6..29b638fd9aac 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1 2012/09/09 05:38:17 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.2 2012/10/09 21:29:53 zerochaos Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
@@ -15,11 +15,10 @@ EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa doc examples fcd filter grc jack oss portaudio qt4 sdl utils wavelet wxwidgets"
+IUSE="alsa doc examples fcd filter grc jack oss portaudio qt4 sdl uhd utils wavelet wxwidgets"
 
 # bug #348206
 # comedi? ( >=sci-electronics/comedilib-0.7 )
-# uhd? ( dev-libs/uhd )
 RDEPEND=">=dev-lang/orc-0.4.12
 	dev-libs/boost
 	dev-python/cheetah
@@ -46,6 +45,7 @@ RDEPEND=">=dev-lang/orc-0.4.12
 		x11-libs/qt-gui:4
 	)
 	sdl? ( media-libs/libsdl )
+	uhd? ( >=net-wireless/uhd-3.4.3-r1 )
 	wavelet? (
 		sci-libs/gsl
 	)
@@ -98,6 +98,7 @@ src_configure() {
 		$(cmake-utils_use_enable jack GR_AUDIO_JACK)
 		$(cmake-utils_use_enable oss GR_AUDIO_OSS)
 		$(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) \
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index cae9797a285f..47c9e7b1237f 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -8,6 +8,7 @@
 		<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='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='wavelet'>enable wavelet signal processing blocks</flag>
 	</use>