summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-06-04 16:25:58 +0000
committerJeroen Roovers <jer@gentoo.org>2009-06-04 16:25:58 +0000
commit64188d8a1f0492bced438fcf8fe7349aa0ef361e (patch)
tree0cc7c678fe41c83f15661d3d9189ebffaf68cd23 /www-client/opera
parentVersion bumped. (diff)
downloadhistorical-64188d8a1f0492bced438fcf8fe7349aa0ef361e.tar.gz
historical-64188d8a1f0492bced438fcf8fe7349aa0ef361e.tar.bz2
historical-64188d8a1f0492bced438fcf8fe7349aa0ef361e.zip
Fix the fix (bug #272496 again).
Package-Manager: portage-2.2_rc33/cvs/Linux 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_pre4402.ebuild6
3 files changed, 9 insertions, 6 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 52e2782e53f5..0c3dc68602d9 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
# 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.349 2009/06/04 04:15:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.350 2009/06/04 16:25:58 jer Exp $
+
+ 04 Jun 2009; Jeroen Roovers <jer@gentoo.org> opera-10.00_pre4402.ebuild:
+ Fix the fix (bug #272496 again).
04 Jun 2009; Jeroen Roovers <jer@gentoo.org> opera-10.00_pre4402.ebuild:
Add media-libs/nas dependency for Qt4/static thanks to Piotr Szymaniak
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index ea4364b1c9c2..666114b02871 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -48,8 +48,8 @@ DIST opera-9.64.gcc4-static-qt3.i386.tar.bz2 9273212 RMD160 338c780de3d9495d3c27
EBUILD opera-10.00_pre4340.ebuild 6449 RMD160 a3cb684d1ec9038f1d77d913f46eac8ee762789d SHA1 6593a3361f7d77d1aca87adb4fbacc27d75be85c SHA256 dae4cc7e8183d9997ab3f57103531aa18cbc85eb4a8729fa58076bc925485542
EBUILD opera-10.00_pre4345.ebuild 6361 RMD160 32e809e38f8d64279e4b692ab26c6284173158ba SHA1 61edccab7580e142840b1a6a1e674e4f53c35856 SHA256 b4cf9e3204c216368eb307b5f727b793382e86fddbc283f150818e767d8cdac0
EBUILD opera-10.00_pre4394.ebuild 6597 RMD160 00dce84b665b0d4787236d8dda89726b3a6e8e47 SHA1 a0da5c0fd86ce2c0fc3384c471354279322b01f3 SHA256 9b259b1b804b68174c566aa5a55218788593df066ae66209c4416c6130b44c3c
-EBUILD opera-10.00_pre4402.ebuild 6691 RMD160 faf778bb82c7bcdb197af9866523dad3269b1b79 SHA1 7a80a635b11ae2850095499fd31d0c6ad3a272ce SHA256 b928f6905447f53f68c16e2fd790efcca50729248530bb7c56557571b7bba949
+EBUILD opera-10.00_pre4402.ebuild 6737 RMD160 5f63f84b93773c770075edd3838795cd2b21f9ce SHA1 6188bf8838710447529edb41c9be2e014a5b5c32 SHA256 a6e55fc1a880c58a378d1d8c32c755cdd773d5dfffa14ad6117346f92ea936ae
EBUILD opera-9.27.ebuild 6053 RMD160 fa86d79c0a1beae6d3605467122c2a5451b21bff SHA1 32d8ea747f757e99ce0af0c456c4aed71a660689 SHA256 4b0d2bb5bbbdc1eb4cee89f717d6bdc556337fb4d7e7973c216292d1f4cd8fee
EBUILD opera-9.64.ebuild 7896 RMD160 0c981a40e72c64929e06cb3643e0a04ab538202d SHA1 64fcac7617e01be342ac7b0c2c65a38b9a867d92 SHA256 6eb45e59ecf811df18afc8ff52cb48d3608060a5c76c883abfa8772388dd7806
-MISC ChangeLog 67696 RMD160 712677a7fb041bfa31caa9d9f9c05dbb3bca4125 SHA1 f8f42a197f1c8e01a250590ac5c212eb59d6837d SHA256 ce4a29a50283f323104c543ae5d6017ceb1335640dc57373b311b3d7649675ab
+MISC ChangeLog 67807 RMD160 6ea9d59a7338c94e616c9681d2fff0667cfc8fd6 SHA1 2a767959543bd077423387d85c756cdb94a35578 SHA256 49d8ed7f0a920da87e254c689cc1f167e8591c295e3097d09f44a912bbba71d6
MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4402.ebuild b/www-client/opera/opera-10.00_pre4402.ebuild
index a717c242cb28..1c699f4dd8c4 100644
--- a/www-client/opera/opera-10.00_pre4402.ebuild
+++ b/www-client/opera/opera-10.00_pre4402.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.00_pre4402.ebuild,v 1.2 2009/06/04 04:15:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4402.ebuild,v 1.3 2009/06/04 16:25:58 jer Exp $
EAPI="2"
@@ -75,10 +75,10 @@ RDEPEND="
x11-libs/libSM
x11-libs/libICE
x86? (
+ qt-static? ( !qt3? ( media-libs/nas ) )
!qt-static? (
qt3? ( =x11-libs/qt-3*[-immqt] )
!qt3? (
- media-libs/nas
x11-libs/qt-core
x11-libs/qt-gui
)
@@ -87,10 +87,10 @@ RDEPEND="
ppc? ( =x11-libs/qt-3*[-immqt] )
amd64? (
ia32? (
+ qt-static? ( !qt3? ( media-libs/nas ) )
!qt-static? (
qt3? ( =x11-libs/qt-3*[-immqt] )
!qt3? (
- media-libs/nas
x11-libs/qt-core
x11-libs/qt-gui
)