But only whe USE=qt-static thanks to Rafał Mużyło (bug #325569).

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

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 692dc6cceeb8d173cfbaf338e7af8be1a038bc84..4256973e754273a517914fdcf6b00e0aea2a3124 100644 (file)
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.504 2010/06/29 13:38:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.505 2010/06/29 15:37:48 jer Exp $
+
+  29 Jun 2010; Jeroen Roovers <jer@gentoo.org> opera-10.11.ebuild:
+  But only whe USE=qt-static thanks to Rafał Mużyło (bug #325569).
 
   29 Jun 2010; Jeroen Roovers <jer@gentoo.org> opera-10.11.ebuild:
   Specifically use =media-libs/libpng-1.2* (bug #325569).

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 00ebd572a7ade28f2b81d41132fe7cf0dffec450..9d98871e9c644181f754cb264d4080802afdc709 100644 (file)
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -13,7 +13,7 @@ DIST opera-10.60-6384.i386.freebsd.tar.bz2 13809868 RMD160 d01df9c21673c88f20a36
 DIST opera-10.60-6384.i386.linux.tar.bz2 13748412 RMD160 413fca33e1cdc134984e1c4a65085975c1236325 SHA1 9f90dbc1bfca51ac782b4c0e69ff017922996020 SHA256 b62db8bf2db68df9b737db36471a55f140b0b03bcabcbf9be7b7ebe7dded9917
 DIST opera-10.60-6384.ppc.linux.tar.bz2 14089258 RMD160 bf587849846e70a204bc770fa78cfeeb2476f0fc SHA1 e2bd88479f37992995596a89df24a049a49d7979 SHA256 cad71da0979fecc58da2dc7cb93c03b7de03e87c7e673c7d751a415710b8fe12
 DIST opera-10.60-6384.x86_64.linux.tar.bz2 14782607 RMD160 1302381cfa9bb463c8c21b7af209e473cfb51d77 SHA1 46209c17f77b309819fa911f30acea9e22d7eb7e SHA256 579fda42ab138b142e0b199a777bd132bac516e5c2eea6584e091cf466d1bece
-EBUILD opera-10.11.ebuild 4916 RMD160 dfa2a5cb1fdf9760d8f0b163ea5c55039cdf744b SHA1 e931d8beb28a3bd8c67ff6c076fb00c204d5048a SHA256 f6cc35db2c55cc5ca5ff2c40898f7cd49fffcfdaf2325d340db366d4822f8b25
+EBUILD opera-10.11.ebuild 4931 RMD160 13ff28c49a332f816a6c6977f44b105f6063a7e6 SHA1 c3b88e01930c067585647ec7e527c35cd346dc72 SHA256 8d1bb4b49055f5542c3398233513ec51f95d8e7d565e46f74d1cd3b01d099fe3
 EBUILD opera-10.60_pre6384.ebuild 4872 RMD160 e5534102e53160768c447e97e792425bf17139d3 SHA1 f20b8282ea2580ee9eae9ca4f5254a2f4ea1eb81 SHA256 4e256661d39d0c83efcbf528dbb6f8752a90647973f2e5a39e32ab39ee8fcac1
-MISC ChangeLog 97808 RMD160 d503970ea7591c02409ab68d412c869db4f52051 SHA1 483252e77847e89e420095de8174757836bb584b SHA256 8619edd4e5c05b71918e19638eb06b8fc2d3f8d1eb4f3fdabb43b32743e78b1d
+MISC ChangeLog 97946 RMD160 2284077111d44f370d1df6ad692b80e8a0739a64 SHA1 6a166afe5b5bd10fd7a235487af46fe580c15755 SHA256 6c3a4bb1ef4364626764722b434d897f1fee641d2d9f547da82707dafd4bbcec
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a

diff --git a/www-client/opera/opera-10.11.ebuild b/www-client/opera/opera-10.11.ebuild
index 11bdf186d8ca4fa74776c3849390c492ce7b29f8..15dcc52abbe5a1aecc6acfa8088a6dfa925a2245 100644 (file)
--- a/www-client/opera/opera-10.11.ebuild
+++ b/www-client/opera/opera-10.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.11.ebuild,v 1.5 2010/06/29 13:38:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.11.ebuild,v 1.6 2010/06/29 15:37:48 jer Exp $
 
 EAPI="2"
 
@@ -56,7 +56,7 @@ DEPEND=">=sys-apps/sed-4"
 
 RDEPEND="
        media-libs/jpeg
-       =media-libs/libpng-1.2*
+       qt-static? ( =media-libs/libpng-1.2* )
        media-libs/libexif
        >=media-libs/fontconfig-2.1.94-r1
        x11-libs/libXrandr