1 |
commit: 8f430267839bb27e317fc375ea14165a9c868921 |
2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 24 16:13:20 2018 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 24 16:16:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f430267 |
7 |
|
8 |
net-wireless/gnuradio: bug 668440 |
9 |
|
10 |
plus some other minor dep clean up |
11 |
|
12 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
13 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
14 |
|
15 |
...7.13.4-r1.ebuild => gnuradio-3.7.13.4-r2.ebuild} | 17 +++++++++-------- |
16 |
net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 21 +++++++-------------- |
17 |
2 files changed, 16 insertions(+), 22 deletions(-) |
18 |
|
19 |
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild |
20 |
similarity index 95% |
21 |
rename from net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild |
22 |
rename to net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild |
23 |
index 401a34b7994..eab46b2eca5 100644 |
24 |
--- a/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild |
25 |
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild |
26 |
@@ -23,9 +23,7 @@ else |
27 |
KEYWORDS="~amd64 ~arm ~x86" |
28 |
fi |
29 |
if [[ ${PV} == "3.7.9999" ]]; then |
30 |
- EGIT_BRANCH="maint" |
31 |
-elif [[ ${PV} == "3.8.9999" ]]; then |
32 |
- EGIT_BRANCH="next" |
33 |
+ EGIT_BRANCH="maint-3.7" |
34 |
fi |
35 |
|
36 |
IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" |
37 |
@@ -53,7 +51,7 @@ RDEPEND="${PYTHON_DEPS} |
38 |
>=dev-lang/orc-0.4.12 |
39 |
dev-libs/boost:0=[${PYTHON_USEDEP}] |
40 |
!<=dev-libs/boost-1.52.0-r6:0/1.52 |
41 |
- dev-python/numpy[${PYTHON_USEDEP}] |
42 |
+ dev-python/mako[${PYTHON_USEDEP}] |
43 |
dev-python/six[${PYTHON_USEDEP}] |
44 |
sci-libs/fftw:3.0= |
45 |
alsa? ( |
46 |
@@ -62,9 +60,10 @@ RDEPEND="${PYTHON_DEPS} |
47 |
fcd? ( virtual/libusb:1 ) |
48 |
filter? ( sci-libs/scipy ) |
49 |
grc? ( |
50 |
- dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}] |
51 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
52 |
- dev-python/mako[${PYTHON_USEDEP}] |
53 |
+ dev-python/cheetah[${PYTHON_USEDEP}] |
54 |
+ dev-python/lxml[${PYTHON_USEDEP}] |
55 |
+ >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] |
56 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
57 |
) |
58 |
jack? ( |
59 |
media-sound/jack-audio-connection-kit |
60 |
@@ -90,6 +89,7 @@ RDEPEND="${PYTHON_DEPS} |
61 |
) |
62 |
wxwidgets? ( |
63 |
dev-python/wxpython:3.0[${PYTHON_USEDEP}] |
64 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
65 |
) |
66 |
zeromq? ( >=net-libs/zeromq-2.1.11 ) |
67 |
" |
68 |
@@ -111,7 +111,7 @@ DEPEND="${RDEPEND} |
69 |
src_prepare() { |
70 |
gnome2_environment_reset #534582 |
71 |
|
72 |
- if [[ ${PV} == "3.8.9999" ]]; then |
73 |
+ if [[ ${PV} == "9999" ]]; then |
74 |
true |
75 |
else |
76 |
epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch |
77 |
@@ -129,6 +129,7 @@ src_prepare() { |
78 |
} |
79 |
|
80 |
src_configure() { |
81 |
+ #zeromq missing deps isn't fatal |
82 |
python_export PYTHON_SITEDIR |
83 |
mycmakeargs=( |
84 |
-DENABLE_DEFAULT=OFF |
85 |
|
86 |
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild |
87 |
index eaeda20092f..d9ecae20f23 100644 |
88 |
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild |
89 |
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild |
90 |
@@ -5,7 +5,7 @@ EAPI=6 |
91 |
PYTHON_COMPAT=( python2_7 ) |
92 |
|
93 |
CMAKE_BUILD_TYPE="None" |
94 |
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils |
95 |
+inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils |
96 |
|
97 |
DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" |
98 |
HOMEPAGE="https://www.gnuradio.org/" |
99 |
@@ -48,7 +48,8 @@ RDEPEND="${PYTHON_DEPS} |
100 |
>=dev-lang/orc-0.4.12 |
101 |
dev-libs/boost:0=[${PYTHON_USEDEP}] |
102 |
!<=dev-libs/boost-1.52.0-r6:0/1.52 |
103 |
- dev-python/numpy[${PYTHON_USEDEP}] |
104 |
+ dev-python/mako[${PYTHON_USEDEP}] |
105 |
+ dev-python/six[${PYTHON_USEDEP}] |
106 |
sci-libs/fftw:3.0= |
107 |
alsa? ( |
108 |
media-libs/alsa-lib:= |
109 |
@@ -59,6 +60,7 @@ RDEPEND="${PYTHON_DEPS} |
110 |
dev-python/cheetah[${PYTHON_USEDEP}] |
111 |
dev-python/lxml[${PYTHON_USEDEP}] |
112 |
>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] |
113 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
114 |
) |
115 |
jack? ( |
116 |
media-sound/jack-audio-connection-kit |
117 |
@@ -76,9 +78,8 @@ RDEPEND="${PYTHON_DEPS} |
118 |
>=sci-libs/gsl-1.10 |
119 |
) |
120 |
wxwidgets? ( |
121 |
- dev-python/lxml[${PYTHON_USEDEP}] |
122 |
- dev-python/numpy[${PYTHON_USEDEP}] |
123 |
dev-python/wxpython:3.0[${PYTHON_USEDEP}] |
124 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
125 |
) |
126 |
zeromq? ( >=net-libs/zeromq-2.1.11 ) |
127 |
" |
128 |
@@ -86,7 +87,6 @@ RDEPEND="${PYTHON_DEPS} |
129 |
DEPEND="${RDEPEND} |
130 |
app-text/docbook-xml-dtd:4.2 |
131 |
>=dev-lang/swig-3.0.5 |
132 |
- dev-python/cheetah[${PYTHON_USEDEP}] |
133 |
virtual/pkgconfig |
134 |
doc? ( |
135 |
>=app-doc/doxygen-1.5.7.1 |
136 |
@@ -117,16 +117,8 @@ src_prepare() { |
137 |
} |
138 |
|
139 |
src_configure() { |
140 |
- # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX |
141 |
- #audio provider is still automagic |
142 |
#zeromq missing deps isn't fatal |
143 |
- #remaining QA issues, these appear broken: |
144 |
- #ENABLE_ENABLE_PERFORMANCE_COUNTERS |
145 |
- #ENABLE_GR_AUDIO_ALSA |
146 |
- #ENABLE_GR_AUDIO_JACK |
147 |
- #ENABLE_GR_AUDIO_OSS |
148 |
- #ENABLE_GR_AUDIO_PORTAUDIO |
149 |
- #ENABLE_GR_CORE |
150 |
+ python_export PYTHON_SITEDIR |
151 |
mycmakeargs=( |
152 |
-DENABLE_DEFAULT=OFF |
153 |
-DENABLE_GNURADIO_RUNTIME=ON |
154 |
@@ -167,6 +159,7 @@ src_configure() { |
155 |
-DENABLE_GR_CORE=ON |
156 |
-DSYSCONFDIR="${EPREFIX}"/etc |
157 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
158 |
+ -DGR_PYTHON_DIR="${PYTHON_SITEDIR}" |
159 |
-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" |
160 |
) |
161 |
use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE ) |