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

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/opera: ChangeLog opera-10.60_pre6347.ebuild opera-10.60_pre6346.ebuild
Date: Thu, 03 Jun 2010 15:37:14
Message-Id: 20100603153709.A2E392CF44@corvid.gentoo.org
1 jer 10/06/03 15:37:09
2
3 Modified: ChangeLog
4 Added: opera-10.60_pre6347.ebuild
5 opera-10.60_pre6346.ebuild
6 Log:
7 Version bumps <http://my.opera.com/desktopteam/blog/2010/06/03/further-core-updates-and-fixes> <http://my.opera.com/desktopteam/blog/2010/06/03/unix-like-bugfixes>.
8 (Portage version: 2.2_rc67/cvs/Linux i686)
9
10 Revision Changes Path
11 1.484 www-client/opera/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera/ChangeLog?rev=1.484&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera/ChangeLog?rev=1.484&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera/ChangeLog?r1=1.483&r2=1.484
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v
20 retrieving revision 1.483
21 retrieving revision 1.484
22 diff -u -r1.483 -r1.484
23 --- ChangeLog 31 May 2010 14:32:43 -0000 1.483
24 +++ ChangeLog 3 Jun 2010 15:37:09 -0000 1.484
25 @@ -1,6 +1,16 @@
26 # ChangeLog for www-client/opera
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.483 2010/05/31 14:32:43 jer Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.484 2010/06/03 15:37:09 jer Exp $
30 +
31 +*opera-10.60_pre6347 (03 Jun 2010)
32 +*opera-10.60_pre6346 (03 Jun 2010)
33 +
34 + 03 Jun 2010; Jeroen Roovers <jer@g.o> +opera-10.60_pre6346.ebuild,
35 + +opera-10.60_pre6347.ebuild:
36 + Version bumps
37 + <http://my.opera.com/desktopteam/blog/2010/06/03/further-core-updates-and-
38 + fixes>
39 + <http://my.opera.com/desktopteam/blog/2010/06/03/unix-like-bugfixes>.
40
41 *opera-10.60_pre6344 (31 May 2010)
42
43
44
45
46 1.1 www-client/opera/opera-10.60_pre6347.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera/opera-10.60_pre6347.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera/opera-10.60_pre6347.ebuild?rev=1.1&content-type=text/plain
50
51 Index: opera-10.60_pre6347.ebuild
52 ===================================================================
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.60_pre6347.ebuild,v 1.1 2010/06/03 15:37:09 jer Exp $
56
57 EAPI="2"
58
59 inherit eutils multilib
60
61 DESCRIPTION="A standards-compliant graphical Web browser"
62 HOMEPAGE="http://www.opera.com/"
63
64 SLOT="0"
65 LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
66 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
67 IUSE="elibc_FreeBSD gtk kde"
68
69 RESTRICT="mirror test"
70
71 OPREFIX="/usr/$(get_libdir)"
72
73 QA_DT_HASH="${OPREFIX}/${PN}/.*"
74 QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
75
76 MY_LINGUAS="
77 be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka
78 ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK
79 zh-TW
80 "
81
82 for MY_LINGUA in ${MY_LINGUAS}; do
83 IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
84 done
85
86 O_U="http://snapshot.opera.com/unix/25089_${PV/_pre/-}/"
87 O_P="${P/_pre/-}"
88
89 SRC_URI="
90 amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
91 ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 )
92 x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
93 x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 )
94 "
95
96 DEPEND=">=sys-apps/sed-4"
97
98 RDEPEND="
99 gtk? (
100 =x11-libs/gtk+-2*
101 dev-libs/atk
102 dev-libs/glib
103 media-libs/glitz
104 media-libs/libpng
105 x11-libs/cairo
106 x11-libs/pango
107 x11-libs/pixman
108 )
109 kde? (
110 kde-base/kdelibs
111 )
112 dev-libs/expat
113 media-libs/fontconfig
114 media-libs/freetype
115 media-plugins/gst-plugins-meta
116 sys-apps/util-linux
117 sys-libs/zlib
118 virtual/opengl
119 x11-libs/libICE
120 x11-libs/libSM
121 x11-libs/libX11
122 x11-libs/libXau
123 x11-libs/libXcomposite
124 x11-libs/libXcursor
125 x11-libs/libXdamage
126 x11-libs/libXdmcp
127 x11-libs/libXext
128 x11-libs/libXfixes
129 x11-libs/libXi
130 x11-libs/libXmu
131 x11-libs/libXrandr
132 x11-libs/libXrender
133 x11-libs/libXt
134 x11-libs/libxcb
135 x11-libs/xcb-util
136 "
137
138 opera_linguas() {
139 # Remove unwanted LINGUAS:
140 local LINGUA
141 local LNGDIR="${D}usr/share/${PN}/locale"
142 einfo "Keeping these locales: ${LINGUAS}."
143 for LINGUA in ${MY_LINGUAS}; do
144 if ! use linguas_${LINGUA/-/_}; then
145 LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
146 rm -r "${LINGUA}"
147 fi
148 done
149 }
150
151 pkg_setup() {
152 echo -e \
153 " ${GOOD}****************************************************${NORMAL}"
154 elog "If you seek support, please file a bug report at"
155 elog "https://bugs.gentoo.org and post the output of"
156 elog " \`emerge --info =${CATEGORY}/${P}'"
157 echo -e \
158 " ${GOOD}****************************************************${NORMAL}"
159 }
160
161 src_unpack() {
162 unpack ${A}
163 if [[ ! -d ${S} ]]; then
164 cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
165 S="$(pwd)"
166 einfo "Setting WORKDIR to ${S}"
167 fi
168 }
169
170 src_install() {
171 # Remove "license directory" (bug #315473)
172 rm -rf "share/doc/opera"
173
174 # We install into usr instead of opt as Opera does not support the latter
175 dodir /usr
176 mv lib/ "${D}/${OPREFIX}" || die "mv lib/ failed"
177 mv share/ "${D}/usr/" || die "mv share/ failed"
178
179 # Unzip the man pages before sedding
180 gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed"
181
182 # Replace PREFIX and SUFFIX in various files
183 sed -i \
184 -e "s:@@{PREFIX}:/usr:g" \
185 -e "s:@@{SUFFIX}::g" \
186 -e "s:@@{_SUFFIX}::g" \
187 -e "s:@@{USUFFIX}::g" \
188 "${D}"/usr/share/mime/packages/opera-widget.xml \
189 "${D}"/usr/share/man/man1/* \
190 "${D}"/usr/share/applications/opera-browser.desktop \
191 "${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
192
193 # Sed libdir in opera script
194 sed "${FILESDIR}"/opera \
195 -e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
196 || die "sed opera script failed"
197
198 # Sed libdir in defaults/pluginpath.ini
199 sed -i \
200 -e "s|/usr/lib32|${OPREFIX}|g" \
201 "${D}"/usr/share/opera/defaults/pluginpath.ini \
202 || die "sed pluginpath.ini failed"
203
204 # Install startup scripts
205 dobin ${PN} ${PN}-widget-manager || die "dobin failed"
206
207 # Stop revdep-rebuild from checking opera binaries
208 dodir /etc/revdep-rebuild
209 echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera
210
211 # Change libz.so.3 to libz.so.1 for gentoo/freebsd
212 if use elibc_FreeBSD; then
213 scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${PN}/ | \
214 while read i; do
215 if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
216 then
217 export SANITY_CHECK_LIBZ_FAILED=1
218 break
219 fi
220 sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
221 done
222 [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
223 fi
224
225 [[ -z MY_LINGUAS ]] || opera_linguas
226 }
227
228 pkg_postinst() {
229 elog "To change the UI language, choose [Tools] -> [Preferences], open the"
230 elog "[General] tab, click on [Details...] then [Choose...] and point the"
231 elog "file chooser at /usr/share/opera/locale/, then enter the"
232 elog "directory for the language you want and [Open] the .lng file."
233
234 if use elibc_FreeBSD; then
235 elog
236 elog "To improve shared memory usage please set:"
237 elog "$ sysctl kern.ipc.shm_allow_removed=1"
238 fi
239 }
240
241
242
243 1.1 www-client/opera/opera-10.60_pre6346.ebuild
244
245 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera/opera-10.60_pre6346.ebuild?rev=1.1&view=markup
246 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera/opera-10.60_pre6346.ebuild?rev=1.1&content-type=text/plain
247
248 Index: opera-10.60_pre6346.ebuild
249 ===================================================================
250 # Copyright 1999-2010 Gentoo Foundation
251 # Distributed under the terms of the GNU General Public License v2
252 # $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.60_pre6346.ebuild,v 1.1 2010/06/03 15:37:09 jer Exp $
253
254 EAPI="2"
255
256 inherit eutils multilib
257
258 DESCRIPTION="A standards-compliant graphical Web browser"
259 HOMEPAGE="http://www.opera.com/"
260
261 SLOT="0"
262 LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
263 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
264 IUSE="elibc_FreeBSD gtk kde"
265
266 RESTRICT="mirror test"
267
268 OPREFIX="/usr/$(get_libdir)"
269
270 QA_DT_HASH="${OPREFIX}/${PN}/.*"
271 QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
272
273 MY_LINGUAS="
274 be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka
275 ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK
276 zh-TW
277 "
278
279 for MY_LINGUA in ${MY_LINGUAS}; do
280 IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
281 done
282
283 O_U="http://snapshot.opera.com/unix/20039_${PV/_pre/-}/"
284 O_P="${P/_pre/-}"
285
286 SRC_URI="
287 amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
288 ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 )
289 x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
290 x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 )
291 "
292
293 DEPEND=">=sys-apps/sed-4"
294
295 RDEPEND="
296 gtk? (
297 =x11-libs/gtk+-2*
298 dev-libs/atk
299 dev-libs/glib
300 media-libs/glitz
301 media-libs/libpng
302 x11-libs/cairo
303 x11-libs/pango
304 x11-libs/pixman
305 )
306 kde? (
307 kde-base/kdelibs
308 )
309 dev-libs/expat
310 media-libs/fontconfig
311 media-libs/freetype
312 media-plugins/gst-plugins-meta
313 sys-apps/util-linux
314 sys-libs/zlib
315 virtual/opengl
316 x11-libs/libICE
317 x11-libs/libSM
318 x11-libs/libX11
319 x11-libs/libXau
320 x11-libs/libXcomposite
321 x11-libs/libXcursor
322 x11-libs/libXdamage
323 x11-libs/libXdmcp
324 x11-libs/libXext
325 x11-libs/libXfixes
326 x11-libs/libXi
327 x11-libs/libXmu
328 x11-libs/libXrandr
329 x11-libs/libXrender
330 x11-libs/libXt
331 x11-libs/libxcb
332 x11-libs/xcb-util
333 "
334
335 opera_linguas() {
336 # Remove unwanted LINGUAS:
337 local LINGUA
338 local LNGDIR="${D}usr/share/${PN}/locale"
339 einfo "Keeping these locales: ${LINGUAS}."
340 for LINGUA in ${MY_LINGUAS}; do
341 if ! use linguas_${LINGUA/-/_}; then
342 LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
343 rm -r "${LINGUA}"
344 fi
345 done
346 }
347
348 pkg_setup() {
349 echo -e \
350 " ${GOOD}****************************************************${NORMAL}"
351 elog "If you seek support, please file a bug report at"
352 elog "https://bugs.gentoo.org and post the output of"
353 elog " \`emerge --info =${CATEGORY}/${P}'"
354 echo -e \
355 " ${GOOD}****************************************************${NORMAL}"
356 }
357
358 src_unpack() {
359 unpack ${A}
360 if [[ ! -d ${S} ]]; then
361 cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
362 S="$(pwd)"
363 einfo "Setting WORKDIR to ${S}"
364 fi
365 }
366
367 src_install() {
368 # Remove "license directory" (bug #315473)
369 rm -rf "share/doc/opera"
370
371 # We install into usr instead of opt as Opera does not support the latter
372 dodir /usr
373 mv lib/ "${D}/${OPREFIX}" || die "mv lib/ failed"
374 mv share/ "${D}/usr/" || die "mv share/ failed"
375
376 # Unzip the man pages before sedding
377 gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed"
378
379 # Replace PREFIX and SUFFIX in various files
380 sed -i \
381 -e "s:@@{PREFIX}:/usr:g" \
382 -e "s:@@{SUFFIX}::g" \
383 -e "s:@@{_SUFFIX}::g" \
384 -e "s:@@{USUFFIX}::g" \
385 "${D}"/usr/share/mime/packages/opera-widget.xml \
386 "${D}"/usr/share/man/man1/* \
387 "${D}"/usr/share/applications/opera-browser.desktop \
388 "${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
389
390 # Sed libdir in opera script
391 sed "${FILESDIR}"/opera \
392 -e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
393 || die "sed opera script failed"
394
395 # Sed libdir in defaults/pluginpath.ini
396 sed -i \
397 -e "s|/usr/lib32|${OPREFIX}|g" \
398 "${D}"/usr/share/opera/defaults/pluginpath.ini \
399 || die "sed pluginpath.ini failed"
400
401 # Install startup scripts
402 dobin ${PN} ${PN}-widget-manager || die "dobin failed"
403
404 # Stop revdep-rebuild from checking opera binaries
405 dodir /etc/revdep-rebuild
406 echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera
407
408 # Change libz.so.3 to libz.so.1 for gentoo/freebsd
409 if use elibc_FreeBSD; then
410 scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${PN}/ | \
411 while read i; do
412 if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
413 then
414 export SANITY_CHECK_LIBZ_FAILED=1
415 break
416 fi
417 sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
418 done
419 [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
420 fi
421
422 [[ -z MY_LINGUAS ]] || opera_linguas
423 }
424
425 pkg_postinst() {
426 elog "To change the UI language, choose [Tools] -> [Preferences], open the"
427 elog "[General] tab, click on [Details...] then [Choose...] and point the"
428 elog "file chooser at /usr/share/opera/locale/, then enter the"
429 elog "directory for the language you want and [Open] the .lng file."
430
431 if use elibc_FreeBSD; then
432 elog
433 elog "To improve shared memory usage please set:"
434 elog "$ sysctl kern.ipc.shm_allow_removed=1"
435 fi
436 }
Report Message
Find on MARC Find on Google Groups