adding new revisions for subslot support

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

4 files changed, 217 insertions, 18 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 29e5ec2144c9..a2cad5e77e6c 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.24 2013/03/18 21:48:33 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.25 2013/04/20 15:09:56 zerochaos Exp $
+
+*gnuradio-3.6.4.1-r1 (20 Apr 2013)
+
+  20 Apr 2013; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.6.4.1-r1.ebuild,
+  gnuradio-9999.ebuild:
+  adding new revisions for subslot support
 
 *gnuradio-3.6.4.1 (18 Mar 2013)
 
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 7d67bb10b7a6..95ce4a41f859 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -9,25 +9,26 @@ DIST gnuradio-3.6.4.tar.gz 2922269 SHA256 a0e2bcfb55457cb302c440f981ff4876a7b18d
 EBUILD gnuradio-3.6.2-r1.ebuild 4863 SHA256 be9ec8d903ef1bd411d699c36c206abd08f3f1c09d1b37f8aa1bf35c8f8e5f66 SHA512 0e460cdde4e61f0359a8da21729881dd812d72384310f61a66bc489788d7574e6e2dfae1acd7a6bc653fc2c3708e7db842e6132ce5cf5f20d1150535b1a2838f WHIRLPOOL b4bf5f5dd5b07b7349ca5307da06193fc6f609c68a27f398f7b6ad9e277857754b6f19f71b0759b1c3d0095bc9b9b2789860dad2600c1102205a393b4dcb11fe
 EBUILD gnuradio-3.6.2.ebuild 4801 SHA256 276b88a02d9515f1785d8f12dcc01b749b1094c576709c718b845c7746558cc4 SHA512 e55195ae3249a87afe20c6c0730126b5f4ee0d0cd22c0046a015fe6e35579b2c8a2f9d484b5a8b3a5c73a6c91c7778dddad20a085f4b304f135c8114891214f1 WHIRLPOOL b541ba3255c11798a6abb8bfbd0a582fee71119af088875ba65beeabc76255656a7d2d48e269304dc44a50169b9a7c9579e3cba86a7ca8377be7171218882086
 EBUILD gnuradio-3.6.3.ebuild 4985 SHA256 f1f1a30e328e5f7acc821fcebe794f977d54f232c5581c47d6fc8007818f8a6b SHA512 7a2a605ef99cb4b392bd8dcdfe63c0b76536087d77c40cafeeb90d6a58fd29f8117c985ee32e1fdfa5d8d20364bd78bcbcf5c725323b128c30058b8f659cba5c WHIRLPOOL edec98b169aaf0bfcd18923302c8fd230d476615424afdae9a7026266d8a757af57db49b6fae5d7e10e79c9624a8873dcc40207b3c3e623d8d40f48569783c67
+EBUILD gnuradio-3.6.4.1-r1.ebuild 5202 SHA256 685395bcd5025389e48a70d0b404389dd918da3d4c12fdf8f300de3847b4d46f SHA512 4df481698a91e63ebd2f63848cfe041165c7f249c7878a5feb9ebb26eb9c0ee93166f4eb25fe18f60774aca1181614c5abd73ce6db23527c221821b8552c5d1c WHIRLPOOL a875044c8297062c0be2fd686c363557b74117c0264a8f7e37140ceb0e3a4cdea5d0f36ccd4cca6ecf1a228aaeb8a4f8d1920c8b38397069405df44f229be1eb
 EBUILD gnuradio-3.6.4.1.ebuild 5193 SHA256 1c90e28481d0fb94d5049b3f907fe798d8502f9d52ed48fcd351d9509fe219fc SHA512 b47141156ccee0f49b01c2f97335e30951df77dbe711f1368c4b5b87f2ca4182ae8fd2a806f439ae500af13d98a3912099cb2e83bca69a7bbf54e6e4a1dce42e WHIRLPOOL 4826be5fc9c4739a20aff5ce73cfa6a08c7e247f4f284ab65c43b8b4daac131efafc0be3060cfe818148e1028aa961c2807b15099d00a7f94e039a7f797b3777
 EBUILD gnuradio-3.6.4.ebuild 5190 SHA256 6b14d813e95413e7cafc8e2f43bb8c0f7e1f2f4747f256dcbe6843551c530fb4 SHA512 e7c2f328dd76cca670dae808992506400ce4a7209ea9d9a000b11f4b68c9302cee259f9990224c71f407f9e04236a84b349f4e23fb2416ed3ef62d27cc528ab1 WHIRLPOOL a4373577a8fdb1553ec95768ee78a4524aeabd42866e1438e39fd61156104eacbda6ce6be8b5667a9c2f1e9acfc99d39fe73a98ca82e000e7fe09610c895f986
