Fix media-libs/libpng depend to pull any providing libpng14.so.14 SONAME.

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

4 files changed, 22 insertions, 8 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index e0cf832c2e1b..5a4eb42f852b 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea6-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.65 2011/09/16 06:10:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.66 2011/09/17 19:23:35 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  icedtea6-bin-1.10.2.ebuild, icedtea6-bin-1.10.3.ebuild:
+  Fix media-libs/libpng depend to pull any providing libpng14.so.14 SONAME.
 
   16 Sep 2011; Vlastimil Babka <caster@gentoo.org> icedtea6-bin-1.10.2.ebuild,
   icedtea6-bin-1.10.3.ebuild:
diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index 568d09cd3a53..c0dee275a29e 100644
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX icedtea6-bin.env 1023 RMD160 6b5de5f11b11cecc72dc89077ec7795f322f030b SHA1 3392ee66d94e952ec63e682f5f1ad8cbb8b1d4a2 SHA256 729a1f5ee5c64c0270ae12acafd6a73dac0858edb5493868a98a2de4b606d0ff
 DIST icedtea6-bin-core-1.10.2-amd64.tar.bz2 35149854 RMD160 00100a4689a85bb5f8275d80385ba83159b30808 SHA1 7c7adffe4915d30258e394e8d24a5db2ad57b222 SHA256 457961a0bbf2b57d6cdbbf365c9c975f9cc23e3f80e620c285ddd3c8496651b1
 DIST icedtea6-bin-core-1.10.2-x86.tar.bz2 36115323 RMD160 0b75fb16d32d2d03cc45794e8bf2329c05c8ae04 SHA1 fc3a459853dcd42889a713da908383c7acfd9be7 SHA256 0f36d76c67dd8cb285b0a08695286cc71dd4e4dda5ce71f51fb6cb1b318f33e8
@@ -15,7 +18,14 @@ DIST icedtea6-bin-nsplugin-1.10.3-amd64.tar.bz2 901853 RMD160 8f0a7466b923f7e74b
 DIST icedtea6-bin-nsplugin-1.10.3-x86.tar.bz2 895214 RMD160 56f2d1167d3979c42823c325ff89437a9725640c SHA1 f9709e44fd9719f023f50839bf16fba2f10bcb26 SHA256 4583fa09fb83ec79e4ac71b7b423453877bf613cb4e3dfe02f169383f3b92503
 DIST icedtea6-bin-src-1.10.2.tar.bz2 40817645 RMD160 5331ebd98d5a480a8a02ae85ba15dec18e81f05c SHA1 c0bf5e7e6dbfc29c68656a38db160aaf565dca8a SHA256 1cc7f91f6849cc40b1b924e71d404910f45d74668cd6eb32439bc4d77adb76ff
 DIST icedtea6-bin-src-1.10.3.tar.bz2 40818662 RMD160 6285f875e59cd1f6423a45f975cae0dfc9945392 SHA1 d22efefbdefcf1e1e4476dbde44554b96e9f9dd9 SHA256 8a81efcf7ef34b64e1306b041b886a4281a28d9a21ea6cae2f899993d01394dd
-EBUILD icedtea6-bin-1.10.2.ebuild 2804 RMD160 4ee52d40f8b6f6a58e33133fe96046f13bdfbe23 SHA1 8cac324cf6b86b29481f0909771e6483894fe893 SHA256 b9d22d975442f7ec0eb99b8e1574e8d37c96c462328b2b370e7b2189e08fdafa
-EBUILD icedtea6-bin-1.10.3.ebuild 2803 RMD160 6e696e7663e249d7e38f7ad77a3757559b8c2e90 SHA1 24038cab1f9b6ba41eb63d2180c776838bd6c2b1 SHA256 713be112f44ca2dc32d92b148e6f56788e34697bc79b3e2c2ef8ff7c8ec6440b
-MISC ChangeLog 10650 RMD160 1889b4ab128ae45e8458f38cdefe1db8c49048ec SHA1 e09c380d6716c8ad455dc8386128fa10c14b9fc1 SHA256 0a7fc68607407c9643879318b616f7680d28b9a9101aab6d28a0b54dd4f10e22
+EBUILD icedtea6-bin-1.10.2.ebuild 2805 RMD160 c52331760423a3ae84691bfb1f23ca2af460189d SHA1 7a1e0b0994c160217ef7d12b2fd011531bf4793d SHA256 a094f47166b968f9835449366112ed1e0d12fab0b7086991e97ef5fbb423d519
+EBUILD icedtea6-bin-1.10.3.ebuild 2804 RMD160 b6fdf191d76181ca748dbdb25951e4520f499043 SHA1 c9ff8f30fe540935325c55d76747e76f08d83e7e SHA256 4d5f717f370e4a4d251f4075b67e9605a532671d7685e6036eaf2ab4bddb18cc
+MISC ChangeLog 10842 RMD160 7598fbf44c1221d2fb613d03fe02e2482db9a27a SHA1 a3a334da2fcb2d61d3dca3ef847d4c03edcd5775 SHA256 0d6476c2f7069586a5a5598372a1482aee56b10f989d40ec9e38fab27bfcc12b
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk508/QACgkQXkR9YqOcLPHOkAEAgZMC3IjxBBCno0YWFc81ZgyZ
+pKocgzYiBfkuqCdXZGMA/j1yR9a9XfqwsYmbpK1FxGSwvk8gC87cZ2aCthQ2Sq0a
+=KBfg
+-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild
index 64cb9eb60fa0..0dad02c03206 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.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/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild,v 1.6 2011/09/16 06:10:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild,v 1.7 2011/09/17 19:23:35 ssuominen Exp $
 
 EAPI="3"
 
@@ -36,7 +36,7 @@ RDEPEND=">=sys-devel/gcc-4.3
 	>=sys-libs/glibc-2.11.2
 	>=media-libs/giflib-4.1.6-r1
 	virtual/jpeg
-	>=media-libs/libpng-1.4:0
+	=media-libs/libpng-1.4*
 	>=sys-libs/zlib-1.2.3-r1
 	"
 PDEPEND="
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild
index f46704f3e6a4..da45c4d5201b 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.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/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild,v 1.6 2011/09/16 06:10:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild,v 1.7 2011/09/17 19:23:35 ssuominen Exp $
 
 EAPI="3"
 
@@ -36,7 +36,7 @@ RDEPEND=">=sys-devel/gcc-4.3
 	>=sys-libs/glibc-2.11.2
 	>=media-libs/giflib-4.1.6-r1
 	virtual/jpeg
-	>=media-libs/libpng-1.4:0
+	=media-libs/libpng-1.4*
 	>=sys-libs/zlib-1.2.3-r1
 	"
 PDEPEND="