net-wireless/uhd: add split python3

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos@gentoo.org>

9 files changed, 18 insertions, 741 deletions

diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 2d85130bec3c..56c287e9d84c 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,16 +1,2 @@
-DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
-DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
-DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
-DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B 69d84db2b908598545af8175304c19d00bde29d606b6af55e12ed2184d14a08bee7cb229b54dc5f339f587194b493e04f6f584685c2e836f81a9063ffc5e5799 SHA512 83196212326ab43f7996bf297677980f1e2cb2e51fc6479f086e010078d2ff6ee42ffd5af6bdcaaf0d6c45a3e773b117f8bdbf2e8e0add2b8dc6f3e19ad777cd
-DIST EttusResearch-UHD-3.13.1.0.tar.gz 11587157 BLAKE2B 44cd1759c9106c36e149431e655c673ba665b2a632e7bbf598b60950b31d4325921a1fe265d2fc47eb23dd3f90733b1407a6ed522f57ba975a0a4a5d9576c238 SHA512 3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
-DIST EttusResearch-UHD-3.14.0.0.tar.gz 12935658 BLAKE2B 8b5273ee3cd4c39ebb3848152116dc26caac951b3cea4c5e5efe37a90ac3a1e0580e7ed65af9145e4981abf7abd9ef748f9b3c823d87194ce7a4a5f9b799abec SHA512 c4754dbbd3540a41407a3bb31866a83c8ab319375db300113c0d13a3debbc4f0f820ccb83c30079c22388409edd032609cdb77bf6c098b37152b1985f773d1cb
-DIST EttusResearch-UHD-3.14.1.1.tar.gz 12960651 BLAKE2B 8a2a0ac4d1cf71177dad1334dcc7426dc78a0c6b8c1bd895d7eb1ca4e2eb5b9a4208998118ba084f1932edacc7503b49a5ebd78dd1b1d9acbac6fe83f503b9eb SHA512 461f9314dd0af5feed91b18196cccb7828cee91a712dec0bb8b59878d54500906beea9f6dd938a90eae041dca6a1f6b564b6924d8e53e4b2fb507f2ed7be0ff4
 DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
-DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
-DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
-DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B 0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842 SHA512 94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
-DIST uhd-images_3.13.1.0.tar.xz 176004828 BLAKE2B 3a476337443f58a55773dd55f3605a37591d73ddd875a2cdb0459adfe93774ebc6c6f380aee7b00b70fd26ca5ac72730fdacd213f31239599227e19b24b9cc2a SHA512 3db7429c99823a7ef48253bb996e284c66f8f44913ed9d48baa3d7553a7d13724cbc1fe2df0032504491b677bdb3d609e3c6c01a580bd717cc311d54aa10d9fa
-DIST uhd-images_3.14.0.0.tar.xz 112971440 BLAKE2B b0aeb77251500c42ccaa753483b20d82113d55f1e2f2e1181a27cd95f6aec1768e8a02c9dbc65db612d04d43e7756c6b6e3d6f662a4e66043b3ec52b44bbeb77 SHA512 a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
-DIST uhd-images_3.14.1.1.tar.xz 113265248 BLAKE2B b1ac40435b8bce5cdc29bbdfd182f65d8d2f7d80b21a835202551e52cdc5d7f3b028faa73850121a79a1ff4df73620b8c36a5cab38cb2fed9c582a48429e0ee3 SHA512 d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd
 DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
-DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
diff --git a/net-wireless/uhd/uhd-3.10.3.0.ebuild b/net-wireless/uhd/uhd-3.10.3.0.ebuild
deleted file mode 100644
index 9a1c22cdf241..000000000000
--- a/net-wireless/uhd/uhd-3.10.3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils 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).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).$(get_version_component_range 4).tar.gz \
-	http://files.ettus.com/binaries/images/${image_version}.zip"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	virtual/libusb:1
-	dev-lang/orc
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	dev-python/mako
-	dev-python/cheetah
-	app-arch/unzip
-"
-
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
-
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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 || die
-}
-
-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.11.0.0.ebuild b/net-wireless/uhd/uhd-3.11.0.0.ebuild
deleted file mode 100644
index f24e3c0eb34d..000000000000
--- a/net-wireless/uhd/uhd-3.11.0.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/release_003_011_000_000/uhd_${PV}_images.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host"
-
-src_unpack() {
-	unpack EttusResearch-UHD-${PV}.tar.gz
-	mkdir images || die
-	cd images || die
-	unpack uhd_${PV}_images.tar.xz
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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 || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.12.0.0.ebuild b/net-wireless/uhd/uhd-3.12.0.0.ebuild
deleted file mode 100644
index 35c0d6bfeb77..000000000000
--- a/net-wireless/uhd/uhd-3.12.0.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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 || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.13.0.1.ebuild b/net-wireless/uhd/uhd-3.13.0.1.ebuild
deleted file mode 100644
index 35c0d6bfeb77..000000000000
--- a/net-wireless/uhd/uhd-3.13.0.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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 || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.13.1.0.ebuild b/net-wireless/uhd/uhd-3.13.1.0.ebuild
deleted file mode 100644
index c0012fc33e0d..000000000000
--- a/net-wireless/uhd/uhd-3.13.1.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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 || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.14.0.0.ebuild b/net-wireless/uhd/uhd-3.14.0.0.ebuild
deleted file mode 100644
index c0012fc33e0d..000000000000
--- a/net-wireless/uhd/uhd-3.14.0.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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 || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
index 0bc67971a97c..9e805a23f6d1 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
@@ -78,7 +78,6 @@ src_configure() {
 		-DENABLE_C_API=ON
 		-DENABLE_LIBERIO=OFF
 		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
 		-DENABLE_MAN_PAGE_COMPRESSION=OFF
 		-DENABLE_EXAMPLES="$(usex examples)"
 		-DENABLE_TESTS="$(usex test)"
diff --git a/net-wireless/uhd/uhd-3.14.1.1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 3d733a2b4f07..d598931abd15 100644
--- a/net-wireless/uhd/uhd-3.14.1.1.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 #not sure why, but eapi 7 fails
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
 
@@ -33,11 +33,20 @@ RDEPEND="${PYTHON_DEPS}
 	usb? ( virtual/libusb:1 )
 	dev-libs/boost:=
 	sys-libs/ncurses:0[tinfo]
+	$(python_gen_cond_dep '
+	|| (
+		dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	)
+	dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	dev-python/mako
+	$(python_gen_cond_dep '
+	dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')
 	app-arch/unzip
 	app-arch/gzip
 "
@@ -52,16 +61,15 @@ src_unpack() {
 }
 
 src_prepare() {
-	cd ..
-	eapply "${FILESDIR}"/uhd_man_pages_optional_compress.diff
-	cd host
-
 	cmake-utils_src_prepare
 
 	gnome2_environment_reset #534582
 
 	#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 || die
+
+	#rpath is set for apple and no one else, just remove the conditional
+	sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die
 }
 
 src_configure() {
@@ -70,7 +78,6 @@ src_configure() {
 		-DENABLE_C_API=ON
 		-DENABLE_LIBERIO=OFF
 		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
 		-DENABLE_MAN_PAGE_COMPRESSION=OFF
 		-DENABLE_EXAMPLES="$(usex examples)"
 		-DENABLE_TESTS="$(usex test)"
@@ -87,11 +94,14 @@ src_configure() {
 		-DENABLE_N230="$(usex n230)"
 		-DENABLE_MPMD="$(usex mpmd)"
 		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
+	python_optimize
 	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
 	if [ "${PV}" != "9999" ]; then
 		rm -rf "${ED}/usr/bin/uhd_images_downloader"
@@ -133,7 +143,4 @@ src_install() {
 	fi
 	insinto /usr/share/${PN}
 	doins -r "${WORKDIR}/images"
-
-	#fix doc location
-	mv "${ED}"/usr/share/doc/uhd "${ED}/usr/share/doc/${PF}" || die
 }