projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 761105b)
net-wireless/gnuradio: Remove support for non-existent deps
authorMichał Górny <mgorny@gentoo.org>
Sun, 26 Aug 2018 18:03:33 +0000 (20:03 +0200)
committerMichał Górny <mgorny@gentoo.org>
Sun, 26 Aug 2018 18:22:13 +0000 (20:22 +0200)
net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild patch | blob | history
net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild patch | blob | history
net-wireless/gnuradio/gnuradio-3.7.9999.ebuild patch | blob | history
net-wireless/gnuradio/gnuradio-9999.ebuild patch | blob | history

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 652fb5cea0ec4763e14f1a953742297e62fedd3b..03fd5605be2857a2a162f6a55ea6bb2e97a8b5b8 100644 (file)
--- 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 28a0664b9c5f7479fc0669e755161dba6f9e3a99..f7a017d103c08dda3729e319b5ab4e24915847f7 100644 (file)
--- 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 0cbdae486411bb77c53519357ed44694308c8a7f..ad674115e294153e8f3ba3cb233cb16d92511fad 100644 (file)
--- 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 cc111c7ec837e873ec5c620db85caa86f9d77491..e2920f5cc5fdf6da3b889e034d781b751d070b79 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.