net-wireless/gnuradio: dep cleanup

fix automagic bits, fix missing codec2 deps

Signed-off-by: Rick Farina <zerochaos@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

4 files changed, 40 insertions, 18 deletions

diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild
index eb3fe3b2645d..401a34b79947 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -84,7 +84,7 @@ RDEPEND="${PYTHON_DEPS}
 	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
 	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
 	vocoder? ( media-sound/gsm
-		 >=media-libs/codec2-0.8.1 )
+		>=media-libs/codec2-0.8.1 )
 	wavelet? (
 		>=sci-libs/gsl-1.10
 	)
@@ -121,6 +121,10 @@ src_prepare() {
 	epatch "${WORKDIR}"/qt5-maint-00*.patch
 	epatch "${WORKDIR}"/codec2-next-00*.patch
 
+	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+
 	cmake-utils_src_prepare
 }
 
@@ -220,7 +224,6 @@ pkg_postinst()
 	if use grc ; then
 		xdg_desktop_database_update
 		xdg_mimeinfo_database_update
-		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -240,7 +243,6 @@ pkg_postrm()
 	if use grc ; then
 		xdg_desktop_database_update
 		xdg_mimeinfo_database_update
-		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index ad674115e294..3b3053625af0 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint"
+	EGIT_BRANCH="maint-3.7"
 elif [[ ${PV} == "3.8.9999" ]]; then
 	EGIT_BRANCH="next"
 fi
@@ -72,7 +72,8 @@ 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
 	)
@@ -109,6 +110,11 @@ src_prepare() {
 	fi
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+
+	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+
 	cmake-utils_src_prepare
 }
 
@@ -214,7 +220,7 @@ pkg_postinst()
 
 	if use grc ; then
 		xdg_desktop_database_update
-		xdg_mime_database_update
+		xdg_mimeinfo_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -233,7 +239,7 @@ pkg_postrm()
 
 	if use grc ; then
 		xdg_desktop_database_update
-		xdg_mime_database_update
+		xdg_mimeinfo_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
index 8096356bfba8..cdc3acd6eebc 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -75,12 +75,15 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
 		x11-libs/qwt:6[qt5(+)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}]
+		dev-libs/log4cpp )
 	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
 	)
@@ -111,6 +114,11 @@ src_prepare() {
 	fi
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+
+	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+
 	cmake-utils_src_prepare
 }
 
@@ -208,7 +216,7 @@ pkg_postinst()
 
 	if use grc ; then
 		xdg_desktop_database_update
-		xdg_mime_database_update
+		xdg_mimeinfo_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -227,7 +235,7 @@ pkg_postrm()
 
 	if use grc ; then
 		xdg_desktop_database_update
-		xdg_mime_database_update
+		xdg_mimeinfo_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index e2920f5cc5fd..6d2250097909 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,7 +73,8 @@ 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
 	)
@@ -110,6 +111,11 @@ src_prepare() {
 	fi
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+
+	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+
 	cmake-utils_src_prepare
 }
 
@@ -215,7 +221,7 @@ pkg_postinst()
 
 	if use grc ; then
 		xdg_desktop_database_update
-		xdg_mime_database_update
+		xdg_mimeinfo_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -234,7 +240,7 @@ pkg_postrm()
 
 	if use grc ; then
 		xdg_desktop_database_update
-		xdg_mime_database_update
+		xdg_mimeinfo_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"