net-wireless/gnuradio: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
index 5c9dcc3167877fc7922c5c7a0162c599322236f6..a38d393dfebb4ae271a52160a92b1381390a82bb 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,21 +35,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
        >=dev-lang/orc-0.4.12
-       dev-libs/boost:0=[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
+       ')
        !<=dev-libs/boost-1.52.0-r6:0/1.52
        dev-util/cppunit
        sci-libs/fftw:3.0=
        fcd? ( virtual/libusb:1 )
        alsa? (
-               media-libs/alsa-lib[${PYTHON_USEDEP}]
+               media-libs/alsa-lib[${PYTHON_SINGLE_USEDEP}]
        )
        grc? (
-               dev-python/lxml[${PYTHON_USEDEP}]
-               || (
-                       dev-python/numpy-python2[${PYTHON_USEDEP}]
-                       dev-python/numpy[${PYTHON_USEDEP}]
-               )
-               dev-python/pygtk:2[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+                       || (
+                               dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+                       )
+                       dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+               ')
        )
        jack? (
                media-sound/jack-audio-connection-kit
@@ -58,19 +62,21 @@ RDEPEND="${PYTHON_DEPS}
                >=media-libs/portaudio-19_pre
        )
        sdl? ( media-libs/libsdl )
-       uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+       uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_SINGLE_USEDEP}] )
        wavelet? (
                sci-libs/gsl
        )
 "
 DEPEND="${RDEPEND}
        dev-lang/swig
-       dev-python/cheetah[${PYTHON_USEDEP}]
        virtual/pkgconfig
