Remove IUSE=ia32.

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

5 files changed, 29 insertions, 72 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 937b7a585052..9e63c318bc39 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.422 2009/11/23 20:52:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.423 2009/11/25 15:44:03 jer Exp $
+
+  25 Nov 2009; Jeroen Roovers <jer@gentoo.org> opera-10.01.ebuild,
+  opera-10.10.ebuild, metadata.xml:
+  Remove IUSE=ia32.
 
   23 Nov 2009; Christian Faulhammer <fauli@gentoo.org> opera-10.10.ebuild:
   stable x86, bug 294208
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index fa39fb0c8728..54d18b356c13 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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-freedesktop.patch 995 RMD160 9ebe36fa34b25a4ab151033a10f7b53494cb4a4a SHA1 e1613110be5c4c4061227776db590f069041f525 SHA256 dc5e4b56ae89049e9708fa3180f375b2de795219fff7d868b8dbbffd99fd7ec5
@@ -23,14 +20,7 @@ DIST opera-10.10.gcc4-qt4.x86_64.tar.bz2 12537317 RMD160 db34e4a2b92965472ecc47c
 DIST opera-10.10.gcc4-shared-qt3.i386.tar.bz2 11708070 RMD160 4681757bff76a1c4edd75fc5985e4e16d6d4fa90 SHA1 fb49d4bf2f83c5acd47d347e84491e025308b7ee SHA256 ec5eed808935c21d7d09f883995e17cd3ee77b447c7ee2e7405c96fe38541d79
 DIST opera-10.10.gcc4-shared-qt3.ppc.tar.bz2 11858703 RMD160 2d28eb46c550515cac6d1bf042c1a72c33279738 SHA1 c1b48469cfbfcab38acd993ce3669ef3b90308cc SHA256 bfca95eb48aeea77c18823f1e34960028378a3ae149e0c760ab4fdf27330ec8f
 DIST opera-10.10.gcc4-shared-qt3.x86_64.tar.bz2 12538791 RMD160 269c812f2f4ade237718dc8e695f7e47370f575e SHA1 03dde588b1afcd38076be83bb7cf1c43bde38ff0 SHA256 7a60b23fb15cb5e9e25c2dd493cb815f7b87634bef8fa7657096a68da97a1ffc
-EBUILD opera-10.01.ebuild 6358 RMD160 fa5bffcf58df9b713215f73d9631e860fd11aa4d SHA1 0ba021f25d8c52ddecaa842dee50142b86932916 SHA256 ed63c41e4608c4adc66387960781d9a8b3bed6b32a9c526777678d14a370fb43
-EBUILD opera-10.10.ebuild 6362 RMD160 d1ca2adfb5e0fcba8cb4d06db987f556fb6fdfeb SHA1 e2cd80f6e324848336145c215251142db1c15d8e SHA256 c05d376bcc7d3720d1519157409bcaa926d83904ec9f4bff6524c7f2f6834fd0
-MISC ChangeLog 81638 RMD160 6d9c9041282d0231080b9e245ba553ac29bf376b SHA1 42c8584b95b7be6c5fef09b4c39c6e6c70132828 SHA256 58bc94acb4e1ae87b244edb1661404c24bb873b49964491154a1a876134de1d8
-MISC metadata.xml 623 RMD160 b931e2f0fde75fc6d06f1c4d50306f9290953672 SHA1 2983627e32312dd3a625f0b418057341da220403 SHA256 e35d04f13c0c9a659a804ff0bd241b503fdf153e343bd566422317ddd5f90cdd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksK9iwACgkQNQqtfCuFneNS+wCfb4xATelencDAq+GRfGNJDrXP
-0yAAni+nHRDNoUdd6X+kNo0TZhNUk2sI
-=h0s/
------END PGP SIGNATURE-----
+EBUILD opera-10.01.ebuild 5943 RMD160 1d75c1d22119d5db22654ed9fca261629f694252 SHA1 dd2676cd0bcf86b5320e3a506208479166220307 SHA256 0a8275e1a5cd62d67883f50228c41b08dc65a6df90650944e4553a9e85f638eb
+EBUILD opera-10.10.ebuild 5945 RMD160 a3d424346488dc945b968f2e812c00fc0c9e3ecf SHA1 ac41c8c8881bb8d40e78f8d40f1ed46d596e6fea SHA256 b51c3032dd2752fa6e7de0ae1502c6c58d5cf33cf90d659686ea52806a258322
+MISC ChangeLog 81760 RMD160 a5568a33baa364a69266ba19c0698fb03e4be8bf SHA1 02eea45776226ea1bfb43b132cc021032e19c9b9 SHA256 5904ab290c280a32519f0a903340d04087562489c3f4af461265e69087c1b80c
+MISC metadata.xml 547 RMD160 dabb86bc4db85881b0ce910ac05e63d16342e787 SHA1 9acc7ec7a62017ed7c9acfca301a3ea75e4e88d9 SHA256 9f70a9db124893d6a56a40615dbe8cccd015b836067d570a9638a9bd9ec6217a
diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 55bae180e8b6..61783b2ac6db 100644
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/metadata.xml
@@ -12,7 +12,6 @@ version runs on GNU/Linux, FreeBSD, and Solaris. Versions for Macintosh and
 Windows are also available.
 </longdescription>
 <use>
-<flag name='ia32'>Install 32-bit binaries instead of 64-bit binaries</flag>
 <flag name='qt-static'>Install binaries statically linked to Qt</flag>
 </use>
 </pkgmetadata>
