Gentoo Archives: gentoo-commits

From: "Richard Farina (zerochaos)" <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/multimode: multimode-1.00-r2.ebuild multimode-9999.ebuild multimode-1.4_p20140831-r1.ebuild ChangeLog multimode-1.4_p20140831.ebuild multimode-1.00-r1.ebuild
Date: Thu, 25 Sep 2014 02:26:32
Message-Id: 20140925022628.507B862E3@oystercatcher.gentoo.org
1 zerochaos 14/09/25 02:26:28
2
3 Modified: multimode-9999.ebuild ChangeLog
4 Added: multimode-1.00-r2.ebuild
5 multimode-1.4_p20140831-r1.ebuild
6 Removed: multimode-1.4_p20140831.ebuild
7 multimode-1.00-r1.ebuild
8 Log:
9 we need some PYTHONPATH manipulation or this builds against the installed multimode_helper (or not at all) instead of the one we are installing
10
11 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
12
13 Revision Changes Path
14 1.12 net-wireless/multimode/multimode-9999.ebuild
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild?rev=1.12&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild?rev=1.12&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild?r1=1.11&r2=1.12
19
20 Index: multimode-9999.ebuild
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild,v
23 retrieving revision 1.11
24 retrieving revision 1.12
25 diff -u -r1.11 -r1.12
26 --- multimode-9999.ebuild 24 Sep 2014 05:55:50 -0000 1.11
27 +++ multimode-9999.ebuild 25 Sep 2014 02:26:28 -0000 1.12
28 @@ -1,6 +1,6 @@
29 # Copyright 1999-2014 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild,v 1.11 2014/09/24 05:55:50 zerochaos Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild,v 1.12 2014/09/25 02:26:28 zerochaos Exp $
33
34 EAPI=5
35 PYTHON_COMPAT="python2_7"
36 @@ -27,6 +27,10 @@
37 =net-wireless/gr-osmosdr-9999:="
38 RDEPEND="${DEPEND}"
39
40 +src_compile() {
41 + PYTHONPATH="${S}":"${PYTHONPATH}" emake
42 +}
43 +
44 src_install() {
45 newbin ${PN}.py ${PN}
46 insinto $(python_get_sitedir)
47
48
49
50 1.13 net-wireless/multimode/ChangeLog
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/ChangeLog?rev=1.13&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/ChangeLog?rev=1.13&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/ChangeLog?r1=1.12&r2=1.13
55
56 Index: ChangeLog
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/net-wireless/multimode/ChangeLog,v
59 retrieving revision 1.12
60 retrieving revision 1.13
61 diff -u -r1.12 -r1.13
62 --- ChangeLog 24 Sep 2014 05:55:50 -0000 1.12
63 +++ ChangeLog 25 Sep 2014 02:26:28 -0000 1.13
64 @@ -1,6 +1,15 @@
65 # ChangeLog for net-wireless/multimode
66 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
67 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/ChangeLog,v 1.12 2014/09/24 05:55:50 zerochaos Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/ChangeLog,v 1.13 2014/09/25 02:26:28 zerochaos Exp $
69 +
70 +*multimode-1.4_p20140831-r1 (25 Sep 2014)
71 +*multimode-1.00-r2 (25 Sep 2014)
72 +
73 + 25 Sep 2014; Rick Farina <zerochaos@g.o> +multimode-1.00-r2.ebuild,
74 + +multimode-1.4_p20140831-r1.ebuild, -multimode-1.00-r1.ebuild,
75 + -multimode-1.4_p20140831.ebuild, multimode-9999.ebuild:
76 + we need some PYTHONPATH manipulation or this builds against the installed
77 + multimode_helper (or not at all) instead of the one we are installing
78
79 24 Sep 2014; Rick Farina <zerochaos@g.o> multimode-1.00-r1.ebuild,
80 multimode-1.4_p20140831.ebuild, multimode-9999.ebuild:
81
82
83
84 1.1 net-wireless/multimode/multimode-1.00-r2.ebuild
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-1.00-r2.ebuild?rev=1.1&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-1.00-r2.ebuild?rev=1.1&content-type=text/plain
88
89 Index: multimode-1.00-r2.ebuild
90 ===================================================================
91 # Copyright 1999-2014 Gentoo Foundation
92 # Distributed under the terms of the GNU General Public License v2
93 # $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-1.00-r2.ebuild,v 1.1 2014/09/25 02:26:28 zerochaos Exp $
94
95 EAPI=5
96 PYTHON_COMPAT="python2_7"
97
98 inherit python-single-r1
99
100 DESCRIPTION="multimode radio decoder for rtl-sdr devices using gnuradio"
101 HOMEPAGE="https://www.cgran.org/browser/projects/multimode/trunk"
102 LICENSE="BSD"
103 SLOT="0"
104 IUSE=""
105
106 if [[ ${PV} == "9999" ]] ; then
107 ESVN_REPO_URI="https://www.cgran.org/svn/projects/multimode/trunk"
108 inherit subversion
109 KEYWORDS=""
110 else
111 SRC_URI="http://www.sbrac.org/files/${PN}-r${PV}.tar.gz"
112 KEYWORDS="~amd64 ~arm ~x86"
113 S="${WORKDIR}"
114 fi
115
116 DEPEND=""
117 RDEPEND="${DEPEND}
118 >=net-wireless/gr-osmosdr-0.0.1
119 <net-wireless/gnuradio-3.7:=[grc,utils,${PYTHON_USEDEP}]
120 >=net-wireless/rtl-sdr-0.5.0"
121
122 src_compile() {
123 PYTHONPATH="${S}":"${PYTHONPATH}" emake
124 }
125
126 src_install() {
127 newbin ${PN}.py ${PN}
128 insinto $(python_get_sitedir)
129 doins ${PN}_helper.py
130 insinto /usr/share/${PN}
131 doins ${PN}.grc
132 python_fix_shebang "${ED}"/usr/bin
133 }
134
135
136
137 1.1 net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
138
139 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild?rev=1.1&view=markup
140 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild?rev=1.1&content-type=text/plain
141
142 Index: multimode-1.4_p20140831-r1.ebuild
143 ===================================================================
144 # Copyright 1999-2014 Gentoo Foundation
145 # Distributed under the terms of the GNU General Public License v2
146 # $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild,v 1.1 2014/09/25 02:26:28 zerochaos Exp $
147
148 EAPI=5
149 PYTHON_COMPAT="python2_7"
150
151 inherit python-single-r1
152
153 DESCRIPTION="multimode radio decoder for rtl-sdr devices using gnuradio"
154 HOMEPAGE="https://www.cgran.org/browser/projects/multimode/trunk"
155 LICENSE="BSD"
156 SLOT="0"
157 IUSE=""
158
159 if [[ ${PV} == "9999" ]] ; then
160 ESVN_REPO_URI="https://www.cgran.org/svn/projects/multimode/trunk"
161 inherit subversion
162 KEYWORDS=""
163 else
164 #SRC_URI="http://www.sbrac.org/files/${PN}-r${PV}.tar.gz"
165 SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
166 KEYWORDS="~amd64 ~arm ~x86"
167 fi
168
169 DEPEND=">=net-wireless/gnuradio-3.7:=[grc,utils,${PYTHON_USEDEP}]
170 >=net-wireless/gr-osmosdr-0.1.0:="
171 RDEPEND="${DEPEND}"
172
173 src_compile() {
174 PYTHONPATH="${S}":"${PYTHONPATH}" emake
175 }
176
177 src_install() {
178 newbin ${PN}.py ${PN}
179 insinto $(python_get_sitedir)
180 doins ${PN}_helper.py
181 insinto /usr/share/${PN}
182 doins ${PN}.grc
183 python_fix_shebang "${ED}"/usr/bin
184 }