Version bump <http://my.opera.com/desktopteam/blog/2008/10/01/opera-9-6-rc-1>. Implement install.sh changes thanks to Pacho Ramos (bug #204294).

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

6 files changed, 393 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index e0a16cd5f0e9..18232ed5580f 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,15 @@
 # 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.286 2008/09/26 17:29:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.287 2008/10/02 02:59:20 jer Exp $
+
+*opera-9.60_pre2440 (02 Oct 2008)
+
+  02 Oct 2008; Jeroen Roovers <jer@gentoo.org>
+  +files/opera-freedesktop.patch, +files/opera-gentoo.patch,
+  +files/opera-simplify-desktop.patch, +opera-9.60_pre2440.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2008/10/01/opera-9-6-rc-1>.
+  Implement install.sh changes thanks to Pacho Ramos (bug #204294).
 
 *opera-9.60_pre2436 (26 Sep 2008)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index fa55971050a9..ebaade4f967f 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -3,6 +3,9 @@ AUX opera-9.21-pluginpath.patch 387 RMD160 009157fd0f3e32e3409dd3fdd3be3c03bd90e
 AUX opera-9.23-pluginpath-fbsd.patch 297 RMD160 d2f1039d2d84f6fd0b7dc1430ade806431b74d70 SHA1 28640e570ef2654baae09337ab18b9444ea0c975 SHA256 5f3f7ae85c4329d54f9aeeaf16e5db280c4c966d5f776342946da2231163a482
 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-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
 DIST opera-9.27-20080331.1-static-qt.ppc-en.tar.bz2 6860940 RMD160 5e109dabb20cc8d7afc6a2ef96e274f5e4eb973c SHA1 3a6e8d565ed3a2d0373be3e36324818a7e54fedb SHA256 f3dff4eae0092a55868aa778aa14000407a13e7909f0e493c1a38c58c2bdc56d
@@ -52,6 +55,12 @@ DIST opera-9.60-2436.gcc4-shared-qt3.i386.tar.bz2 6780570 RMD160 5246ef78a0f6e7b
 DIST opera-9.60-2436.gcc4-shared-qt3.ppc.tar.bz2 6835278 RMD160 5403fc29e53963ca59f2793a7c7bd5d4b7e952f2 SHA1 e5cf3c17bb271f448289bcea00b942e8f135dd56 SHA256 9e680812b7096357a2ec3aad99aad1611618bde0c23c10f002174a72444b0cae
 DIST opera-9.60-2436.gcc4-shared-qt3.x86_64.tar.bz2 7392203 RMD160 de0df9ea7b06466071e768f2297e7a49928942a6 SHA1 a4da3990b14be86714f5869c7ea3d82fd0e6dc09 SHA256 e333414df1eae08ac2eb0f06cd6394f97dd7a6701ef01bb19895bd3819a319b1
 DIST opera-9.60-2436.gcc4-static-qt3.i386.tar.bz2 8679805 RMD160 98b5e552a3745cd4ce9a833839e8d5f2b99867ad SHA1 277016274fcbc1a7ab563b599191f780deb32f13 SHA256 07e9ccd06c2e3590d1e81ffadfcf6eac41dbc5b88d3028ed45e77c25ea4f1557
+DIST opera-9.60-2440.freebsd5-shared-qt3.i386.tar.bz2 7347021 RMD160 9c2d20aa7524f0d2e81a900e946c19a5cd7b0c13 SHA1 8729949fc4a7a693d0a67d7b2fc9120437f7f89c SHA256 e5cd811fe079e48b93566cdf7440268f7621ca626839d8ccb4357200fc4144bb
+DIST opera-9.60-2440.gcc4-qt4.i386.tar.bz2 9441173 RMD160 4d6fee832f22b57eb886a2bb5ab49ae01e0f0656 SHA1 f454ad09d366bba8fa57d11f4d496bd5bcb22496 SHA256 4aecf08fc0862ef8c23635cffd43bf717e3a50a0fbe83a3586277e1d211d1190
+DIST opera-9.60-2440.gcc4-shared-qt3.i386.tar.bz2 7220064 RMD160 71acfc948b1ee19da07ee377bdf5f7240856fcdd SHA1 913629ad315428e9df13f862fca34eecfce12a6d SHA256 9418110a7769995a3dd1e8bd26441301b7488f51aa5ee6f271fb104653f6e9e3
+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-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
@@ -68,5 +77,6 @@ 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
-MISC ChangeLog 57662 RMD160 363e472d681545903a89c8b5d8a33bb09ecf1cf1 SHA1 a7902c16bed2c27b193e7a7c48e2c15e53a9b3f3 SHA256 05356f3c06f4ec6061457047afad4108f5403f9dc9c970ad52ff5dd19476b7b0
+EBUILD opera-9.60_pre2440.ebuild 7131 RMD160 1ec5ca7e0e23de702fa9b4d1fe429201d25331e1 SHA1 ec7013c144fc8e6b906aeda148e28e48b66292ac SHA256 2a3da9be50f95bbae4bf571a55adaef04c260a616e98493c6bac0684e0a54492
+MISC ChangeLog 58024 RMD160 c8e3508e8335a46085dcf8a4e6bfafaeb6445709 SHA1 d9aa4dc363a959006306658812f22baae1440de1 SHA256 6cdac80eb26bbfd0719b4545610ba7804aaf84bb725ff405dfa99f840bbd2320
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/files/opera-freedesktop.patch b/www-client/opera/files/opera-freedesktop.patch
new file mode 100644
index 000000000000..16c6614ab5da
--- /dev/null
+++ b/www-client/opera/files/opera-freedesktop.patch
@@ -0,0 +1,35 @@
+--- install.sh~	2008-09-07 14:22:32.000000000 +0200
++++ install.sh	2008-09-07 14:22:32.000000000 +0200
+@@ -1405,7 +1405,6 @@
+ EOF
+ 	fi
+ 	cat <<EOF
+-Encoding=UTF-8
+ Name=Opera
+ Name[af]=opera
+ Name[eo]=Opero
+@@ -1438,19 +1437,20 @@
+ # http://standards.freedesktop.org/menu-spec/menu-spec-latest.html
+ #
+ # but Chris included it anyway to fix
+-# http://bugs.gentoo.org/show_bug.cgi?id=90508
++# http://bugs.gentoo.org/show_bug.cgi?id=90508 -> This is already fixed
++# in Gnome
+ #
+ # Other possible categories:
+ # Email, Presentation, IRCClient, FileTransfer, P2P, News, WebDevelopment
+ 
+ 	if test "$1" = "xdg"
+ 	then cat <<EOF
+-Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
+-Icon=opera.png
++Categories=Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel;
++Icon=opera
+ EOF
+ 	else echo 'Icon=opera'
+ 	fi
+-	echo 'MimeType=text/html;text/xml;application/xhtml+xml'
++	echo 'MimeType=text/html;text/xml;application/xhtml+xml;'
+     fi
+     cat <<EOF
+ Comment=Web Browser
diff --git a/www-client/opera/files/opera-gentoo.patch b/www-client/opera/files/opera-gentoo.patch
new file mode 100644
index 000000000000..8fb02dd50e8a
--- /dev/null
+++ b/www-client/opera/files/opera-gentoo.patch
@@ -0,0 +1,70 @@
+--- install.sh.orig	2008-08-12 23:45:42.000000000 +0200
++++ install.sh	2008-08-13 23:09:44.000000000 +0200
+@@ -1720,6 +1720,18 @@
+     fi
+ }
+ 
++gentoo()
++{
++	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
++		done
++		mkdir -p ${D}/usr/share/applications
++		generate_desktop ${D}/usr/share/applications xdg
++	fi
++}
++
+ huntdirs()
+ {
+     # $GNOME2PATH and $GNOMEPATH skipped (too few hits google site:gnome.org)
+@@ -1737,47 +1749,7 @@
+ 
+ xdg()
+ {   # http://standards.freedesktop.org
+-    UDD=''
+-    for BIN_DIR in `pathdirs`; do
+-	test -x ${BIN_DIR}/update-desktop-database || continue
+-	UDD=${BIN_DIR}/update-desktop-database; break
+-    done
+-
+-    # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+-    if test "$UDD"; then
+-	for ICON_DIR in `echo ${XDG_DATA_DIRS}:/usr/local/share:/usr/share|tr : '\012'|sed -e '/^$/d;s:$:/icons/hicolor:'` /usr/share/pixmaps/hicolor
+-	do test -d ${ICON_DIR} && break
+-	done
+-
+-	if   test ! -d ${ICON_DIR}
+-	then warn "Could not find icon installation directory, icons not installed."
+-	elif test ! -w ${ICON_DIR}
+-	then warn "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed."
+-	elif [ "`cd $ICON_DIR; /bin/pwd`" != "`cd usr/share/icons/hicolor; /bin/pwd`" ]
+-	then
+-	    for RESOLUTION in 48x48 32x32 22x22
+-	    do	TO_DIR=${ICON_DIR}/${RESOLUTION}/apps
+-		test -d $TO_DIR && test -w $TO_DIR && cp $cpv usr/share/icons/hicolor/$RESOLUTION/apps/opera.png $TO_DIR
+-	    done
+-	fi
+-
+-	for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications
+-	do test -d ${SHORTCUT_DIR} && break;
+-	done
+-
+-	if   test ! -d ${SHORTCUT_DIR}; then warn "Could not find shortcut installation directory, desktop entry not installed."; return
+-	elif test ! -w ${SHORTCUT_DIR}; then warn "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed."; return
+-	fi
+-	generate_desktop ${SHORTCUT_DIR} xdg
+-	${UDD}
+-    else
+-	icons
+-	gnome
+-	kde 3
+-	kde 2
+-	kde1
+-	mandrake
+-    fi
++	gentoo
+ }
+ 
+ echo test | sed -n -e 's/test//' || error 'sed'
diff --git a/www-client/opera/files/opera-simplify-desktop.patch b/www-client/opera/files/opera-simplify-desktop.patch
new file mode 100644
index 000000000000..10d8f5a7110c
--- /dev/null
+++ b/www-client/opera/files/opera-simplify-desktop.patch
@@ -0,0 +1,24 @@
+--- install.sh~	2008-08-12 23:39:54.000000000 +0200
++++ install.sh	2008-08-12 23:39:54.000000000 +0200
+@@ -1331,20 +1331,7 @@
+ 	fi
+ 
+ 	# Shorcuts and Icons
+-	bool_icons=1 # install icons by default
+-	if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
+-	then
+-	    warn
+-	    warn "Shortcut icons would be ignored if installed with the prefix \"$prefix\"."
+-	    if [ "$flag_mode" = "--force" ]
+-	    then warn "Installing them in default locations."
+-	    else bool_icons=0; warn "Ignoring them; menus shall lack nice icons."
+-	    fi
+-	fi
+-
+-	if test "$bool_icons" -ne 0
+-	then xdg
+-	fi
++	xdg
+ 
+     fi # OPERADESTDIR
+ 
diff --git a/www-client/opera/opera-9.60_pre2440.ebuild b/www-client/opera/opera-9.60_pre2440.ebuild
new file mode 100644
index 000000000000..4461fd51cafa
--- /dev/null
+++ b/www-client/opera/opera-9.60_pre2440.ebuild
@@ -0,0 +1,243 @@
+# 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 $
+
+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="2440"
+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"
+
+}
+
+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
+}