summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-04-09 20:26:41 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-04-09 20:26:41 +0000
commit9b466f06e1bfe22e7590f44fb9972e21b1f62899 (patch)
treea325a8a5f4a84d5f6fd55260e9da1ac1f41dca3f /dev-java/icedtea-bin
parentAdded 'msg' and 'dynmasq' modules by sebaFlame (bug #462868). Switched to EAPI=5 (diff)
downloadgentoo-2-9b466f06e1bfe22e7590f44fb9972e21b1f62899.tar.gz
gentoo-2-9b466f06e1bfe22e7590f44fb9972e21b1f62899.tar.bz2
gentoo-2-9b466f06e1bfe22e7590f44fb9972e21b1f62899.zip
Avoid pulling in libpng16 for now wrt #464914
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'dev-java/icedtea-bin')
-rw-r--r--dev-java/icedtea-bin/ChangeLog7
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild4
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild4
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild4
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild4
5 files changed, 14 insertions, 9 deletions
diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index b9e623c634ba..e1646c9b9555 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/icedtea-bin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.42 2013/03/25 21:15:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.43 2013/04/09 20:26:41 ssuominen Exp $
+
+ 09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+ icedtea-bin-6.1.12.2.ebuild, icedtea-bin-6.1.12.4.ebuild,
+ icedtea-bin-7.2.3.6.ebuild, icedtea-bin-7.2.3.8.ebuild:
+ Avoid pulling in libpng16 for now wrt #464914
25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> icedtea-bin-6.1.12.4.ebuild:
Stable for amd64, wrt bug #461714
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild
index 077d4ac68f3b..401d0f07ff93 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild,v 1.3 2013/02/14 13:10:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild,v 1.4 2013/04/09 20:26:41 ssuominen Exp $
EAPI="4"
@@ -52,7 +52,7 @@ X_COMMON_DEP="
COMMON_DEP="
>=media-libs/giflib-4.1.6-r1
- >=media-libs/libpng-1.5
+ =media-libs/libpng-1.5*
>=sys-devel/gcc-4.3
>=sys-libs/glibc-2.11.2
>=sys-libs/zlib-1.2.3-r1
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild
index cd88fd513e6c..3ebd02cca620 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild,v 1.3 2013/03/25 21:15:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.4.ebuild,v 1.4 2013/04/09 20:26:41 ssuominen Exp $
EAPI="4"
@@ -52,7 +52,7 @@ X_COMMON_DEP="
COMMON_DEP="
>=media-libs/giflib-4.1.6-r1
- >=media-libs/libpng-1.5
+ =media-libs/libpng-1.5*
>=sys-devel/gcc-4.3
>=sys-libs/glibc-2.11.2
>=sys-libs/zlib-1.2.3-r1
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild
index 6982f961a030..2fd89ccb1edf 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild,v 1.1 2013/02/14 06:15:06 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild,v 1.2 2013/04/09 20:26:41 ssuominen Exp $
EAPI="4"
@@ -59,7 +59,7 @@ X_COMMON_DEP="
COMMON_DEP="
>=media-libs/giflib-4.1.6-r1
media-libs/lcms:2
- >=media-libs/libpng-1.5
+ =media-libs/libpng-1.5*
>=sys-devel/gcc-4.3
>=sys-libs/glibc-2.11.2
>=sys-libs/zlib-1.2.3-r1
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild
index 63650c648662..ed8ca9c3fe5b 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild,v 1.1 2013/03/24 13:27:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild,v 1.2 2013/04/09 20:26:41 ssuominen Exp $
EAPI="4"
@@ -59,7 +59,7 @@ X_COMMON_DEP="
COMMON_DEP="
>=media-libs/giflib-4.1.6-r1
media-libs/lcms:2
- >=media-libs/libpng-1.5
+ =media-libs/libpng-1.5*
>=sys-devel/gcc-4.3
>=sys-libs/glibc-2.11.2
>=sys-libs/zlib-1.2.3-r1