bump to 3.6.3, tested against a few libs and all seems well

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

3 files changed, 212 insertions, 16 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index e39e2a372865..236fdf0014eb 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2012/10/14 23:20:02 zerochaos Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.21 2013/01/10 19:32:51 zerochaos Exp $
+
+*gnuradio-3.6.3 (10 Jan 2013)
+
+  10 Jan 2013; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.6.3.ebuild:
+  bump to 3.6.3, tested against a few libs and all seems well
 
   14 Oct 2012; Rick Farina <zerochaos@gentoo.org> gnuradio-9999.ebuild:
   fixup for live build to make new releases easier, just rename
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index e1ce0e16a7fd..e8463ba3022a 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -4,26 +4,28 @@ 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
+DIST gnuradio-3.6.3.tar.gz 2766447 SHA256 bf4b2d7df2c078a6fccc0cf288d12bbb7617a9f86d453028db95f05e47745c9f SHA512 b58aefba7dc04c4a4e055f6bf74a026ef6e4bf7422fdc139e2c20fbf837b60ad419090aa0eca92c79fb25228dd160a04779c4aa9fed5ff65294fad4c61fb1683 WHIRLPOOL d1e7918dd57d642a2fa2539865f0f5d8c50e9f216a7919c87ce9ff4434a216a5e90ec835ec266ab2e7e43fe8b400e998f790ca15babf64049f5262a1b992c285
 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-3.6.3.ebuild 4989 SHA256 69a1b8600aa048128880ca25e0422aefafbce8b17cf97930c28f77157d46f449 SHA512 7cc922568a10ae928f0cbbe7c6f77e045baf8ccb09fbc1bf12f730e2cc927125906680caabd02207be2b0818b70e912435fb09facb2f83d13bc6aa3ef356101f WHIRLPOOL fcefacc912d21b89573939ee985470cac656817bda4ae31da2f9d797fcd755ae13117da0aa10d2e5d57ce9c9dd16ec099d057014f2e39e37d4b9e9a99f37bcc5
 EBUILD gnuradio-9999.ebuild 4988 SHA256 9835e64a9eaf89b954176970d25adc82cef74d9c5b397542d2fab824c2d725c1 SHA512 386c76a440d171769ba50b3620b23be8f65ad5d3699f1279d3ab8044cdc39fbdb137f10f0e548f63237602cbcf56e17124cfc77fb5f3049e4b8263eaf689990a WHIRLPOOL 094ce379af813c2e74f94c956c048704956e6752f0926b660a0f9b16d491f69fc12bad6278064a114fde2ce57a5786a1c49bbeccf0a7385c00adeaad8959629a
-MISC ChangeLog 3752 SHA256 3fde419e38baca068cc1276e60297080459b76d1526c62d72e0a6fb7869e6a9e SHA512 f949c7daa95fa111166f967c60018d27e74f9de3e02358b07808e424833b86694374fd6de958b350465963781172b55ef67b963d114085b1c9d6ac698a4f1123 WHIRLPOOL 6dc8c3f741c3fa1c8971f696ed44b25c66bdad3c034057d31dc1cbe2f18e6c78fee6b7cc04deba3384c7267d8dfef3c7a1fcb147d1e3b1bcbed665ac656cd4ea
+MISC ChangeLog 3920 SHA256 a3b05e692f0ec5da0e9bed09280e3e9cb0b2b2d474285ecd951739f1e77f0806 SHA512 4b9cbafeb5302ec8cf8ccaf40c444604d45c08bdbaeda0da9e2a7de5346d95437080a793faf28b35965932599ae6ef6cf3ae76f4528bab4d9997ed922f19d23e WHIRLPOOL 92f203c3c01e0ad82f5a2fdbf5b209867baa16468324e4d6db12983490b0b6978eb36bb3634be8b95a46e37fc393088c72f4835b279caa93f5ed89d01456ea01
 MISC metadata.xml 760 SHA256 7b4c66887819529699e1d406eddedfea177c89fc3eca20e116252e5661048833 SHA512 43203e82858497e8a5873b67d053d53ff5bdf96840ba97b6aa257ded90a48eeba46d45c067648df88198d66b83e1df347daaa4fd2d6ed36d8384becd21037233 WHIRLPOOL b417c04aefbfa79330cc29054aa77ff299e6e3927f1057a81810111b8e2e43c25b23ab446aac58508ad738eb53d14678be2af8019f9242677a3bb5fcab2ef7a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQe0kHAAoJEKXdFCfdEflKb/kP/1+ftlUpseXGDUkT/qfJAMau
