Restrict libpng depend to libpng12.so.0.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

5 files changed, 16 insertions, 11 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index 1a2f18b94cc8..a1346baa4f2e 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea6-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.19 2010/03/03 09:48:29 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.20 2010/03/11 13:40:02 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  icedtea6-bin-1.6.2-r2.ebuild, icedtea6-bin-1.7-r1.ebuild,
+  icedtea6-bin-1.7.1.ebuild:
+  Restrict libpng depend to libpng12.so.0.
 
 *icedtea6-bin-1.7.1 (03 Mar 2010)
 
diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index fd5fb0661817..8ff90faee009 100644
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -25,8 +25,8 @@ DIST icedtea6-bin-nsplugin-1.7.1-x86.tar.bz2 73279 RMD160 33e4b4b8f0688f344c5660
 DIST icedtea6-bin-src-1.6.2-r2.tar.bz2 26607726 RMD160 8ae63a6e69b42b3745014ef0ba43d1f494c07997 SHA1 ad3631199b021024245c181c86c2d400512ffdf1 SHA256 afad5f25f8ef7aa58bee06094316da26256e1a3c48a950ed27371a9fc5270865
 DIST icedtea6-bin-src-1.7.1.tar.bz2 26640897 RMD160 162fe8553f8600133796cdcd97f7eedfb1438af8 SHA1 fdcdf84c9cfe78fbebb51ab9c95f10e23ad63701 SHA256 e3dd860455e74386a165cafecb97e234a451c5199a10de7fb6c93d1422405d03
 DIST icedtea6-bin-src-1.7.tar.bz2 26615529 RMD160 8b8ed52e0943cf539c31b57235eabe8a6755877c SHA1 a798af258df0e0d1bfd0293066649d808385a7a4 SHA256 2dc853236a898d4163bf514f1a7f090e47249164746a22f121e9081de606dc21
-EBUILD icedtea6-bin-1.6.2-r2.ebuild 2926 RMD160 a96f95fd4cf3d9bdd2d38bbe1d5f7e6e0bed8740 SHA1 b0b0a77e151563045294adec91508661985de434 SHA256 07a32e1acbfb62a9c6c7326e768f293e9e949bec2f354ae4832315843c2e7fb1
-EBUILD icedtea6-bin-1.7-r1.ebuild 3484 RMD160 63f2958fbedcbd88c1d78e5ee9f9f868b3f7cf12 SHA1 2f31ea73333b0e3500f3e995f3d3910488c913ca SHA256 9001519c5c43d64ec1bbc6a4d3fefe79fc0ea22c74a82f2888aa2938fcd25b6f
-EBUILD icedtea6-bin-1.7.1.ebuild 2936 RMD160 57781458b0f18a04aa0b65b2c0ce497a6d5dee59 SHA1 c0324835e7c35f2c536e4814b03ee9020ad0d8f3 SHA256 fdc28b3f5e46618085827e647073fed8fe0f67f53b579fdef4c293d9e9bf87f4
-MISC ChangeLog 3569 RMD160 061873dea0f2f3b16e0ffaeb4df177f8beda4237 SHA1 ea8d4c6e476afb42f6b6367c14394fa837064b0f SHA256 a8881262a9644ef9e55466595a93de4b3b7759ccca4fe8414ceb7e6973572cf1
+EBUILD icedtea6-bin-1.6.2-r2.ebuild 2926 RMD160 dcb20cb408e517f8b84c2cf3a6d907faf1f8dbf9 SHA1 7ab38fe821c916faa27e69c39a6a577578c010ff SHA256 3a7c1d43ed9b04f9ed0623a0914bb5e137e46647ef7d2accf502cced573e1f3f
+EBUILD icedtea6-bin-1.7-r1.ebuild 3484 RMD160 8a6d16980b03ba94cc68ba2296165f83519f22ed SHA1 c4162db26a8f0be14f3761314335f38c06421e14 SHA256 1b87b93d6a42fa3ac3515a51a9e7a2f210d429e482eedc34c0712ae52313466c
+EBUILD icedtea6-bin-1.7.1.ebuild 2936 RMD160 2cd6b6965555ecab45543331d74550a6f62be5a2 SHA1 5bf3c7f9252b8fb08950e3a7a2c22661de3b8faa SHA256 55af3a1b953442766df52bc2edde61abe84abe3844d97a80e89ed5a52f7d72c5
+MISC ChangeLog 3759 RMD160 e102f36650e928350c6b1afc1d1d1de85c4b4ac1 SHA1 ff85d9e7bff3d2c3cc4778a2e753a4c137adbe4b SHA256 4931bd235b3f38afd30a4bb3a262da78e25ac7f5e5da3741df0315589e909185
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild
index d3741534d2ca..f90f9d1ec5a1 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.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/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild,v 1.3 2010/02/19 19:35:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild,v 1.4 2010/03/11 13:40:02 ssuominen Exp $
 
 EAPI="1"
 
@@ -36,7 +36,7 @@ RDEPEND=">=sys-devel/gcc-4.3
 	>=sys-libs/glibc-2.9
 	>=media-libs/giflib-4.1.6-r1
 	=media-libs/jpeg-8*
-	>=media-libs/libpng-1.2.38
+	=media-libs/libpng-1.2*
 	>=sys-libs/zlib-1.2.3-r1
 	alsa? ( >=media-libs/alsa-lib-1.0.20 )
 	X? (
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.7-r1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.7-r1.ebuild
index 571ab07ac13f..dac04b037bfd 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.7-r1.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.7-r1.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/dev-java/icedtea6-bin/icedtea6-bin-1.7-r1.ebuild,v 1.1 2010/02/06 16:55:19 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.7-r1.ebuild,v 1.2 2010/03/11 13:40:02 ssuominen Exp $
 
 EAPI="1"
 
@@ -38,7 +38,7 @@ RDEPEND=">=sys-devel/gcc-4.3
 	>=sys-libs/glibc-2.9
 	>=media-libs/giflib-4.1.6-r1
 	>=media-libs/jpeg-7
-	>=media-libs/libpng-1.2.38
+	=media-libs/libpng-1.2*
 	>=sys-libs/zlib-1.2.3-r1
 	alsa? ( >=media-libs/alsa-lib-1.0.20 )
 	X? (
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild
index 9be0ef0b5881..f1d2119ee2a5 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.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/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild,v 1.1 2010/03/03 09:44:45 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild,v 1.2 2010/03/11 13:40:02 ssuominen Exp $
 
 EAPI="1"
 
@@ -36,7 +36,7 @@ RDEPEND=">=sys-devel/gcc-4.3
 	>=sys-libs/glibc-2.9
 	>=media-libs/giflib-4.1.6-r1
 	>=media-libs/jpeg-8
-	>=media-libs/libpng-1.2.38
+	=media-libs/libpng-1.2*
 	>=sys-libs/zlib-1.2.3-r1
 	alsa? ( >=media-libs/alsa-lib-1.0.20 )
 	X? (