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)".

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

4 files changed, 21 insertions, 12 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/Manifest b/www-client/opera/Manifest
index 2e3f781bbe72..b42522922aa0 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -35,8 +35,8 @@ DIST opera-9.64.gcc4-shared-qt3.x86_64.tar.bz2 7977427 RMD160 190e22a742eeba7300
 DIST opera-9.64.gcc4-static-qt3.i386.tar.bz2 9273212 RMD160 338c780de3d9495d3c27f6bba9b9122adb6b36e0 SHA1 3bbe6fd5ea852f6dae130ffad816034ebfb27e79 SHA256 056f3983497438878741c45ceade285387cd393d0b3469f0a8971223c1364dbf
 EBUILD opera-10.00_pre4166.ebuild 6447 RMD160 8c7d7b04ec2bcd8a2c408f4d19837f64f5c2e303 SHA1 0d95b61183ec7b31752735198b948df48e940e11 SHA256 f988801322f8ac6714b0d7108273eb571b152f3b58d0ed25992b55c82d0ae639
 EBUILD opera-10.00_pre4205.ebuild 6488 RMD160 4b9bef1c8d25078feb04be2f4be03ec29e7b9df6 SHA1 3324b15730135760b9eb9f96d73eba5fc26cb4b6 SHA256 dd8d616501ca9831dd2e1450d61cf894eece6b6be8f55487a94714193516306e
-EBUILD opera-10.00_pre4214.ebuild 6242 RMD160 9f4848fe667db7dfb3da920238fcef5f01e8a7a1 SHA1 f8b2ba0f09e83e373f1529cddb6a097adc7a1094 SHA256 e57b29016850f757dcb7bac7a45e3c1a7439708e4c03bde9c15a48f32d1e9af5
+EBUILD opera-10.00_pre4214.ebuild 6268 RMD160 a7a54bacb239d6a2847da57cfd0a7db5669fc072 SHA1 b9c5daf7687afff21f0375c0d34d2321e736449b SHA256 7f1e00cfc70814bc4de8c3bceb3ef1abcf000289b16d077b9d72e8df0ffe7c63
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
-EBUILD opera-9.64.ebuild 7742 RMD160 6da55d636cb1a838551114c43933d9716ac6aeef SHA1 904894164f726a11e18d5032a8f5b8fddedc08e5 SHA256 8c029dedc573770d7b86dbc8f210b12b0a0ab3567250810c0ad5599ac98c9e24
-MISC ChangeLog 64324 RMD160 7958a0b869a77d136841a9a2b488680abc1eff4e SHA1 789c83141ac2e73914e915b50a3b53539b72fd85 SHA256 c114fe9ce9f37c6034affff36373ebdecbde99e73da170335bafcf3127a9297c
+EBUILD opera-9.64.ebuild 7782 RMD160 1a904fb6304a0bc27f34af7ef5d7ea9fbe4c6eb2 SHA1 e340d12dfcd89e0ecebc9ae97c79b2e121e750a9 SHA256 ca8df7d7fb7a7ec84217629a2c448af8f9e2afd410b18fa12ed01a9f55e5c9a8
+MISC ChangeLog 64563 RMD160 c83c5c0d38e8be717a8fee0c5db792943394cb9c SHA1 df55b48c8d577371e81b7a61d459fa6df1bccb78 SHA256 45c59f493f0cf725c8b817d60138957abaad34e4b8cb67ea08e19b815234c0de
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
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] ) )
 	)
 	"