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-next: opera-next-12.12_pre1662.ebuild ChangeLog opera-next-12.11_pre1661.ebuild opera-next-12.50.1583.ebuild opera-next-12.12.1662.ebuild opera-next-12.11.1661.ebuild
Date: Wed, 28 Nov 2012 17:40:32
Message-Id: 20121128174020.A116F20C65@flycatcher.gentoo.org
1 jer 12/11/28 17:40:20
2
3 Modified: ChangeLog
4 Added: opera-next-12.12_pre1662.ebuild
5 opera-next-12.11_pre1661.ebuild
6 Removed: opera-next-12.50.1583.ebuild
7 opera-next-12.12.1662.ebuild
8 opera-next-12.11.1661.ebuild
9 Log:
10 Fix the difference between snapshot and release builds in the version string. Remove ancient 12.50 snapshot.
11
12 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key A792A613)
13
14 Revision Changes Path
15 1.157 www-client/opera-next/ChangeLog
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera-next/ChangeLog?rev=1.157&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera-next/ChangeLog?rev=1.157&content-type=text/plain
19 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera-next/ChangeLog?r1=1.156&r2=1.157
20
21 Index: ChangeLog
22 ===================================================================
23 RCS file: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v
24 retrieving revision 1.156
25 retrieving revision 1.157
26 diff -u -r1.156 -r1.157
27 --- ChangeLog 26 Nov 2012 18:07:34 -0000 1.156
28 +++ ChangeLog 28 Nov 2012 17:40:20 -0000 1.157
29 @@ -1,6 +1,16 @@
30 # ChangeLog for www-client/opera-next
31 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
32 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.156 2012/11/26 18:07:34 jer Exp $
33 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.157 2012/11/28 17:40:20 jer Exp $
34 +
35 +*opera-next-12.12_pre1662 (28 Nov 2012)
36 +*opera-next-12.11_pre1661 (28 Nov 2012)
37 +
38 + 28 Nov 2012; Jeroen Roovers <jer@g.o>
39 + +opera-next-12.11_pre1661.ebuild, -opera-next-12.11.1661.ebuild,
40 + +opera-next-12.12_pre1662.ebuild, -opera-next-12.12.1662.ebuild,
41 + -opera-next-12.50.1583.ebuild:
42 + Fix the difference between snapshot and release builds in the version string.
43 + Remove ancient 12.50 snapshot.
44
45 *opera-next-12.12.1662 (26 Nov 2012)
46
47
48
49
50 1.1 www-client/opera-next/opera-next-12.12_pre1662.ebuild
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera-next/opera-next-12.12_pre1662.ebuild?rev=1.1&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera-next/opera-next-12.12_pre1662.ebuild?rev=1.1&content-type=text/plain
54
55 Index: opera-next-12.12_pre1662.ebuild
56 ===================================================================
57 # Copyright 1999-2012 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 # $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.12_pre1662.ebuild,v 1.1 2012/11/28 17:40:20 jer Exp $
60
61 EAPI=4
62 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
63
64 DESCRIPTION="A fast and secure web browser and Internet suite"
65 HOMEPAGE="http://www.opera.com/"
66
67 SLOT="0"
68 LICENSE="OPERA-12 LGPL-2 LGPL-3"
69 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
70 IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
71
72 O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
73 O_B="$(get_version_component_range 3)" # Build number, i.e. 1156
74
75 # == Variables that often change ==
76 # All other variables should be accounted for by _pre/_p
77
78 O_K="1712" # The key to the snapshot URL
79
80 O_LINGUAS="
81 af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
82 hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
83 sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
84 " # Supported linguas
85
86 # == End of variables that often change ==
87
88 if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then # snapshot: _pre
89 O_B="${O_B/pre}" # remove _pre
90 O_D="${O_K}_${O_V}-${O_B}" # directory string
91 O_P="${PN}-${O_V}-${O_B}" # package string
92 O_U="http://snapshot.opera.com/unix/" # base URI
93
94 SRC_URI="
95 amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
96 x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
97 x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
98 "
99 else # release: _p
100 O_B="${O_B/p}" # remove _p
101 O_D="${O_V/./}" # directory string
102 O_P="${PN}-${O_V}-${O_B}" # package string
103 O_U="mirror://opera/" # base URI
104
105 SRC_URI="
106 amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
107 x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
108 x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
109 "
110 fi
111
112 for O_LINGUA in ${O_LINGUAS}; do
113 IUSE+=" linguas_${O_LINGUA/-/_}"
114 done
115
116 DEPEND="
117 >=sys-apps/sed-4
118 app-arch/xz-utils
119 "
120 GTKRDEPEND="
121 dev-libs/atk
122 dev-libs/glib:2
123 x11-libs/cairo
124 x11-libs/gdk-pixbuf
125 gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
126 x11-libs/pango
127 x11-libs/pixman
128 "
129 KDERDEPEND="
130 kde-base/kdelibs
131 x11-libs/qt-core:4
132 x11-libs/qt-gui:4
133 "
134 GSTRDEPEND="
135 dev-libs/glib:2
136 dev-libs/libxml2
137 media-libs/gst-plugins-base
138 media-libs/gstreamer
139 media-plugins/gst-plugins-meta
140 "
141 RDEPEND="
142 media-libs/fontconfig
143 media-libs/freetype
144 sys-apps/util-linux
145 sys-libs/zlib
146 virtual/opengl
147 x11-libs/libICE
148 x11-libs/libSM
149 x11-libs/libX11
150 x11-libs/libXext
151 x11-libs/libXft
152 x11-libs/libXrender
153 x11-libs/libXt
154 gtk? ( ${GTKRDEPEND} )
155 kde? ( ${KDERDEPEND} )
156 gstreamer? ( ${GSTRDEPEND} )
157 "
158 src_unpack() {
159 unpack ${A}
160 mv -v ${PN}* "${S}" || die
161 }
162
163 src_prepare() {
164 export OPREFIX="/usr/$(get_libdir)"
165 export QA_PREBUILT="${OPREFIX}/${PN}/.*"
166 export QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
167
168 local LNGDIR="share/${PN}/locale"
169
170 # Count linguas
171 count() { echo ${#}; }
172 local lingua_count=$(count ${O_LINGUAS} en)
173 local locale_count=$(count ${LNGDIR}/*)
174 [[ ${lingua_count} = ${locale_count} ]] \
175 || die "Number of LINGUAS does not match number of locales"
176 unset count
177
178 # Remove unwanted linguas
179 for LINGUA in ${O_LINGUAS}; do
180 if ! use linguas_${LINGUA/-/_}; then
181 LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
182 rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
183 fi
184 done
185
186 # Remove doc directory but keep the LICENSE under another name (bug #315473)
187 mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
188 rm -rf share/doc
189 for locale in share/${PN}/locale/*; do
190 rm -f "${locale}/license.txt"
191 ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
192 || die
193 done
194
195 # Remove package directory
196 rm -rf share/${PN}/package
197
198 # Optional libraries
199 if ! use gtk; then
200 rm lib/${PN}/liboperagtk2.so || die
201 rm lib/${PN}/liboperagtk3.so || die
202 fi
203 if ! use kde; then
204 rm lib/${PN}/liboperakde4.so || die
205 fi
206 if ! use gstreamer; then
207 rm -r lib/${PN}/gstreamer || die
208 fi
209 if use amd64 && ! use multilib; then
210 rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
211 fi
212
213 # Unzip the man pages before sedding
214 gunzip share/man/man1/* || die
215
216 local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
217 if [[ ${PN} = opera-next ]]; then
218 OPERA_SUFFIX="-next"
219 OPERA__SUFFIX=" Next"
220 OPERA_USUFFIX="-NEXT"
221 fi
222
223 # Replace PREFIX, SUFFIX and PN in various files
224 sed -i \
225 -e "s:@@{PREFIX}:/usr:g" \
226 -e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
227 -e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
228 -e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
229 share/man/man1/* \
230 share/mime/packages/* \
231 share/applications/${PN}-*.desktop \
232 || die
233
234 # Create /usr/bin/opera wrapper
235 echo '#!/bin/sh' > ${PN}
236 echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
237 echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
238 >> ${PN}
239 echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
240
241 # Change libz.so.3 to libz.so.1 for gentoo/freebsd
242 if use elibc_FreeBSD; then
243 scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
244 while read i; do
245 if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
246 then
247 export SANITY_CHECK_LIBZ_FAILED=1
248 break
249 fi
250 sed -i \
251 "$i" \
252 -e 's/libz\.so\.3/libz.so.1/g'
253 done
254 [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
255 fi
256 }
257
258 src_install() {
259 # We install into usr instead of opt as Opera does not support the latter
260 dodir /usr
261 mv lib/ "${D}/${OPREFIX}" || die
262 mv share/ "${D}/usr/" || die
263
264 # Install startup scripts
265 dobin ${PN}
266
267 # Stop revdep-rebuild from checking opera binaries
268 dodir /etc/revdep-rebuild
269 echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
270 > "${D}"/etc/revdep-rebuild/90${PN}
271
272 # Set PaX markings for hardened/PaX (bug #344267)
273 pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
274 }
275
276 pkg_preinst() {
277 gnome2_icon_savelist
278 }
279
280 pkg_postinst() {
281 if use elibc_FreeBSD; then
282 elog
283 elog "To improve shared memory usage please set:"
284 elog "$ sysctl kern.ipc.shm_allow_removed=1"
285 fi
286
287 # Update desktop file database and gtk icon cache (bug #334993)
288 gnome2_icon_cache_update
289 fdo-mime_desktop_database_update
290 }
291
292 pkg_postrm() {
293 # Update desktop file database and gtk icon cache (bug #334993)
294 gnome2_icon_cache_update
295 fdo-mime_desktop_database_update
296 }
297
298
299
300 1.1 www-client/opera-next/opera-next-12.11_pre1661.ebuild
301
302 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera-next/opera-next-12.11_pre1661.ebuild?rev=1.1&view=markup
303 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/opera-next/opera-next-12.11_pre1661.ebuild?rev=1.1&content-type=text/plain
304
305 Index: opera-next-12.11_pre1661.ebuild
306 ===================================================================
307 # Copyright 1999-2012 Gentoo Foundation
308 # Distributed under the terms of the GNU General Public License v2
309 # $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.11_pre1661.ebuild,v 1.1 2012/11/28 17:40:20 jer Exp $
310
311 EAPI=4
312 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
313
314 DESCRIPTION="A fast and secure web browser and Internet suite"
315 HOMEPAGE="http://www.opera.com/"
316
317 SLOT="0"
318 LICENSE="OPERA-12 LGPL-2 LGPL-3"
319 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
320 IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
321
322 O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
323 O_B="$(get_version_component_range 3)" # Build number, i.e. 1156
324
325 # == Variables that often change ==
326 # All other variables should be accounted for by _pre/_p
327
328 O_K="" # The key to the snapshot URL
329
330 O_LINGUAS="
331 af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
332 hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
333 sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
334 " # Supported linguas
335
336 # == End of variables that often change ==
337
338 if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then # snapshot: _pre
339 O_B="${O_B/pre}" # remove _pre
340 O_D="${O_K}_${O_V}-${O_B}" # directory string
341 O_P="${PN}-${O_V}-${O_B}" # package string
342 O_U="http://snapshot.opera.com/unix/" # base URI
343
344 SRC_URI="
345 amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
346 x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
347 x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
348 "
349 else # release: _p
350 O_B="${O_B/p}" # remove _p
351 O_D="${O_V/./}" # directory string
352 O_P="${PN}-${O_V}-${O_B}" # package string
353 O_U="mirror://opera/" # base URI
354
355 SRC_URI="
356 amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
357 x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
358 x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
359 "
360 fi
361
362 for O_LINGUA in ${O_LINGUAS}; do
363 IUSE+=" linguas_${O_LINGUA/-/_}"
364 done
365
366 DEPEND="
367 >=sys-apps/sed-4
368 app-arch/xz-utils
369 "
370 GTKRDEPEND="
371 dev-libs/atk
372 dev-libs/glib:2
373 x11-libs/cairo
374 x11-libs/gdk-pixbuf
375 gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
376 x11-libs/pango
377 x11-libs/pixman
378 "
379 KDERDEPEND="
380 kde-base/kdelibs
381 x11-libs/qt-core:4
382 x11-libs/qt-gui:4
383 "
384 GSTRDEPEND="
385 dev-libs/glib:2
386 dev-libs/libxml2
387 media-libs/gst-plugins-base
388 media-libs/gstreamer
389 media-plugins/gst-plugins-meta
390 "
391 RDEPEND="
392 media-libs/fontconfig
393 media-libs/freetype
394 sys-apps/util-linux
395 sys-libs/zlib
396 virtual/opengl
397 x11-libs/libICE
398 x11-libs/libSM
399 x11-libs/libX11
400 x11-libs/libXext
401 x11-libs/libXft
402 x11-libs/libXrender
403 x11-libs/libXt
404 gtk? ( ${GTKRDEPEND} )
405 kde? ( ${KDERDEPEND} )
406 gstreamer? ( ${GSTRDEPEND} )
407 "
408 src_unpack() {
409 unpack ${A}
410 mv -v ${PN}* "${S}" || die
411 }
412
413 src_prepare() {
414 export OPREFIX="/usr/$(get_libdir)"
415 export QA_PREBUILT="${OPREFIX}/${PN}/.*"
416 export QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
417
418 local LNGDIR="share/${PN}/locale"
419
420 # Count linguas
421 count() { echo ${#}; }
422 local lingua_count=$(count ${O_LINGUAS} en)
423 local locale_count=$(count ${LNGDIR}/*)
424 [[ ${lingua_count} = ${locale_count} ]] \
425 || die "Number of LINGUAS does not match number of locales"
426 unset count
427
428 # Remove unwanted linguas
429 for LINGUA in ${O_LINGUAS}; do
430 if ! use linguas_${LINGUA/-/_}; then
431 LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
432 rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
433 fi
434 done
435
436 # Remove doc directory but keep the LICENSE under another name (bug #315473)
437 mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
438 rm -rf share/doc
439 for locale in share/${PN}/locale/*; do
440 rm -f "${locale}/license.txt"
441 ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
442 || die
443 done
444
445 # Remove package directory
446 rm -rf share/${PN}/package
447
448 # Optional libraries
449 if ! use gtk; then
450 rm lib/${PN}/liboperagtk2.so || die
451 rm lib/${PN}/liboperagtk3.so || die
452 fi
453 if ! use kde; then
454 rm lib/${PN}/liboperakde4.so || die
455 fi
456 if ! use gstreamer; then
457 rm -r lib/${PN}/gstreamer || die
458 fi
459 if use amd64 && ! use multilib; then
460 rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
461 fi
462
463 # Unzip the man pages before sedding
464 gunzip share/man/man1/* || die
465
466 local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
467 if [[ ${PN} = opera-next ]]; then
468 OPERA_SUFFIX="-next"
469 OPERA__SUFFIX=" Next"
470 OPERA_USUFFIX="-NEXT"
471 fi
472
473 # Replace PREFIX, SUFFIX and PN in various files
474 sed -i \
475 -e "s:@@{PREFIX}:/usr:g" \
476 -e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
477 -e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
478 -e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
479 share/man/man1/* \
480 share/mime/packages/* \
481 share/applications/${PN}-*.desktop \
482 || die
483
484 # Create /usr/bin/opera wrapper
485 echo '#!/bin/sh' > ${PN}
486 echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
487 echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
488 >> ${PN}
489 echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
490
491 # Change libz.so.3 to libz.so.1 for gentoo/freebsd
492 if use elibc_FreeBSD; then
493 scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
494 while read i; do
495 if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
496 then
497 export SANITY_CHECK_LIBZ_FAILED=1
498 break
499 fi
500 sed -i \
501 "$i" \
502 -e 's/libz\.so\.3/libz.so.1/g'
503 done
504 [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
505 fi
506 }
507
508 src_install() {
509 # We install into usr instead of opt as Opera does not support the latter
510 dodir /usr
511 mv lib/ "${D}/${OPREFIX}" || die
512 mv share/ "${D}/usr/" || die
513
514 # Install startup scripts
515 dobin ${PN}
516
517 # Stop revdep-rebuild from checking opera binaries
518 dodir /etc/revdep-rebuild
519 echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
520 > "${D}"/etc/revdep-rebuild/90${PN}
521
522 # Set PaX markings for hardened/PaX (bug #344267)
523 pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
524 }
525
526 pkg_preinst() {
527 gnome2_icon_savelist
528 }
529
530 pkg_postinst() {
531 if use elibc_FreeBSD; then
532 elog
533 elog "To improve shared memory usage please set:"
534 elog "$ sysctl kern.ipc.shm_allow_removed=1"
535 fi
536
537 # Update desktop file database and gtk icon cache (bug #334993)
538 gnome2_icon_cache_update
539 fdo-mime_desktop_database_update
540 }
541
542 pkg_postrm() {
543 # Update desktop file database and gtk icon cache (bug #334993)
544 gnome2_icon_cache_update
545 fdo-mime_desktop_database_update
546 }
Report Message
Find on MARC Find on Google Groups