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 C6AD6138334 for ; Sun, 26 Aug 2018 18:22:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4E05E0929; Sun, 26 Aug 2018 18:22:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B065FE0928 for ; Sun, 26 Aug 2018 18:22:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A94B6335CC6 for ; Sun, 26 Aug 2018 18:22:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9F153B5 for ; Sun, 26 Aug 2018 18:22:23 +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: <1535307733.87befbf45f8351215213994c60f3d6bad7cc0e01.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-r2.ebuild net-wireless/gnuradio/gnuradio-3.7.11-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: 87befbf45f8351215213994c60f3d6bad7cc0e01 X-VCS-Branch: master Date: Sun, 26 Aug 2018 18:22:23 +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-Archives-Salt: ce351029-04d1-4bd7-8a0d-2c2c5ecdcaa3 X-Archives-Hash: 4767275d86d0594f44d5090b65e2f6b3 commit: 87befbf45f8351215213994c60f3d6bad7cc0e01 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 26 18:03:33 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 26 18:22:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87befbf4 net-wireless/gnuradio: Remove support for non-existent deps net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild | 11 ++--------- net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild | 12 ++---------- net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 12 ++---------- net-wireless/gnuradio/gnuradio-9999.ebuild | 12 ++---------- 4 files changed, 8 insertions(+), 39 deletions(-) diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild index 652fb5cea0e..03fd5605be2 100644 --- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild @@ -20,13 +20,12 @@ else KEYWORDS="~amd64 ~arm ~x86" fi -IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet" +IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio sdl uhd +utils wavelet" REQUIRED_USE="${PYTHON_REQUIRED_USE} analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) - qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog )" @@ -55,11 +54,6 @@ RDEPEND="${PYTHON_DEPS} portaudio? ( >=media-libs/portaudio-19_pre ) - qt4? ( - dev-python/PyQt4[X,opengl,${PYTHON_USEDEP}] - dev-python/pyqwt:5 - dev-qt/qtgui:4 - ) sdl? ( media-libs/libsdl ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] ) wavelet? ( @@ -109,14 +103,13 @@ src_configure() { $(cmake-utils_use_enable uhd GR_UHD) \ $(cmake-utils_use_enable utils GR_UTILS) \ $(cmake-utils_use_enable wavelet GR_WAVELET) \ - $(cmake-utils_use_enable qt4 GR_QTGUI) \ $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \ + -DENABLE_GR_QTGUI=OFF \ -DENABLE_GR_WXGUI=OFF \ -DENABLE_GR_CORE=ON \ -DSYSCONFDIR="${EPREFIX}"/etc \ -DPYTHON_EXECUTABLE="${PYTHON}" ) - use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 ) cmake-utils_src_configure } diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild index 28a0664b9c5..f7a017d103c 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild @@ -21,7 +21,7 @@ else KEYWORDS="~amd64 ~arm ~x86" fi -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" +IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" #tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS RESTRICT=test @@ -35,7 +35,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) - qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) @@ -67,13 +66,6 @@ RDEPEND="${PYTHON_DEPS} portaudio? ( >=media-libs/portaudio-19_pre ) - qt4? ( - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}] - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}] - >=dev-qt/qtcore-4.4:4 - >=dev-qt/qtgui-4.4:4 - x11-libs/qwt:6[qt4(-)] - ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) @@ -158,7 +150,7 @@ src_configure() { -DENABLE_GR_VOCODER="$(usex vocoder)" -DENABLE_GR_WAVELET="$(usex wavelet)" -DENABLE_GR_WXGUI="$(usex wxwidgets)" - -DENABLE_GR_QTGUI="$(usex qt4)" + -DENABLE_GR_QTGUI=OFF -DENABLE_GR_VIDEO_SDL="$(usex sdl)" -DENABLE_GR_ZEROMQ="$(usex zeromq)" -DENABLE_GR_CORE=ON diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild index 0cbdae48641..ad674115e29 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild @@ -26,7 +26,7 @@ elif [[ ${PV} == "3.8.9999" ]]; then EGIT_BRANCH="next" fi -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" +IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" REQUIRED_USE="${PYTHON_REQUIRED_USE} audio? ( || ( alsa oss jack portaudio ) ) @@ -38,7 +38,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) - qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) @@ -70,13 +69,6 @@ RDEPEND="${PYTHON_DEPS} portaudio? ( >=media-libs/portaudio-19_pre ) - qt4? ( - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}] - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}] - >=dev-qt/qtcore-4.4:4 - >=dev-qt/qtgui-4.4:4 - x11-libs/qwt:6[qt4(-)] - ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) @@ -165,7 +157,7 @@ src_configure() { -DENABLE_GR_VOCODER="$(usex vocoder)" -DENABLE_GR_WAVELET="$(usex wavelet)" -DENABLE_GR_WXGUI="$(usex wxwidgets)" - -DENABLE_GR_QTGUI="$(usex qt4)" + -DENABLE_GR_QTGUI=OFF -DENABLE_GR_VIDEO_SDL="$(usex sdl)" -DENABLE_GR_ZEROMQ="$(usex zeromq)" -DENABLE_GR_CORE=ON diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index cc111c7ec83..e2920f5cc5f 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -26,7 +26,7 @@ elif [[ ${PV} == "3.8.9999" ]]; then EGIT_BRANCH="next" fi -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" +IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" REQUIRED_USE="${PYTHON_REQUIRED_USE} audio? ( || ( alsa oss jack portaudio ) ) @@ -38,7 +38,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) - qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) @@ -71,13 +70,6 @@ RDEPEND="${PYTHON_DEPS} portaudio? ( >=media-libs/portaudio-19_pre ) - qt4? ( - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}] - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}] - >=dev-qt/qtcore-4.4:4 - >=dev-qt/qtgui-4.4:4 - x11-libs/qwt:6[qt4(-)] - ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) @@ -166,7 +158,7 @@ src_configure() { -DENABLE_GR_VOCODER="$(usex vocoder)" -DENABLE_GR_WAVELET="$(usex wavelet)" -DENABLE_GR_WXGUI="$(usex wxwidgets)" - -DENABLE_GR_QTGUI="$(usex qt4)" + -DENABLE_GR_QTGUI=OFF -DENABLE_GR_VIDEO_SDL="$(usex sdl)" -DENABLE_GR_ZEROMQ="$(usex zeromq)" -DENABLE_GR_CORE=ON