<http://my.opera.com/desktopteam/blog/2010/06/23/stability-work>.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 84e250d38b05bd06010de97617b2541fe7658c49..f7cd2742e07339ddc63e34fad1e4818832d0dc66 100644 (file)
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.497 2010/06/23 16:40:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.498 2010/06/23 17:49:10 jer Exp $
+
+*opera-10.60_pre6379 (23 Jun 2010)
+
+  23 Jun 2010; Jeroen Roovers <jer@gentoo.org> +opera-10.60_pre6379.ebuild:
+  <http://my.opera.com/desktopteam/blog/2010/06/23/stability-work>.
 
   23 Jun 2010; Christoph Mende <angelos@gentoo.org> opera-10.11.ebuild:
   Stable on amd64 wrt bug #325199

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index ce60a7664bc76bd51b187f920d55a087b1935261..750dbaa39a5e716f17d335b8fe101df1bdd755cf 100644 (file)
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX opera 123 RMD160 69142622c1e9930354e708f1cb59a5cb529957df SHA1 be6610d3fe5bd60cf9d4c31ca4072155130c54c3 SHA256 bd412849d77521621398feb0efa342aaa31901746d395a6078065422502bd428
 AUX opera-10.00-pluginpath-fbsd.patch 341 RMD160 735a872421680b1468e2694f9ed41a56d0f23f60 SHA1 41ba2709c1fa585491221f924b3cd000768cd7c2 SHA256 0af425e1845617d7a5f23b1a991c7d306ea2b62b548a2201aa6f0b0ad060d023
 AUX opera-10.00-pluginpath.patch 439 RMD160 9fc1bcb8430d185d040a811c2714077eaad159af SHA1 37a6b63d4d1d34e8f43f6ba838d09ceec6cfd607 SHA256 b34e438bab40599b70a7dfd4946a82e718fb46de0384062b41c51db5a047db4c
@@ -32,18 +29,16 @@ DIST opera-10.60-6378.i386.freebsd.tar.bz2 13704975 RMD160 0cda74c12d669480c346c
 DIST opera-10.60-6378.i386.linux.tar.bz2 13705407 RMD160 619ab0f67a85c06bd181c259778fc4d348da8e05 SHA1 a7607ff44ddf02e6e30544d3ad5c40daa156d4d3 SHA256 a066c1f187ce3c427c1350e98c1e177e859e3f574ee90ae8413c1a6b11825429
 DIST opera-10.60-6378.ppc.linux.tar.bz2 14012651 RMD160 794d666ba0bcd05a9a70628544ef8a8933d7b73f SHA1 a224127040159109cd5804172f7f216d279ae05f SHA256 89a670a7665cd2dd6b1062674530a26e7632aab53ffd42db8a0051203fe68e97
 DIST opera-10.60-6378.x86_64.linux.tar.bz2 14764919 RMD160 60b52d65eea146e3ca5f37f1ab8d019c3de10bf5 SHA1 b415f9d1755f75014a8ef945a7371001681c391c SHA256 bfa12ba5845e641c2150bad690251af17079ddbb5fbd05644c9c2c5072be8be7
