commit: 8f430267839bb27e317fc375ea14165a9c868921
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 16:13:20 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 16:16:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f430267
net-wireless/gnuradio: bug 668440
plus some other minor dep clean up
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
...7.13.4-r1.ebuild => gnuradio-3.7.13.4-r2.ebuild} | 17 +++++++++--------
net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 21 +++++++--------------
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild
b/net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild
similarity index 95%
rename from net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild
rename to net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild
index 401a34b7994..eab46b2eca5 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild
@@ -23,9 +23,7 @@ else
KEYWORDS="~amd64 ~arm ~x86"
fi
if [[ ${PV} == "3.7.9999" ]]; then
- EGIT_BRANCH="maint"
-elif [[ ${PV} == "3.8.9999" ]]; then
- EGIT_BRANCH="next"
+ EGIT_BRANCH="maint-3.7"
fi
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"
@@ -53,7 +51,7 @@ 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[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
sci-libs/fftw:3.0=
alsa? (
@@ -62,9 +60,10 @@ RDEPEND="${PYTHON_DEPS}
fcd? ( virtual/libusb:1 )
filter? ( sci-libs/scipy )
grc? (
- dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
)
jack? (
media-sound/jack-audio-connection-kit
@@ -90,6 +89,7 @@ RDEPEND="${PYTHON_DEPS}
)
wxwidgets? (
dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
)
zeromq? ( >=net-libs/zeromq-2.1.11 )
"
@@ -111,7 +111,7 @@ DEPEND="${RDEPEND}
src_prepare() {
gnome2_environment_reset #534582
- if [[ ${PV} == "3.8.9999" ]]; then
+ if [[ ${PV} == "9999" ]]; then
true
else
epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
@@ -129,6 +129,7 @@ src_prepare() {
}
src_configure() {
+ #zeromq missing deps isn't fatal
python_export PYTHON_SITEDIR
mycmakeargs=(
-DENABLE_DEFAULT=OFF
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index eaeda20092f..d9ecae20f23 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1
xdg-utils
DESCRIPTION="Toolkit that provides signal processing blocks to implement
software radios"
HOMEPAGE="https://www.gnuradio.org/";
@@ -48,7 +48,8 @@ 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[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
sci-libs/fftw:3.0=
alsa? (
media-libs/alsa-lib:=
@@ -59,6 +60,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
)
jack? (
media-sound/jack-audio-connection-kit
@@ -76,9 +78,8 @@ RDEPEND="${PYTHON_DEPS}
>=sci-libs/gsl-1.10
)
wxwidgets? (
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
)
zeromq? ( >=net-libs/zeromq-2.1.11 )
"
@@ -86,7 +87,6 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.2
>=dev-lang/swig-3.0.5
- dev-python/cheetah[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=app-doc/doxygen-1.5.7.1
@@ -117,16 +117,8 @@ src_prepare() {
}
src_configure() {
- # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
- #audio provider is still automagic
#zeromq missing deps isn't fatal
- #remaining QA issues, these appear broken:
- #ENABLE_ENABLE_PERFORMANCE_COUNTERS
- #ENABLE_GR_AUDIO_ALSA
- #ENABLE_GR_AUDIO_JACK
- #ENABLE_GR_AUDIO_OSS
- #ENABLE_GR_AUDIO_PORTAUDIO
- #ENABLE_GR_CORE
+ python_export PYTHON_SITEDIR
mycmakeargs=(
-DENABLE_DEFAULT=OFF
-DENABLE_GNURADIO_RUNTIME=ON
@@ -167,6 +159,7 @@ src_configure() {
-DENABLE_GR_CORE=ON
-DSYSCONFDIR="${EPREFIX}"/etc
-DPYTHON_EXECUTABLE="${PYTHON}"
+ -DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
)
use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
