[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/

["Richard Farina" <zerochaos@gentoo.org>]

commit:     e1423683bb320596509f383d6b6226939362c486
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 20:45:43 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 20:46:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1423683

net-wireless/gnuradio: fixes

fix bug #659946
fix https://github.com/pentoo/pentoo-overlay/issues/289
update debian patchset, use more of their backports

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-wireless/gnuradio/Manifest                               |  3 ++-
 ...{gnuradio-3.7.13.3.ebuild => gnuradio-3.7.13.3-r1.ebuild} | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 7d394200df6..a0e28ee3259 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,4 +1,5 @@
 DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
-DIST gnuradio-3.7.12-qt5.tar.xz 31048 BLAKE2B 5665ecd7f5ab34852a0e2dc975c483331e7b547377adf8a4c38ab68a6e034d6ec9f009210f74bbf9a0fc76e214bd744558b267e853843f33f799bbf0a0f2a7fc SHA512 25da9415d7b7f9984075c2a8fcf092bc0585be550c0b9a7e6910d934fd3aab4be3135d7a2c83b01ce19b2ac8e0065ffb5ad1375fa29cc259d4dc2d1d92003f99
+DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
+DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.3.tar.gz 4544605 BLAKE2B f059e8af860b7c18573f0efa909f3bf2b36b4d7208e26dd18a1c9de8cbf40e0d9079336f4a5f48430790e28dc21f5150ad2294fa1d664889c07e849d236160a0 SHA512 e4bf63899678fd792bc08baa2db673b192dc823d6e586124538cbdf12e60a882847e72cfca7f52ef906d52038a9cb48a8b5891593c9db1cb172c4077a54d4056

diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild
similarity index 95%
rename from net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild
rename to net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild
index 469c004b33d..64d520389a3 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild
@@ -18,7 +18,8 @@ if [[ ${PV} =~ "9999" ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz
-			https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.12-qt5.tar.xz"
+		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz
+		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -82,10 +83,14 @@ RDEPEND="${PYTHON_DEPS}
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
 	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
+	vocoder? ( media-sound/gsm
+		 >=media-libs/codec2-0.8.1 )
 	wavelet? (
 		>=sci-libs/gsl-1.10
 	)
+	wxwidgets? (
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
 
@@ -114,6 +119,8 @@ src_prepare() {
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	epatch "${WORKDIR}"/qt5-maint-00*.patch
+	epatch "${WORKDIR}"/codec2-next-00*.patch
+
 	cmake-utils_src_prepare
 }
 
@@ -152,6 +159,7 @@ src_configure() {
 		-DENABLE_GR_UTILS="$(usex utils)"
 		-DENABLE_GR_VOCODER="$(usex vocoder)"
 		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
 		-DENABLE_GR_QTGUI="$(usex qt5)"
 		-DDESIRED_QT_VERSION="$(usex qt5 5)"
 		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"