Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/
Date: Sun, 26 Aug 2018 18:22:29
Message-Id: 1535307733.87befbf45f8351215213994c60f3d6bad7cc0e01.mgorny@gentoo
1 commit: 87befbf45f8351215213994c60f3d6bad7cc0e01
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 26 18:03:33 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 26 18:22:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87befbf4
7
8 net-wireless/gnuradio: Remove support for non-existent deps
9
10 net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild | 11 ++---------
11 net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild | 12 ++----------
12 net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 12 ++----------
13 net-wireless/gnuradio/gnuradio-9999.ebuild | 12 ++----------
14 4 files changed, 8 insertions(+), 39 deletions(-)
15
16 diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
17 index 652fb5cea0e..03fd5605be2 100644
18 --- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
19 +++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
20 @@ -20,13 +20,12 @@ else
21 KEYWORDS="~amd64 ~arm ~x86"
22 fi
23
24 -IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet"
25 +IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio sdl uhd +utils wavelet"
26
27 REQUIRED_USE="${PYTHON_REQUIRED_USE}
28 analog? ( filter )
29 digital? ( filter analog )
30 pager? ( filter analog )
31 - qt4? ( filter )
32 uhd? ( filter analog )
33 fcd? ( || ( alsa oss ) )
34 wavelet? ( analog )"
35 @@ -55,11 +54,6 @@ RDEPEND="${PYTHON_DEPS}
36 portaudio? (
37 >=media-libs/portaudio-19_pre
38 )
39 - qt4? (
40 - dev-python/PyQt4[X,opengl,${PYTHON_USEDEP}]
41 - dev-python/pyqwt:5
42 - dev-qt/qtgui:4
43 - )
44 sdl? ( media-libs/libsdl )
45 uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
46 wavelet? (
47 @@ -109,14 +103,13 @@ src_configure() {
48 $(cmake-utils_use_enable uhd GR_UHD) \
49 $(cmake-utils_use_enable utils GR_UTILS) \
50 $(cmake-utils_use_enable wavelet GR_WAVELET) \
51 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
52 $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
53 + -DENABLE_GR_QTGUI=OFF \
54 -DENABLE_GR_WXGUI=OFF \
55 -DENABLE_GR_CORE=ON \
56 -DSYSCONFDIR="${EPREFIX}"/etc \
57 -DPYTHON_EXECUTABLE="${PYTHON}"
58 )
59 - use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 )
60 cmake-utils_src_configure
61 }
62
63
64 diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
65 index 28a0664b9c5..f7a017d103c 100644
66 --- a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
67 +++ b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
68 @@ -21,7 +21,7 @@ else
69 KEYWORDS="~amd64 ~arm ~x86"
70 fi
71
72 -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"
73 +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"
74 #tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS
75 RESTRICT=test
76
77 @@ -35,7 +35,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
78 digital? ( filter analog )
79 dtv? ( fec )
80 pager? ( filter analog )
81 - qt4? ( filter )
82 uhd? ( filter analog )
83 fcd? ( || ( alsa oss ) )
84 wavelet? ( analog )
85 @@ -67,13 +66,6 @@ RDEPEND="${PYTHON_DEPS}
86 portaudio? (
87 >=media-libs/portaudio-19_pre
88 )
89 - qt4? (
90 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
91 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
92 - >=dev-qt/qtcore-4.4:4
93 - >=dev-qt/qtgui-4.4:4
94 - x11-libs/qwt:6[qt4(-)]
95 - )
96 sdl? ( >=media-libs/libsdl-1.2.0 )
97 uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
98 utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
99 @@ -158,7 +150,7 @@ src_configure() {
100 -DENABLE_GR_VOCODER="$(usex vocoder)"
101 -DENABLE_GR_WAVELET="$(usex wavelet)"
102 -DENABLE_GR_WXGUI="$(usex wxwidgets)"
103 - -DENABLE_GR_QTGUI="$(usex qt4)"
104 + -DENABLE_GR_QTGUI=OFF
105 -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
106 -DENABLE_GR_ZEROMQ="$(usex zeromq)"
107 -DENABLE_GR_CORE=ON
108
109 diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
110 index 0cbdae48641..ad674115e29 100644
111 --- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
112 +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
113 @@ -26,7 +26,7 @@ elif [[ ${PV} == "3.8.9999" ]]; then
114 EGIT_BRANCH="next"
115 fi
116
117 -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"
118 +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"
119
120 REQUIRED_USE="${PYTHON_REQUIRED_USE}
121 audio? ( || ( alsa oss jack portaudio ) )
122 @@ -38,7 +38,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
123 digital? ( filter analog )
124 dtv? ( fec )
125 pager? ( filter analog )
126 - qt4? ( filter )
127 uhd? ( filter analog )
128 fcd? ( || ( alsa oss ) )
129 wavelet? ( analog )
130 @@ -70,13 +69,6 @@ RDEPEND="${PYTHON_DEPS}
131 portaudio? (
132 >=media-libs/portaudio-19_pre
133 )
134 - qt4? (
135 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
136 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
137 - >=dev-qt/qtcore-4.4:4
138 - >=dev-qt/qtgui-4.4:4
139 - x11-libs/qwt:6[qt4(-)]
140 - )
141 sdl? ( >=media-libs/libsdl-1.2.0 )
142 uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
143 utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
144 @@ -165,7 +157,7 @@ src_configure() {
145 -DENABLE_GR_VOCODER="$(usex vocoder)"
146 -DENABLE_GR_WAVELET="$(usex wavelet)"
147 -DENABLE_GR_WXGUI="$(usex wxwidgets)"
148 - -DENABLE_GR_QTGUI="$(usex qt4)"
149 + -DENABLE_GR_QTGUI=OFF
150 -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
151 -DENABLE_GR_ZEROMQ="$(usex zeromq)"
152 -DENABLE_GR_CORE=ON
153
154 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
155 index cc111c7ec83..e2920f5cc5f 100644
156 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
157 +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
158 @@ -26,7 +26,7 @@ elif [[ ${PV} == "3.8.9999" ]]; then
159 EGIT_BRANCH="next"
160 fi
161
162 -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"
163 +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"
164
165 REQUIRED_USE="${PYTHON_REQUIRED_USE}
166 audio? ( || ( alsa oss jack portaudio ) )
167 @@ -38,7 +38,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
168 digital? ( filter analog )
169 dtv? ( fec )
170 pager? ( filter analog )
171 - qt4? ( filter )
172 uhd? ( filter analog )
173 fcd? ( || ( alsa oss ) )
174 wavelet? ( analog )
175 @@ -71,13 +70,6 @@ RDEPEND="${PYTHON_DEPS}
176 portaudio? (
177 >=media-libs/portaudio-19_pre
178 )
179 - qt4? (
180 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
181 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
182 - >=dev-qt/qtcore-4.4:4
183 - >=dev-qt/qtgui-4.4:4
184 - x11-libs/qwt:6[qt4(-)]
185 - )
186 sdl? ( >=media-libs/libsdl-1.2.0 )
187 uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
188 utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
189 @@ -166,7 +158,7 @@ src_configure() {
190 -DENABLE_GR_VOCODER="$(usex vocoder)"
191 -DENABLE_GR_WAVELET="$(usex wavelet)"
192 -DENABLE_GR_WXGUI="$(usex wxwidgets)"
193 - -DENABLE_GR_QTGUI="$(usex qt4)"
194 + -DENABLE_GR_QTGUI=OFF
195 -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
196 -DENABLE_GR_ZEROMQ="$(usex zeromq)"
197 -DENABLE_GR_CORE=ON
Report Message
Find on MARC Find on Google Groups