Version bump <http://my.opera.com/desktopteam/blog/2009/04/03/turbo-in-10>.

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

5 files changed, 226 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 8e03097eead3..e5a7f3db7dd9 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.335 2009/03/20 19:42:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.336 2009/04/03 19:00:53 jer Exp $
+
+*opera-10.00_pre4268 (03 Apr 2009)
+
+  03 Apr 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/opera-10.00-pluginpath.patch,
+  +files/opera-10.00-pluginpath-fbsd.patch, +opera-10.00_pre4268.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2009/04/03/turbo-in-10>.
 
   20 Mar 2009; Jeroen Roovers <jer@gentoo.org> opera-9.27.ebuild,
   opera-9.64.ebuild, opera-10.00_pre4205.ebuild, opera-10.00_pre4214.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e6e2518f35b6..f8ba4fb6f79a 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1,5 @@
+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
 AUX opera-9.00-install.patch 320 RMD160 2bc2e345193c007d10db4b39335e7695cd85e4ba SHA1 aff6a31af75ffe1b073059ae5b89d3416daac384 SHA256 c0415f9832624b0f4527b4707f01f1bf069bc9cb63c25fc180218c5543471ed2
 AUX opera-9.21-pluginpath.patch 387 RMD160 009157fd0f3e32e3409dd3fdd3be3c03bd90eb1e SHA1 0533c681e26f2521c38a93e3c731ffe42cd1f54d SHA256 4fc3ae28d7d105bd45c30a45696222cd2bfa9e49bd32c2e7cb8073dd59b2da19
 AUX opera-9.23-pluginpath-fbsd.patch 297 RMD160 d2f1039d2d84f6fd0b7dc1430ade806431b74d70 SHA1 28640e570ef2654baae09337ab18b9444ea0c975 SHA256 5f3f7ae85c4329d54f9aeeaf16e5db280c4c966d5f776342946da2231163a482
@@ -16,6 +18,8 @@ DIST opera-10.00-4214.gcc4-bundled-qt4.i386.tar.bz2 12753187 RMD160 e8177b4069e1
 DIST opera-10.00-4214.gcc4-qt4.i386.tar.bz2 7937227 RMD160 b0e80901a066c74b599d08b8b6d74603ca3860cd SHA1 0a939be31a8c6c663b94968f1aebf726f0a64c5e SHA256 8bb8cb9bd62e3b2319910b1fffa0d12eaa201cedbed9096ec4f151f4fb141aa3
 DIST opera-10.00-4214.gcc4-shared-qt3.i386.tar.bz2 7969230 RMD160 c925fbbd4efb2c2cc68a8e5771a97586b93571a3 SHA1 9c3ea5dec7e4796f419aa31f75929f772f6b30f3 SHA256 3c34ee75066ab0939f7c1c10ee081237a9c88c8b6a9ebf425c37003814589244
 DIST opera-10.00-4214.gcc4-shared-qt3.x86_64.tar.bz2 8645763 RMD160 aaaee3f10a777cca11ecd2f9d05f6713aeb935b0 SHA1 c4e9108246e951a21339f00ced7eba28d008c98e SHA256 ca92d75631cf1b77e9c11fc2936e3b770b885ab2d00c9ccbadf00f19f6b541ed