-EBUILD gnuradio-9999.ebuild 5189 SHA256 0c760831e73ae11079aa935a8f213780602225b9e59b95d9d5ff8805f6f29ecc SHA512 47f6acf2603020ad3a2ef2217c50cf6f7269962c5ace95053bebbf201cabb6810d81faf723f6ab5eefe3585022acf5c1daae63c41b550632c1627340e644e316 WHIRLPOOL 74d83c31fa73188037dc975440841cfebcc26a546d3ed0d15e80436e527466f549996f9043d98c7669556674ecb147cd18dcb0ba242417bdb948b6e172c08a6b
-MISC ChangeLog 4546 SHA256 93c4214ae3ff65fced7f643de98fc7e73216452dce8f1bc88cb340b41b7734c2 SHA512 c5d8bfb724bb0848e1749e2687abfbd3ee4ef2b60e9fce54eed428b3ab6248a2885d71d5c522d9982dc09ed4aeacc66fbf528ec5b7fbdf902204a4de3d96399f WHIRLPOOL b334747443074720011b3b605baa71909238e34c40a6ccff3ac894b99b238255d761f96b8238e4096f0f227e70a7b6c66fab1117396a7f66834a263824918c06
+EBUILD gnuradio-9999.ebuild 5196 SHA256 a9fbb072f765813bbe82647e931978335d361998b38a2a794663693f83aa47a4 SHA512 1bbff7f986e337bfe4efaa8b23917076ea2473ff29556d5710680ef305a58da74f8040b9de056fb08657b7d5a90c008e159ffacf7cba5bad7d02c5622cdbc354 WHIRLPOOL 652e757146a07adee4ad3ca725bf7cbb8438c76f1872c29309d3c2434787af320876253fea2f91d7f36d1b014ac5f703d15ec904963034f21f876f27757fe633
+MISC ChangeLog 4729 SHA256 4eddd9507e41a1ca4dd05e8fc6bd8b640378bcb87300708bc8a7e151baf394a0 SHA512 c749a6691935d1f2dfce6a42ff29c5ed1fde710446f097dcaa4b28b9ad60b43d547d5b2e2afccd2c585519c8831d36e081a794a0c1657d5b0055984abdca69e7 WHIRLPOOL cd2e7d3c3a3866db24a26b01a3797d0e6aff54fed473734b1eb77d26ddb543633fa3c469aa986982a6ec5dec8ef12079e7e3373b37356aae6cadba0e2ef6716f
 MISC metadata.xml 728 SHA256 9e95ec272bf243e9aeeb83495eb985756816acbf667fc0af1628bb2e53aa71c1 SHA512 5e43037b0b2e8b249abf465d22006330cfa04c12366a13ddd24f25393d910d6c62cab12a88942c55521e4dceaa2d3dd42e32c35a0d57f75f19922a001e9262e3 WHIRLPOOL d89b6e7e79bc63184c80346281d76567483596407d146dea1f7f9740c997cdf756ad603287e65ccb9e699a7b6ad57e268086acc76d8131936605e09d71347caf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRR4wPAAoJEKXdFCfdEflKARMQAIim7qXA/PeB/LOdH/jyTViP