-SYtWsdI9956qPk8d5lWxRQYwhuyAaNppoMZgtGWIA9kt+/VJ4M/Qexe1T1zqrztd
-hhASneXQkq6fK9T2pBznJkF0mrcZQDvxLZvUCoWKIf2kTuSNPwaOwAMEgZUaIbiD
-RHscOEqH80o7iTPPTK/Hfq9vAgzkWldr5MWsjVuYKkzmUJ2QffmM2/ncVQC+oQpI
-znyMO/f2sHibiZJ8KnB1S/wBr1HZjgYr0GZqRSrh9thfgL3eIFMdcxXBbDoCD2i2
-BAMTmOXFWNZOI6ry+tWBqBKzFaktzGCqQQIJeoAwVott/ozZwHUrKkbpeXIZggDY
-DuPrwlv0lIP3zfEK+NI2+Tn7CHS1bCfsD7sOULM8hMxO+3XR6eVO07405aY5RCCk
-oa5ejohjRxWd08SGMaQP7H/x6CFHum5P1aMb2q818vMuSwzo5TDGXWC0lwcGJu6s
-/aQTCIC/v2vRkppKEINDKOoyi4z3DEESS6moa2hCBUyCY86IJnBzk25pv57ha/Ix
-QYE/H2EJ+Lk2RsPvZqdk22+WAxW2QCIbFW2pLMg+xinJ7Ge9l4MjlGhAkXwNEM3N
-hSRdqZMR25Acu5i7xtap2WEaZo4zm0v4J66CJrMMGSBEGCJ6pCeVllmbGilmicN6
-3HYaw59p7eTuRn9ejrES
-=2Ao+
+iQIcBAEBCgAGBQJQ7xeeAAoJEKXdFCfdEflKA7MP/Ruvs34p8gAKs4G9aUmZirKU
+HGi3bhP2eMos2LLScZO3o24Uw4VfqynGChXdbbz+KO9+lLcecCK1rg+Sry5OfDD7
+8P5O5WrvQfuoqYQRQzbQq61fgGge4gzYNZsWRLUJCwtd0ySl0y7znEWjnHoWIBcc
+vKp90zVZcw1wft8/34A/IeV8ulrtV/dyuQt2V9xEQeXTcoPeHJPCwKqUZUbbYbZ8
+5OF9SRJFXtSzHkaoahTXsuBux5EvaFt5HMHHcgHtOID6ZIodu1vcW4BgePpo4nA9
+UncRAOfhgX4SxKeNPTm9q/SkaLa/1WQxAF8PTl4k8gI2XLyK6Ub4iGUzDMkgPxYz
+XyfNEvohnFSKEHVT1b7fSrtbvzdpJIyyl/hB/68HrkESvPtVPIxuZ9rpw5TvHxnF
+/vSHurTUYg1bcCMW0+LUUWiZTqiihz4gNxQ30iilWxA88dXveSIqtKs4crT6Du98
+/gNJFXbXHsefVdUIMwXgv+fHj2BtOixtl6mruF6ELuCQ45xbLyEhReUuJM76JSxA
+60PXPXcXkBv0chsjojmuLyU/LDNdghiM/X0RQVjioqGqfxNUiPqhecKeWLvc67Ys
+iTT83hdncVbFEx5AttFwD/wmUAZV3RW8Jy/QvJtu/4VuJ0eeDZw0IGabeQfILeSo
+FL3Lv/coVhgj36ZN+/xU
+=0sWl
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.6.3.ebuild b/net-wireless/gnuradio/gnuradio-3.6.3.ebuild
new file mode 100644
index 000000000000..abe3d0a4c6ed
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.6.3.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.3.ebuild,v 1.1 2013/01/10 19:32:51 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/"
+LICENSE="GPL-3"
+SLOT="0"
+
+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 ~x86"
+fi
+
+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
+}