+DIST opera-10.00-4268.gcc4-shared-qt3.i386.tar.bz2 7948661 RMD160 0ed905a2e4e471332e116b5a8d0fbe313fcf14e9 SHA1 41a3104deeb296e33c10d66167331039fb5c8044 SHA256 e26c84eb2a6580a3afe3d29b1e6a5236cb61ca99bcdc790befc10d75d134a4e5
+DIST opera-10.00-4268.gcc4-static-qt3.i386.tar.bz2 9877121 RMD160 52d6cae17128be2a05d5e6aff5b07cbae4d6967a SHA1 cc55ea54870dfcb6a5a606ad2781c47e78eec469 SHA256 ab7e9062bd694e0ceddeaa2a2c5a8aa04f10ad2996e8d5842bd20c5a1c762d36
 DIST opera-9.27-20080331.1-static-qt.i386-en.tar.bz2 6813669 RMD160 353adab3fa9a401720264738ea7494c184b0df2e SHA1 4fee1c05b31be9e11fbe78c127809c3f550b775a SHA256 3f76e709ee4896abb8aa5dfc5ce7c1b75f476faf947c1f6bb8b125d0726bc031
 DIST opera-9.27-20080331.1-static-qt.i386.freebsd-en.tar.bz2 6561843 RMD160 14264eb3e249e4c23625f9a8d521a84d382077fd SHA1 8853366a874cb18a6eff86b7ce5c63923984e0a3 SHA256 ac695d429e859f2764d4c3d80798b0bcce9a8670c83ebe61ef568d197bd61aab
 DIST opera-9.27-20080331.1-static-qt.ppc-en.tar.bz2 6860940 RMD160 5e109dabb20cc8d7afc6a2ef96e274f5e4eb973c SHA1 3a6e8d565ed3a2d0373be3e36324818a7e54fedb SHA256 f3dff4eae0092a55868aa778aa14000407a13e7909f0e493c1a38c58c2bdc56d
@@ -30,7 +34,8 @@ DIST opera-9.64.gcc4-shared-qt3.x86_64.tar.bz2 7977427 RMD160 190e22a742eeba7300
 DIST opera-9.64.gcc4-static-qt3.i386.tar.bz2 9273212 RMD160 338c780de3d9495d3c27f6bba9b9122adb6b36e0 SHA1 3bbe6fd5ea852f6dae130ffad816034ebfb27e79 SHA256 056f3983497438878741c45ceade285387cd393d0b3469f0a8971223c1364dbf
 EBUILD opera-10.00_pre4205.ebuild 6646 RMD160 529a11a4deffc89a75746a540603b4801441f1f4 SHA1 84c18f2323c9ebb1de499076b458c64a8138ab63 SHA256 2c098ecc3375fa5a7a70dface5707cab72cba47462265d95719606a8fdca3c50
 EBUILD opera-10.00_pre4214.ebuild 6384 RMD160 1547da0f968c7cecc8487c40525cef5cc11b4471 SHA1 a0be26b554fc53639575f323a669bcebcb1f364e SHA256 d4f90f1231ae9a9c886772273818497295aa80887ee120a1b85bfd881de81381
+EBUILD opera-10.00_pre4268.ebuild 5316 RMD160 f63f04f9f713516485f0728c6fd2b1a6a7d17538 SHA1 c585d0143a8c343bc0a251c4ad253ebd3716299b SHA256 c862214f96aa7f51a01ffc5f906440e09983acb76cbdcc3b8e3cc6ee3efd8609
 EBUILD opera-9.27.ebuild 6053 RMD160 fa86d79c0a1beae6d3605467122c2a5451b21bff SHA1 32d8ea747f757e99ce0af0c456c4aed71a660689 SHA256 4b0d2bb5bbbdc1eb4cee89f717d6bdc556337fb4d7e7973c216292d1f4cd8fee
 EBUILD opera-9.64.ebuild 7898 RMD160 ff064d2d3c14c98ae219805e2c673cec13bc758a SHA1 1d7b4fdfa7a7f6ac19c6117ab39393a85d5f9290 SHA256 3e6f233d638445e8e124f84aa91e4accc324a844a866c5d1df467e28b1aeef4a