diff --git a/www-client/opera/opera-10.01.ebuild b/www-client/opera/opera-10.01.ebuild
index 58ecd5dcbfea..0eaba7ec02ef 100644
--- a/www-client/opera/opera-10.01.ebuild
+++ b/www-client/opera/opera-10.01.ebuild
@@ -1,6 +1,6 @@
 # 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.01.ebuild,v 1.8 2009/11/18 15:32:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.01.ebuild,v 1.9 2009/11/25 15:44:03 jer Exp $
 
 EAPI="2"
 
@@ -27,7 +27,7 @@ QA_PRESTRIPPED="
 	opt/${PN}/lib/opera/${PV/_pre*}/operapluginwrapper
 "
 
-IUSE="elibc_FreeBSD gnome ia32 qt3 qt-static"
+IUSE="elibc_FreeBSD gnome qt3 qt-static"
 MY_LINGUAS="be bg cs da de el 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 ro ru sk sr sv ta te tr uk zh-CN zh-HK zh-TW"
 
 for MY_LINGUA in ${MY_LINGUAS}; do
@@ -38,19 +38,10 @@ O_U="mirror://opera/linux/1001/final/en/"
 
 SRC_URI="
 	amd64? (
-		!ia32? (
-			qt-static? ( ${O_U}x86_64/${P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
-			!qt-static? (
-				qt3? ( ${O_U}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-				!qt3? ( ${O_U}x86_64/${P}.gcc4-qt4.x86_64.tar.bz2 )
-			)
-		)
-		ia32? (
-			qt-static? ( ${O_U}i386/${P}.gcc4-bundled-qt4.i386.tar.bz2 )
-			!qt-static? (
-				qt3? ( ${O_U}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}i386/${P}.gcc4-qt4.i386.tar.bz2 )
-			)
+		qt-static? ( ${O_U}x86_64/${P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
+		!qt-static? (
+			qt3? ( ${O_U}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			!qt3? ( ${O_U}x86_64/${P}.gcc4-qt4.x86_64.tar.bz2 )
 		)
 	)
 	ppc? ( ${O_U}ppc/shared/${P}.gcc4-shared-qt3.ppc.tar.bz2 )
@@ -81,19 +72,10 @@ RDEPEND="
 	x11-libs/libSM
 	x11-libs/libICE
 	amd64? (
-		ia32? (
-			qt-static? ( media-libs/nas )
-			!qt-static? (
-				qt3? ( =x11-libs/qt-3*[-immqt] )
-				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-			)
-		)
-		!ia32? (
-			qt-static? ( media-libs/nas )
-			!qt-static? (
-				qt3? ( =x11-libs/qt-3*[-immqt] )
-				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-			)
+		qt-static? ( media-libs/nas )
+		!qt-static? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
 		)
 	)
 	ppc? ( =x11-libs/qt-3*[-immqt] )
diff --git a/www-client/opera/opera-10.10.ebuild b/www-client/opera/opera-10.10.ebuild
index c062e85a7f94..9e8d01825ee3 100644
--- a/www-client/opera/opera-10.10.ebuild
+++ b/www-client/opera/opera-10.10.ebuild
@@ -1,6 +1,6 @@
 # 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.10.ebuild,v 1.2 2009/11/23 20:52:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.10.ebuild,v 1.3 2009/11/25 15:44:03 jer Exp $
 
 EAPI="2"
 
@@ -27,7 +27,7 @@ QA_PRESTRIPPED="
 	opt/${PN}/lib/opera/${PV/_pre*}/operapluginwrapper
 "
 
-IUSE="elibc_FreeBSD gnome ia32 qt3 qt-static"
+IUSE="elibc_FreeBSD gnome qt3 qt-static"
 MY_LINGUAS="be bg cs da de el 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 ro ru sk sr sv ta te tr uk zh-CN zh-HK zh-TW"
 
 for MY_LINGUA in ${MY_LINGUAS}; do
@@ -38,19 +38,10 @@ O_U="mirror://opera/linux/1010/final/en/"
 
 SRC_URI="
 	amd64? (
-		!ia32? (
-			qt-static? ( ${O_U}x86_64/${P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
-			!qt-static? (
-				qt3? ( ${O_U}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-				!qt3? ( ${O_U}x86_64/${P}.gcc4-qt4.x86_64.tar.bz2 )
-			)
-		)
-		ia32? (
-			qt-static? ( ${O_U}i386/${P}.gcc4-bundled-qt4.i386.tar.bz2 )
-			!qt-static? (
-				qt3? ( ${O_U}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}i386/${P}.gcc4-qt4.i386.tar.bz2 )
-			)
+		qt-static? ( ${O_U}x86_64/${P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
+		!qt-static? (
+			qt3? ( ${O_U}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			!qt3? ( ${O_U}x86_64/${P}.gcc4-qt4.x86_64.tar.bz2 )
 		)
 	)
 	ppc? ( ${O_U}ppc/shared/${P}.gcc4-shared-qt3.ppc.tar.bz2 )
@@ -81,19 +72,10 @@ RDEPEND="
 	x11-libs/libSM
 	x11-libs/libICE
 	amd64? (
-		ia32? (
-			qt-static? ( media-libs/nas )
-			!qt-static? (
-				qt3? ( =x11-libs/qt-3*[-immqt] )
-				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-			)
-		)
-		!ia32? (
-			qt-static? ( media-libs/nas )
-			!qt-static? (
-				qt3? ( =x11-libs/qt-3*[-immqt] )
-				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-			)
+		qt-static? ( media-libs/nas )
+		!qt-static? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
 		)
 	)
 	ppc? ( =x11-libs/qt-3*[-immqt] )