Block <x11-libs/gdk-pixbuf-2.24.0-r1 to avoid Libs.private: libpng14 entry wrt #383655

Package-Manager: portage-2.2.0_alpha61/cvs/Linux x86_64

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 9ca12ae8754634c25a6b89eaa50302f3a86f4baf..ce4c9bf743c3883ba57cf47cc5202f030c1ecefc 100644 (file)
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.309 2011/10/05 15:59:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.310 2011/10/06 07:38:06 ssuominen Exp $
+
+  06 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> libpng-1.5.5.ebuild:
+  Block <x11-libs/gdk-pixbuf-2.24.0-r1 to avoid Libs.private: libpng14 entry
+  wrt #383655
 
   05 Oct 2011; Jeroen Roovers <jer@gentoo.org> libpng-1.4.8-r1.ebuild:
   Stable for HPPA (bug #384285).

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index e479e064879c919f2c8b2322dcf684ed67227614..4b781451b9da3baf8d5a557af1347661f5ecb145 100644 (file)
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -19,13 +19,17 @@ EBUILD libpng-1.4.8-r1.ebuild 1417 RMD160 cbdf2d8a6c91bee4b0e500aca4f28990a199d1
 EBUILD libpng-1.4.8-r2.ebuild 1369 RMD160 531f587ba91f30eb15135f613068aed99545600f SHA1 bc4b9405b9d7533dd7ece78f7e39542b61d2d6b0 SHA256 ec52f045d997fc9bfb1fa2fe3686489956395c6f079b9a815e2cec32fbf497d2
 EBUILD libpng-1.4.8.ebuild 1467 RMD160 023570d161ac3f93c09893c2292a605ec079418b SHA1 6e2808c79a8c2cebdafa56611c7236d9aa2c195c SHA256 8447d796a9d51d3ed14b91aad3b39d82c4ea1ce0b0d35f8b3fcb6ce2a7abf5c1
 EBUILD libpng-1.5.4-r1.ebuild 1463 RMD160 27b6c8dd18f3169fb359c3bec9b433693d67b5de SHA1 faa68726cc46b698db204b4120fe2e0d1ce37af9 SHA256 40a8a4cd20697bcc2fb08fb1248db7515841039d9bfdfd9307fbd34c2cb21be6
-EBUILD libpng-1.5.5.ebuild 1409 RMD160 de88b88ee8fd48e3966274f695042d9a00c6a005 SHA1 0782445ae3b6d041047ba761f022213373b67be1 SHA256 8181225f4900651d03e914e93593d1825de51260eb70e31a1b80cde7a76298fb
-MISC ChangeLog 41657 RMD160 9c88e880d0a77ec39ac8fcca340653b6457bddde SHA1 5099a3db47e91bdbb0b8468fd7801f7c05ce0c93 SHA256 b5b4344c78f78f12a42cff9c26ef4a5186fab6a2c55d4c328cf2325c4f6a8e15
+EBUILD libpng-1.5.5.ebuild 1446 RMD160 d07e760fc646612551b75a4b09e4bc0a1dfe8578 SHA1 6d5b35335bd9bb8d80ef11c12872d8526678dd93 SHA256 d3bfb9ffdc980cb8986e9e54ffd3fe839d36c6710ae18170022a6c755810c161
+MISC ChangeLog 41830 RMD160 7c825d720aa59df612ed0aef222e40fd0de514f9 SHA1 a492e2c6275f268b5e4e8a098741b89b002afba3 SHA256 33f5b209b09f0b85ce1cc7b79dedb29e71ca1bcc7f23653f2dc45b2469508ab6
 MISC metadata.xml 247 RMD160 61ce1843d85a1ab05dc7838ac15375b0fb4f35bd SHA1 0a4b634f99126e9ebc485ad949b41df5a11f2fb0 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6MfuUACgkQVWmRsqeSphMdBQCeJroJPkoZx3eAZjjIItokrCxT
-BAEAn3lry7BkPGRv7cPSQGVaPvBVdPq6
-=U2iB
+iQEcBAEBAgAGBQJOjVsBAAoJEEdUh39IaPFNzVsIAI+1I1jh7cSXLsSs2RLznyaH
++dIZipPru17oVdpjDzgW03PefS3OPkFPMr886/I784+JCed2nwiL6zUvGVANIBuw
+X/0AmwdFtVf7JWn9ygDGvzUn24uG4rBzSPS3iJmQVXdyLjNrRq29AT4xnwomKrq8
+px6+HGqUOnWsmZz3Aoxs3G0bTvFyjBIZxh1HfbBFQVtnnZoNkpjS7tX65piJwPYg
+ukap9TIr9Gz2CX/rSxWEopUAD1CnNdfDVhQWLr/xr1aAHETqg894ym2JEI1cdF2k
+BET8/eVWSowxx4E45jRI1TD3mZ5UBRHDHPQiK6d37OLWinkzGmAOd2w8K8dSr3s=
+=k+8r
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libpng/libpng-1.5.5.ebuild b/media-libs/libpng/libpng-1.5.5.ebuild
index 157eec23ce85432b2efd01416f69f709004f9c03..8451213d913bc974c43d7182080a6b70fbd99501 100644 (file)
--- a/media-libs/libpng/libpng-1.5.5.ebuild
+++ b/media-libs/libpng/libpng-1.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.5.ebuild,v 1.1 2011/09/24 05:39:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.5.ebuild,v 1.2 2011/10/06 07:38:06 ssuominen Exp $
 
 EAPI=4
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng static-libs"
 
-RDEPEND="sys-libs/zlib"
+RDEPEND="sys-libs/zlib
+       !!<x11-libs/gdk-pixbuf-2.24.0-r1"
 DEPEND="${RDEPEND}
        app-arch/xz-utils"