Version bump <http://my.opera.com/desktopteam/blog/2008/09/05/9-60-beta-1-rc>.

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

3 files changed, 255 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 3f3b03a2ee7d..2548d48eb699 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.281 2008/08/29 15:33:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.282 2008/09/06 05:17:06 jer Exp $
+
+*opera-9.60_pre2415 (06 Sep 2008)
+
+  06 Sep 2008; Jeroen Roovers <jer@gentoo.org> +opera-9.60_pre2415.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2008/09/05/9-60-beta-1-rc>.
 
 *opera-9.60_pre2410 (29 Aug 2008)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 8ab50330971b..1b1b0b9fb0f9 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -28,9 +28,16 @@ DIST opera-9.60-2410.gcc4-shared-qt3.i386.tar.bz2 5810913 RMD160 aa4674cb6479329
 DIST opera-9.60-2410.gcc4-shared-qt3.ppc.tar.bz2 5872345 RMD160 2498a9f1fa12952cc422034d2111500d53f991b6 SHA1 cf90bb8bf1d7d319afc0cad0bcc87635f50dfaef SHA256 ba4878aa3303bd22dbf1b13b21dc9bed1e24ac72b46c6cead16c638dd595b5e1
 DIST opera-9.60-2410.gcc4-shared-qt3.x86_64.tar.bz2 6421777 RMD160 cd3e58345f9eadb05ae49f87430edddf7ca4db53 SHA1 f0f15583493734182f7b49267a47aae30a2b51c9 SHA256 b319f4c481a6dce4f924f0bc9495297c175dbef44e364a6cbb89a736d242e057
 DIST opera-9.60-2410.gcc4-static-qt3.i386.tar.bz2 7712574 RMD160 9392efa4e7ae8dda1db22b0faed08689188f105c SHA1 17dfc5e7f5a5c95eeda2945db1a0f35990b94927 SHA256 c689e7ae9f11b348f7ec7cd2e67fe22fde5edbcf83b0bff34eb03b497a56df8d
+DIST opera-9.60-2415.freebsd5-shared-qt3.i386.tar.bz2 6003401 RMD160 1082811c03b9570f7632f33cb61077c55e66a717 SHA1 f1af5927843947f5d85f9af9a51c002bd64224a0 SHA256 22765f790c9937f1572b0240192b54fd650eaad158edc520267896cfe62ae0a8
+DIST opera-9.60-2415.gcc4-qt4.i386.tar.bz2 8090452 RMD160 b912106e415891eaa5521fe00fceec779caac70e SHA1 0383f2d1fc181be015090f8d362dbb55dd134e69 SHA256 539776d999988b90d1fee8514bbda179e486de8193ada40793db978acbc70ea8
+DIST opera-9.60-2415.gcc4-shared-qt3.i386.tar.bz2 5856805 RMD160 dc7302fd9c84e6908e637d8d0925e9d63843a64b SHA1 3bf5041912a04183fd07a872cdb890a9b9a72835 SHA256 c75d3be6e07510dede150340185d3ae31f723b9c312903a5b679a6a2f1a74b53
+DIST opera-9.60-2415.gcc4-shared-qt3.ppc.tar.bz2 5935067 RMD160 afc60e306851cec482211504a63e72c91ef9017c SHA1 4fe36bd7f54d4d4e608e1602494af30c5300b6b1 SHA256 72c6f7fa56ed8726b9171787a48121b8062a43799012ad099666470b139b82fa
+DIST opera-9.60-2415.gcc4-shared-qt3.x86_64.tar.bz2 6470754 RMD160 d980c07f03d1786b9852ea89ea30be43aa495c02 SHA1 dafeee6d23b3d1a824ef5a5aaa41546f7d0a1ffd SHA256 a9630375688d78772992c2fca7c5eec403986ca2c0b8d436e0c2ee7a3b3ce9ba
+DIST opera-9.60-2415.gcc4-static-qt3.i386.tar.bz2 7766732 RMD160 7c6226fec228ce71aa02f5d86afc5b9ec6b18e58 SHA1 c2cfcda7982f2676681659df2731e160a7f4b023 SHA256 34aa714d6bc350f45e614230bdd3ae68d8cee49c0931faab217cc7be19764fba
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
 EBUILD opera-9.52.ebuild 7332 RMD160 7d52e5124559fe06984017a23c5e9f513d801be5 SHA1 ceb20bc6ecd0fef8f58db346c27c726ace4fb4ec SHA256 179dae5f51aedc9e92006294994747d16b286ce29b1f17e8a12e5d292c0c3054
 EBUILD opera-9.60_pre2405.ebuild 7005 RMD160 8b520d9639df532966260d8e293ec891cb07f51e SHA1 702351a83b0cbb5c336a763bec20ea3d47cdf423 SHA256 74caf2deddd23fe5b9318388e05c1f15642c23263898e3b87bc2246580bde798
 EBUILD opera-9.60_pre2410.ebuild 7005 RMD160 eac685a4a6386c7f173c45aa1b45c12c1c9b769c SHA1 da2dc7728c73189e55f5991d509d0b9c7d7d79c4 SHA256 7fcebdf3f0819a1cf3f68987e83b67aba74344c1b786b9db9b571eeedf498532
-MISC ChangeLog 56660 RMD160 2612969d4b444cc04f810bd5fd1e62b0a64fca4d SHA1 33550d7f0705b85af8b4464b7571b1649051f477 SHA256 121aab4ac80ad357c795aee52415021c7d30294cac0012f9f2f91eed728e2ee8
+EBUILD opera-9.60_pre2415.ebuild 7005 RMD160 57dd15676741a4ecee942f92482684eed654be81 SHA1 999133076e245bf754015fc2b3ffdd9ad4fa3fb9 SHA256 830a79565e88205d84d4db627720e4baabffe1ad84261ece0b20b894e251e578
+MISC ChangeLog 56854 RMD160 40d697e348289f4d74af3c49a948be9e2da8b64a SHA1 66371a447ba767893c974d1b383f66c1657d5f09 SHA256 6787b89aa78b6ca4f033a2032cfd9d90c8e2bac3db318224ca181519d969c94a
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-9.60_pre2415.ebuild b/www-client/opera/opera-9.60_pre2415.ebuild
new file mode 100644
index 000000000000..08cb37d9228d
--- /dev/null
+++ b/www-client/opera/opera-9.60_pre2415.ebuild
@@ -0,0 +1,240 @@
+# 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_pre2415.ebuild,v 1.1 2008/09/06 05:17:06 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="be bg cs da de el en en-GB es-ES es-LA fi fr fr-CA fy hi
+#hr hu it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv tr zh-CN zh-TW"
+
+#for MY_LINGUA in ${MY_LINGUAS}; do
+#	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+#done
+
+O_SUFF="2415"
+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
+}