Version bump.

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

4 files changed, 193 insertions, 17 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 8e36b49b4a6d..ee254c2a8d8c 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.15 2012/07/27 18:19:18 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.16 2012/09/05 21:38:56 chithanh Exp $
+
+*gnuradio-3.6.2 (05 Sep 2012)
+
+  05 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +gnuradio-3.6.2.ebuild, metadata.xml:
+  Version bump.
 
   27 Jul 2012; Michael Palimaka <kensington@gentoo.org> gnuradio-3.5.3.2.ebuild,
   gnuradio-3.6.0-r1.ebuild, gnuradio-3.6.1-r1.ebuild, gnuradio-3.6.1.ebuild:
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index aeb1fad02175..46aad488ecc3 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,25 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gnuradio-3.6.0-cmake-sysconfdir.patch 3526 SHA256 3bc919327e0bb99591cb4ef1d5868dba5b5fe4acb37ecaf81fa7df202e166a2f SHA512 21936f393d3c4963473501d5a45e4039f1c3058e1b28bb9c5921377f122142e4ea9a065d0668637285e375cda7a4fdf2549949f0b6bf1d15d4c81c3a0073900a WHIRLPOOL 6b2e84fae60e1710f1f144a937b4060d67104da7141885d0be0f40f6aeafab6a8cda5d9f45d5a25476c8e0b23afb0c43062a30ce57d2e560fd84486d92b2bf6d
 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.0.tar.gz 2391734 SHA256 17327d9fd03dbbdefe920536e1bad1de0ff80e101846109e0ec2654314f55376
 DIST gnuradio-3.6.1.tar.gz 2475061 SHA256 22256fbbaf9bf6ed5f7b6828b54372db1ad549ee8e458290b1d2fed95bb18621 SHA512 9817cc6dd20e6d9fb441b150a06b13c40083e06e3e3485fc9ac9436480082f31ecb5e4fa05f295cb9f2c284f8c5b7107f38b14bcb15fff5077bd7a7c9e5fe444 WHIRLPOOL b8ee69c31bdfc90bef8b70a908b09c8b404ccba678b1470acafe8eaa79238a5246baf814bf1c3fe109f13628c1eb2b008637036947dee7e017b540a851330ed8
+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.0-r1.ebuild 4568 SHA256 baa37ccec927dc16a36b2240a06994dae083c94e3d8153d92af2b0de3000fbe6 SHA512 99487fe2ce6d3236823e234d225c57e1137111d00328673d044e3ba72c30dd42e2ebcdb7d9e1f360b28dcc62da7d6a1a37281122630fc8e4891d95584014c82c WHIRLPOOL 681d460ff453e634e828126df27d1d086fad3a3da46454c15416a3f746908be9bef0188bda48c605ef2d04a9715a43acff203a857fd1909adca81852cf9dcffe
 EBUILD gnuradio-3.6.1-r1.ebuild 4878 SHA256 206612642c320141665bb6e936126f456897ee0874e5c1da2d5b299d195df77f SHA512 18a7d7130b7be19400a97c85217bbb9900a24f15dcf180475d66614f65ca16ce79d253e01753b2d2216c3fa14cda51d2f9df3a48cea0f643dab810cf6644bf39 WHIRLPOOL b22b23c50c7c32a9f0d99b3adde464ff84a7bff6de72fb84c07e9ac727b342a8e6d907e7c15c7acf05dffaab695a5626e049b09415dab955ab46a44016133746
 EBUILD gnuradio-3.6.1.ebuild 4626 SHA256 048071696ec173ddbe0e0247b4eb8f27bd221d89dfd2b90d7920cca02d7ad698 SHA512 6493cf2143e1df1b462eae0bbc69aaca92205155f3cd64c57a60d09d77dee078d10ce296360f119c9d61b0357671cf2b3aff62d7d8694ff92b84a7b593780613 WHIRLPOOL a85a7d96c67d8e1de7a8629ec5e980a056a60ea6a6fde267e13b24dd1e913e7529d148d1f62cd5dfff7cd734dfc43a1df11c8d9c6880ac76b8386be8034e6c38
