Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/chrome-binary-plugins: chrome-binary-plugins-9999.ebuild chrome-binary-plugins-38.0.2125.24_beta1.ebuild chrome-binary-plugins-39.0.2138.3_alpha1.ebuild chrome-binary-plugins-37.0.2062.94_p1.ebuild metadata.xml ChangeLog
Date: Sun, 31 Aug 2014 23:11:46
Message-Id: 20140831231141.4A6AD4607@oystercatcher.gentoo.org
1 floppym 14/08/31 23:11:41
2
3 Modified: chrome-binary-plugins-9999.ebuild
4 chrome-binary-plugins-38.0.2125.24_beta1.ebuild
5 chrome-binary-plugins-39.0.2138.3_alpha1.ebuild
6 chrome-binary-plugins-37.0.2062.94_p1.ebuild
7 metadata.xml ChangeLog
8 Log:
9 EAPI=5. Consolidate code for the live ebuild.
10
11 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
12
13 Revision Changes Path
14 1.14 www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild?rev=1.14&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild?rev=1.14&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild?r1=1.13&r2=1.14
19
20 Index: chrome-binary-plugins-9999.ebuild
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild,v
23 retrieving revision 1.13
24 retrieving revision 1.14
25 diff -u -r1.13 -r1.14
26 --- chrome-binary-plugins-9999.ebuild 8 Aug 2014 02:26:33 -0000 1.13
27 +++ chrome-binary-plugins-9999.ebuild 31 Aug 2014 23:11:41 -0000 1.14
28 @@ -1,21 +1,52 @@
29 # Copyright 1999-2014 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild,v 1.13 2014/08/08 02:26:33 floppym Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild,v 1.14 2014/08/31 23:11:41 floppym Exp $
33
34 -EAPI=4
35 +EAPI=5
36
37 inherit multilib unpacker
38
39 DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
40 HOMEPAGE="http://www.google.com/chrome"
41 -SLOT="unstable"
42 -URI_BASE="https://dl.google.com/linux/direct/"
43 -URI_BASE_NAME="google-chrome-${SLOT}_current_"
44 -SRC_URI="" # URI is left blank on live ebuild
45 +
46 +case ${PV} in
47 + *_alpha*|9999*)
48 + SLOT="unstable"
49 + CHROMEDIR="opt/google/chrome-${SLOT}"
50 + MY_PV=${PV/_alpha/-}
51 + ;;
52 + *_beta*)
53 + SLOT="beta"
54 + CHROMEDIR="opt/google/chrome-${SLOT}"
55 + MY_PV=${PV/_beta/-}
56 + ;;
57 + *_p*)
58 + SLOT="stable"
59 + CHROMEDIR="opt/google/chrome"
60 + MY_PV=${PV/_p/-}
61 + ;;
62 + *)
63 + die "Invalid value for \${PV}: ${PV}"
64 + ;;
65 +esac
66 +
67 +MY_PN="google-chrome-${SLOT}"
68 +MY_P="${MY_PN}_${MY_PV}"
69 +
70 +if [[ ${PV} != 9999* ]]; then
71 +SRC_URI="
72 + amd64? (
73 + https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
74 + )
75 + x86? (
76 + https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
77 + )
78 +"
79 +KEYWORDS="~amd64 ~x86"
80 +fi
81
82 LICENSE="google-chrome"
83 -KEYWORDS="" # KEYWORDS is also left blank on live ebuild
84 -IUSE="+flash +pdf"
85 +IUSE="+flash"
86 RESTRICT="bindist mirror strip"
87
88 for x in 0 beta stable unstable; do
89 @@ -24,30 +55,27 @@
90 fi
91 done
92
93 -S="${WORKDIR}/opt/google/chrome-${SLOT}"
94 +S="${WORKDIR}/${CHROMEDIR}"
95 QA_PREBUILT="*"
96
97 -src_unpack() {
98 - # We have to do this inside of here, since it's a live ebuild. :-(
99 +pkg_nofetch() {
100 + eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
101 +}
102
103 - if use x86; then
104 - G_ARCH="i386";
105 - elif use amd64; then
106 - G_ARCH="amd64";
107 - else
108 - die "This only supports x86 and amd64."
109 - fi
110 - wget "${URI_BASE}${URI_BASE_NAME}${G_ARCH}.deb"
111 - unpack_deb "./${URI_BASE_NAME}${G_ARCH}.deb"
112 +if [[ ${PV} == 9999* ]]; then
113 +src_unpack() {
114 + local base="https://dl.google.com/linux/direct"
115 + local debarch=${ARCH/x86/i386}
116 + wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
117 + unpack_deb ./google-chrome.deb
118 }
119 +fi
120
121 src_install() {
122 local version flapper
123
124 insinto /usr/$(get_libdir)/chromium-browser/
125
126 - use pdf && doins libpdf.so
127 -
128 if use flash; then
129 doins -r PepperFlash
130
131
132
133
134 1.2 www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild
135
136 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild?rev=1.2&view=markup
137 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild?rev=1.2&content-type=text/plain
138 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild?r1=1.1&r2=1.2
139
140 Index: chrome-binary-plugins-38.0.2125.24_beta1.ebuild
141 ===================================================================
142 RCS file: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild,v
143 retrieving revision 1.1
144 retrieving revision 1.2
145 diff -u -r1.1 -r1.2
146 --- chrome-binary-plugins-38.0.2125.24_beta1.ebuild 31 Aug 2014 02:13:05 -0000 1.1
147 +++ chrome-binary-plugins-38.0.2125.24_beta1.ebuild 31 Aug 2014 23:11:41 -0000 1.2
148 @@ -1,8 +1,8 @@
149 # Copyright 1999-2014 Gentoo Foundation
150 # Distributed under the terms of the GNU General Public License v2
151 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild,v 1.1 2014/08/31 02:13:05 floppym Exp $
152 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-38.0.2125.24_beta1.ebuild,v 1.2 2014/08/31 23:11:41 floppym Exp $
153
154 -EAPI=4
155 +EAPI=5
156
157 inherit multilib unpacker
158
159 @@ -10,7 +10,7 @@
160 HOMEPAGE="http://www.google.com/chrome"
161
162 case ${PV} in
163 - *_alpha*)
164 + *_alpha*|9999*)
165 SLOT="unstable"
166 CHROMEDIR="opt/google/chrome-${SLOT}"
167 MY_PV=${PV/_alpha/-}
168 @@ -33,17 +33,19 @@
169 MY_PN="google-chrome-${SLOT}"
170 MY_P="${MY_PN}_${MY_PV}"
171
172 +if [[ ${PV} != 9999* ]]; then
173 SRC_URI="
174 amd64? (
175 - http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
176 + https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
177 )
178 x86? (
179 - http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
180 + https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
181 )
182 "
183 +KEYWORDS="~amd64 ~x86"
184 +fi
185
186 LICENSE="google-chrome"
187 -KEYWORDS="~amd64 ~x86"
188 IUSE="+flash"
189 RESTRICT="bindist mirror strip"
190
191 @@ -60,6 +62,15 @@
192 eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
193 }
194
195 +if [[ ${PV} == 9999* ]]; then
196 +src_unpack() {
197 + local base="https://dl.google.com/linux/direct"
198 + local debarch=${ARCH/x86/i386}
199 + wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
200 + unpack_deb ./google-chrome.deb
201 +}
202 +fi
203 +
204 src_install() {
205 local version flapper
206
207
208
209
210 1.2 www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild
211
212 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild?rev=1.2&view=markup
213 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild?rev=1.2&content-type=text/plain
214 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild?r1=1.1&r2=1.2
215
216 Index: chrome-binary-plugins-39.0.2138.3_alpha1.ebuild
217 ===================================================================
218 RCS file: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild,v
219 retrieving revision 1.1
220 retrieving revision 1.2
221 diff -u -r1.1 -r1.2
222 --- chrome-binary-plugins-39.0.2138.3_alpha1.ebuild 31 Aug 2014 02:13:05 -0000 1.1
223 +++ chrome-binary-plugins-39.0.2138.3_alpha1.ebuild 31 Aug 2014 23:11:41 -0000 1.2
224 @@ -1,8 +1,8 @@
225 # Copyright 1999-2014 Gentoo Foundation
226 # Distributed under the terms of the GNU General Public License v2
227 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild,v 1.1 2014/08/31 02:13:05 floppym Exp $
228 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-39.0.2138.3_alpha1.ebuild,v 1.2 2014/08/31 23:11:41 floppym Exp $
229
230 -EAPI=4
231 +EAPI=5
232
233 inherit multilib unpacker
234
235 @@ -10,7 +10,7 @@
236 HOMEPAGE="http://www.google.com/chrome"
237
238 case ${PV} in
239 - *_alpha*)
240 + *_alpha*|9999*)
241 SLOT="unstable"
242 CHROMEDIR="opt/google/chrome-${SLOT}"
243 MY_PV=${PV/_alpha/-}
244 @@ -33,17 +33,19 @@
245 MY_PN="google-chrome-${SLOT}"
246 MY_P="${MY_PN}_${MY_PV}"
247
248 +if [[ ${PV} != 9999* ]]; then
249 SRC_URI="
250 amd64? (
251 - http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
252 + https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
253 )
254 x86? (
255 - http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
256 + https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
257 )
258 "
259 +KEYWORDS="~amd64 ~x86"
260 +fi
261
262 LICENSE="google-chrome"
263 -KEYWORDS="~amd64 ~x86"
264 IUSE="+flash"
265 RESTRICT="bindist mirror strip"
266
267 @@ -60,6 +62,15 @@
268 eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
269 }
270
271 +if [[ ${PV} == 9999* ]]; then
272 +src_unpack() {
273 + local base="https://dl.google.com/linux/direct"
274 + local debarch=${ARCH/x86/i386}
275 + wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
276 + unpack_deb ./google-chrome.deb
277 +}
278 +fi
279 +
280 src_install() {
281 local version flapper
282
283
284
285
286 1.4 www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild
287
288 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild?rev=1.4&view=markup
289 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild?rev=1.4&content-type=text/plain
290 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild?r1=1.3&r2=1.4
291
292 Index: chrome-binary-plugins-37.0.2062.94_p1.ebuild
293 ===================================================================
294 RCS file: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild,v
295 retrieving revision 1.3
296 retrieving revision 1.4
297 diff -u -r1.3 -r1.4
298 --- chrome-binary-plugins-37.0.2062.94_p1.ebuild 28 Aug 2014 00:21:05 -0000 1.3
299 +++ chrome-binary-plugins-37.0.2062.94_p1.ebuild 31 Aug 2014 23:11:41 -0000 1.4
300 @@ -1,8 +1,8 @@
301 # Copyright 1999-2014 Gentoo Foundation
302 # Distributed under the terms of the GNU General Public License v2
303 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild,v 1.3 2014/08/28 00:21:05 floppym Exp $
304 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.94_p1.ebuild,v 1.4 2014/08/31 23:11:41 floppym Exp $
305
306 -EAPI=4
307 +EAPI=5
308
309 inherit multilib unpacker
310
311 @@ -10,7 +10,7 @@
312 HOMEPAGE="http://www.google.com/chrome"
313
314 case ${PV} in
315 - *_alpha*)
316 + *_alpha*|9999*)
317 SLOT="unstable"
318 CHROMEDIR="opt/google/chrome-${SLOT}"
319 MY_PV=${PV/_alpha/-}
320 @@ -33,17 +33,19 @@
321 MY_PN="google-chrome-${SLOT}"
322 MY_P="${MY_PN}_${MY_PV}"
323
324 +if [[ ${PV} != 9999* ]]; then
325 SRC_URI="
326 amd64? (
327 - http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
328 + https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
329 )
330 x86? (
331 - http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
332 + https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
333 )
334 "
335 +KEYWORDS="~amd64 ~x86"
336 +fi
337
338 LICENSE="google-chrome"
339 -KEYWORDS="~amd64 ~x86"
340 IUSE="+flash"
341 RESTRICT="bindist mirror strip"
342
343 @@ -60,6 +62,15 @@
344 eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
345 }
346
347 +if [[ ${PV} == 9999* ]]; then
348 +src_unpack() {
349 + local base="https://dl.google.com/linux/direct"
350 + local debarch=${ARCH/x86/i386}
351 + wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
352 + unpack_deb ./google-chrome.deb
353 +}
354 +fi
355 +
356 src_install() {
357 local version flapper
358
359
360
361
362 1.2 www-plugins/chrome-binary-plugins/metadata.xml
363
364 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/metadata.xml?rev=1.2&view=markup
365 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/metadata.xml?rev=1.2&content-type=text/plain
366 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/metadata.xml?r1=1.1&r2=1.2
367
368 Index: metadata.xml
369 ===================================================================
370 RCS file: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/metadata.xml,v
371 retrieving revision 1.1
372 retrieving revision 1.2
373 diff -u -r1.1 -r1.2
374 --- metadata.xml 19 Oct 2012 20:10:37 -0000 1.1
375 +++ metadata.xml 31 Aug 2014 23:11:41 -0000 1.2
376 @@ -7,7 +7,6 @@
377 <name>Jason A. Donenfeld</name>
378 </maintainer>
379 <use>
380 - <flag name="pdf">Install Chrome's native PDF reader plugin.</flag>
381 - <flag name="flash">Install Chrome's native Pepper Flash.</flag>
382 + <flag name="flash">Install Chrome's native Pepper Flash</flag>
383 </use>
384 </pkgmetadata>
385
386
387
388 1.175 www-plugins/chrome-binary-plugins/ChangeLog
389
390 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog?rev=1.175&view=markup
391 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog?rev=1.175&content-type=text/plain
392 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog?r1=1.174&r2=1.175
393
394 Index: ChangeLog
395 ===================================================================
396 RCS file: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v
397 retrieving revision 1.174
398 retrieving revision 1.175
399 diff -u -r1.174 -r1.175
400 --- ChangeLog 31 Aug 2014 02:13:05 -0000 1.174
401 +++ ChangeLog 31 Aug 2014 23:11:41 -0000 1.175
402 @@ -1,6 +1,13 @@
403 # ChangeLog for www-plugins/chrome-binary-plugins
404 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
405 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v 1.174 2014/08/31 02:13:05 floppym Exp $
406 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/ChangeLog,v 1.175 2014/08/31 23:11:41 floppym Exp $
407 +
408 + 31 Aug 2014; Mike Gilbert <floppym@g.o>
409 + chrome-binary-plugins-37.0.2062.94_p1.ebuild,
410 + chrome-binary-plugins-38.0.2125.24_beta1.ebuild,
411 + chrome-binary-plugins-39.0.2138.3_alpha1.ebuild,
412 + chrome-binary-plugins-9999.ebuild, metadata.xml:
413 + EAPI=5. Consolidate code for the live ebuild.
414
415 *chrome-binary-plugins-39.0.2138.3_alpha1 (31 Aug 2014)
416 *chrome-binary-plugins-38.0.2125.24_beta1 (31 Aug 2014)