Version bump <http://my.opera.com/desktopteam/blog/2008/09/19/another-step>.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7-JeR i686

3 files changed, 254 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 13558c495e92..eb4e7f3868f9 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.284 2008/09/13 13:17:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.285 2008/09/19 14:15:35 jer Exp $
+
+*opera-9.60_pre2430 (19 Sep 2008)
+
+  19 Sep 2008; Jeroen Roovers <jer@gentoo.org> +opera-9.60_pre2430.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2008/09/19/another-step>.
 
 *opera-9.60_pre2426 (13 Sep 2008)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e8de3dd5036d..0b2917f340d4 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -40,6 +40,12 @@ DIST opera-9.60-2426.gcc4-shared-qt3.i386.tar.bz2 5857639 RMD160 3e26486ff6b058c
 DIST opera-9.60-2426.gcc4-shared-qt3.ppc.tar.bz2 5933256 RMD160 ff4c1dee44e54ccded66f99357e940a9fc6a925e SHA1 21c20f05353aa8ae4bd4f8f6038ad1ccfe4356dc SHA256 544de1afd6655ddd45806ae4d66f063d1717609f59c592f9ead0efd2dfe6fc45
 DIST opera-9.60-2426.gcc4-shared-qt3.x86_64.tar.bz2 6469662 RMD160 cf5987ed65aefc59addf404318c81ff922fdc7cb SHA1 84cef723c4a9ad0fdacd54866353385cb5d0506d SHA256 6f3f844cba186b3030d749305782780f2c955c7f36418b0b2766bcf5ddb3dad8
 DIST opera-9.60-2426.gcc4-static-qt3.i386.tar.bz2 7767094 RMD160 dfa17a2fc9147c961974f886d9c33d2b5e3fa8de SHA1 3bd36be2543eea8da0ee6007dc6d04a4d27ae42b SHA256 af383dd3c2a954be5252a8d7d213df5c711fcb9c1cabfae189040ff85ffbfdf1
+DIST opera-9.60-2430.freebsd5-shared-qt3.i386.tar.bz2 6010107 RMD160 9270da1a04a8f9f6adfcb738063d259dadf8830b SHA1 4ea637b151ee63aad3792e5eb7b8077aef7e35dd SHA256 f1c4379992500ecff526166d090d0716d0a91c8b237e9f66d2b4b5902cc7e014
+DIST opera-9.60-2430.gcc4-qt4.i386.tar.bz2 8096854 RMD160 5750857bd71857a1ac2dca551835b103de70d036 SHA1 cfd9124fbf53695f952de666aeace8fd3ac452ed SHA256 f0a605aaefbd7ed2e65d3469c8fc7b392108dff40bfcebb7e1aa911eea9a755d
+DIST opera-9.60-2430.gcc4-shared-qt3.i386.tar.bz2 5861982 RMD160 9a65a06efb95a6ac27c967f893406896d543a4ef SHA1 b4ece7f877f1522d6ccd7a74b3f06c8566370db1 SHA256 0abb1b199b560f6f59abfaaa959955ef946f339ab232e6ad2ec364aeead18aef
+DIST opera-9.60-2430.gcc4-shared-qt3.ppc.tar.bz2 5938552 RMD160 56016c91af681252ad57e2153e899ec5175fa7f5 SHA1 89a1ab457e09203543a41c3a3761a91c35d26205 SHA256 3b2c4305634c33cf81a3d1d4a65f7778eb9763afd811b6f7c6e1a930fec052bc
+DIST opera-9.60-2430.gcc4-shared-qt3.x86_64.tar.bz2 6471904 RMD160 d5a07ee184fed2137453bd4584ee93499fe1dd86 SHA1 45a65d12e432fd851a14e9afe7a22f12c05db491 SHA256 4eb375f5438a6e325d7998dfcf1edf1fab9d318b1de8c1ff3a616289181b423e
+DIST opera-9.60-2430.gcc4-static-qt3.i386.tar.bz2 7766909 RMD160 5be5e60d0876d76d176177be1cccbee6abdb8cd9 SHA1 fbb51adf0fff4e5163cd0403d4b98294981f0040 SHA256 9eddd252b7c8e716a920faceab1cb2dc824b9423a24c5dde5462893da2579162
 DIST opera-9.60-freebsd5-shared-qt3.i386.tar.bz2 6717427 RMD160 ed06d7ff3ef4f8cf335dff6aac81916436b6f101 SHA1 39a30762102bc3dac1db463c7ba511808f89c551 SHA256 238665c176ab82f3da5719c2b24412aad38154ceb4401da863aadb9d7319d9bf
 DIST opera-9.60-freebsd5-static-qt3.i386.tar.bz2 8642807 RMD160 fa4313c0a94e22856219cecfaa959f9b07e8140f SHA1 14b1dc8d90c18614f29e903f323b7f9285d7460d SHA256 fd3354b9c9d4d2fa9640ded124103fb8d6dc047e0a36f74631b43f7868b49374
 DIST opera-9.60.gcc4-qt4.i386.tar.bz2 8805058 RMD160 2078250af3230901e58b4752a80f037c6c5fa9af SHA1 df58d25b6fe60c00e05bd1846a1b9891954cfe90 SHA256 445f72e5fdaa0be1000bdf1533335f12d943756b40fc9b966d10372206c00996
