diff options
| -rw-r--r-- | www-client/opera/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/opera/metadata.xml | 1 | ||||
| -rw-r--r-- | www-client/opera/opera-10.01.ebuild | 38 | ||||
| -rw-r--r-- | www-client/opera/opera-10.10.ebuild | 38 |
4 files changed, 25 insertions, 58 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/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] ) |