| 1 |
commit: a0d9ac7b1717f538f2fe861db301f1cae880e0e8 |
| 2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 1 20:24:03 2020 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 1 20:45:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d9ac7b |
| 7 |
|
| 8 |
net-wireless/gnuradio: minor fixes |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 11 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 12 |
|
| 13 |
net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild | 14 +++++++++++++- |
| 14 |
net-wireless/gnuradio/gnuradio-9999.ebuild | 11 +++++++++++ |
| 15 |
2 files changed, 24 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild |
| 18 |
index 876a00b18cf..1ba2694abe7 100644 |
| 19 |
--- a/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild |
| 20 |
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild |
| 21 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 22 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 23 |
|
| 24 |
CMAKE_BUILD_TYPE="None" |
| 25 |
-inherit cmake-utils python-single-r1 virtualx xdg-utils |
| 26 |
+inherit cmake-utils python-single-r1 virtualx xdg-utils desktop |
| 27 |
|
| 28 |
DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" |
| 29 |
HOMEPAGE="https://www.gnuradio.org/" |
| 30 |
@@ -130,6 +130,7 @@ src_configure() { |
| 31 |
mycmakeargs=( |
| 32 |
-DENABLE_DEFAULT=OFF |
| 33 |
-DENABLE_VOLK=OFF |
| 34 |
+ -DENABLE_INTERNAL_VOLK=OFF |
| 35 |
-DENABLE_GNURADIO_RUNTIME=ON |
| 36 |
-DENABLE_PYTHON=ON |
| 37 |
-DENABLE_GR_BLOCKS=ON |
| 38 |
@@ -183,6 +184,17 @@ src_install() { |
| 39 |
rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die |
| 40 |
rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die |
| 41 |
|
| 42 |
+ # Install icons, menu items and mime-types for GRC |
| 43 |
+ if use grc ; then |
| 44 |
+ local fd_path="${S}/grc/scripts/freedesktop" |
| 45 |
+ insinto /usr/share/mime/packages |
| 46 |
+ doins "${fd_path}/${PN}-grc.xml" |
| 47 |
+ |
| 48 |
+ domenu "${fd_path}/"*.desktop |
| 49 |
+ doicon "${fd_path}/"*.png |
| 50 |
+ fi |
| 51 |
+ |
| 52 |
+ python_fix_shebang "${ED}" |
| 53 |
# Remove incorrectly byte-compiled Python files and replace |
| 54 |
find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die |
| 55 |
python_optimize |
| 56 |
|
| 57 |
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 58 |
index 445acb55d95..c3f9aab150e 100644 |
| 59 |
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 60 |
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 61 |
@@ -184,6 +184,17 @@ src_install() { |
| 62 |
rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die |
| 63 |
rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die |
| 64 |
|
| 65 |
+ # Install icons, menu items and mime-types for GRC |
| 66 |
+ if use grc ; then |
| 67 |
+ local fd_path="${S}/grc/scripts/freedesktop" |
| 68 |
+ insinto /usr/share/mime/packages |
| 69 |
+ doins "${fd_path}/${PN}-grc.xml" |
| 70 |
+ |
| 71 |
+ domenu "${fd_path}/"*.desktop |
| 72 |
+ doicon "${fd_path}/"*.png |
| 73 |
+ fi |
| 74 |
+ |
| 75 |
+ python_fix_shebang "${ED}" |
| 76 |
# Remove incorrectly byte-compiled Python files and replace |
| 77 |
find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die |
| 78 |
python_optimize |
Archives