Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/
Date: Thu, 22 Feb 2018 04:21:16
Message-Id: 1519273254.8e746e8da0895bbf684431a93cc3c021df9b73c4.zerochaos@gentoo
1 commit: 8e746e8da0895bbf684431a93cc3c021df9b73c4
2 Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 22 04:20:54 2018 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 22 04:20:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e746e8d
7
8 net-wireless/gnuradio: I heard you like gnuradio
9
10 so I added gnuradio to your gnuradio so you can next while you maint
11
12 Package-Manager: Portage-2.3.24, Repoman-2.3.6
13
14 .../{gnuradio-9999.ebuild => gnuradio-3.7.9999.ebuild} | 13 +++++++++++--
15 .../{gnuradio-9999.ebuild => gnuradio-3.8.9999.ebuild} | 13 +++++++++++--
16 net-wireless/gnuradio/gnuradio-9999.ebuild | 13 +++++++++++--
17 3 files changed, 33 insertions(+), 6 deletions(-)
18
19 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
20 similarity index 96%
21 copy from net-wireless/gnuradio/gnuradio-9999.ebuild
22 copy to net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
23 index 32a66381ccf..6e4c8e7f78f 100644
24 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
25 +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
26 @@ -12,7 +12,7 @@ HOMEPAGE="http://gnuradio.org/"
27 LICENSE="GPL-3"
28 SLOT="0/${PV}"
29
30 -if [[ ${PV} == "9999" ]] ; then
31 +if [[ ${PV} =~ "9999" ]]; then
32 EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
33 inherit git-r3
34 KEYWORDS=""
35 @@ -20,6 +20,11 @@ else
36 SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
37 KEYWORDS="~amd64 ~arm ~x86"
38 fi
39 +if [[ ${PV} == "3.7.9999" ]]; then
40 + EGIT_BRANCH="maint"
41 +elif [[ ${PV} == "3.8.9999" ]]; then
42 + EGIT_BRANCH="next"
43 +fi
44
45 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"
46
47 @@ -105,7 +110,11 @@ DEPEND="${RDEPEND}
48 src_prepare() {
49 gnome2_environment_reset #534582
50
51 - epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
52 + if [[ ${PV} == "3.8.9999" ]]; then
53 + true
54 + else
55 + epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
56 + fi
57 # Useless UI element would require qt3support, bug #365019
58 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
59 default
60
61 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
62 similarity index 96%
63 copy from net-wireless/gnuradio/gnuradio-9999.ebuild
64 copy to net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
65 index 32a66381ccf..6e4c8e7f78f 100644
66 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
67 +++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
68 @@ -12,7 +12,7 @@ HOMEPAGE="http://gnuradio.org/"
69 LICENSE="GPL-3"
70 SLOT="0/${PV}"
71
72 -if [[ ${PV} == "9999" ]] ; then
73 +if [[ ${PV} =~ "9999" ]]; then
74 EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
75 inherit git-r3
76 KEYWORDS=""
77 @@ -20,6 +20,11 @@ else
78 SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
79 KEYWORDS="~amd64 ~arm ~x86"
80 fi
81 +if [[ ${PV} == "3.7.9999" ]]; then
82 + EGIT_BRANCH="maint"
83 +elif [[ ${PV} == "3.8.9999" ]]; then
84 + EGIT_BRANCH="next"
85 +fi
86
87 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"
88
89 @@ -105,7 +110,11 @@ DEPEND="${RDEPEND}
90 src_prepare() {
91 gnome2_environment_reset #534582
92
93 - epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
94 + if [[ ${PV} == "3.8.9999" ]]; then
95 + true
96 + else
97 + epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
98 + fi
99 # Useless UI element would require qt3support, bug #365019
100 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
101 default
102
103 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
104 index 32a66381ccf..6e4c8e7f78f 100644
105 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
106 +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
107 @@ -12,7 +12,7 @@ HOMEPAGE="http://gnuradio.org/"
108 LICENSE="GPL-3"
109 SLOT="0/${PV}"
110
111 -if [[ ${PV} == "9999" ]] ; then
112 +if [[ ${PV} =~ "9999" ]]; then
113 EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
114 inherit git-r3
115 KEYWORDS=""
116 @@ -20,6 +20,11 @@ else
117 SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
118 KEYWORDS="~amd64 ~arm ~x86"
119 fi
120 +if [[ ${PV} == "3.7.9999" ]]; then
121 + EGIT_BRANCH="maint"
122 +elif [[ ${PV} == "3.8.9999" ]]; then
123 + EGIT_BRANCH="next"
124 +fi
125
126 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"
127
128 @@ -105,7 +110,11 @@ DEPEND="${RDEPEND}
129 src_prepare() {
130 gnome2_environment_reset #534582
131
132 - epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
133 + if [[ ${PV} == "3.8.9999" ]]; then
134 + true
135 + else
136 + epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
137 + fi
138 # Useless UI element would require qt3support, bug #365019
139 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
140 default
Report Message
Find on MARC Find on Google Groups