Version bump <http://my.opera.com/desktopteam/blog/2008/10/04/opera-9-6-rc-2>. Remove sed scripts and improve gentoo patch thanks to Pacho Ramos (bug #239365).

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

5 files changed, 302 insertions, 26 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 4bfda0869f2e..d2f875a66e76 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,14 @@
 # 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.288 2008/10/02 03:02:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.289 2008/10/06 16:58:28 jer Exp $
+
+*opera-9.60_pre2444 (06 Oct 2008)
+
+  06 Oct 2008; Jeroen Roovers <jer@gentoo.org> files/opera-gentoo.patch,
+  opera-9.60_pre2440.ebuild, +opera-9.60_pre2444.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2008/10/04/opera-9-6-rc-2>. Remove
+  sed scripts and improve gentoo patch thanks to Pacho Ramos (bug #239365).
 
   02 Oct 2008; Jeroen Roovers <jer@gentoo.org> -opera-9.60_pre2405.ebuild,
   -opera-9.60_pre2410.ebuild, -opera-9.60_pre2415.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 504d20892b08..1362e1c7be82 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -4,7 +4,7 @@ AUX opera-9.23-pluginpath-fbsd.patch 297 RMD160 d2f1039d2d84f6fd0b7dc1430ade8064
 AUX opera-9.50-pluginpath-fbsd.patch 341 RMD160 735a872421680b1468e2694f9ed41a56d0f23f60 SHA1 41ba2709c1fa585491221f924b3cd000768cd7c2 SHA256 0af425e1845617d7a5f23b1a991c7d306ea2b62b548a2201aa6f0b0ad060d023
 AUX opera-9.50-pluginpath.patch 425 RMD160 53d3c9755eee6f836b9ca446512963de9c8c3145 SHA1 dc5392dd12151f4aef64df0b01ba4eb2cb2a6ab4 SHA256 659c33dd45ebe42e63e4fb791879bf8057c746138538eb0693bfa2a76714c670
 AUX opera-freedesktop.patch 995 RMD160 9ebe36fa34b25a4ab151033a10f7b53494cb4a4a SHA1 e1613110be5c4c4061227776db590f069041f525 SHA256 dc5e4b56ae89049e9708fa3180f375b2de795219fff7d868b8dbbffd99fd7ec5
-AUX opera-gentoo.patch 2268 RMD160 bce8f2fcd6ca0a43d40335beda9bb7f0b952405e SHA1 3c183113b52614db99f0885d2af3ba9e9394bc69 SHA256 dddcc59555c98aefe6f0d0845595e54442d413eb55d10301aa2a8b4e6eac39d2
+AUX opera-gentoo.patch 2276 RMD160 6b68de743af9f420454e0555d242643dbcb45470 SHA1 7dbf662019b7e07df515d27f1519a0da86dce765 SHA256 bcfd73704420fd3bf4a191c1a018b4bb209031aab505544b5e95c24702b9ef01
 AUX opera-simplify-desktop.patch 637 RMD160 017fea605f8a81aa4f48b6cc3081c990fffa3842 SHA1 eb2011ef0d4f8754bb43b506e27ef7b622ab8e91 SHA256 c0009b41727023b3d03faa7c891764d886e92641cb57d8fa762353c9137e0a74
 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
@@ -43,6 +43,12 @@ DIST opera-9.60-2440.gcc4-shared-qt3.i386.tar.bz2 7220064 RMD160 71acfc948b1ee19
 DIST opera-9.60-2440.gcc4-shared-qt3.ppc.tar.bz2 7284991 RMD160 ab81de44f8544186dcf5ae826d8367ab78af2324 SHA1 e836eeea23168d7c46cf209d30d97c6d67eb906a SHA256 8269977e8d802d97c269020cad51cfc4397bc51129b17c35aff976545e1e28a0
 DIST opera-9.60-2440.gcc4-shared-qt3.x86_64.tar.bz2 7827862 RMD160 b32c8b1325cb10512fb54641b5d46aedc151c80c SHA1 b4fe4a0c641029a31998197885705bba1e348663 SHA256 d6bdbd694446e301f084a3e728c9771fcabb851874c50b65f88c71fbc01f9b15
 DIST opera-9.60-2440.gcc4-static-qt3.i386.tar.bz2 9147461 RMD160 3233e91052e04c7890adc706146d20b4cebd3dd3 SHA1 27d416ebefe6f800c254f8fa144428e14bac060b SHA256 595e3b3710c355075c3728924459231e3dda334f27aebf4f00340bfc37f2129f
+DIST opera-9.60-2444.freebsd5-shared-qt3.i386.tar.bz2 7342693 RMD160 5a6c43869123949310d565fd2d14075006b3b66d SHA1 6a0ffacb5557ab708d4aa153e36e73bd3c5edade SHA256 ff5a9f022f6dbab5faabd1195c0af5edd091218377b93698ee1c0c88562a6d04
+DIST opera-9.60-2444.gcc4-qt4.i386.tar.bz2 9440112 RMD160 47d2dfd13b792a69ca65ccdfed8a58a4385c565b SHA1 d93748e4161591e28bf5400567075b057c92d127 SHA256 0803824397ab4ad3f2e5780a8932e19d0ee08c02ef8d4c201d606a5164683fdc
+DIST opera-9.60-2444.gcc4-shared-qt3.i386.tar.bz2 7218947 RMD160 e1b41000bba8ab3b804377202e337ded6084b274 SHA1 229137e8f5f373d36b39d348e992774bc0ce094d SHA256 b136be1f245d159a947c3b3f44934c33fa51e1cceaaa64137896ecbce427d4e5
+DIST opera-9.60-2444.gcc4-shared-qt3.ppc.tar.bz2 7282185 RMD160 a1ba27d545a18edf4c8a734212d2f0d61754b0f8 SHA1 0dad99dd89495ffb76a1334e9924124288ddd38a SHA256 697b851188725f1f3b4d2412e0c0aabea65740d3ee7240338e75d0fc34267660
+DIST opera-9.60-2444.gcc4-shared-qt3.x86_64.tar.bz2 7825070 RMD160 9302b27ae78062b5f560021689f5949d1a5614a5 SHA1 fef45219fac04d9630f73355d6fe6f2d4b9fe07f SHA256 30f7165821179ba38c2c72b9eea10abc8b56e538601b92d19203776dd99799fd
+DIST opera-9.60-2444.gcc4-static-qt3.i386.tar.bz2 9142543 RMD160 ed1404eab43c07ef3494109dd310bf9606e6b5ad SHA1 c805abcc32b3b79f09b9162e268d9375703ac0bd SHA256 4f6f097ebaf3ba95f5bd35a2d7087800a4cf4e739e47e2297edb339c7797f30f
 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
@@ -56,6 +62,7 @@ EBUILD opera-9.60_pre2424.ebuild 7243 RMD160 4296f757d57f955b8ef16521e3ec91e116d
 EBUILD opera-9.60_pre2426.ebuild 6872 RMD160 17ac883d8e1ed5aa24f6b0f7f61b4930cd05e875 SHA1 531f55174e5b605777c4704cf68b1eeacdb71274 SHA256 5414a8fedfe4ed7e3a2591c209dee6a7d0a740ce8e3364abad52627c2981986d
 EBUILD opera-9.60_pre2430.ebuild 6872 RMD160 d1dd6b7855217da963d2242c841f77791d59fc8b SHA1 ddf08e9a66bdcca3734070480e06f3ef8ad96087 SHA256 373b74394f9abc907877f867f98672aa1dcc005678a44ec8bc157a249f267fa0
 EBUILD opera-9.60_pre2436.ebuild 6950 RMD160 caaafca9c8d74aefd8ec9f7a0fb9439bc6bec720 SHA1 a174fa040fbd70ac16d269b8d199800e0cab7961 SHA256 65de0384167c93ea924dda48eb97e71ea5b43026003e628171ee88ca74c7be3e
-EBUILD opera-9.60_pre2440.ebuild 7131 RMD160 1ec5ca7e0e23de702fa9b4d1fe429201d25331e1 SHA1 ec7013c144fc8e6b906aeda148e28e48b66292ac SHA256 2a3da9be50f95bbae4bf571a55adaef04c260a616e98493c6bac0684e0a54492
-MISC ChangeLog 58180 RMD160 ab0c955d71be6aa6359f29ed6fc1c5b7b74b3b3c SHA1 898359d2f28de2a2a26041bef807c2daaa2e49d8 SHA256 563353b8799962ef759b65bd67badaa08d1ca424d3e17e898d72b492d73a41cc
+EBUILD opera-9.60_pre2440.ebuild 7573 RMD160 e174bf51ecf4af1ac4387f3ffc02b5247cb7de4b SHA1 308cf21fa2a933254a8792614e8e50326121ddf5 SHA256 50d045ec15f211fe6290e1ff4227bde376f9af990a3860e36e33f5cea64a3724
+EBUILD opera-9.60_pre2444.ebuild 7573 RMD160 9aff4a52ec346b5f0ad787068e509b33ae89c710 SHA1 3ad7faa7e5e5d77fe6935a21f03d5bb875af86ee SHA256 0f7f0dc47dad2f123bc0cde337b0a6e02dbeada146a6e5a3369253755a3f0f38
+MISC ChangeLog 58512 RMD160 57de9e9aa0cf7354adb135195af577e1310ebd7c SHA1 f2a6370105bf09525cc3219e2f31d0ae351e1898 SHA256 c6d8097a0f6f674ccf4d76e4f43a2b82a3133a7e5e4bb0b061121c59b90a04cb
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/files/opera-gentoo.patch b/www-client/opera/files/opera-gentoo.patch
index 8fb02dd50e8a..11aa2845cd5a 100644
--- a/www-client/opera/files/opera-gentoo.patch
+++ b/www-client/opera/files/opera-gentoo.patch
@@ -8,8 +8,8 @@
 +{
 +	if test -e /etc/gentoo-release ; then
 +		for res in 16x16 22x22 32x32 48x48 ; do
-+			mkdir -p /usr/share/icons/hicolor/${res}/apps
-+			cp usr/share/icons/hicolor/${res}/apps/opera.png /usr/share/icons/hicolor/${res}/apps
++			mkdir -p ${D}/usr/share/icons/hicolor/${res}/apps
++			cp usr/share/icons/hicolor/${res}/apps/opera.png ${D}/usr/share/icons/hicolor/${res}/apps
 +		done
 +		mkdir -p ${D}/usr/share/applications
 +		generate_desktop ${D}/usr/share/applications xdg
diff --git a/www-client/opera/opera-9.60_pre2440.ebuild b/www-client/opera/opera-9.60_pre2440.ebuild
index 4461fd51cafa..08b4ebfa676b 100644
--- a/www-client/opera/opera-9.60_pre2440.ebuild
+++ b/www-client/opera/opera-9.60_pre2440.ebuild
@@ -1,6 +1,6 @@
 # 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_pre2440.ebuild,v 1.1 2008/10/02 02:59:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.60_pre2440.ebuild,v 1.2 2008/10/06 16:58:28 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -114,18 +114,24 @@ src_unpack() {
 		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:" \
+#	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"
+
+	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"
 
 }
@@ -155,17 +161,20 @@ src_install() {
 	dosed /opt/opera/share/opera/java/opera.policy
 
 	# Install the icons
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/opera.xpm
+#	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
+#	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'
+#	make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient'
+
+	# 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
diff --git a/www-client/opera/opera-9.60_pre2444.ebuild b/www-client/opera/opera-9.60_pre2444.ebuild
new file mode 100644
index 000000000000..c3ea200b6972
--- /dev/null
+++ b/www-client/opera/opera-9.60_pre2444.ebuild
@@ -0,0 +1,252 @@
+# 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_pre2444.ebuild,v 1.1 2008/10/06 16:58:28 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 id it
+ja ka ko lt mk nb nl nn pl pt pt-BR ru sv tr uk zh-CN zh-TW"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_SUFF="2444"
+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"
+	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}-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"
+
+	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_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'
+
+	# 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
+
+	# 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
+}