gentoo resync : 02.03.2018

3 files changed, 17 insertions, 55 deletions

diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 24a3ffb65dc1..9f89337d7cfa 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,11 +1,10 @@
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf156a83f6b463b74398a6bb17f70a0917bdded1e585fe1ead61dd38f5aeb9020fac256a6f5caf9e1f638e214035fb8ec3b8ef7c SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768
-AUX gnuradio-3.7.6.1-qwt-with-qt5-support.patch 961 BLAKE2B 00e64e3a2cb588c87cfb577bb611dc6f166e6886d680be9e7a8e12e6e814436abda8b70f141eb0737f2d4c2bff479a5dc8b92e8e4f90ab72e1c98108f8a47ff1 SHA512 021dfd17426081dd8ec8bb2cd7e7f6a185f2c36f85c83bfa9099c157bffb2d63831241175547f5ad1838ae46e089fa5054fcadbddefb59fa1f34f8c0fa2d4075
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 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
 EBUILD gnuradio-3.6.5.1-r2.ebuild 5313 BLAKE2B 5fa23624df4cf4d28504bd9aa1ec2cfe7340299077483481467675dad50629d8b6c3b29b77587bc43b7b1d542a3b9c04ca41470456760fb40efb2d91d089e205 SHA512 8492ef981cc6d401d0c57354e188c3d926eb04c078d7a6997173e926fb22d43b2d4881ea359d77a9491f1e7f67802248982266c680a50624a550b8865be6bb95
 EBUILD gnuradio-3.7.11-r2.ebuild 7057 BLAKE2B 2c593828e3a48fc55bf6e45bcf5fc2386c28307008e040f203fac0d4c59d237610cd4a87aeb3da7df60fc17fc5b6d717bcde230c5b9fb536f470657d1bebc47c SHA512 b4738ba81b862c77c243f2cc26c25bb31fd8d9e2b4a47a1f2485c68fc8db636e9691f10f87a4b2d596a51f12e53af5f06ddfd361e0fd0e23056e6eb5c24afc0c
 EBUILD gnuradio-3.7.9999.ebuild 7134 BLAKE2B 0e472b2e5831c1584238e498a51009354364dee5a84d079881c018e219205449a3cbc2165887ea925602a36535fd021d2232664a45a66f6883f4e7e8456931d3 SHA512 8ded1e7077faf7cde683b172b36b1fe77650cda9bbb607383e23f4d2fb31c45fa58221259a335f469bd38092ab37aa5ee81e5ab24bd4160be7396bd0c5c6698a
-EBUILD gnuradio-3.8.9999.ebuild 7134 BLAKE2B 0e472b2e5831c1584238e498a51009354364dee5a84d079881c018e219205449a3cbc2165887ea925602a36535fd021d2232664a45a66f6883f4e7e8456931d3 SHA512 8ded1e7077faf7cde683b172b36b1fe77650cda9bbb607383e23f4d2fb31c45fa58221259a335f469bd38092ab37aa5ee81e5ab24bd4160be7396bd0c5c6698a
+EBUILD gnuradio-3.8.9999.ebuild 6683 BLAKE2B b7678a29c47cea1993445a9e7be567855536225859003dbb9e2d1192a327ede7ea08b2478c0013b19e71407e75a3c4fbcf223528677cbb98d75c4dca361f86a7 SHA512 b182cc6692fa85c47fe9f82e137014cc076c5fd6e28d0929af40cfc20b75242fd5bc641b33175f234fe6a9bd2c20e62a2cbb924f06f666ea815f5dfd735127ca
 EBUILD gnuradio-9999.ebuild 7134 BLAKE2B 0e472b2e5831c1584238e498a51009354364dee5a84d079881c018e219205449a3cbc2165887ea925602a36535fd021d2232664a45a66f6883f4e7e8456931d3 SHA512 8ded1e7077faf7cde683b172b36b1fe77650cda9bbb607383e23f4d2fb31c45fa58221259a335f469bd38092ab37aa5ee81e5ab24bd4160be7396bd0c5c6698a
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch b/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch
deleted file mode 100644
index f155ed51db73..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b3bdd301debb2eb859473a25b23d068fa66f6cb1 Mon Sep 17 00:00:00 2001
-From: Zero_Chaos <sidhayn@gmail.com>
-Date: Fri, 20 Feb 2015 15:54:00 -0500
-Subject: [PATCH] Update FindQwt.cmake to support qwt6-qt4
-
-allow finding qwt6-qt4 library.  Some distros have added support for both qt4 and qt5 in qwt6, the common name the library uses appears to be qwt6-qt4.  The pre-existance of the qwt-qt4 entry suggests this naming convention is reasonably standard (or at least this isn't a unique hack)
----
- cmake/Modules/FindQwt.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
-index 68f55bf..3ce49aa 100644
---- a/cmake/Modules/FindQwt.cmake
-+++ b/cmake/Modules/FindQwt.cmake
-@@ -22,7 +22,7 @@ find_path(QWT_INCLUDE_DIRS
- )
- 
- find_library (QWT_LIBRARIES
--  NAMES qwt6 qwt qwt-qt4
-+  NAMES qwt6 qwt6-qt4 qwt qwt-qt4
-   HINTS
-   ${CMAKE_INSTALL_PREFIX}/lib
-   ${CMAKE_INSTALL_PREFIX}/lib64
diff --git a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
index 6e4c8e7f78f1..2eae70bee9f1 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils python-utils-r1
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -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 +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		audio? ( || ( alsa oss jack portaudio ) )
@@ -38,7 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		digital? ( filter analog )
 		dtv? ( fec )
 		pager? ( filter analog )
-		qt4? ( filter )
+		qt5? ( filter )
 		uhd? ( filter analog )
 		fcd? ( || ( alsa oss ) )
 		wavelet? ( analog )
@@ -52,6 +52,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:0=[${PYTHON_USEDEP}]
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
 	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0=
 	alsa? (
 		media-libs/alsa-lib[${PYTHON_USEDEP}]
@@ -59,9 +60,9 @@ RDEPEND="${PYTHON_DEPS}
 	fcd? ( virtual/libusb:1 )
 	filter? ( sci-libs/scipy )
 	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+		dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
 	)
 	jack? (
 		media-sound/jack-audio-connection-kit
@@ -70,12 +71,11 @@ 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(+)]
+	qt5? (
+		dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
@@ -84,18 +84,12 @@ RDEPEND="${PYTHON_DEPS}
 	wavelet? (
 		>=sci-libs/gsl-1.10
 	)
-	wxwidgets? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
 
 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
@@ -122,16 +116,7 @@ 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
@@ -165,13 +150,14 @@ 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 qt4)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DDESIRED_QT_VERSION="$(usex qt5 5)"
 		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
 		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
 		-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 )