@@ -54,5 +60,6 @@ EBUILD opera-9.60_pre2410.ebuild 7005 RMD160 eac685a4a6386c7f173c45aa1b45c12c1c9
 EBUILD opera-9.60_pre2415.ebuild 7005 RMD160 57dd15676741a4ecee942f92482684eed654be81 SHA1 999133076e245bf754015fc2b3ffdd9ad4fa3fb9 SHA256 830a79565e88205d84d4db627720e4baabffe1ad84261ece0b20b894e251e578
 EBUILD opera-9.60_pre2424.ebuild 7243 RMD160 4296f757d57f955b8ef16521e3ec91e116db9206 SHA1 3ece7ed59301a70d2ee52e2a69f6a840379fae24 SHA256 cf3423d5ca6754255488e35e9a5265e0eb3d9d60edb22768396d72ca01aed323
 EBUILD opera-9.60_pre2426.ebuild 6872 RMD160 17ac883d8e1ed5aa24f6b0f7f61b4930cd05e875 SHA1 531f55174e5b605777c4704cf68b1eeacdb71274 SHA256 5414a8fedfe4ed7e3a2591c209dee6a7d0a740ce8e3364abad52627c2981986d
-MISC ChangeLog 57275 RMD160 30710eaeb4c2007dd2f4aabba382ed42c397b4b7 SHA1 ff3960de987131f108d9f0ab7df5f7b50afeb285 SHA256 cec61d6fb6e37ad4faad34db69f51dbc61bd12072dd58754235eb2c54ed78486
+EBUILD opera-9.60_pre2430.ebuild 6872 RMD160 d1dd6b7855217da963d2242c841f77791d59fc8b SHA1 ddf08e9a66bdcca3734070480e06f3ef8ad96087 SHA256 373b74394f9abc907877f867f98672aa1dcc005678a44ec8bc157a249f267fa0
+MISC ChangeLog 57467 RMD160 c1524547ba7c54dacd26eee5b3528bed489b541f SHA1 0942fb6e6f29a20c2106d6f8ce40b37bd283ed98 SHA256 351fea577709d9ce7b53821e923e2810dc1ec7760fea6568ca328658c701b68f
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-9.60_pre2430.ebuild b/www-client/opera/opera-9.60_pre2430.ebuild
new file mode 100644
index 000000000000..900a17753d7f
--- /dev/null
+++ b/www-client/opera/opera-9.60_pre2430.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.60_pre2430.ebuild,v 1.1 2008/09/19 14:15:35 jer Exp $
+
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="A standards-compliant graphical Web browser"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-9.0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RESTRICT="mirror strip test"
+
+IUSE="elibc_FreeBSD gnome ia32 qt-static qt3-static spell"
+MY_LINGUAS="de en nl"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_SUFF="2430"
+O_P="${PN}-9.60-${O_SUFF}"
+O_URI="http://snapshot.opera.com/unix/snapshot-${O_SUFF}/"
+
+SRC_URI="
+	x86-fbsd? ( ${O_URI}intel-freebsd/${O_P}.freebsd5-shared-qt3.i386.tar.bz2 )
+	ppc? ( ${O_URI}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
+	qt-static? (
+		qt3-static? (
+			amd64? (
+				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+		)
+		!qt3-static? (
+			amd64? (
+				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+		)
+	)
+	!qt-static? (
+		qt3-static? (
+			amd64? (
+				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+		)
+		!qt3-static? (
+			amd64? (
+				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+		)
+	)
+	"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="media-libs/libexif
+	media-libs/jpeg
+	>=media-libs/fontconfig-2.1.94-r1
+	x11-libs/libXrandr
+	x11-libs/libXp
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXft
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
+	x86? ( !qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) ) )
+	amd64? (
+		ia32? ( app-emulation/emul-linux-x86-qtlibs )
+		!ia32? ( =x11-libs/qt-3* )
+	)
+	ppc? ( =x11-libs/qt-3* )
+	spell? ( app-text/aspell )
+	x86-fbsd? (
+		=virtual/libstdc++-3*
+		!qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) )
+	)
+	"
+
+opera_cd() {
+	cd "${WORKDIR}"/${O_P}* || die "failed to enter work directory"
+	S="$(pwd)"
+	einfo "Working in ${S}"
+}
+
+src_unpack() {
+	unpack ${A}
+	opera_cd
+
+	epatch "${FILESDIR}/${PN}-9.00-install.patch"
+
+	# bug #181300:
+	if use elibc_FreeBSD; then
+		epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch"
+	else
+		epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
+	fi
+
+	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
+		-e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
+		-e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
+		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
+		-e "s:/etc/X11:${D}/etc/X11:g" \
+		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
+		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
+		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
+		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		-e 's:read str_answer:return 0:' \
+		-e "s:/opt/kde:${D}/usr/kde:" \
+		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
+		install.sh || die "sed failed"
+
+}
+
+src_compile() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a configure script or Makefile exists.
+	true
+}
+
+src_install() {
+	opera_cd
+	# Prepare installation directories for Opera's installer script.
+	dodir /etc
+
+	# Opera's native installer.
+	./install.sh --prefix="${D}"/opt/opera || die "install.sh failed"
+
+	einfo "It is safe to ignore warnings about failed checksums"
+	einfo "and about files that would be ignored ..."
+	einfo "Completing the installation where install.sh abandoned us ..."
+
+	# java workaround
+	sed -i -e 's:LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so":LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so":' "${D}"/opt/opera/bin/opera
+
+	dosed /opt/opera/bin/opera
+	dosed /opt/opera/share/opera/java/opera.policy
+
+	# Install the icons
+	insinto /usr/share/pixmaps
+	doins usr/share/pixmaps/opera.xpm
+
+	local res
+	for res in 16x16 22x22 32x32 48x48 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins usr/share/icons/hicolor/${res}/apps/opera.png
+	done
+
+	# Install the menu entry
+	make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient'
+
+	# Install a symlink /usr/bin/opera
+	dodir /usr/bin
+	dosym /opt/opera/bin/opera /usr/bin/opera
+
+	# fix plugin path
+	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> "${D}"/etc/opera6rc
+
+	# enable spellcheck
+	if use spell; then
+		if use qt-static; then
+			DIR=${P}.1
+		else
+			use sparc && DIR=${P}.2 || DIR=${P}.5
+		fi
+		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
+	fi
+
+	dodir /etc/revdep-rebuild
+	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${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}"/opt/${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
+
+	# Add the Opera man dir to MANPATH:
+	insinto /etc/env.d
+	echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
+
+	# Remove unwanted LINGUAS:
+	local LINGUA
+	local LNGDIR="${D}/opt/opera/share/opera/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_postinst() {
+	use gnome && gnome2_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 /opt/opera/share/opera/locale/, then enter the"
+	elog "directory for the language you want and [Open] the .lng file."
+	elog
+	elog "To use the spellchecker (USE=spell) for non-English simply do"
+	elog "$ emerge app-dicts/aspell-[your language]."
+
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	elog "The Opera betas may still have issues with plugins, notably"
+	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}