commit: 13c9097d61c3f45ce8a27ef406ac16415fe05d7d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 01:43:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 01:43:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c9097d
net-wireless/gnuradio: adapt to net-wireless/soapysdr becoming single-target
Also, simplify/fix the net-wireless/uhd dep while here.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{gnuradio-3.10.9.2-r2.ebuild => gnuradio-3.10.9.2-r4.ebuild} | 4 ++--
.../{gnuradio-3.10.9.2-r3.ebuild => gnuradio-3.10.9.2-r5.ebuild} | 4 ++--
net-wireless/gnuradio/gnuradio-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild
b/net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild
similarity index 97%
rename from net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild
rename to net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild
index e18205314679..8f673a36f670 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild
@@ -89,12 +89,12 @@ RDEPEND="${PYTHON_DEPS}
dev-qt/qtwidgets:5
)
soapy? (
- $(python_gen_cond_dep
'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
+ net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}]
)
sdl? ( >=media-libs/libsdl-1.2.0 )
trellis? ( dev-python/scipy )
uhd? (
- $(python_gen_cond_dep
'>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+ >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
)
utils? (
$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r3.ebuild
b/net-wireless/gnuradio/gnuradio-3.10.9.2-r5.ebuild
similarity index 97%
rename from net-wireless/gnuradio/gnuradio-3.10.9.2-r3.ebuild
rename to net-wireless/gnuradio/gnuradio-3.10.9.2-r5.ebuild
index 4bfd82679765..6136c45c0420 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r5.ebuild
@@ -89,12 +89,12 @@ RDEPEND="${PYTHON_DEPS}
dev-qt/qtwidgets:5
)
soapy? (
- $(python_gen_cond_dep
'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
+ net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}]
)
sdl? ( >=media-libs/libsdl-1.2.0 )
trellis? ( dev-python/scipy )
uhd? (
- $(python_gen_cond_dep
'>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+ >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
)
utils? (
$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild
b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 04191082fbfe..ce5367b7d75a 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -89,12 +89,12 @@ RDEPEND="${PYTHON_DEPS}
dev-qt/qtwidgets:5
)
soapy? (
- $(python_gen_cond_dep
'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
+ net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}]
)
sdl? ( >=media-libs/libsdl-1.2.0 )
trellis? ( dev-python/scipy )
uhd? (
- $(python_gen_cond_dep
'>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+ >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
)
utils? (
$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]