+DIST opera-10.60-6379.i386.freebsd.tar.bz2 13707276 RMD160 9df2774b85f26d2000c5327780ccd797f36b4965 SHA1 1ed05de70c64eb5b1bceaf8102d3e25a72e16682 SHA256 d3aef75e84bd45300b569acd8ba461ea08111ed9f0838d04c12b2ebaf7b4e3a9
+DIST opera-10.60-6379.i386.linux.tar.bz2 13708982 RMD160 08e88fca9b37712c66348b201fc6f4365ab0cb3c SHA1 56c35c17e3f0974539ac381a6c9c692ede3fb671 SHA256 eaa58afae016dd15fffe201b280e820e52c0975cd8bcdbad99b3190d4bc62007
+DIST opera-10.60-6379.ppc.linux.tar.bz2 14016463 RMD160 8c4d22a6b2c2131acaa93fc94e106827d57d5d6c SHA1 5a97a22ecbe370e324a5596ac62a0bc7fed90a05 SHA256 8540541585cb2ac962404e891eaf20a816164989b297b4534537bcd074f09b2d
+DIST opera-10.60-6379.x86_64.linux.tar.bz2 14767803 RMD160 836ab3c6821730ccfea4e99203b3b3b27c20077f SHA1 5d00a3b6543cb5127a35a7393bebaa7082532f18 SHA256 5fc1e37d7b77998c11055e1b223f521e15c8ea0d0476e85125dd1244fa5e79b4
 EBUILD opera-10.10.ebuild 4893 RMD160 6691d79a5f95c3e3d0701b4129a481875399d587 SHA1 2bd8f1a8e97f79607afc1f2ad0edf8a4c80c7f62 SHA256 8dc65519c765759956195bad7bd25bade46c222bfeb10d9e5057bf4f7bb90565
 EBUILD opera-10.11.ebuild 4895 RMD160 135051e159b1d6e5bd29b97efcc54b5a4b7d21eb SHA1 a395b737002353fbf71ece26ea14efc4572b5be1 SHA256 81cd524417d11b31e4733b942f45a0712eba2b3445257c1df1abfdc4d901e14d
 EBUILD opera-10.60_pre6368.ebuild 4883 RMD160 96c7bd86a6e8793f062dc6210d587a7bdf0d7ffb SHA1 5533f3b0f57da31769601ef1ddaa65a60ab2408f SHA256 c5e5d713be8c1dc893af258469d88392378147a075a1e7bfb10805492978dd32
 EBUILD opera-10.60_pre6372.ebuild 4867 RMD160 28d75737d9d11aee7e4ae0274901788c63d68844 SHA1 ec757129f897d40e3d33c542d40fb4c55239ccdd SHA256 7d278b70edd2b28065065e2499d9920331cb7e7ec41197f1825121813839e127
 EBUILD opera-10.60_pre6374.ebuild 4867 RMD160 0236fb461ae89a3d11176b25d9e89651f26781f5 SHA1 f64fe131e3b7aa62f146ae36070eb54dc285f784 SHA256 94475802c9d7e0f3078191e8c44839770d6e73361ad662846c2a27d89d25eede
 EBUILD opera-10.60_pre6378.ebuild 4867 RMD160 acac7b968443810ebbde4b30f988f2e3745efc8e SHA1 66b845181247923a0c432b25d9f204af58a930c3 SHA256 65f4293cc7a6592852b9ef87349705f4b5d6f3c25e4f95230c08646d4adcbaa6
-MISC ChangeLog 96435 RMD160 448690671df32a0e834078e03d32182e53b302b8 SHA1 6edda2849dda79cda6376d686c7a162c0f5d91d5 SHA256 a8595c9b00f4287d64f5ce1c521dc2412da11e28b33237cabdf40996f686f0ee
+EBUILD opera-10.60_pre6379.ebuild 4866 RMD160 f9bd611eb1a354ce97def36dd4d5d7f04829096c SHA1 b1db8382245d487adab15ba37f467899f837852c SHA256 26763a336f70aa944907dd892d61c20bcd378f1f3545ce5e8f1165b0cecef31c
+MISC ChangeLog 96612 RMD160 76f3cf3d9d590366b8a3067718f3658a9fe3764a SHA1 ac1ad4076709f6adc71d66e3f482d6c94e658bdc SHA256 b44e940a0862b3d67d80739c93e2cab3d0f35f9f946b283c43e08cff5dbb12a6
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkwiOS0ACgkQmWq1bYTyC0M2dAD/SOIln15Bf1ZeVS65UsjaSRRC
-LQmDvFe+xbIQzS6I9xoBAK8rZ6osMztWAzgHgMMIfFGOR64jZGz23/de7vnTVP/j
-=snlq
------END PGP SIGNATURE-----

