From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1176237-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 802AD1382C5
for <garchives@archives.gentoo.org>; Mon, 1 Jun 2020 20:46:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A606AE08B1;
Mon, 1 Jun 2020 20:46:04 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 7783FE08AA
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jun 2020 20:46:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 21F2A34EFC9
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jun 2020 20:46:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 99195296
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jun 2020 20:45:58 +0000 (UTC)
From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" <zerochaos@gentoo.org>
Message-ID: <1591044348.a0d9ac7b1717f538f2fe861db301f1cae880e0e8.zerochaos@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild net-wireless/gnuradio/gnuradio-9999.ebuild
X-VCS-Directories: net-wireless/gnuradio/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Rick Farina
X-VCS-Revision: a0d9ac7b1717f538f2fe861db301f1cae880e0e8
X-VCS-Branch: master
Date: Mon, 1 Jun 2020 20:45:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3dc356ec-8305-40c5-b460-b713df1cfaec
X-Archives-Hash: d204a2745596fc27ac9bd1c836534b17
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