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
commit837167120bbba06c4d98d78f0d855c4b1fe77861 (patch)
tree4e34f524b393a51ae53ca0c7d164ad4720046f29 /www-client/opera
parentRemoved strip command as per bug #240932 (diff)
downloadhistorical-837167120bbba06c4d98d78f0d855c4b1fe77861.tar.gz
historical-837167120bbba06c4d98d78f0d855c4b1fe77861.tar.bz2
historical-837167120bbba06c4d98d78f0d855c4b1fe77861.zip
Depend on Qt 4 instead of 3 (bug #252630).
Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.25-gentoo-r7-JeR i686
Diffstat (limited to 'www-client/opera')
-rw-r--r--www-client/opera/ChangeLog5
-rw-r--r--www-client/opera/Manifest4
-rw-r--r--www-client/opera/opera-10.00_pre4116.ebuild8
3 files changed, 12 insertions, 5 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/Manifest b/www-client/opera/Manifest
index 64dc8220071d..8b53fcbe6876 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -32,8 +32,8 @@ DIST opera-9.63.gcc4-shared-qt3.ppc.tar.bz2 7408630 RMD160 2254de216d07b2ecb38f5
DIST opera-9.63.gcc4-shared-qt3.x86_64.tar.bz2 7972223 RMD160 43c826276d535a74ebf7cf78bea3ec7fb3a686cc SHA1 9d416676a8f6b1db250d7ecc733a97855da9e73a SHA256 0296d0d6b51be980e042e34232563d4a17cb764e511ce7c1f75d4f48f7e563ce
DIST opera-9.63.gcc4-static-qt3.i386.tar.bz2 9266959 RMD160 f982a5da638ef3b609c1775904929240f4d2542e SHA1 b946933a8d145c61c94181ad4e7a6297cdb4b74e SHA256 0e33b1c2f8154147ce29c4f4ba02c20a76170363cf8f8269b4c047f49378b7d0
EBUILD opera-10.00_pre4102.ebuild 7667 RMD160 3e0c3a3192f7359463644b4843a1badd8f8e27bc SHA1 705ee849b1fd02cdf0e4104909b8ffb023c87849 SHA256 f34356901eabc74280c3c7f5efc8f21c7b763f3d8066d13834d4a2224a093c84
-EBUILD opera-10.00_pre4116.ebuild 6509 RMD160 485af1e6e4c889d47ab7b750aeafd233f237f767 SHA1 b8d1630803a4f2c81a0da45d7d18c832ab1ca1fd SHA256 e2beed257ec8890617240b537dcf3c2552d52d93dde610a073481a80d5c319bc
+EBUILD opera-10.00_pre4116.ebuild 6575 RMD160 693f662a5b47b90f1271ea9bd12b544306735cf1 SHA1 cc4275475d0888ac8465945e8ed5410c921abaef SHA256 7690873e15e9bc65886cd0349e93ca89e05ccd036f3745ee79969f377cdce49c
EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
EBUILD opera-9.63.ebuild 7761 RMD160 d84113a28ad13ec79153c2b968faeb1b0be4914b SHA1 7deb049dbd34255f36bc4f51a1813b1c61bab223 SHA256 e06f34767567a1683c674cb428ce94d614ded19625b3d04a17bffcb27a7f25b3
-MISC ChangeLog 61718 RMD160 66e77e079acea1f122a6a45485922fecf943a7f6 SHA1 bd491c5d84214fd3cad511740edbb809beb2a333 SHA256 f111ed5ffb06f1bc0e0e7f74e279540d055dcb88d92f5300229d25db51adf1d0
+MISC ChangeLog 61839 RMD160 ec186830a5ff57c2f238087c56e195d533ed5860 SHA1 948633b65a0d6a6a362e2b2c73d09931d86677f9 SHA256 8e15a9ba0fe54e47eea2bcd512d351e9f580ebf0c0e2321ffd2a7c41df9a5b2c
MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
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* )