diff options
author | Jeroen Roovers <jer@gentoo.org> | 2009-03-18 16:30:01 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2009-03-18 16:30:01 +0000 |
commit | a58731e9cfbb5eb4cb8db99e49a06772c32a4883 (patch) | |
tree | 653cb8e3b9f857f27e374e7a86c63054c9c1b0d4 /www-client/opera | |
parent | alpha/ia64 stable wrt #260063 (diff) | |
download | gentoo-2-a58731e9cfbb5eb4cb8db99e49a06772c32a4883.tar.gz gentoo-2-a58731e9cfbb5eb4cb8db99e49a06772c32a4883.tar.bz2 gentoo-2-a58731e9cfbb5eb4cb8db99e49a06772c32a4883.zip |
DEPEND on x11-libs/qt-3[-immqt] (bug #259381). Either set -immqt or +immqt-bc for x11-libs/qt-3 in case of USE="!qt-static qt3(-static)".
(Portage version: 2.2_rc25/cvs/Linux i686)
Diffstat (limited to 'www-client/opera')
-rw-r--r-- | www-client/opera/ChangeLog | 7 | ||||
-rw-r--r-- | www-client/opera/opera-10.00_pre4214.ebuild | 8 | ||||
-rw-r--r-- | www-client/opera/opera-9.64.ebuild | 12 |
3 files changed, 18 insertions, 9 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index f40df09b97f8..aaa856925503 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/opera # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.330 2009/03/15 06:02:11 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.331 2009/03/18 16:30:01 jer Exp $ + + 18 Mar 2009; Jeroen Roovers <jer@gentoo.org> opera-9.64.ebuild, + opera-10.00_pre4214.ebuild: + DEPEND on x11-libs/qt-3[-immqt] (bug #259381). Either set -immqt or + +immqt-bc for x11-libs/qt-3 in case of USE="!qt-static qt3(-static)". 15 Mar 2009; Jeroen Roovers <jer@gentoo.org> -opera-10.00_pre4102.ebuild, -opera-10.00_pre4116.ebuild, -opera-10.00_pre4126.ebuild, diff --git a/www-client/opera/opera-10.00_pre4214.ebuild b/www-client/opera/opera-10.00_pre4214.ebuild index 2415ce4c0b0e..b1aa0b7c8beb 100644 --- a/www-client/opera/opera-10.00_pre4214.ebuild +++ b/www-client/opera/opera-10.00_pre4214.ebuild @@ -1,6 +1,8 @@ # 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.00_pre4214.ebuild,v 1.1 2009/03/13 19:46:56 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4214.ebuild,v 1.2 2009/03/18 16:30:01 jer Exp $ + +EAPI="2" GCONF_DEBUG="no" @@ -78,13 +80,13 @@ RDEPEND=" x11-libs/libICE qt-static? ( !qt3? ( x11-libs/libXinerama media-libs/nas ) ) x86? ( !qt-static? ( - qt3? ( =x11-libs/qt-3* ) + qt3? ( =x11-libs/qt-3*[-immqt] ) !qt3? ( =x11-libs/qt-core-4* =x11-libs/qt-gui-4* ) ) ) amd64? ( ia32? ( app-emulation/emul-linux-x86-qtlibs ) - !ia32? ( =x11-libs/qt-3* ) + !ia32? ( =x11-libs/qt-3*[-immqt] ) ) " diff --git a/www-client/opera/opera-9.64.ebuild b/www-client/opera/opera-9.64.ebuild index c32b2e5a67d0..2db8d10a9a2f 100644 --- a/www-client/opera/opera-9.64.ebuild +++ b/www-client/opera/opera-9.64.ebuild @@ -1,6 +1,8 @@ # 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-9.64.ebuild,v 1.4 2009/03/07 09:03:06 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.64.ebuild,v 1.5 2009/03/18 16:30:01 jer Exp $ + +EAPI="2" GCONF_DEBUG="no" @@ -81,16 +83,16 @@ RDEPEND="media-libs/libexif x11-libs/libSM x11-libs/libICE qt-static? ( !qt3-static? ( x11-libs/libXinerama ) ) - x86? ( !qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) ) ) + x86? ( !qt-static? ( !qt3-static? ( =x11-libs/qt-3*[-immqt] ) ) ) amd64? ( ia32? ( app-emulation/emul-linux-x86-qtlibs ) - !ia32? ( =x11-libs/qt-3* ) + !ia32? ( =x11-libs/qt-3*[-immqt] ) ) - ppc? ( =x11-libs/qt-3* ) + ppc? ( =x11-libs/qt-3*[-immqt] ) spell? ( app-text/aspell ) x86-fbsd? ( =virtual/libstdc++-3* - !qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) ) + !qt-static? ( !qt3-static? ( =x11-libs/qt-3*[-immqt] ) ) ) " |