-2OADvluZDKY+hT7/tLE49WelB8De8j/0vXSGPzo8lnByb0HzI8IHL9zBYwPjGWUA
-bZvMU1AbmgTRKl/7L4A5yIaN6y6gPi90sXgSu+uPmjp8tz+yUS+2Md80mKZ6G+iU
-uLKnSR/B6YsXDOd8e7YClTO8SUTY87kSp4GBP1hJ5hDErht5ejoegE76SIRaQdCu
-Xk9mwvVrCjWNVhJNNBGZHoTc1UNIN4ZngczeoG+EgRcH0ittSQhRVdZJ3mAiD15B
-BxWPST7Tzz3HWwVFJ3drT+oWd+RqGovcwhDs4xhod2n9bB3h9Mxs/RQBCz5T7Qme
-igQ4/prlhhWJorTjzHAQa1vlvrlSmjUCX8UemjPHQKD4L69SiYmkzDO6XUBlPaXL
-N5QMPIxEFoLjzyW9jofUNQIkln6ydliTRJHFO/t3T3asP+CgTJyPMk9EL83pMrck
-63rcbDj8hbFrKh9CVVk3YnoIS9H0soE7jrq6F4wo3H9mk+IoNmO/rDSeNbZZ81gE
-smtBxsFYuooBSe83V2fmM4YZxIET3N5ieULZqct0rGgc0g+30Sb5hsuhzyUniVjo
-cNdOgJ0//cf0B7qnnhAaHFjIdRy3z+zJwH5IKaRGLnrmg+UocmhijpTe0tMadS1v
-G+TSUk7Ny9B4GXvUt+Hk
-=w27B
+iQIcBAEBCgAGBQJRcrBZAAoJEKXdFCfdEflKKkUQALFqh8L0xXD82XXoj7gjHgrZ
+Zm1a0kD5M4/jqHcr7Uy/ImbhXs5aLrV8EVS9CFRl/awzpYNWCUAE5z2UJaYClYbf
+KOb6uJ/I3RC/QKevw4IRzpFB4F7O1RrcUIEBwsDFfwjvo8SRcuR2Ui6mXaXkZcjJ
+XHEFrjUF5+a9ieSvNuBg5HNRFecnuseOBZpNzPFWFIAtDYMJ8D1p8+Vfxqj+/W9o
+0VXtlJMkm3M/Xne/dWjfSwHiV+cgJlIxgjhIUZplsJ3KOd1mP7xWdSKGUipb5lPC
+Tf7D78v4FA9AQv+J/HKctdJFMtPuivRy0ETNPkXYOo5IPrbp6XzmHKzpMb459GD9
+akfb8DPTRUrIjmKrXVctgMfahJGk6N64mgnRR6y+vTVvHSXeBypgseqeyyRCt06U
+FBOgC2q71KMjHTDduE/sWtkLs5OOxxqj3na+hAteEqB6cqxrrVO+BwkfM760+6Z+
++XDSZKrPDouC2qxm2cMhXL5J2NQPtaIiRx+/f9k4IhTfOQ7GpQYcCSQAY20rvnf5
+C0w/lrF5BM+Ii1qaCKthloLXRaU0FSe/iTG4fCmzpMNp1LwKRXQqMZcI5MWcWVnv
+I9srKdydTwlpBsNyXvbBYYdoUQ4CEDccgc2IaFjqF7HYb6qMOUIUYOx7oUY20FYR
+QIfzDwFJQ7tPpWATJXh8
+=MBJJ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.6.4.1-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.6.4.1-r1.ebuild
new file mode 100644
index 000000000000..17492af826df
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.6.4.1-r1.ebuild
@@ -0,0 +1,192 @@
+# 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.4.1-r1.ebuild,v 1.1 2013/04/20 15:09:56 zerochaos Exp $
+
+EAPI=5
+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/${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 ~x86"
+fi
+
+IUSE="alsa doc examples fcd filter grc jack oss performance-counters portaudio qt4 sdl uhd utils wavelet wxwidgets"
+
+# 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
+	!<=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
+	)
+"
+
+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 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
+		-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 ff7ffc86910a..c8de07198509 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.5 2013/03/12 19:50:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.6 2013/04/20 15:09:56 zerochaos Exp $
 
 EAPI=5
 PYTHON_DEPEND="2"
@@ -10,7 +10,7 @@ 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"
+SLOT="0/${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"