--- opera-9.50-r2.ebuild	2008-06-24 11:17:41.000000000 -0500
+++ /usr/portage/www-client/opera/opera-9.50-r1.ebuild	2008-06-23 19:39:27.000000000 -0500
@@ -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.50.ebuild,v 1.7 2008/06/13 15:34:40 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50-r1.ebuild,v 1.3 2008/06/24 00:38:48 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -11,11 +11,11 @@
 
 SLOT="0"
 LICENSE="OPERA-9.0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RESTRICT="strip test"
 
-IUSE="elibc_FreeBSD gnome qt-static spell ia32"
+IUSE="elibc_FreeBSD gnome ia32 qt-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"
 
@@ -28,11 +28,8 @@
 O_SUFF="2042"
 
 SRC_URI="
-	amd64? ( 
-		ia32? (
-				qt-static? ( ${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 )
-				!qt-static? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
-			 )
+	amd64? (
+		ia32? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
 		!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
 	)
 	ppc? ( ${O_URI}linux${O_FTP}ppc/shared/${P}.gcc4-shared-qt3.ppc.tar.bz2 )
@@ -60,23 +57,25 @@
 	x11-libs/libX11
 	x11-libs/libSM
 	x11-libs/libICE
-	x86? (	
-		!qt-static? ( =x11-libs/qt-3* )
-		)
-	amd64? (
-			!ia32? ( =x11-libs/qt-3* )
-			ia32? ( 
-				!qt-static? ( app-emulation/emul-linux-x86-qtlibs )
-				)
+	!qt-static? ( =x11-libs/qt-3* )
+	amd64? ( =x11-libs/qt-3*
+			 ia32? ( app-emulation/emul-linux-x86-qtlibs )
+	)
 	ppc? ( =x11-libs/qt-3* )
 	spell? ( app-text/aspell )
 	x86-fbsd? ( =x11-libs/qt-3* =virtual/libstdc++-3* )"
 
 pkg_setup() {
-	use amd64 && S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.x86_64"
+	if use amd64; then
+		if use ia32; then
+			S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386"
+		else
+			S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.x86_64"
+		fi
+	fi
 	use ppc && S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.ppc"
 	use x86-fbsd && S="${WORKDIR}/${P}-${O_SUFF}-freebsd5-shared-qt3.i386"
-	if use x86 || use ia32; then
+	if use x86; then
 		if use qt-static; then
 			S="${WORKDIR}/${P}-${O_SUFF}.gcc4-qt4.i386"
 		else