bump, remove a bunch of old/unneeded versions

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

8 files changed, 11 insertions, 246 deletions

diff --git a/net-wireless/uhd/ChangeLog b/net-wireless/uhd/ChangeLog
index 35b2aa3f0e0e..b326a8b704e4 100644
--- a/net-wireless/uhd/ChangeLog
+++ b/net-wireless/uhd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/uhd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/ChangeLog,v 1.12 2014/04/25 12:56:11 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/ChangeLog,v 1.13 2014/08/22 16:42:29 zerochaos Exp $
+
+*uhd-3.7.2 (22 Aug 2014)
+
+  22 Aug 2014; Rick Farina <zerochaos@gentoo.org> +uhd-3.7.2.ebuild,
+  -uhd-3.4.3-r1.ebuild, -uhd-3.4.3-r2.ebuild, -uhd-3.4.3.ebuild,
+  -uhd-3.5.0.ebuild, -uhd-3.5.3.ebuild, -uhd-3.6.2.ebuild, -uhd-3.7.0.ebuild:
+  bump, remove a bunch of old/unneeded versions
 
   25 Apr 2014; Jason A. Donenfeld <zx2c4@gentoo.org> metadata.xml:
   Add self to maintainers.
diff --git a/net-wireless/uhd/uhd-3.4.3-r1.ebuild b/net-wireless/uhd/uhd-3.4.3-r1.ebuild
deleted file mode 100644
index 696c1b0168fa..000000000000
--- a/net-wireless/uhd/uhd-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,38 +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/uhd/uhd-3.4.3-r1.ebuild,v 1.1 2012/10/09 21:08:50 zerochaos Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6"
-inherit versionator python cmake-utils
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-SRC_URI="https://github.com/EttusResearch/UHD-Mirror/tarball/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3) -> EttusResearch-UHD-Mirror-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
-	http://files.ettus.com/binaries/maint_images/archive/uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).002-12-geb083300.tar.gz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/master_images/archive
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}"/EttusResearch-UHD-Mirror-6047010/host
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-RDEPEND="virtual/libusb:1
-	dev-libs/boost"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).002-12-geb083300/share/uhd/images
-}
diff --git a/net-wireless/uhd/uhd-3.4.3-r2.ebuild b/net-wireless/uhd/uhd-3.4.3-r2.ebuild
deleted file mode 100644
index 5e859f517cad..000000000000
--- a/net-wireless/uhd/uhd-3.4.3-r2.ebuild
+++ /dev/null
@@ -1,43 +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/uhd/uhd-3.4.3-r2.ebuild,v 1.1 2012/10/18 17:33:05 zerochaos Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6"
-inherit versionator python cmake-utils
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-SRC_URI="https://github.com/EttusResearch/UHD-Mirror/tarball/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3) -> EttusResearch-UHD-Mirror-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
-	http://files.ettus.com/binaries/maint_images/archive/uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).002-12-geb083300.tar.gz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/master_images/archive
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}"/EttusResearch-UHD-Mirror-6047010/host
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-RDEPEND="virtual/libusb:1
-	dev-libs/boost"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).002-12-geb083300/share/uhd/images
-}
diff --git a/net-wireless/uhd/uhd-3.4.3.ebuild b/net-wireless/uhd/uhd-3.4.3.ebuild
deleted file mode 100644
index b05c90519f9b..000000000000
--- a/net-wireless/uhd/uhd-3.4.3.ebuild
+++ /dev/null
@@ -1,33 +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/uhd/uhd-3.4.3.ebuild,v 1.3 2012/09/10 03:33:34 zerochaos Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6"
-inherit versionator python cmake-utils
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-SRC_URI="https://github.com/EttusResearch/UHD-Mirror/tarball/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3) -> EttusResearch-UHD-Mirror-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
-	http://files.ettus.com/binaries/maint_images/archive/uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).002-12-geb083300.tar.gz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/master_images/archive
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}"/EttusResearch-UHD-Mirror-6047010/host
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-RDEPEND="virtual/libusb:1
-	dev-libs/boost"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-src_install() {
-	cmake-utils_src_install
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).002-12-geb083300/share/uhd/images
-}
diff --git a/net-wireless/uhd/uhd-3.5.0.ebuild b/net-wireless/uhd/uhd-3.5.0.ebuild
deleted file mode 100644
index 7fe08313ad70..000000000000
--- a/net-wireless/uhd/uhd-3.5.0.ebuild
+++ /dev/null
@@ -1,44 +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/uhd/uhd-3.5.0.ebuild,v 1.1 2012/12/27 04:53:40 zerochaos Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6"
-inherit versionator python cmake-utils
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).000-release
-SRC_URI="https://github.com/EttusResearch/UHD-Mirror/tarball/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3) -> EttusResearch-UHD-Mirror-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
-	http://files.ettus.com/binaries/maint_images/archive/${image_version}.tar.gz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/master_images/archive
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}"/EttusResearch-UHD-Mirror-6ef9f96/host
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-RDEPEND="virtual/libusb:1
-	dev-libs/boost"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
-}
diff --git a/net-wireless/uhd/uhd-3.5.3.ebuild b/net-wireless/uhd/uhd-3.5.3.ebuild
deleted file mode 100644
index 4135191429b1..000000000000
--- a/net-wireless/uhd/uhd-3.5.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/uhd-3.5.3.ebuild,v 1.3 2013/09/16 06:32:37 zerochaos Exp $
-
-EAPI=5
-PYTHON_DEPEND="2:2.6"
-inherit versionator python cmake-utils
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).000-release
-SRC_URI="https://github.com/EttusResearch/UHD-Mirror/tarball/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3) -> EttusResearch-UHD-Mirror-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
-	http://files.ettus.com/binaries/maint_images/archive/${image_version}.tar.gz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/master_images/archive
-KEYWORDS="~amd64 ~arm ~x86"
-S="${WORKDIR}"/EttusResearch-UHD-Mirror-f4c5812/host
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-RDEPEND="virtual/libusb:1
-	dev-libs/boost:="
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
-}
diff --git a/net-wireless/uhd/uhd-3.7.0.ebuild b/net-wireless/uhd/uhd-3.7.0.ebuild
deleted file mode 100644
index 8d46870fb3c9..000000000000
--- a/net-wireless/uhd/uhd-3.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/uhd-3.7.0.ebuild,v 1.1 2014/02/22 00:32:38 zerochaos Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit versionator python-single-r1 cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).00$(get_version_component_range 3)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
-	http://files.ettus.com/binaries/maint_images/archive/${image_version}.tar.gz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/master_images/archive
-KEYWORDS="~amd64 ~arm ~x86"
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-RDEPEND="virtual/libusb:1
-	dev-libs/boost:="
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-src_prepare() {
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
-}
diff --git a/net-wireless/uhd/uhd-3.6.2.ebuild b/net-wireless/uhd/uhd-3.7.2.ebuild
index be4ed160faeb..8ac106dfc3f2 100644
--- a/net-wireless/uhd/uhd-3.6.2.ebuild
+++ b/net-wireless/uhd/uhd-3.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/uhd-3.6.2.ebuild,v 1.1 2014/02/22 00:32:38 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/uhd/uhd-3.7.2.ebuild,v 1.1 2014/08/22 16:42:29 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/1"
 IUSE=""
 RDEPEND="virtual/libusb:1
 	dev-libs/boost:="
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt
+	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
 }
 
 src_install() {