commit: d66f82af57c808694c347dbca32ea4bac5ca3a98
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 18:05:29 2021 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 02:19:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66f82af
net-wireless/uhd: python bump
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 9 +++------
net-wireless/uhd/uhd-4.0.0.0.ebuild | 9 +++------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 0385c7efbe5..044251f32ff 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
#not sure why, but eapi 7 fails
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
@@ -34,10 +34,7 @@ RDEPEND="${PYTHON_DEPS}
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/numpy[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
')
"
diff --git a/net-wireless/uhd/uhd-4.0.0.0.ebuild
b/net-wireless/uhd/uhd-4.0.0.0.ebuild
index d9315f6f09e..25a3b44949e 100644
--- a/net-wireless/uhd/uhd-4.0.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.0.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
#not sure why, but eapi 7 fails
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
@@ -34,10 +34,7 @@ RDEPEND="${PYTHON_DEPS}
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/numpy[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
')
"