diff --git a/www-client/opera/opera-10.60_pre6379.ebuild b/www-client/opera/opera-10.60_pre6379.ebuild
new file mode 100644 (file)
index 0000000..3d86b18
--- /dev/null
+++ b/www-client/opera/opera-10.60_pre6379.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.60_pre6379.ebuild,v 1.1 2010/06/23 17:49:10 jer Exp $
+
+EAPI="2"
+
+inherit eutils multilib
+
+DESCRIPTION="A standards-compliant graphical Web browser"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde"
+
+RESTRICT="mirror test"
+
+OPREFIX="/usr/$(get_libdir)"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+MY_LINGUAS="
+       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
+       ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK
+       zh-TW
+"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+       IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_U="http://snapshot.opera.com/unix/3946_${PV/_pre/-}/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+       amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
+       ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 )
+       x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
+       x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 )
+"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="
+       gtk? (
+               =x11-libs/gtk+-2*
+               dev-libs/atk
+               dev-libs/glib
+               media-libs/glitz
+               media-libs/libpng
+               x11-libs/cairo
+               x11-libs/pango
+               x11-libs/pixman
+       )
+       kde? (
+               kde-base/kdelibs
+       )
+       dev-libs/expat
+       media-libs/fontconfig
+       media-libs/freetype
+       media-plugins/gst-plugins-meta
+       sys-apps/util-linux
+       sys-libs/zlib
+       virtual/opengl
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libXau
+       x11-libs/libXcomposite
+       x11-libs/libXcursor
+       x11-libs/libXdamage
+       x11-libs/libXdmcp
+       x11-libs/libXext
+       x11-libs/libXfixes
+       x11-libs/libXi
+       x11-libs/libXmu
+       x11-libs/libXrandr
+       x11-libs/libXrender
+       x11-libs/libXt
+       x11-libs/libxcb
+       x11-libs/xcb-util
+       "
+
+opera_linguas() {
+       # Remove unwanted LINGUAS:
+       local LINGUA
+       local LNGDIR="${D}usr/share/${PN}/locale"
+       einfo "Keeping these locales: ${LINGUAS}."
+       for LINGUA in ${MY_LINGUAS}; do
+               if ! use linguas_${LINGUA/-/_}; then
+                       LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+                       rm -r "${LINGUA}"
+               fi
+       done
+}
+
+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}
+       if [[ ! -d ${S} ]]; then
+               cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
+               S="$(pwd)"
+               einfo "Setting WORKDIR to ${S}"
+       fi
+}
+
+src_install() {
+       # Remove "license directory" (bug #315473)
+       rm -rf "share/doc/opera"
+
+       # We install into usr instead of opt as Opera does not support the latter
+       dodir /usr
+       mv lib/  "${D}/${OPREFIX}" || die "mv lib/ failed"
+       mv share/ "${D}/usr/" || die "mv share/ failed"
+
+       # Unzip the man pages before sedding
+       gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed"
+
+       # Replace PREFIX and SUFFIX in various files
+       sed -i \
+               -e "s:@@{PREFIX}:/usr:g" \
+               -e "s:@@{SUFFIX}::g" \
+               -e "s:@@{_SUFFIX}::g" \
+               -e "s:@@{USUFFIX}::g" \
+               "${D}"/usr/share/mime/packages/opera-widget.xml \
+               "${D}"/usr/share/man/man1/* \
+               "${D}"/usr/share/applications/opera-browser.desktop \
+               "${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
+
+       # Sed libdir in opera script
+       sed "${FILESDIR}"/opera \
+               -e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
+               || die "sed opera script failed"
+
+       # Sed libdir in defaults/pluginpath.ini
+       sed -i \
+               -e "s|/usr/lib32|${OPREFIX}|g" \
+               "${D}"/usr/share/opera/defaults/pluginpath.ini \
+               || die "sed pluginpath.ini failed"
+
+       # Install startup scripts
+       dobin ${PN} ${PN}-widget-manager || die "dobin failed"
+
+       # Stop revdep-rebuild from checking opera binaries
+       dodir /etc/revdep-rebuild
+       echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera
+
+       # Change libz.so.3 to libz.so.1 for gentoo/freebsd
+       if use elibc_FreeBSD; then
+               scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${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 -e 's/libz\.so\.3/libz.so.1/g' "$i"
+               done
+               [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
+       fi
+
+       [[ -z MY_LINGUAS ]] || opera_linguas
+}
+
+pkg_postinst() {
+       elog "To change the UI language, choose [Tools] -> [Preferences], open the"
+       elog "[General] tab, click on [Details...] then [Choose...] and point the"
+       elog "file chooser at /usr/share/opera/locale/, then enter the"
+       elog "directory for the language you want and [Open] the .lng file."
+
+       if use elibc_FreeBSD; then
+               elog
+               elog "To improve shared memory usage please set:"
+               elog "$ sysctl kern.ipc.shm_allow_removed=1"
+       fi
+}