-MISC ChangeLog 65050 RMD160 fa310e6c75a3c039bf61c83f0cd91edaf8d532aa SHA1 9b5fef15e716327369061a51b69b62cea3a7279d SHA256 2a7c9c0416169a816040a1d0a32f34a0351a2e2c8c141c417a0169cec27037ff
+MISC ChangeLog 65326 RMD160 b40d1cb9539be3f2a85b446c82e425b61aea5fee SHA1 ee6ef59e0b9235c4e73a3d40ee4c8be28b357c1a SHA256 863f422c95e37029e6805af22c8df5c104018090721804f351a51a9024371190
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/files/opera-10.00-pluginpath-fbsd.patch b/www-client/opera/files/opera-10.00-pluginpath-fbsd.patch
new file mode 100644
index 000000000000..8720125ae11c
--- /dev/null
+++ b/www-client/opera/files/opera-10.00-pluginpath-fbsd.patch
@@ -0,0 +1,10 @@
+--- usr/local/share/opera/ini/pluginpath.ini	2007-09-06 18:53:54 +0200
++++ usr/local/share/opera/ini/pluginpath.ini	2007-09-06 18:55:49 +0200
+@@ -21,6 +21,7 @@
+ ; Netscape Plug-in Paths
+ /usr/X11R6/lib/browser_plugins=1
+ $HOME/.netscape/plugins=1
++/usr/lib/nsbrowser/plugins=1
+ 
+ ; FreeBSD Plug-in Paths
+ /usr/local/lib/npapi/symlinks/opera
diff --git a/www-client/opera/files/opera-10.00-pluginpath.patch b/www-client/opera/files/opera-10.00-pluginpath.patch
new file mode 100644
index 000000000000..a385ced4c305
--- /dev/null
+++ b/www-client/opera/files/opera-10.00-pluginpath.patch
@@ -0,0 +1,12 @@
+--- usr/share/opera/defaults/pluginpath.ini.orig	2007-09-03 20:33:17.000000000 +0200
++++ usr/share/opera/defaults/pluginpath.ini	2007-09-04 18:44:28.000000000 +0200
+@@ -49,7 +49,8 @@
+ ; Netscape Plug-in Paths
+ $HOME/.netscape6/plugins=1
+ $HOME/.netscape/plugins=1
+-/opt/netscape/plugins=1
++/usr/lib/nsbrowser/plugins=1
++/opt/netscape/plugins=2
+ /usr/lib/netscape/plugins=1
+ /usr/local/netscape/plugins=1
+ /usr/local/lib/netscape/plugins=1
diff --git a/www-client/opera/opera-10.00_pre4268.ebuild b/www-client/opera/opera-10.00_pre4268.ebuild
new file mode 100644
index 000000000000..a94a0df8a8f1
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4268.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4268.ebuild,v 1.1 2009/04/03 19:00:53 jer Exp $
+
+EAPI="2"
+
+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 ~x86"
+
+RESTRICT="mirror strip test"
+
+IUSE="elibc_FreeBSD gnome qt-static"
+MY_LINGUAS="be bg cs da de el en 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 ru sv ta te tr uk zh-CN zh-TW"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_U="http://snapshot.opera.com/unix/snapshot-${P##*_pre}/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+	qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+	!qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+	"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="
+	media-libs/jpeg
+	media-libs/libexif
+	>=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
+	!qt-static? ( =x11-libs/qt-3*[-immqt] )
+	"
+
+opera_cd() {
+	cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
+	S="$(pwd)"
+	einfo "Working in ${S}"
+}
+
+opera_linguas() {
+	# 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
+}
+
+src_unpack() {
+	unpack ${A}
+	opera_cd
+
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-simplify-desktop.patch"
+	epatch "${FILESDIR}/${PN}-freedesktop.patch"
+
+	# bug #181300:
+	if use elibc_FreeBSD; then
+		epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
+	else
+		epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
+	fi
+
+	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
+		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
+		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
+		install.sh || die "sed failed"
+
+}
+
+src_configure() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a configure script exists.
+	true
+}
+
+src_compile() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a 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
+
+	# Adapt desktop file to Gnome when needed
+	use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/opera.desktop
+
+	# 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
+
+	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
+
+	[[ -z MY_LINGUAS ]] || opera_linguas
+}
+
+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 languages other than English, do:"
+	elog " emerge app-dicts/myspell-[your language]"
+	elog " mkdir \${HOME}/.opera/dictionaries"
+	elog " cd \${HOME}/.opera/dictionaries"
+	elog " ln -s /usr/share/myspell/*.{aff,dic} ."
+	elog "A future release of Opera 10 should remedy this inconvenience."
+
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	elog
+	elog "The current Opera builds 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
+}