summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-09-17 19:23:35 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-09-17 19:23:35 +0000
commit6633ee6cf3a78c777cbb2112e76bb646c23b61eb (patch)
tree1fbffb73970879ab3c67a18c7f9417034b7faf99 /dev-java
parentFix building with libpng15 (bump patchset to 5) wrt #383213 by Diego Elio Pet... (diff)
downloadgentoo-2-6633ee6cf3a78c777cbb2112e76bb646c23b61eb.tar.gz
gentoo-2-6633ee6cf3a78c777cbb2112e76bb646c23b61eb.tar.bz2
gentoo-2-6633ee6cf3a78c777cbb2112e76bb646c23b61eb.zip
Fix media-libs/libpng depend to pull any providing libpng14.so.14 SONAME.
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/icedtea6-bin/ChangeLog6
-rw-r--r--dev-java/icedtea6-bin/icedtea6-bin-1.10.2.ebuild4
-rw-r--r--dev-java/icedtea6-bin/icedtea6-bin-1.10.3.ebuild4
3 files changed, 9 insertions, 5 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/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="