From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F112138350 for ; Sun, 9 Feb 2020 16:34:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EBF4E0887; Sun, 9 Feb 2020 16:34:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47A35E0887 for ; Sun, 9 Feb 2020 16:34:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B995834E8D5 for ; Sun, 9 Feb 2020 16:34:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B709138 for ; Sun, 9 Feb 2020 16:34:38 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1581266059.fd07701bd0cf2f2ff2cd24453d8e7895dd74f2d8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild net-wireless/gnuradio/gnuradio-3.7.9999.ebuild net-wireless/gnuradio/gnuradio-9999.ebuild X-VCS-Directories: net-wireless/gnuradio/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fd07701bd0cf2f2ff2cd24453d8e7895dd74f2d8 X-VCS-Branch: master Date: Sun, 9 Feb 2020 16:34:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d7a9eca1-ec5f-432c-812f-76c4ee6ba9ef X-Archives-Hash: 0a0938b6a10d7a75fdf718d89ee3b874 commit: fd07701bd0cf2f2ff2cd24453d8e7895dd74f2d8 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 17:40:55 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 16:34:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd07701b net-wireless/gnuradio: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild | 36 +++++---- ....13.5-r2.ebuild => gnuradio-3.7.13.5-r3.ebuild} | 91 ++++++++++++---------- net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 72 +++++++++-------- net-wireless/gnuradio/gnuradio-9999.ebuild | 68 ++++++++-------- 4 files changed, 143 insertions(+), 124 deletions(-) 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 5c9dcc31678..a38d393dfeb 100644 --- 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 dec78f161e8..a73f9f65dc6 100644 --- 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 8c07aa105ae..f8ecf5a7787 100644 --- 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 6687ca88195..7bbe445db14 100644 --- 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 )