Version bump <http://my.opera.com/desktopteam/blog/2010/06/17/core-fixes>.

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

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index d1721de6eafff673e18f2193c413643c6f30b96f..2cae28967c5a511e087d4350191008482aa58f9f 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.491 2010/06/16 12:32:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.492 2010/06/17 17:16:41 jer Exp $
+
+*opera-10.60_pre6372 (17 Jun 2010)
+
+  17 Jun 2010; Jeroen Roovers <jer@gentoo.org> +opera-10.60_pre6372.ebuild:
+  Version bump <http://my.opera.com/desktopteam/blog/2010/06/17/core-fixes>.
 
   16 Jun 2010; Jeroen Roovers <jer@gentoo.org> opera-10.60_pre6368.ebuild:
   The beta release candidate went beta

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 076c3127fe9627d547da7b2c1b934da0659394e5..0a56187c048372cb6693f576c509dd2b5e3c2c2e 100644 (file)
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -13,8 +13,13 @@ DIST opera-10.60-6368.i386.freebsd.tar.bz2 13702436 RMD160 c74505043c50f7aa00c69
 DIST opera-10.60-6368.i386.linux.tar.bz2 13701207 RMD160 33ffde3b254afc2cec14d8637e2af21e5e37c01c SHA1 cd94bdcb1fa8de9b1ab6f3f861ee48cfd158c8eb SHA256 31bdcffeead5d59bdfcb51aafa753466246bfe588fe15cbdbaf2e1900cb7c5de
 DIST opera-10.60-6368.ppc.linux.tar.bz2 14009434 RMD160 7d8ccb90db0b5dd3ab9adfd1243ef6237bbaee25 SHA1 b5479bf62c6b2965feb04f8711260735498582d7 SHA256 9a4ac5dc50fcafe23ff6099a002b3244f1aded6e5d5d501afcea5efd1aac193b
 DIST opera-10.60-6368.x86_64.linux.tar.bz2 14760207 RMD160 e94f6e7eb12c342f1461bfa149ffd1fb0a40bcc4 SHA1 f748a42c8323fc2cd93c17b52aec4c0eef3e1fdd SHA256 dc3f8e409b75d5d43e1ca5a0bcfc65256210484bfbff334ea7e01ad781bc5afc
+DIST opera-10.60-6372.i386.freebsd.tar.bz2 13703861 RMD160 0bd85a6f85c9e30b193b0c45cc7782ac39e55632 SHA1 17af69f848e8474d512f0d2d9bd302678fd05996 SHA256 86de6d69942db3a68e9db4d7a815ad30ca31b26b50e4adfd7f00d2d5d534635d
+DIST opera-10.60-6372.i386.linux.tar.bz2 13705042 RMD160 e2de6b16d83a1fedce7a3005ebfc87659909e818 SHA1 1fa784b0ac3018dbfae6185d9960603749d8ea35 SHA256 d71352a9f621aa051067a8ba8b5580fa4a329b9dcb1ce01b8dca3e788e424d9e
+DIST opera-10.60-6372.ppc.linux.tar.bz2 14013316 RMD160 dddc5f314f906e2443bf40ed7177c31159de8988 SHA1 5684ce27505c5de8f82a330451a92389b044197a SHA256 390f3c4a6d99cdba045d2fa6a63b1d45240af415c20b1b5bf3a4a0b0b2dbac9d
+DIST opera-10.60-6372.x86_64.linux.tar.bz2 14766143 RMD160 05e396dc1433524744dc2728337bb986281accb9 SHA1 643301e369f175ddb1e315fd6f70fe6226c7e252 SHA256 16b56212869568213a85bac729e222f6b1b1797f103af063fd40bc4d042de06d
 EBUILD opera-10.10-r1.ebuild 4893 RMD160 2733461c1ddbceae8a1177fb931693aedaaf8a2d SHA1 1c95510bf92b10420c5739c1e45cdf80aee07627 SHA256 36e9ec97cb0e8d5b01a0765e56ff7fda46f80e0590ca4342aaada9632bc62d3a
 EBUILD opera-10.10.ebuild 4893 RMD160 6691d79a5f95c3e3d0701b4129a481875399d587 SHA1 2bd8f1a8e97f79607afc1f2ad0edf8a4c80c7f62 SHA256 8dc65519c765759956195bad7bd25bade46c222bfeb10d9e5057bf4f7bb90565
 EBUILD opera-10.60_pre6368.ebuild 4883 RMD160 96c7bd86a6e8793f062dc6210d587a7bdf0d7ffb SHA1 5533f3b0f57da31769601ef1ddaa65a60ab2408f SHA256 c5e5d713be8c1dc893af258469d88392378147a075a1e7bfb10805492978dd32
-MISC ChangeLog 95470 RMD160 68cde48fe8d676b2a5ad18489be063dd0ead1bc6 SHA1 21bbe93f6683c4b0c013853ea101b7768b983e5f SHA256 d94837f0f91fc6634d60eaf1234ca1a59a18de52d0cc80cdc33beaf0f20a208b
+EBUILD opera-10.60_pre6372.ebuild 4867 RMD160 28d75737d9d11aee7e4ae0274901788c63d68844 SHA1 ec757129f897d40e3d33c542d40fb4c55239ccdd SHA256 7d278b70edd2b28065065e2499d9920331cb7e7ec41197f1825121813839e127
+MISC ChangeLog 95660 RMD160 7e0e5384219c6413a25863c1faff319690afdb4e SHA1 4d3fbfc1f502031cc3b9c64e585d5fb7af1266d0 SHA256 4ece393f6256e2f5b82f9ac9cac57ba30209bc13e17c32185f1fc293d78530ca
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a

diff --git a/www-client/opera/opera-10.60_pre6372.ebuild b/www-client/opera/opera-10.60_pre6372.ebuild
new file mode 100644 (file)
index 0000000..5973e17
--- /dev/null
+++ b/www-client/opera/opera-10.60_pre6372.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_pre6372.ebuild,v 1.1 2010/06/17 17:16:41 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/26449_${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
+}