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

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

commit:     a0d9ac7b1717f538f2fe861db301f1cae880e0e8
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 20:24:03 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 20:45:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d9ac7b

net-wireless/gnuradio: minor fixes

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild | 14 +++++++++++++-
 net-wireless/gnuradio/gnuradio-9999.ebuild    | 11 +++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild
index 876a00b18cf..1ba2694abe7 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils python-single-r1 virtualx xdg-utils
+inherit cmake-utils python-single-r1 virtualx xdg-utils desktop
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="https://www.gnuradio.org/"
@@ -130,6 +130,7 @@ src_configure() {
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
 		-DENABLE_PYTHON=ON
 		-DENABLE_GR_BLOCKS=ON
@@ -183,6 +184,17 @@ src_install() {
 	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
 	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
 
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
 	# Remove incorrectly byte-compiled Python files and replace
 	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
 	python_optimize

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 445acb55d95..c3f9aab150e 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -184,6 +184,17 @@ src_install() {
 	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
 	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
 
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
 	# Remove incorrectly byte-compiled Python files and replace
 	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
 	python_optimize