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

[Richard Farina]

commit:     8e746e8da0895bbf684431a93cc3c021df9b73c4
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 04:20:54 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 04:20:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e746e8d

net-wireless/gnuradio: I heard you like gnuradio

so I added gnuradio to your gnuradio so you can next while you maint

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../{gnuradio-9999.ebuild => gnuradio-3.7.9999.ebuild}      | 13 +++++++++++--
 .../{gnuradio-9999.ebuild => gnuradio-3.8.9999.ebuild}      | 13 +++++++++++--
 net-wireless/gnuradio/gnuradio-9999.ebuild                  | 13 +++++++++++--
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild 
b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
similarity index 96%
copy from net-wireless/gnuradio/gnuradio-9999.ebuild
copy to net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 32a66381ccf..6e4c8e7f78f 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://gnuradio.org/";
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} =~ "9999" ]]; then
        EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git";
        inherit git-r3
        KEYWORDS=""
@@ -20,6 +20,11 @@ else
        SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz";
        KEYWORDS="~amd64 ~arm ~x86"
 fi
+if [[ ${PV} == "3.7.9999" ]]; then
+       EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+       EGIT_BRANCH="next"
+fi
 
 IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec 
+filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl 
test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
@@ -105,7 +110,11 @@ DEPEND="${RDEPEND}
 src_prepare() {
        gnome2_environment_reset #534582
 
-       epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+       if [[ ${PV} == "3.8.9999" ]]; then
+               true
+       else
+               epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+       fi
        # Useless UI element would require qt3support, bug #365019
        sed -i '/qPixmapFromMimeSource/d' 
"${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
        default

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild 
b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
similarity index 96%
copy from net-wireless/gnuradio/gnuradio-9999.ebuild
copy to net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
index 32a66381ccf..6e4c8e7f78f 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://gnuradio.org/";
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} =~ "9999" ]]; then
        EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git";
        inherit git-r3
        KEYWORDS=""
@@ -20,6 +20,11 @@ else
        SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz";
        KEYWORDS="~amd64 ~arm ~x86"
 fi
+if [[ ${PV} == "3.7.9999" ]]; then
+       EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+       EGIT_BRANCH="next"
+fi
 
 IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec 
+filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl 
test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
@@ -105,7 +110,11 @@ DEPEND="${RDEPEND}
 src_prepare() {
        gnome2_environment_reset #534582
 
-       epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+       if [[ ${PV} == "3.8.9999" ]]; then
+               true
+       else
+               epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+       fi
        # Useless UI element would require qt3support, bug #365019
        sed -i '/qPixmapFromMimeSource/d' 
"${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
        default

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild 
b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 32a66381ccf..6e4c8e7f78f 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://gnuradio.org/";
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} =~ "9999" ]]; then
        EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git";
        inherit git-r3
        KEYWORDS=""
@@ -20,6 +20,11 @@ else
        SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz";
        KEYWORDS="~amd64 ~arm ~x86"
 fi
+if [[ ${PV} == "3.7.9999" ]]; then
+       EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+       EGIT_BRANCH="next"
+fi
 
 IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec 
+filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl 
test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
@@ -105,7 +110,11 @@ DEPEND="${RDEPEND}
 src_prepare() {
        gnome2_environment_reset #534582
 
-       epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+       if [[ ${PV} == "3.8.9999" ]]; then
+               true
+       else
+               epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+       fi
        # Useless UI element would require qt3support, bug #365019
        sed -i '/qPixmapFromMimeSource/d' 
"${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
        default