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

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-client/google-chrome: google-chrome-18.0.1025.151_beta130497.ebuild google-chrome-18.0.1025.151_p130497.ebuild ChangeLog google-chrome-18.0.1025.142_beta129054.ebuild google-chrome-18.0.1025.142_p129054.ebuild
Date: Thu, 05 Apr 2012 20:09:04
Message-Id: 20120405200852.1B8FB2004B@flycatcher.gentoo.org
1 floppym 12/04/05 20:08:52
2
3 Modified: ChangeLog
4 Added: google-chrome-18.0.1025.151_beta130497.ebuild
5 google-chrome-18.0.1025.151_p130497.ebuild
6 Removed: google-chrome-18.0.1025.142_beta129054.ebuild
7 google-chrome-18.0.1025.142_p129054.ebuild
8 Log:
9 Stable and beta bump.
10
11 (Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
12
13 Revision Changes Path
14 1.112 www-client/google-chrome/ChangeLog
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/ChangeLog?rev=1.112&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/ChangeLog?rev=1.112&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/ChangeLog?r1=1.111&r2=1.112
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v
23 retrieving revision 1.111
24 retrieving revision 1.112
25 diff -u -r1.111 -r1.112
26 --- ChangeLog 3 Apr 2012 23:46:31 -0000 1.111
27 +++ ChangeLog 5 Apr 2012 20:08:52 -0000 1.112
28 @@ -1,6 +1,16 @@
29 # ChangeLog for www-client/google-chrome
30 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.111 2012/04/03 23:46:31 floppym Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.112 2012/04/05 20:08:52 floppym Exp $
33 +
34 +*google-chrome-18.0.1025.151_beta130497 (05 Apr 2012)
35 +*google-chrome-18.0.1025.151_p130497 (05 Apr 2012)
36 +
37 + 05 Apr 2012; Mike Gilbert <floppym@g.o>
38 + +google-chrome-18.0.1025.151_beta130497.ebuild,
39 + +google-chrome-18.0.1025.151_p130497.ebuild,
40 + -google-chrome-18.0.1025.142_beta129054.ebuild,
41 + -google-chrome-18.0.1025.142_p129054.ebuild:
42 + Stable and beta bump.
43
44 *google-chrome-19.0.1084.9_alpha130290 (03 Apr 2012)
45
46
47
48
49 1.1 www-client/google-chrome/google-chrome-18.0.1025.151_beta130497.ebuild
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.151_beta130497.ebuild?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.151_beta130497.ebuild?rev=1.1&content-type=text/plain
53
54 Index: google-chrome-18.0.1025.151_beta130497.ebuild
55 ===================================================================
56 # Copyright 1999-2012 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.151_beta130497.ebuild,v 1.1 2012/04/05 20:08:52 floppym Exp $
59
60 EAPI="4"
61
62 CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
63 hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
64 sv sw ta te th tr uk vi zh_CN zh_TW"
65
66 inherit chromium eutils multilib pax-utils unpacker
67
68 DESCRIPTION="The web browser from Google"
69 HOMEPAGE="http://www.google.com/chrome"
70
71 case ${PV} in
72 *_alpha*)
73 SLOT="unstable"
74 MY_PV=${PV/_alpha/-r}
75 ;;
76 *_beta*)
77 SLOT="beta"
78 MY_PV=${PV/_beta/-r}
79 ;;
80 *_p*)
81 SLOT="stable"
82 MY_PV=${PV/_p/-r}
83 ;;
84 *)
85 die "Invalid value for \${PV}: ${PV}"
86 ;;
87 esac
88
89 MY_PN="${PN}-${SLOT}"
90 MY_P="${MY_PN}_${MY_PV}"
91
92 SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
93 SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
94
95 LICENSE="google-chrome"
96 KEYWORDS="-* ~amd64 ~x86"
97 IUSE="+plugins"
98 RESTRICT="mirror strip"
99
100 RDEPEND="
101 media-libs/alsa-lib
102 app-arch/bzip2
103 x11-libs/cairo
104 net-print/cups
105 sys-apps/dbus
106 dev-libs/expat
107 media-libs/fontconfig
108 media-libs/freetype
109 app-misc/ca-certificates
110 gnome-base/gconf:2
111 dev-libs/libgcrypt
112 x11-libs/gdk-pixbuf
113 x11-libs/gtk+:2
114 dev-libs/glib:2
115 dev-libs/nspr
116 dev-libs/nss
117 x11-libs/pango
118 media-libs/libpng:1.2
119 || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
120 sys-fs/udev
121 x11-libs/libX11
122 x11-libs/libXext
123 x11-libs/libXfixes
124 x11-libs/libXrender
125 x11-libs/libXScrnSaver
126 sys-libs/zlib
127 x11-misc/xdg-utils
128 net-misc/curl
129 dev-libs/openssl:0.9.8
130 "
131
132 # Add blockers for the other slots.
133 for x in 0 beta stable unstable; do
134 if [[ ${SLOT} != ${x} ]]; then
135 RDEPEND+=" !${CATEGORY}/${PN}:${x}"
136 fi
137 done
138
139 QA_PREBUILT="*"
140 S=${WORKDIR}
141
142 src_install() {
143 CHROME_HOME="opt/google/chrome/"
144
145 pax-mark m ${CHROME_HOME}chrome || die
146 rm -rf usr/share/menu || die
147 mv usr/share/doc/${PN} usr/share/doc/${PF} || die
148
149 pushd "${CHROME_HOME}locales" > /dev/null || die
150 chromium_remove_language_paks
151 popd
152
153 mv opt usr "${D}" || die
154
155 fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
156
157 if use plugins ; then
158 local args='"$@"'
159 local plugins="/usr/$(get_libdir)/nsbrowser/plugins"
160 sed -e "s:${args}:--extra-plugin-dir=\"${plugins}\" \\0:" \
161 -i "${D}${CHROME_HOME}google-chrome" || die
162 fi
163
164 domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
165 local size
166 for size in 16 22 24 32 48 64 128 256 ; do
167 insinto /usr/share/icons/hicolor/${size}x${size}/apps
168 newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
169 done
170 }
171
172
173
174 1.1 www-client/google-chrome/google-chrome-18.0.1025.151_p130497.ebuild
175
176 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.151_p130497.ebuild?rev=1.1&view=markup
177 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.151_p130497.ebuild?rev=1.1&content-type=text/plain
178
179 Index: google-chrome-18.0.1025.151_p130497.ebuild
180 ===================================================================
181 # Copyright 1999-2012 Gentoo Foundation
182 # Distributed under the terms of the GNU General Public License v2
183 # $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1025.151_p130497.ebuild,v 1.1 2012/04/05 20:08:52 floppym Exp $
184
185 EAPI="4"
186
187 CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
188 hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
189 sv sw ta te th tr uk vi zh_CN zh_TW"
190
191 inherit chromium eutils multilib pax-utils unpacker
192
193 DESCRIPTION="The web browser from Google"
194 HOMEPAGE="http://www.google.com/chrome"
195
196 case ${PV} in
197 *_alpha*)
198 SLOT="unstable"
199 MY_PV=${PV/_alpha/-r}
200 ;;
201 *_beta*)
202 SLOT="beta"
203 MY_PV=${PV/_beta/-r}
204 ;;
205 *_p*)
206 SLOT="stable"
207 MY_PV=${PV/_p/-r}
208 ;;
209 *)
210 die "Invalid value for \${PV}: ${PV}"
211 ;;
212 esac
213
214 MY_PN="${PN}-${SLOT}"
215 MY_P="${MY_PN}_${MY_PV}"
216
217 SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
218 SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
219
220 LICENSE="google-chrome"
221 KEYWORDS="-* ~amd64 ~x86"
222 IUSE="+plugins"
223 RESTRICT="mirror strip"
224
225 RDEPEND="
226 media-libs/alsa-lib
227 app-arch/bzip2
228 x11-libs/cairo
229 net-print/cups
230 sys-apps/dbus
231 dev-libs/expat
232 media-libs/fontconfig
233 media-libs/freetype
234 app-misc/ca-certificates
235 gnome-base/gconf:2
236 dev-libs/libgcrypt
237 x11-libs/gdk-pixbuf
238 x11-libs/gtk+:2
239 dev-libs/glib:2
240 dev-libs/nspr
241 dev-libs/nss
242 x11-libs/pango
243 media-libs/libpng:1.2
244 || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
245 sys-fs/udev
246 x11-libs/libX11
247 x11-libs/libXext
248 x11-libs/libXfixes
249 x11-libs/libXrender
250 x11-libs/libXScrnSaver
251 sys-libs/zlib
252 x11-misc/xdg-utils
253 net-misc/curl
254 dev-libs/openssl:0.9.8
255 "
256
257 # Add blockers for the other slots.
258 for x in 0 beta stable unstable; do
259 if [[ ${SLOT} != ${x} ]]; then
260 RDEPEND+=" !${CATEGORY}/${PN}:${x}"
261 fi
262 done
263
264 QA_PREBUILT="*"
265 S=${WORKDIR}
266
267 src_install() {
268 CHROME_HOME="opt/google/chrome/"
269
270 pax-mark m ${CHROME_HOME}chrome || die
271 rm -rf usr/share/menu || die
272 mv usr/share/doc/${PN} usr/share/doc/${PF} || die
273
274 pushd "${CHROME_HOME}locales" > /dev/null || die
275 chromium_remove_language_paks
276 popd
277
278 mv opt usr "${D}" || die
279
280 fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
281
282 if use plugins ; then
283 local args='"$@"'
284 local plugins="/usr/$(get_libdir)/nsbrowser/plugins"
285 sed -e "s:${args}:--extra-plugin-dir=\"${plugins}\" \\0:" \
286 -i "${D}${CHROME_HOME}google-chrome" || die
287 fi
288
289 domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
290 local size
291 for size in 16 22 24 32 48 64 128 256 ; do
292 insinto /usr/share/icons/hicolor/${size}x${size}/apps
293 newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
294 done
295 }
Report Message
Find on MARC Find on Google Groups