summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2011-04-22 14:47:32 +0000
committerVlastimil Babka <caster@gentoo.org>2011-04-22 14:47:32 +0000
commit3183eed32b04a733b42987bdddcbe1f75b69a89d (patch)
treeadd18389e4b76f4c577fd5fc91db0536990814cc /dev-java
parentVersion bump. (diff)
downloadgentoo-2-3183eed32b04a733b42987bdddcbe1f75b69a89d.tar.gz
gentoo-2-3183eed32b04a733b42987bdddcbe1f75b69a89d.tar.bz2
gentoo-2-3183eed32b04a733b42987bdddcbe1f75b69a89d.zip
Version bump, bug #361921. Includes libpng-1.5 support, 1.9.7 restricts dep to =1.4* fixing bug #356743.
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/icedtea6-bin/ChangeLog9
-rw-r--r--dev-java/icedtea6-bin/icedtea6-bin-1.10.1.ebuild (renamed from dev-java/icedtea6-bin/icedtea6-bin-1.9.6.ebuild)6
-rw-r--r--dev-java/icedtea6-bin/icedtea6-bin-1.9.7.ebuild4
3 files changed, 14 insertions, 5 deletions
diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index 640b0bd0c651..a367e2f16934 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,13 @@
# 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.55 2011/03/27 09:40:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.56 2011/04/22 14:47:32 caster Exp $
+
+*icedtea6-bin-1.10.1 (22 Apr 2011)
+
+ 22 Apr 2011; Vlastimil Babka <caster@gentoo.org> -icedtea6-bin-1.9.6.ebuild,
+ icedtea6-bin-1.9.7.ebuild, +icedtea6-bin-1.10.1.ebuild:
+ Version bump, bug #361921. Includes libpng-1.5 support, 1.9.7 restricts dep
+ to =1.4* fixing bug #356743.
27 Mar 2011; Vlastimil Babka <caster@gentoo.org> icedtea6-bin-1.9.7.ebuild:
Change the optional deps to PDEPEND to avoid dependency circles.
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.9.6.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.10.1.ebuild
index c1fa12131c56..33d44e648f0a 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.9.6.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.10.1.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.9.6.ebuild,v 1.3 2011/02/11 22:12:57 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.1.ebuild,v 1.1 2011/04/22 14:47:32 caster Exp $
EAPI="1"
@@ -28,7 +28,7 @@ RESTRICT="strip"
LICENSE="GPL-2-with-linking-exception"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
@@ -38,6 +38,8 @@ RDEPEND=">=sys-devel/gcc-4.3
virtual/jpeg
>=media-libs/libpng-1.4:0
>=sys-libs/zlib-1.2.3-r1
+ "
+PDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.20 )
X? (
>=media-libs/freetype-2.3.9:2
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.9.7.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.9.7.ebuild
index ec34ca81c1b9..086f763e6cd0 100644
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.9.7.ebuild
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.9.7.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.9.7.ebuild,v 1.4 2011/03/27 09:40:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.7.ebuild,v 1.5 2011/04/22 14:47:32 caster Exp $
EAPI="1"
@@ -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="