summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2008-12-30 17:37:20 +0000
committerJeroen Roovers <jer@gentoo.org>2008-12-30 17:37:20 +0000
commitb1f7f334f56923aa68fecade300e6ac882e98c38 (patch)
treebff5d3634dde8cd71933d22331cee26ed8b3d8ce /www-client
parentRemoved strip command as per bug #240932 (diff)
downloadgentoo-2-b1f7f334f56923aa68fecade300e6ac882e98c38.tar.gz
gentoo-2-b1f7f334f56923aa68fecade300e6ac882e98c38.tar.bz2
gentoo-2-b1f7f334f56923aa68fecade300e6ac882e98c38.zip
Depend on Qt 4 instead of 3 (bug #252630).
(Portage version: 2.2_rc19/cvs/Linux 2.6.25-gentoo-r7-JeR i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/opera/ChangeLog5
-rw-r--r--www-client/opera/opera-10.00_pre4116.ebuild8
2 files changed, 10 insertions, 3 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index aa42425eaa5b..b94f1901917f 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/opera
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.314 2008/12/24 16:14:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.315 2008/12/30 17:37:20 jer Exp $
+
+ 30 Dec 2008; Jeroen Roovers <jer@gentoo.org> opera-10.00_pre4116.ebuild:
+ Depend on Qt 4 instead of 3 (bug #252630).
*opera-10.00_pre4116 (24 Dec 2008)
diff --git a/www-client/opera/opera-10.00_pre4116.ebuild b/www-client/opera/opera-10.00_pre4116.ebuild
index c684e456de71..ca2383e538df 100644
--- a/www-client/opera/opera-10.00_pre4116.ebuild
+++ b/www-client/opera/opera-10.00_pre4116.ebuild
@@ -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-10.00_pre4116.ebuild,v 1.1 2008/12/24 16:14:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4116.ebuild,v 1.2 2008/12/30 17:37:20 jer Exp $
GCONF_DEBUG="no"
@@ -78,7 +78,11 @@ RDEPEND="media-libs/libexif
x11-libs/libSM
x11-libs/libICE
qt-static? ( !qt3? ( x11-libs/libXinerama media-libs/nas ) )
- x86? ( !qt-static? ( !qt3? ( =x11-libs/qt-3* ) ) )
+ x86? ( !qt-static? (
+ qt3? ( =x11-libs/qt-3* )
+ !qt3? ( =x11-libs/qt-core-4* =x11-libs/qt-gui-4* )
+ )
+ )
amd64? (
ia32? ( app-emulation/emul-linux-x86-qtlibs )
!ia32? ( =x11-libs/qt-3* )