--- /usr/portage/www-client/opera/opera-8.52.ebuild	2006-04-11 16:37:14.000000000 +0200
+++ /usr/portage/www-client/opera/opera-8.52.ebuild	2006-04-12 14:46:00.000000000 +0200
@@ -1,31 +1,28 @@ 
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.52.ebuild,v 1.6 2006/04/11 14:28:31 blubb Exp $
+# $Header: $
 
 inherit eutils
 
-IUSE="qt-static spell qt kde"
+IUSE="qt-static spell"
 
-OPERAVER="8.52-20060201"
-OPERAFTPDIR="852/final/en"
+OPERAVER="9.0-20060206"
+OPERAFTPDIR="9.0-Preview-2"
 
 S=${WORKDIR}/${A/.tar.bz2/}
 
 DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
+HOMEPAGE="http://www.opera.com"
 
 # that's an ugly workaround for the broken src_uri syntax
-OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
+OPERA_URI="http://snapshot.opera.com/unix/${OPERAFTPDIR}/"
 SRC_URI="
-	x86? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	x86? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	amd64? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	amd64? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	sparc? ( ${OPERA_URI}sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
-	ppc? ( ${OPERA_URI}ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
-
-#	sparc? ( !qt-static? ( ${OPERA_URI}/sparc/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
-#	ppc? ( !qt-static? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 ) )
+	x86? ( qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	x86? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	amd64? ( qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	amd64? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	sparc? ( ${OPERA_URI}sparc-linux/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
+	ppc? ( ${OPERA_URI}ppc-linux/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
 
 # Dependencies may be augmented later (see below).
 DEPEND=">=sys-apps/sed-4
@@ -47,18 +44,19 @@ 
 	>=media-libs/fontconfig-2.1.94-r1
 	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
 	         !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
-	!amd64? ( virtual/motif
+	!amd64? ( media-libs/libexif
 	          spell? ( app-text/aspell )
 	          x86? ( !qt-static? ( =x11-libs/qt-3* ) )
 	          media-libs/jpeg )"
 
 SLOT="0"
-LICENSE="OPERA-8.50"
-KEYWORDS="amd64 ppc sparc x86"
+LICENSE="OPERA-9.0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch "${FILESDIR}/${P}-install.patch"
 	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" \
@@ -66,8 +64,6 @@ 
 	       -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:/usr/share/applications:${D}/usr/share/applications:g" \
-		   -e "s:/usr/local/share/applications:${D}/usr/share/applications: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:' \
@@ -122,11 +118,6 @@ 
 		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
 	fi
 
-	#if use qt || use kde; then
-	#	cd ${D}/opt/opera/bin
-	#	epatch ${FILESDIR}/opera-qt.2.patch
-	#fi
-
 	dodir /etc/env.d
 	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > ${D}/etc/env.d/90opera
 }