Drop some obsolete versions.

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

6 files changed, 7 insertions, 631 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 87088a401ad0..d6a666d9bcd3 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.17 2012/09/09 05:38:17 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.18 2012/09/30 14:57:10 chithanh Exp $
+
+  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,
+  -gnuradio-3.6.1-r1.ebuild, -gnuradio-3.6.1.ebuild:
+  Drop some obsolete versions.
 
 *gnuradio-9999 (09 Sep 2012)
 
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index d2d75e0aa74b..9db6b29341a6 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,34 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-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
 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 3190 SHA256 d4f2aedfaf7fa508fc615b8540c2a0c25b5071b2f3ee6e0c4afb81cc3f1665df SHA512 fd38cbe775f7fc07e0088451425c66070d1ef24507c2c02543b9aa44edd76ada3c4aa99cf1dfa46fe6240cd01dfe68ff43259714a1ac1d25e3eb1ae0c7113ed5 WHIRLPOOL b1ab2cf4aacde7246cd5decd8b6cffaa2c0cbee8e291dc0b72acf8b22c5431fe833adea1bf778db967e0f4f55ad0648030e4a3c2bc97edea6ed4ad62b5ccca5d
+MISC ChangeLog 3418 SHA256 98752cc5a1e133efb5b532ff372c98600fa4dcb82c1596853aad908c6cb89bb5 SHA512 584a9b86285d912ee7e47ba8d14894a2266722568c58ce405c1c296c77c2ba5bdbe7139b9a2ddfd54f5d95694f6c97a979ba95bfecf6a4767a55400f7f0fd73c WHIRLPOOL f121b0ac298a0937f483c7cc8fd91a4398d148df7d2f17ce6c154a32701e017830630e959eae6a91189f4095bb47e7bda6e378358c31e815921a8d2a64f320a9
 MISC metadata.xml 699 SHA256 b706bc8e1655fad90c4a2b68d96de3a37659abfe486e886b6563064f74340ae8 SHA512 a6b175ba6035c870a846913f41cbc4767a4f03ab85b2e8b861a2454096e44636dc66905bd274bb3782dc4ef7f54573e675d7d333d6b5cb30907968a7506ce289 WHIRLPOOL 82df69dbb09419083b303fc08b0ed59f8ccd8d33d5d761a65c623ca13a19315b756ed91b9efdfd8722f90efc7fc012d03f13c196c77b90187e9cd5d134886297
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJQTCv6AAoJEKXdFCfdEflKsYIP+waLwmpRXzyfajkSoOnLzEwP
-IEYBpRLsDOs+SH+YEetl9VV5i5K8EWCIHPXFzOGCA+ikoMTbfhZWXqpHg+YsHbtB
-66tpiTjXzwErFC2Khv7yVuL3c+pqG2dM1ldBfOJ2vMdz+rn6uFt1DwuMChdnzCvx
-Nbzgvl5nHPMaHtUvK1+YGzXLlyn9Q2prUWu+NPWcyEt7QIKKhKF9w/rl8wNJxfXh
-n5piXUuiUMnDvYSz+nea9TX6MwLmTk+loXFOZ9hZhMF0o1zMpeY6tKD5JTmzTwrq
-siZc7DcqwTVIfCiu3Kiqr1XGCPh63/45VBbcGNEbQVyKnr7/NPATnJrvRkJRnZCx
-rGPJ0tcut5IG49mHLoRw7cOZB3kZ1fXvU4JZvSPoA8zBrz7ER4U6gcGC7op2h+c+
-7Y27hXIwMkgaJw5eWnSC2jITa8tZeinLFxYYTlQy1SyUlmazMm0kyYHKnYENoiHr
-dWjrYqV8deHUI/C0UaSE+kZm2jcjVnNXcJmHP5Ppjo+W3U4Mj3PMl4k6XABdslF0
-CiTUEqkYB6RqS/LPvErQrzjXC/iM7EVXv/tcmi+PPz73WjJbYIrAzjfK54OR2pxI
-KH8WgneS9QaksbS7qzi7DGNQNfRFxa6vPMgVu4AyGNeC1tmU2w3wF7sGtBTN6knb
-ErRhZtg+4qTwnbDajUgn
-=6Hka
------END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch b/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
deleted file mode 100644
index 337a356485ca..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
-+++ b/CMakeLists.txt	2012-05-06 15:22:01.000000000 +0200
-@@ -107,6 +107,8 @@
- set(GR_LIBEXEC_DIR      libexec)
- set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
- set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
-+set(SYSCONFDIR          "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
-+set(GR_PREFSDIR         ${SYSCONFDIR}/${CMAKE_PROJECT_NAME}/conf.d)
- 
- ########################################################################
- # Variables replaced when configuring the package config files
-@@ -115,6 +117,8 @@
- file(TO_NATIVE_PATH "\${prefix}"                        exec_prefix)
- file(TO_NATIVE_PATH "\${exec_prefix}/${GR_LIBRARY_DIR}" libdir)
- file(TO_NATIVE_PATH "\${prefix}/${GR_INCLUDE_DIR}"      includedir)
-+file(TO_NATIVE_PATH "${SYSCONFDIR}"                     SYSCONFDIR)
-+file(TO_NATIVE_PATH "${GR_PREFSDIR}"                    GR_PREFSDIR)
- 
- ########################################################################
- # Create uninstall target
-diff -ur a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
---- a/gnuradio-core/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
-+++ b/gnuradio-core/CMakeLists.txt	2012-05-05 20:05:52.000000000 +0200
-@@ -109,7 +109,7 @@
- 
- install(
-     FILES gnuradio-core.conf
--    DESTINATION ${GR_PKG_CONF_DIR}
-+    DESTINATION ${GR_PREFSDIR}
-     COMPONENT "core_runtime"
- )
- 
-diff -ur a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
---- a/gnuradio-core/src/lib/general/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
-+++ b/gnuradio-core/src/lib/general/CMakeLists.txt	2012-05-06 15:01:12.000000000 +0200
-@@ -48,9 +48,6 @@
- 
- message(STATUS "Loading version ${VERSION} into gr_constants...")
- 
--file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}"     SYSCONFDIR)
--file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_PKG_CONF_DIR}" GR_PREFSDIR)
--
- #double escape for windows backslash path separators
- string(REPLACE "\\" "\\\\" prefix ${prefix})
- string(REPLACE "\\" "\\\\" SYSCONFDIR ${SYSCONFDIR})
-diff -ur a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
---- a/gr-audio/lib/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
-+++ b/gr-audio/lib/CMakeLists.txt	2012-05-05 20:06:08.000000000 +0200
-@@ -150,4 +150,4 @@
- target_link_libraries(gnuradio-audio ${gr_audio_libs})
- GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
- 
--install(FILES ${gr_audio_confs} DESTINATION ${GR_PKG_CONF_DIR} COMPONENT "audio_runtime")
-+install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime")
-diff -ur a/grc/CMakeLists.txt b/grc/CMakeLists.txt
---- a/grc/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
-+++ b/grc/CMakeLists.txt	2012-05-05 20:05:16.000000000 +0200
-@@ -75,7 +75,7 @@
- 
- install(
-     FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf
--    DESTINATION ${GR_PKG_CONF_DIR}
-+    DESTINATION ${GR_PREFSDIR}
-     COMPONENT "grc"
- )
- 
-diff -ur a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt
---- a/gr-wxgui/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
-+++ b/gr-wxgui/CMakeLists.txt	2012-05-05 20:06:17.000000000 +0200
-@@ -76,7 +76,7 @@
- ########################################################################
- install(
-     FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf
--    DESTINATION ${GR_PKG_CONF_DIR}
-+    DESTINATION ${GR_PREFSDIR}
-     COMPONENT "wxgui"
- )
- 
diff --git a/net-wireless/gnuradio/gnuradio-3.6.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.6.0-r1.ebuild
deleted file mode 100644
index 18447de34e7c..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# 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.0-r1.ebuild,v 1.2 2012/07/27 18:19:18 kensington 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/redmine/attachments/download/326/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audio doc examples fcd grc qt4 sdl utils wavelet wxwidgets"
-REQUIRED_USE="fcd? ( audio )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.7 )
-# uhd? ( dev-libs/uhd )
-RDEPEND=">=dev-lang/orc-0.4.12
-	dev-libs/boost
-	dev-util/cppunit
-	sci-libs/fftw:3.0
-	fcd? ( virtual/libusb:1 )
-	audio? (
-		media-libs/alsa-lib
-		media-sound/jack-audio-connection-kit
-		>=media-libs/portaudio-19_pre
-	)
-	grc? (
-		dev-python/cheetah
-		dev-python/lxml
-		dev-python/numpy
-		dev-python/pygtk:2
-	)
-	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
-	)
-	grc? (
-		x11-misc/xdg-utils
-	)
-"
-
-# Add support for custom SYSCONFDIR, upstream bug #492
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.0-cmake-sysconfdir.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 audio GR_AUDIO)
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(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-3.6.1-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.6.1-r1.ebuild
deleted file mode 100644
index 588db3dc7951..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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.1-r1.ebuild,v 1.3 2012/07/27 18:19:18 kensington 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/redmine/attachments/download/389/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa doc examples fcd 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
-	)
-"
-
-# Add support for custom SYSCONFDIR, upstream bug #492
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.0-cmake-sysconfdir.patch
-	"${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 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/gnuradio-3.6.1.ebuild b/net-wireless/gnuradio/gnuradio-3.6.1.ebuild
deleted file mode 100644
index 55580008c2b9..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.6.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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.1.ebuild,v 1.2 2012/07/27 18:19:18 kensington 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/redmine/attachments/download/389/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audio doc examples fcd grc qt4 sdl utils wavelet wxwidgets"
-REQUIRED_USE="fcd? ( audio )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.7 )
-# uhd? ( dev-libs/uhd )
-RDEPEND=">=dev-lang/orc-0.4.12
-	dev-libs/boost
-	dev-util/cppunit
-	sci-libs/fftw:3.0
-	fcd? ( virtual/libusb:1 )
-	audio? (
-		media-libs/alsa-lib
-		media-sound/jack-audio-connection-kit
-		>=media-libs/portaudio-19_pre
-	)
-	grc? (
-		dev-python/cheetah
-		dev-python/lxml
-		dev-python/numpy
-		dev-python/pygtk:2
-	)
-	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
-	)
-"
-
-# Add support for custom SYSCONFDIR, upstream bug #492
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.0-cmake-sysconfdir.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 audio GR_AUDIO)
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(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
-}