-       doc? (
-               >=app-doc/doxygen-1.5.7.1
-               dev-python/sphinx[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep '
+               dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+               doc? (
+                       >=app-doc/doxygen-1.5.7.1
+                       dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+               )
+       ')
        grc? (
                x11-misc/xdg-utils
        )

diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
similarity index 84%
rename from net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
rename to net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
index dec78f161e8c526a274b941bd1a22f693918cc3b..a73f9f65dc64f9346081388a6151c0181b8a7019 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
@@ -50,30 +50,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
        >=dev-lang/orc-0.4.12
-       dev-libs/boost:0=[python,${PYTHON_USEDEP}]
        !<=dev-libs/boost-1.52.0-r6:0/1.52
-       dev-python/mako[${PYTHON_USEDEP}]
-       dev-python/six[${PYTHON_USEDEP}]
        sci-libs/fftw:3.0=
        alsa? (
                media-libs/alsa-lib:=
        )
        fcd? ( virtual/libusb:1 )
-       filter? (
-               || (
-                       sci-libs/scipy-python2[${PYTHON_USEDEP}]
-                       sci-libs/scipy[${PYTHON_USEDEP}]
-               )
-       )
-       grc? (
-               dev-python/cheetah[${PYTHON_USEDEP}]
-               dev-python/lxml[${PYTHON_USEDEP}]
-               >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-               || (
-                       dev-python/numpy-python2[${PYTHON_USEDEP}]
-                       dev-python/numpy[${PYTHON_USEDEP}]
-               )
-       )
        jack? (
                media-sound/jack-audio-connection-kit
        )
@@ -81,44 +63,67 @@ RDEPEND="${PYTHON_DEPS}
        portaudio? (
                >=media-libs/portaudio-19_pre
        )
-       qt5? (
-               dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               x11-libs/qwt:6[qt5(+)]
-               dev-qt/qtwidgets:5
-       )
        sdl? ( >=media-libs/libsdl-1.2.0 )
-       uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-       utils? (
-               || (
-                       dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-                       dev-python/matplotlib[${PYTHON_USEDEP}]
-               )
-       )
+       uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
        vocoder? ( media-sound/gsm
                >=media-libs/codec2-0.8.1 )
        wavelet? (
                >=sci-libs/gsl-1.10
        )
-       wxwidgets? (
-               dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-               || (
-                       dev-python/numpy-python2[${PYTHON_USEDEP}]
-                       dev-python/numpy[${PYTHON_USEDEP}]
-               )
-       )
        zeromq? ( >=net-libs/zeromq-2.1.11 )
+       $(python_gen_cond_dep '
+               dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}]
+               dev-python/mako[${PYTHON_MULTI_USEDEP}]
+               dev-python/six[${PYTHON_MULTI_USEDEP}]
+               filter? (
+                       || (
+                               sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+                               sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+               grc? (
+                       dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+                       dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+                       || (
+                               dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+               qt5? (
+                       dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
+                       dev-qt/qtcore:5
+                       dev-qt/qtgui:5
+                       x11-libs/qwt:6[qt5(+)]
+                       dev-qt/qtwidgets:5
+               )
+               utils? (
+                       || (
+                               dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+                               dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+               wxwidgets? (
+                       dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+                       || (
+                               dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+       ')
        "
 
 DEPEND="${RDEPEND}
        app-text/docbook-xml-dtd:4.2
        >=dev-lang/swig-3.0.5
        virtual/pkgconfig
-       doc? (
-               >=app-doc/doxygen-1.5.7.1
-               dev-python/sphinx[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep '
+               dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+               doc? (
+                       >=app-doc/doxygen-1.5.7.1
+                       dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+               )
+       ')
        grc? ( x11-misc/xdg-utils )
        oss? ( virtual/os-headers )
        test? ( >=dev-util/cppunit-1.9.14 )

diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 8c07aa105ae0549ecba7a82960bee535911aeed4..f8ecf5a7787320e9928fa62a2abd550b786fb657 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -47,30 +47,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
        >=dev-lang/orc-0.4.12
-       dev-libs/boost:0=[${PYTHON_USEDEP}]
-       !<=dev-libs/boost-1.52.0-r6:0/1.52
-       dev-python/mako[${PYTHON_USEDEP}]
-       dev-python/six[${PYTHON_USEDEP}]
        sci-libs/fftw:3.0=
        alsa? (
                media-libs/alsa-lib:=
        )
        fcd? ( virtual/libusb:1 )
-       filter? (
-               || (
-                       sci-libs/scipy-python2[${PYTHON_USEDEP}]
-                       sci-libs/scipy[${PYTHON_USEDEP}]
-               )
-       )
-       grc? (
-               dev-python/cheetah[${PYTHON_USEDEP}]
-               dev-python/lxml[${PYTHON_USEDEP}]
-               >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-               || (
-                       dev-python/numpy-python2[${PYTHON_USEDEP}]
-                       dev-python/numpy[${PYTHON_USEDEP}]
-               )
-       )
        jack? (
                media-sound/jack-audio-connection-kit
        )
@@ -79,26 +60,47 @@ RDEPEND="${PYTHON_DEPS}
                >=media-libs/portaudio-19_pre
        )
        sdl? ( >=media-libs/libsdl-1.2.0 )
-       uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-       utils? (
-               || (
-                       dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-                       dev-python/matplotlib[${PYTHON_USEDEP}]
-               )
-       )
+       uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
        vocoder? ( media-sound/gsm
                >=media-libs/codec2-0.8.1 )
        wavelet? (
                >=sci-libs/gsl-1.10
        )
-       wxwidgets? (
-               dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-               || (
-                       dev-python/numpy-python2[${PYTHON_USEDEP}]
-                       dev-python/numpy[${PYTHON_USEDEP}]
-               )
-       )
        zeromq? ( >=net-libs/zeromq-2.1.11 )
+       $(python_gen_cond_dep '
+               dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
+               !<=dev-libs/boost-1.52.0-r6:0/1.52
+               dev-python/mako[${PYTHON_MULTI_USEDEP}]
+               dev-python/six[${PYTHON_MULTI_USEDEP}]
+               filter? (
+                       || (
+                               sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+                               sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+               grc? (
+                       dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+                       dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+                       || (
+                               dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+               utils? (
+                       || (
+                               dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+                               dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+               wxwidgets? (
+                       dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+                       || (
+                               dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                               dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+       ')
        "
 
 DEPEND="${RDEPEND}
@@ -107,7 +109,9 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        doc? (
                >=app-doc/doxygen-1.5.7.1
-               dev-python/sphinx[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+               ')
        )
        grc? ( x11-misc/xdg-utils )
        oss? ( virtual/os-headers )

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 6687ca88195461d3ee6e53bd3243fafe3d67a290..7bbe445db1443fce1652baf09de07b3f7dc8451b 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -48,29 +48,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
        >=dev-lang/orc-0.4.12
-       dev-libs/boost:0=[${PYTHON_USEDEP}]
        !<=dev-libs/boost-1.52.0-r6:0/1.52
-       || (
-               dev-python/numpy-python2[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
-       )
-       dev-python/six[${PYTHON_USEDEP}]
        sci-libs/fftw:3.0=
        alsa? (
                media-libs/alsa-lib:=
        )
        fcd? ( virtual/libusb:1 )
-       filter? (
-               || (
-                       sci-libs/scipy-python2[${PYTHON_USEDEP}]
-                       sci-libs/scipy[${PYTHON_USEDEP}]
-               )
-       )
-       grc? (
-               dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
-               dev-python/pyyaml[${PYTHON_USEDEP}]
-               dev-python/mako[${PYTHON_USEDEP}]
-       )
        jack? (
                media-sound/jack-audio-connection-kit
        )
@@ -78,22 +61,9 @@ RDEPEND="${PYTHON_DEPS}
        portaudio? (
                >=media-libs/portaudio-19_pre
        )
-       qt5? (
-               dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-               x11-libs/qwt:6[qt5(+)]
-       )
        sdl? ( >=media-libs/libsdl-1.2.0 )
-       uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}]
+       uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
                dev-libs/log4cpp )
-       utils? (
-               || (
-                       dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-                       dev-python/matplotlib[${PYTHON_USEDEP}]
-               )
-       )
        vocoder? ( media-sound/gsm
                >=media-libs/codec2-0.8.1 )
        wavelet? (
@@ -101,6 +71,38 @@ RDEPEND="${PYTHON_DEPS}
        )
        zeromq? ( >=net-libs/zeromq-2.1.11
                        dev-libs/gmp:= )
+       $(python_gen_cond_dep '
+               dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
+               || (
+                       dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               )
+               dev-python/six[${PYTHON_MULTI_USEDEP}]
+               filter? (
+                       || (
+                               sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+                               sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+               grc? (
+                       dev-python/pygobject:*[cairo(+),${PYTHON_MULTI_USEDEP}]
+                       dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+                       dev-python/mako[${PYTHON_MULTI_USEDEP}]
+               )
+               qt5? (
+                       dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
+                       dev-qt/qtcore:5
+                       dev-qt/qtgui:5
+                       dev-qt/qtwidgets:5
+                       x11-libs/qwt:6[qt5(+)]
+               )
+               utils? (
+                       || (
+                               dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+                               dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+                       )
+               )
+       ')
        "
 
 DEPEND="${RDEPEND}
@@ -109,7 +111,9 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        doc? (
                >=app-doc/doxygen-1.5.7.1
-               dev-python/sphinx[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+               ')
        )
        grc? ( x11-misc/xdg-utils )
        oss? ( virtual/os-headers )