| 1 |
commit: 514aa621dc3be1b9a2be67e7bf18cb923b45f13d |
| 2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 5 03:00:57 2016 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 5 03:01:31 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514aa621 |
| 7 |
|
| 8 |
net-wireless/gnuradio: bump to 3.7.9, hopefully fix bug #430348 correctly |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
net-wireless/gnuradio/Manifest | 1 + |
| 13 |
.../gnuradio/{gnuradio-9999.ebuild => gnuradio-3.7.9.ebuild} | 10 ++++++++-- |
| 14 |
net-wireless/gnuradio/gnuradio-9999.ebuild | 10 ++++++++-- |
| 15 |
3 files changed, 17 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest |
| 18 |
index 401827a..3764122 100644 |
| 19 |
--- a/net-wireless/gnuradio/Manifest |
| 20 |
+++ b/net-wireless/gnuradio/Manifest |
| 21 |
@@ -3,3 +3,4 @@ DIST gnuradio-3.7.6.1.tar.gz 3588833 SHA256 39dede70eec36f430c4895900bbd7ed266aa |
| 22 |
DIST gnuradio-3.7.7.1.tar.gz 3845988 SHA256 2b27b13fc734ab5882e42c1661d433c0c097fd8b55b682f00626fa96c356584e SHA512 7be9568d19cbe03f3c229dbda5fc8d448a4a57d84bd9f8b91a400c65b526414539536c0a391b15d5f0e63bf22ef5675dc3ed8a6ed94ce3b1e4328948fa202ba1 WHIRLPOOL c54e26af37ecb27dd515d1ca320ccf363f6a9bbff61724f7d98f751d69a32ba21f2a631ce07caf273596f4297ff92359d2469768cd927ae9d680c8a8bbd25dbd |
| 23 |
DIST gnuradio-3.7.8.1.tar.gz 3962961 SHA256 8406f49d085fdc2ef5d8ea90f3e19ad8782d2a2f5154bbe4f076591ddf7ae5aa SHA512 21468335d698963ce5090b03b980ecc3714c301f3cd5d071d8a1b083c3c985479c42ee6d842b1b600ac85640ce875fb2bbfd6f51d30144cb612ac55e648c0c9a WHIRLPOOL 94d1b357539299b74b9f08659426ade1fa6ac3ae6950ec4ffe6797eadaca06785c4707ea1db3500c5b57395e6f7e8c0f14718d00c556aaf6537835ebb6969b7a |
| 24 |
DIST gnuradio-3.7.8.tar.gz 3990172 SHA256 fe19cb54b5d77fb76dde61d5cf184c6dee7066779b45c51676bae6e6d0cd4172 SHA512 2a69101acf8b1ed8cc4791de2961b4d8a4baf50a84e5514ba8f29e300829228daa50863dda8434c1703829412ec6fb2f25560d851b4a39cc687cba0646e1a7d9 WHIRLPOOL 6682b48cde8643509629b4d45f95971260657546349b1bbcb7a4c8323feebd0d042f190824026c26d9d1aa8a91a3e10380c49dc2d4ea1128dcb73edaa903d556 |
| 25 |
+DIST gnuradio-3.7.9.tar.gz 4912459 SHA256 b572873e7215c808fa314180da083a39a7b63adfc1069fe400ee8ff5999a31b0 SHA512 0cac18e14b77f508800c55a7ecd9180549a56010b0d3100dc19f420afcd9933781ca1e50ae27325d6bf436b0b018d077f73662f92a9fc21fb9ed8091e7ba3bb9 WHIRLPOOL afa9b54ad2333af53cd7fa152b872d8aecfa122bb7da09a0905e6c75d33740b8cd8f012ff1495005d8ba2b105e92af86e1d91e7a16c9f312eec05b806ab3187a |
| 26 |
|
| 27 |
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9.ebuild |
| 28 |
similarity index 96% |
| 29 |
copy from net-wireless/gnuradio/gnuradio-9999.ebuild |
| 30 |
copy to net-wireless/gnuradio/gnuradio-3.7.9.ebuild |
| 31 |
index 2933b8e..82c7a54 100644 |
| 32 |
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 33 |
+++ b/net-wireless/gnuradio/gnuradio-3.7.9.ebuild |
| 34 |
@@ -1,4 +1,4 @@ |
| 35 |
-# Copyright 1999-2015 Gentoo Foundation |
| 36 |
+# Copyright 1999-2016 Gentoo Foundation |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
# $Id$ |
| 39 |
|
| 40 |
@@ -154,7 +154,7 @@ src_configure() { |
| 41 |
-DENABLE_GR_CORE=ON \ |
| 42 |
-DSYSCONFDIR="${EPREFIX}"/etc \ |
| 43 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
| 44 |
- -DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}" |
| 45 |
+ -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" |
| 46 |
) |
| 47 |
use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE ) |
| 48 |
cmake-utils_src_configure |
| 49 |
@@ -166,11 +166,17 @@ src_install() { |
| 50 |
if use examples ; then |
| 51 |
dodir /usr/share/doc/${PF}/ |
| 52 |
mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die |
| 53 |
+ docompress -x /usr/share/doc/${PF}/examples |
| 54 |
else |
| 55 |
# It seems that the examples are always installed |
| 56 |
rm -rf "${ED}"/usr/share/${PN}/examples || die |
| 57 |
fi |
| 58 |
|
| 59 |
+ if use doc || use examples; then |
| 60 |
+ #this doesn't appear useful |
| 61 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/xml || die |
| 62 |
+ fi |
| 63 |
+ |
| 64 |
# We install the mimetypes to the correct locations from the ebuild |
| 65 |
rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die |
| 66 |
rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die |
| 67 |
|
| 68 |
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 69 |
index 2933b8e..82c7a54 100644 |
| 70 |
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 71 |
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 72 |
@@ -1,4 +1,4 @@ |
| 73 |
-# Copyright 1999-2015 Gentoo Foundation |
| 74 |
+# Copyright 1999-2016 Gentoo Foundation |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
# $Id$ |
| 77 |
|
| 78 |
@@ -154,7 +154,7 @@ src_configure() { |
| 79 |
-DENABLE_GR_CORE=ON \ |
| 80 |
-DSYSCONFDIR="${EPREFIX}"/etc \ |
| 81 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
| 82 |
- -DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}" |
| 83 |
+ -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" |
| 84 |
) |
| 85 |
use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE ) |
| 86 |
cmake-utils_src_configure |
| 87 |
@@ -166,11 +166,17 @@ src_install() { |
| 88 |
if use examples ; then |
| 89 |
dodir /usr/share/doc/${PF}/ |
| 90 |
mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die |
| 91 |
+ docompress -x /usr/share/doc/${PF}/examples |
| 92 |
else |
| 93 |
# It seems that the examples are always installed |
| 94 |
rm -rf "${ED}"/usr/share/${PN}/examples || die |
| 95 |
fi |
| 96 |
|
| 97 |
+ if use doc || use examples; then |
| 98 |
+ #this doesn't appear useful |
| 99 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/xml || die |
| 100 |
+ fi |
| 101 |
+ |
| 102 |
# We install the mimetypes to the correct locations from the ebuild |
| 103 |
rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die |
| 104 |
rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die |
Archives