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

[Richard Farina]

commit:     395421f62d62f80f54da569388cada8d0731c657
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 20:11:25 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 20:22:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395421f6

bump

Package-Manager: portage-2.2.20.1

 net-wireless/gnuradio/Manifest                                      | 1 +
 .../gnuradio/{gnuradio-9999.ebuild => gnuradio-3.7.8.ebuild}        | 6 +++---
 net-wireless/gnuradio/gnuradio-9999.ebuild                          | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index ed80eb4..a2ac925 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,3 +1,4 @@
 DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 
0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 SHA512 
23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 WHIRLPOOL 
7cf55be5fac7891a737d228d83718bbc43f9069c6275c5ac465ae11088559dca5e7fa31239e281271b529aa8b9ae1a0efe3850a16a40e53c0f1fe57e351ff2a8
 DIST gnuradio-3.7.6.1.tar.gz 3588833 SHA256 
39dede70eec36f430c4895900bbd7ed266aa9e846d0a362987e806b7197c4c0b SHA512 
88ec30b2bd93ca032c29f4606856a8e70b0123474fd84115657804429f381dea78f97a7523c9684acad6a27b357ddf876632e957de5c6e0170045dc38d121939
 WHIRLPOOL 
97d70e403fe46b0afbd1e6f0812f8d9de4ea506dcb2190a23d9a0f0499662f9e2bbaa86d1b624f7c621ae1675094f92cd295bc273db0759b2647e2dfb2a49b43
 DIST gnuradio-3.7.7.1.tar.gz 3845988 SHA256 
2b27b13fc734ab5882e42c1661d433c0c097fd8b55b682f00626fa96c356584e SHA512 
7be9568d19cbe03f3c229dbda5fc8d448a4a57d84bd9f8b91a400c65b526414539536c0a391b15d5f0e63bf22ef5675dc3ed8a6ed94ce3b1e4328948fa202ba1
 WHIRLPOOL 
c54e26af37ecb27dd515d1ca320ccf363f6a9bbff61724f7d98f751d69a32ba21f2a631ce07caf273596f4297ff92359d2469768cd927ae9d680c8a8bbd25dbd
+DIST gnuradio-3.7.8.tar.gz 3990172 SHA256 
fe19cb54b5d77fb76dde61d5cf184c6dee7066779b45c51676bae6e6d0cd4172 SHA512 
2a69101acf8b1ed8cc4791de2961b4d8a4baf50a84e5514ba8f29e300829228daa50863dda8434c1703829412ec6fb2f25560d851b4a39cc687cba0646e1a7d9
 WHIRLPOOL 
6682b48cde8643509629b4d45f95971260657546349b1bbcb7a4c8323feebd0d042f190824026c26d9d1aa8a91a3e10380c49dc2d4ea1128dcb73edaa903d556

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild 
b/net-wireless/gnuradio/gnuradio-3.7.8.ebuild
similarity index 97%
copy from net-wireless/gnuradio/gnuradio-9999.ebuild
copy to net-wireless/gnuradio/gnuradio-3.7.8.ebuild
index 2f9f15c..2933b8e 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.8.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3
        KEYWORDS=""
 else
-       SRC_URI="http://s3-dist.gnuradio.org/${P}.tar.gz";
+       SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz";
        KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -89,7 +89,7 @@ RDEPEND="${PYTHON_DEPS}
        "
 
 DEPEND="${RDEPEND}
-       dev-lang/swig
+       >=dev-lang/swig-3.0.5
        dev-python/cheetah[${PYTHON_USEDEP}]
        virtual/pkgconfig
        doc? (
@@ -111,7 +111,6 @@ src_prepare() {
 }
 
 src_configure() {
-       # TODO: docs are installed to /usr/share/doc/${PN} not 
/usr/share/doc/${PF}
        # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
        #audio provider is still automagic
        #zeromq missing deps isn't fatal
@@ -155,6 +154,7 @@ src_configure() {
                -DENABLE_GR_CORE=ON \
                -DSYSCONFDIR="${EPREFIX}"/etc \
                -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"
        )
        use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
        cmake-utils_src_configure

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild 
b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 2f9f15c..2933b8e 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3
        KEYWORDS=""
 else
-       SRC_URI="http://s3-dist.gnuradio.org/${P}.tar.gz";
+       SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz";
        KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -89,7 +89,7 @@ RDEPEND="${PYTHON_DEPS}
        "
 
 DEPEND="${RDEPEND}
-       dev-lang/swig
+       >=dev-lang/swig-3.0.5
        dev-python/cheetah[${PYTHON_USEDEP}]
        virtual/pkgconfig
        doc? (
@@ -111,7 +111,6 @@ src_prepare() {
 }
 
 src_configure() {
-       # TODO: docs are installed to /usr/share/doc/${PN} not 
/usr/share/doc/${PF}
        # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
        #audio provider is still automagic
        #zeromq missing deps isn't fatal
@@ -155,6 +154,7 @@ src_configure() {
                -DENABLE_GR_CORE=ON \
                -DSYSCONFDIR="${EPREFIX}"/etc \
                -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"
        )
        use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
        cmake-utils_src_configure