From: Jeroen Roovers Date: Thu, 17 Nov 2011 16:08:50 +0000 (+0000) Subject: http://my.opera.com/desktopteam/blog/2011/11/17/fixed-fixed-fixed X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2b5264f323c209669072d1595354111a22f4299f;p=gentoo.git my.opera.com/desktopteam/blog/2011/11/17/fixed-fixed-fixed Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index 82d67f19aeb6..47df246e647a 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/opera # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.664 2011/11/12 15:43:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.665 2011/11/17 16:08:50 jer Exp $ + +*opera-11.60.1159 (17 Nov 2011) + + 17 Nov 2011; Jeroen Roovers +opera-11.60.1159.ebuild: + http://my.opera.com/desktopteam/blog/2011/11/17/fixed-fixed-fixed 12 Nov 2011; Jeroen Roovers opera-11.52.1100.ebuild, opera-11.60.1134.ebuild, opera-11.60.1139.ebuild, opera-11.60.1144.ebuild, diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index 1e5d90854b21..d3323fdc7db4 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -22,6 +22,9 @@ DIST opera-11.60-1147.x86_64.linux.tar.xz 12324564 RMD160 67c9627b18af59d1675246 DIST opera-11.60-1150.i386.freebsd.tar.xz 11518948 RMD160 82a734bf05b8feec8baff9ee01505261f93ba3f0 SHA1 e6402ac1ac09c37100b0b68f0fda70c59064d415 SHA256 e6f7212ba62736f15232960067604704f8cee899899d5b3bc9281a9ebc3f8e6d DIST opera-11.60-1150.i386.linux.tar.xz 11465136 RMD160 62c7bcf4eb52c0ba3cb2adf2b4e85e256cae6c50 SHA1 3ff6d43f38ceec15b942c8636a9de5d14de5aa0a SHA256 08d020cb3ad8ddc3d47657f31bd40c53a665f6a991d4303b9afd9a80b06581b9 DIST opera-11.60-1150.x86_64.linux.tar.xz 12323256 RMD160 874cdb4e87f75c33366133da068844d2e4ab3e85 SHA1 3e2f3157b085634f04e9795d7986561bcc41ee37 SHA256 8dd6416cdd324c2b037c8fd251c5c0618d3c8fd02f41f92860cf42243ead2209 +DIST opera-11.60-1159.i386.freebsd.tar.xz 11519324 RMD160 893b92098023111d4fb825032f4508bbd7a10a1a SHA1 06775020b49ffc535b0e1d134dd86300ac4ca37d SHA256 e9caf6668bb5e479e17ec4ae89e993c1da3ed55a343a272f85016012ffee9fe1 +DIST opera-11.60-1159.i386.linux.tar.xz 11478400 RMD160 99a2703f19fb37458f517ae68a8ba868b69ec08b SHA1 8069a5392225f9dedc568696db3943646639bf95 SHA256 5ec1515a8bd7b9a5dabf700fbbd3c13e91c66f9611968f9715ea63645159b713 +DIST opera-11.60-1159.x86_64.linux.tar.xz 12320240 RMD160 921dad23643dc4e0fba1e4d698ff316513318f54 SHA1 771c7bf98f272df0557bc90a7dfbb9b390863672 SHA256 3cab7a15e0b400db3d771726abb1ac7d384c71bd6d3d3a5a926f2d7e3bb9967d EBUILD opera-11.52.1100.ebuild 5695 RMD160 7347ebe510e769a44dc494926ac33e5049561286 SHA1 65f1222bf21cce7524907d77c52d95c933da2678 SHA256 19126014c026a5ca4d89b5d999763c32b9f6ba54e403dc3ca8ea5fbd46d5ddb5 EBUILD opera-11.60.1134.ebuild 5789 RMD160 60882f4ec70b9dc62fdab081ff427f6bc92d6eaf SHA1 083c80968c2c35f9665a2807bbdc302cf72c3196 SHA256 ba8f19bf568c37e3a56c3982fd4720b80c6b309c102b3c398e7c2bb9c57a93a2 EBUILD opera-11.60.1139.ebuild 5916 RMD160 1a953d865c93702e66489bc533ba3af0b5c17df6 SHA1 7e08d403841d05c6f41a557c13c9654242b4483e SHA256 2a6008813cdeb9b446eef7cf61893d4633a0d77a5b5b71eaf273985fe50dcd7a @@ -29,12 +32,13 @@ EBUILD opera-11.60.1144.ebuild 5965 RMD160 e48432c56477d9fe32add31f2f2c6c992360c EBUILD opera-11.60.1145.ebuild 5961 RMD160 287bdbf78d71261c4235b005ab379d6e15a2bdea SHA1 4978ebee21bb8b60a5e478779090f58b1c680fdb SHA256 dc79a2199a944661a3d9e22a8275c4721c47329efac75ddd04620ca61bf0be98 EBUILD opera-11.60.1147.ebuild 5953 RMD160 990c2566e7fdf1113a487b307a73685c2c7829db SHA1 22ba59b36d0c6748526c1fe0bd452d2dbed19d00 SHA256 25aa07ce2db49091c5be8b686fafe2d016935369b3ec9ef844877ab720f73d5e EBUILD opera-11.60.1150.ebuild 5960 RMD160 549fa8ccdf45b068cb4da524941b787a3e73412c SHA1 18c469d6af4f731a7222fff5e8753941ec499926 SHA256 5ccdeae80e0dd81012c2b3c1544fda3a062dff5a064ded1d6fa8d8149cd9572d -MISC ChangeLog 126758 RMD160 239819c612c033aed7391e3fc055176fe8fcde46 SHA1 5837019dcbebb119c2c496b4dd55020766f0d80e SHA256 fc11d29d0cdc5dee56bcd4f58296c60ed8128afe63ff3eb9c6fb3c75f83a1541 +EBUILD opera-11.60.1159.ebuild 5961 RMD160 5e596e8527c6c738806e94fe20abef0c7b6cf89b SHA1 f75c4f56762f1d6ed5c9acb66ae068d9a50abe5f SHA256 bef8fba39a773e9155e766e6148910d4edb14ec05b403c1cf9cb69f46abf2dff +MISC ChangeLog 126933 RMD160 b49b9df82ca5dd532f96b4f412fefc250541675a SHA1 5fa418db80a34f5121997c28f8c398b4ab8d0850 SHA256 4c84cab67019731985002ccc332deb66eca1ef798bbd9ff60e096f9c4103e212 MISC metadata.xml 732 RMD160 28acd15c216329d807150c88fb0861eb1383c61c SHA1 9ff443c6f422e8b018d29d21948da71eda6a4295 SHA256 bd388fb8f6b0aa2cd98fcfc290b677df712be3ef14537102e02665ea2f0d871a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6+lCcACgkQVWmRsqeSphMUeACfbnvXSmDvR/8trgI2GX7voqN/ -P8IAn3YyemRQSqT39FrZM0xre7/7va6i -=cbup +iEYEARECAAYFAk7FMZgACgkQVWmRsqeSphOjsgCeKu8sE9nVT96BPp+L7mVVuESF +oscAnAuh2JJ/QzXQRriDP9aHTZk932WV +=umwh -----END PGP SIGNATURE----- diff --git a/www-client/opera/opera-11.60.1159.ebuild b/www-client/opera/opera-11.60.1159.ebuild new file mode 100644 index 000000000000..e7956fc15782 --- /dev/null +++ b/www-client/opera/opera-11.60.1159.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.60.1159.ebuild,v 1.1 2011/11/17 16:08:50 jer Exp $ + +EAPI="4" + +inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator + +DESCRIPTION="A fast and secure web browser and Internet suite" +HOMEPAGE="http://www.opera.com/" + +SLOT="0" +LICENSE="OPERA-11 LGPL-2 LGPL-3" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer" + +O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00 +O_B="$(get_version_component_range 3)" # Build version, i.e. 1156 + +O_D="china_${O_V}-${O_B}" +O_P="${PN}-${O_V}-${O_B}" +O_U="http://snapshot.opera.com/unix/" + +SRC_URI=" + amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz ) + x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz ) + x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz ) +" + +OPREFIX="/usr/$(get_libdir)" + +QA_DT_HASH="${OPREFIX}/${PN}/.*" +QA_PRESTRIPPED="${OPREFIX}/${PN}/.*" + +O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi +hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te +th tl tr uk uz vi zh-CN zh-TW zu" + +for O_LINGUA in ${O_LINGUAS}; do + IUSE="${IUSE} linguas_${O_LINGUA/-/_}" +done + +DEPEND=" + >=sys-apps/sed-4 + app-arch/xz-utils +" +GTKRDEPEND=" + dev-libs/atk + dev-libs/glib:2 + x11-libs/cairo + x11-libs/gdk-pixbuf + gtk? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + x11-libs/pango + x11-libs/pixman +" +KDERDEPEND=" + kde-base/kdelibs + x11-libs/qt-core + x11-libs/qt-gui +" +GSTRDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 + media-libs/gst-plugins-base + media-libs/gstreamer + media-plugins/gst-plugins-meta +" +RDEPEND=" + media-libs/fontconfig + media-libs/freetype + sys-apps/util-linux + sys-libs/zlib + virtual/opengl + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrender + x11-libs/libXt + gtk? ( ${GTKRDEPEND} ) + gtk3? ( ${GTKRDEPEND} ) + kde? ( ${KDERDEPEND} ) + gstreamer? ( ${GSTRDEPEND} ) +" + +pkg_setup() { + echo -e \ + " ${GOOD}****************************************************${NORMAL}" + elog "If you seek support, please file a bug report at" + elog "https://bugs.gentoo.org and post the output of" + elog " \`emerge --info =${CATEGORY}/${P}'" + echo -e \ + " ${GOOD}****************************************************${NORMAL}" +} + +src_unpack() { + unpack ${A} + mv -v ${PN}* "${S}" || die +} + +src_prepare() { + local LNGDIR="share/${PN}/locale" + + # Count linguas + count() { echo ${#}; } + local lingua_count=$(count ${O_LINGUAS} en) + local locale_count=$(count ${LNGDIR}/*) + [[ ${lingua_count} = ${locale_count} ]] \ + || die "Number of LINGUAS does not match number of locales" + unset count + + # Remove unwanted linguas + einfo "Keeping these locales (linguas): ${LINGUAS}." + for LINGUA in ${O_LINGUAS}; do + if ! use linguas_${LINGUA/-/_}; then + LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) + rm -r "${LINGUA}" || die "The list of linguas needs to be fixed" + fi + done + + # Remove doc directory but keep the LICENSE under another name (bug #315473) + mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt + rm -rf share/doc + for locale in share/${PN}/locale/*; do + rm -f "${locale}/license.txt" + ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \ + || die + done + + # Remove package directory + rm -rf share/${PN}/package + + # Optional libraries + if ! use gtk; then + rm lib/${PN}/liboperagtk2.so || die + fi + if ! use gtk3; then + rm lib/${PN}/liboperagtk3.so || die + fi + if ! use kde; then + rm lib/${PN}/liboperakde4.so || die + fi + if ! use gstreamer; then + rm -r lib/${PN}/gstreamer || die + fi + + # Unzip the man pages before sedding + gunzip share/man/man1/* || die + + # Replace PREFIX, SUFFIX and PN in various files + sed -i \ + -e "s:@@{PREFIX}:/usr:g" \ + -e "s:@@{SUFFIX}::g" \ + -e "s:@@{_SUFFIX}::g" \ + -e "s:@@{USUFFIX}::g" \ + -e "s:opera:${PN}:g" \ + share/man/man1/* \ + share/applications/${PN}-*.desktop \ + || die + + # Replace "Opera" with "Opera Next" + if [[ ${PN} = opera-next ]]; then + sed -i share/applications/${PN}-*.desktop \ + -e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die + fi + + # Create /usr/bin/opera wrapper + echo '#!/bin/sh' > ${PN} + echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN} + echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \ + >> ${PN} + echo 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${PN} + echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN} + + # Change libz.so.3 to libz.so.1 for gentoo/freebsd + if use elibc_FreeBSD; then + scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \ + while read i; do + if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; + then + export SANITY_CHECK_LIBZ_FAILED=1 + break + fi + sed -i \ + "$i" \ + -e 's/libz\.so\.3/libz.so.1/g' + done + [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die + fi +} + +src_install() { + # We install into usr instead of opt as Opera does not support the latter + dodir /usr + mv lib/ "${D}/${OPREFIX}" || die + mv share/ "${D}/usr/" || die + + # Install startup scripts + dobin ${PN} + + # Stop revdep-rebuild from checking opera binaries + dodir /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \ + > "${D}"/etc/revdep-rebuild/90${PN} + + # Set PaX markings for hardened/PaX (bug #344267) + pax-mark m \ + "${D}/${OPREFIX}/${PN}/${PN}" \ + "${D}/${OPREFIX}/${PN}/operaplugincleaner" \ + "${D}/${OPREFIX}/${PN}/operapluginwrapper" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + if use elibc_FreeBSD; then + elog + elog "To improve shared memory usage please set:" + elog "$ sysctl kern.ipc.shm_allow_removed=1" + fi + + # Update desktop file database and gtk icon cache (bug #334993) + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + # Update desktop file database and gtk icon cache (bug #334993) + gnome2_icon_cache_update + fdo-mime_desktop_database_update +}