Fix libpng dependency wrt desktop environment.

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

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 22e657198f2bb2584b1f8b55679810fa1beb35d5..7a9ed9b7ddbeea30c7df93548f13992dff3d68fe 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.510 2010/07/01 18:51:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.511 2010/07/02 01:28:31 jer Exp $
+
+  02 Jul 2010; Jeroen Roovers <jer@gentoo.org> opera-10.60.ebuild:
+  Fix libpng dependency wrt desktop environment.
 
   01 Jul 2010; Jeroen Roovers <jer@gentoo.org> opera-10.60.ebuild:
   Make gstreamer support optional but preferred.

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index d07cd4fa632c3ee07b83be253189bf0c64c1cd71..7cd1c3dbfafa790a3b1d807a3f94b47aa6ff4b3e 100644 (file)
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -14,6 +14,6 @@ DIST opera-10.60-6386.i386.linux.tar.bz2 12653386 RMD160 f35bb15f4354ee6a638ba3b
 DIST opera-10.60-6386.ppc.linux.tar.bz2 12988748 RMD160 c72c9f71ee5b2546829515d210eee81ef889f9da SHA1 5fb76f24dc7f9c962af8e2ed0463e00ca7858ff2 SHA256 4edad3e4814747b7438dfa37b6397996faee6c5e6e9d6fe3773175fd2e42d09b
 DIST opera-10.60-6386.x86_64.linux.tar.bz2 13680030 RMD160 c1975c7a552fc503282103441b557034e6a5ad8f SHA1 4f5285415c88199614ddc61a282d47b21533b3fe SHA256 1d35c9a37966e97d253663ee50d7b7be12f940c51d8b0b88848cdf06d1e32c0c
 EBUILD opera-10.11.ebuild 4931 RMD160 13ff28c49a332f816a6c6977f44b105f6063a7e6 SHA1 c3b88e01930c067585647ec7e527c35cd346dc72 SHA256 8d1bb4b49055f5542c3398233513ec51f95d8e7d565e46f74d1cd3b01d099fe3
-EBUILD opera-10.60.ebuild 4906 RMD160 5a146b7e7c82b77f54fe91943bbb874e55206446 SHA1 b8238bbbfed2e3c136476a70377011dc588d4f48 SHA256 314ac1b3155fd74e5ec593ee8351760c7357fdb39ac6e60b8cd065cdd96863ea
-MISC ChangeLog 98726 RMD160 2a022e71735922becd7c2cd9a4cf683ad4bfee67 SHA1 0cf8599aff45d8bd2124f0d658b4f83e973cece9 SHA256 dcb85d86e50af9b599b4b63e45a294c2058d1c4d2f419fe50ae3bff3e54ee4c0
+EBUILD opera-10.60.ebuild 4951 RMD160 515826fd98024817c747db3596b7402fe29ab052 SHA1 c575eb1cbea089f6d9f7dc459bf3556d405d39c2 SHA256 fc4f5c53e1163ade6d9f02c7c6e78cf7b26445736c74e79c973c4f604f063e49
+MISC ChangeLog 98843 RMD160 e3ea5b018a169b076ad5a7b3547e77380f45fe53 SHA1 2f025b88e0356319960e79b2544fc196828eaaf1 SHA256 4c98678e10ba798e10161c742b42cd58498b0cc34f5adcb7a6fd92030539bd3c
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a

diff --git a/www-client/opera/opera-10.60.ebuild b/www-client/opera/opera-10.60.ebuild
index 79189bcfb3c536ee1c11110f03431eb780c3d9a7..498f0423d0945d74c94da845cfb391cd29e45553 100644 (file)
--- a/www-client/opera/opera-10.60.ebuild
+++ b/www-client/opera/opera-10.60.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.60.ebuild,v 1.3 2010/07/01 18:51:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.60.ebuild,v 1.4 2010/07/02 01:28:31 jer Exp $
 
 EAPI="2"
 
@@ -49,7 +49,8 @@ RDEPEND="
                dev-libs/atk
                dev-libs/glib
                media-libs/glitz
-               media-libs/libpng
+               !kde? ( media-libs/libpng )
+               kde? ( =media-libs/libpng-1.2* )
                x11-libs/cairo
                x11-libs/pango
                x11-libs/pixman