-MISC ChangeLog 2821 SHA256 593bd1243a1c795fc366d946d05c5e62dcbce4d0483073c240a41d21f15dd0fb SHA512 ddf34c3113bfe25552b4997d955870c4e580a3ce00bed82ff71ba8b2a7f3d482f00ecd4f6805054250a378fb0dc45c5c4c605896e6a58e015229d8e54bc16129 WHIRLPOOL 94b070be78be3a5bea2cefa21b28095b6cc65c42a371ca4aec01c50e9b117489f97c1c2877cb8ec0d3365a18e41bf9ed85521279896541eb04061efd882899be
-MISC metadata.xml 631 SHA256 e83dc516a561e7e49759133b3ea4784f92455aff4e6e1cbda155507b50528d9f SHA512 37907d56f2754d328cdf8b0807c9113d5c37c8af54fb9a748f89f4c6a9809ab554f8d6745c06b070aa70c4924415fa6580b5af988d6962ba5573cd5565ce38b6 WHIRLPOOL b44ceee15cafd3ad91a4f5d4ea709ae4babdfa46f3c6f4782d646789a15c9a7b86e5a2be73b0e96301999656c0f4632561f09c63325106a0078982728d378816
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQEtuaAAoJEMbwO6tnXQ0sNPAIANLgIja4NGdLNMUQLtvfoQp2
-m1l5Hn45h0/zyjgY7DSYZ4noD/lyq9obzP/UmSkJpiaESkYDvB/18Uq4y3xQ+NzO
-rHa3MBwCLENBKhS+g3UeyYedKhELoPqphkO4oLx/ikdfeemVqdOYROfFFB1fhpx6
-VM7PX8nW1o/Vb4HyehH0vTzj3CBA0QX5+mgT+cCAo6z3Pl5QjU/i9pGcZG/OYiz/
-Bz7iV//T90m0zMZmiwr6jCbY7DAad7dET1vL8c+GD4X2S7zNpRhRnYzXqeXQlT/a
-g7SJYOu0w2/6IbH7zJok0lt0/f3KYHXjwedFvC9vgI7TsaDuenUUJ0+juqcrzbQ=
-=qxWf
------END PGP SIGNATURE-----
+EBUILD gnuradio-3.6.2.ebuild 4804 SHA256 c2ed07d119748920d07e7e7627bb16fcad5f42046aa697b0440235e393fd3136 SHA512 59514b3c731997a16e4256e8b1ffcf4d4afe2e1a02a4a951a9b7742badeb902e6939b97ae276f1c9ddc1d775d48f37000ad2293faa87852c6c8969863d11ed77 WHIRLPOOL 6114b5c0b8f46698ad35e70dea82205a052ce98cde2f083f8f0b253adaaab2a01b8189ed603e7d0f3797a55d0a71c1abdfaa72bfb6ced160bb2b3d2e1e546908
+MISC ChangeLog 2976 SHA256 c472ef615fa6950516896a5577659fa4da617a6a5e5e37d178829f758eaf1a11 SHA512 2298bd50b1b1dd0f10eea8cedc1f1091b96235580664240de68bfbaa542b8920e8219e2786dacfb64f7d41d8c0eb885e7423324e83927a251fc4d236bb8049f4 WHIRLPOOL 75d179a1177540786fe2be7c9045755efa07ca2b80bb1b92c042c2841047c052bccf264bb119a3e4c8cad51448ed476f5023b01b687d0c7742232841c08b645d
+MISC metadata.xml 699 SHA256 b706bc8e1655fad90c4a2b68d96de3a37659abfe486e886b6563064f74340ae8 SHA512 a6b175ba6035c870a846913f41cbc4767a4f03ab85b2e8b861a2454096e44636dc66905bd274bb3782dc4ef7f54573e675d7d333d6b5cb30907968a7506ce289 WHIRLPOOL 82df69dbb09419083b303fc08b0ed59f8ccd8d33d5d761a65c623ca13a19315b756ed91b9efdfd8722f90efc7fc012d03f13c196c77b90187e9cd5d134886297
diff --git a/net-wireless/gnuradio/gnuradio-3.6.2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.2.ebuild
new file mode 100644
index 000000000000..4d55d1212434
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.6.2.ebuild
@@ -0,0 +1,181 @@
+# 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.ebuild,v 1.1 2012/09/05 21:38:56 chithanh 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 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
+	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 )
+	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 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/metadata.xml b/net-wireless/gnuradio/metadata.xml
index e87f4b0b9e36..cae9797a285f 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -6,6 +6,7 @@
 		<flag name='audio'>enable audio output</flag>
 		<flag name='dot'>create dot graphs in documentation</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='utils'>install scripts to enable viewing and analysis of files produced by flow graphs</flag>
 		<flag name='wavelet'>enable wavelet signal processing blocks</flag>