Version bump, bug #361921. Restrict libpng deps on older versions.

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

6 files changed, 335 insertions, 10 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 5e44ed538516..fcb12b5b6e6a 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.26 2011/03/29 09:08:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.27 2011/04/08 13:14:26 caster Exp $
+
+*icedtea-6.1.10.1 (08 Apr 2011)
+
+  08 Apr 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.7-r1.ebuild,
+  icedtea-6.1.10.ebuild, +icedtea-6.1.10.1.ebuild, metadata.xml:
+  Version bump, bug #361921. Restrict libpng deps on older versions.
 
   29 Mar 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.7-r1.ebuild,
   icedtea-6.1.10.ebuild:
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index a39ba4512a0e..ae2bdc702150 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -3,18 +3,23 @@ AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SH
 AUX icedtea.env 1014 RMD160 566c46cd11c9d9b18d600702b1d4857cacc824ec SHA1 fb2439f39863088b5525102946d154fc54f14c08 SHA256 63d0c03dce0d546bcd9f52ebf7abb56e61f9acaeb659c9fbf19fec315a0cf5ae
 DIST 13edc857b967.tar.gz 8401448 RMD160 3b0f967cebe2e564769ebbdc630c384458aa1f82 SHA1 9ca443bc4994b80535bbe94f0de426a87421d950 SHA256 c595349cb8e4778c9409c550ded749feb0bdd11b962be3e1449eeb53c12b8433
 DIST 6a5eda011e49.tar.gz 4207812 RMD160 4bb71120ec02140386a3354bcd1a285a0016492f SHA1 c59c56fd879763e85a774869a89f8c0f7ae4c987 SHA256 57f3abd73688cb8861875e2f21be9ec8a0c7c234e1e694489e3efa4436e9228c
+DIST c7bf150bfa46.tar.gz 4210056 RMD160 f0afca5b073dba922eebbbbd6a9be1725ccaf86e SHA1 d192a1f7ba73346c86e71a295587381f8a4b2bce SHA256 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee
 DIST e321b101a9ee.tar.bz2 2727158 RMD160 16cb5c6f58197dbfd690e578418fadf911935ed7 SHA1 b41d54057cd98bddb8adb6bd4c1e50b08eaef411 SHA256 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
+DIST f0f676c5a2c6.tar.gz 8506038 RMD160 e00e7b602758eaa6cfdd04b109d99694ce2ae94c SHA1 bdc450f5a1b75b2445c960f43dbc7f605042a3c8 SHA256 aaa322239c181e50a61ec71869843eee7a0a82a9b80f113d32faf2a59d7ba5c4
 DIST f46354849fb3.tar.gz 8506447 RMD160 d03e16a91b623c090ddaa05d33adef662e703249 SHA1 fc975c8bd4e0eee660f9a1d24f556a41236ad785 SHA256 acda8db40fe88da2cc4bf633929b1139d3a3b7c7d0d217b5e56d2509e354e8d9
+DIST icedtea6-1.10.1.tar.gz 6451588 RMD160 55e81e2f0ce90813552ecb7ea28f09c743966388 SHA1 e09a040f28a7a2009f0194fbbe2e83c4d1bfa265 SHA256 0aa25a27fc8d44aa5da65d6852e2ab5baf2e5a31470084b5c0e2dd421567d7eb
 DIST icedtea6-1.10.tar.gz 6443607 RMD160 4ff73cbb4255426e22717ca0ef244c60d68515d9 SHA1 904bd9827e6b62997468a116dfcfcfe3b2291f94 SHA256 feb5d0aadb9ceeb533d4e1d0293d44256c3842b9fa5f49736592201311a84354
 DIST icedtea6-1.9.7.tar.gz 6559744 RMD160 6a5ba7b763f21f55f556c79a45ff3fdeee4e4188 SHA1 0d79e04c665bd89e669dfbc6ffc36f9e2efb30b4 SHA256 fe89234ca7f5dbb8696aa0e97a342c51901c10c0254f8fd563c6ccf7bf532fcc
 DIST jamvm-30c4a6b93ffa385833360921bfc613829fb081c9.tar.gz 286891 RMD160 32ddf8f48ccffc3d45bda9e7e02dd9da32858b2b SHA1 e539a9a947c384d6809d84522d3aeec3cf5bfccf SHA256 e77434a7d02d75de7fe44e9e1d7d6a3fd7ddcd5447ddd175fde2a7ccb40f8838
+DIST jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz 288269 RMD160 9f0dafecf766ae27ad19ed1b6d12fdd59104fbd3 SHA1 b5e304b60f274d0ed59c7888e2340a2f043df4f5 SHA256 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd
 DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 DIST jdk6-jaxp-b20.zip 5944804 RMD160 c02276a9363ec89414e5061b301ee25fca353291 SHA1 688531dfcd81ef704732ffef7d467045fd850544 SHA256 d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b20-21_jun_2010.tar.gz 45078703 RMD160 5248e9b3ed762829c33bf2ff7e3ca0cbf4bee5d2 SHA1 39fc162a740f16aa18afa855fea9d5daf8cf03d4 SHA256 fcf8f1d614e5965e90ef1b1a6d5eecc2bcc3078eaffbb62b83dfba52da62e54b
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
-EBUILD icedtea-6.1.10.ebuild 10576 RMD160 b760efffc777b5ebd510ce1b9faa09e0be8acd30 SHA1 541ffcdafb9ace39e41afdf2f454f2e37f922307 SHA256 588ebae3bcb9540fa4968cca6f4057d4b99a35a8637665059cc4716482031d2a
-EBUILD icedtea-6.1.9.7-r1.ebuild 10603 RMD160 ba7dc231bdcbb89d3f06cc23602e7b1df4769e8d SHA1 42528b9b8df5eaf3e0dc5ad95ac95f4b5eed53b6 SHA256 78faa93ecb1719c26868da6a1e1a886290fe5a8c5f29fd7515f98301e648fead
-MISC ChangeLog 5458 RMD160 171b9d5faa3ec7db25d93dd1d3d49276499ee526 SHA1 f418dbe191d39a4b7d7d13fc53aa605d90e9bebe SHA256 d765f83b8d888b4605f95eae5571022752b1c5c5ce471d67cee84a4dafc16d26
-MISC metadata.xml 1694 RMD160 71c4e9791a672655cec92057d2d850aeae9ca051 SHA1 6dc1462d0ff28a59e10d243ed715d412d1223a66 SHA256 39ef90cceec24335b10e082f7ab2c47d2ccfef4e53aa9841f3ee3f70c6283fc1
+EBUILD icedtea-6.1.10.1.ebuild 10578 RMD160 fd6ed62b5491568ec28abff8fc9e2ea4524bb4ec SHA1 79219e054fff0e99a7bb90246295c9dad7866df5 SHA256 8582cef2efb84ea9e9713e1545136e73c6eb7f9fb1a59eddd58c66f0f2445046
+EBUILD icedtea-6.1.10.ebuild 10578 RMD160 a5a3da348bae58c4ae6124411c2f97ea90485639 SHA1 643c67770cd9552cf7b5c7be8eb4d09e83498be8 SHA256 bfc96beed67a5b5d5b57561c03db5d551bf7b12ce37b4865e04036f6ce4d119d
+EBUILD icedtea-6.1.9.7-r1.ebuild 10605 RMD160 feedc2dc27cd3e08016f8e8ad912e5798e059d67 SHA1 064fdb00a807829ee4dbae52045df649f50bc3ab SHA256 850a27ab6d09455245c07a6d6dc00f330c7adfb64716550b2a85aeb6dc2568b5
+MISC ChangeLog 5704 RMD160 4d34d8b85a658cf5c25ffe8dad6653d8d301034b SHA1 c40e83d112a6023e47ac8213c91a66a53a0b435b SHA256 584d9ac485064da2dd4e02906f4269bd46ac2760a2624046017a45c4ccb70976
+MISC metadata.xml 1630 RMD160 5cca625ab62aa05058fedce18566e7259657086e SHA1 25b8d96a8d16016d510b2f12eb9e42fd9f634898 SHA256 865c229897f018ab797c2432b7acbe40449d5ce251591d62e31303ec7e8ad37c
diff --git a/dev-java/icedtea/icedtea-6.1.10.1.ebuild b/dev-java/icedtea/icedtea-6.1.10.1.ebuild
new file mode 100644
index 000000000000..ccb52522551f
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.10.1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.1.ebuild,v 1.1 2011/04/08 13:14:26 caster Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="2"
+
+inherit pax-utils java-pkg-2 java-vm-2 versionator
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies"
+ICEDTEA_VER="$(get_version_component_range 2-4)"
+ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
+OPENJDK_BUILD="22"
+OPENJDK_DATE="28_feb_2011"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jaxp144_01.zip"
+JAXWS_TARBALL="jdk6-jaxws-b20.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz"
+CACAO_TARBALL="c7bf150bfa46.tar.gz"
+JAMVM_TARBALL="jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz"
+SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
+		 http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
+		 http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
+		 http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
+		 hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )
+		 cacao? ( http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} )
+		 jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} )"
+HOMEPAGE="http://icedtea.classpath.org"
+S=${WORKDIR}/${ICEDTEA_PKG}
+
+# Missing options:
+# shark - needs adding
+IUSE="cacao debug doc examples +hs20 jamvm javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender zero"
+
+# JTReg doesn't pass at present
+RESTRICT="test"
+
+RDEPEND=">=net-print/cups-1.2.12
+	 >=x11-libs/libX11-1.1.3
+	 >=media-libs/freetype-2.3.5
+	 >=media-libs/alsa-lib-1.0
+	 >=x11-libs/gtk+-2.8:2
+	 >=x11-libs/libXinerama-1.0.2
+	 >=x11-libs/libXp-1.0.0
+	 >=x11-libs/libXi-1.1.3
+	 >=x11-libs/libXau-1.0.3
+	 >=x11-libs/libXdmcp-1.0.2
+	 >=x11-libs/libXtst-1.0.3
+	 virtual/jpeg
+	 >=media-libs/libpng-1.2
+	 >=media-libs/giflib-4.1.6
+	 >=sys-libs/zlib-1.2.3
+	 x11-proto/inputproto
+	 x11-proto/xineramaproto
+	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	 javascript? ( dev-java/rhino:1.6 )
+	 zero? ( virtual/libffi )
+	 xrender? ( >=x11-libs/libXrender-0.9.4 )
+	 systemtap? ( >=dev-util/systemtap-1 )
+	 !dev-java/icedtea6
+	 nss? ( >=dev-libs/nss-3.12.5-r1 )"
+
+# Additional dependencies for building:
+#   zip: extract OpenJDK tarball, and needed by configure
+#   xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly)
+#   ant, ecj, jdk: required to build Java code
+# Only ant-core-1.7.1-r2 and later contain a version of Ant that
+# properly respects environment variables, if the build
+# sets some environment variables.
+#   ca-certificates, perl and openssl are used for the cacerts keystore generation
+#   xext headers have two variants depending on version - bug #288855
+DEPEND="${RDEPEND}
+	|| (
+		( >=dev-java/gcj-jdk-4.3 >=app-admin/eselect-ecj-0.5-r1 )
+		( >=dev-java/cacao-0.99.2 >=app-admin/eselect-ecj-0.5-r1 )
+		dev-java/icedtea6-bin
+		dev-java/icedtea:${SLOT}
+	)
+	app-arch/zip
+	>=dev-java/xalan-2.7.0:0
+	>=dev-java/xerces-2.9.1:2
+	>=dev-java/ant-core-1.7.1-r2
+	dev-java/ant-nodeps
+	app-misc/ca-certificates
+	dev-lang/perl
+	dev-libs/openssl
+	|| (
+		(
+			>=x11-libs/libXext-1.1.1
+			>=x11-proto/xextproto-7.1.1
+			x11-proto/xproto
+		)
+		<x11-libs/libXext-1.1.1
+	)
+	sys-apps/lsb-release"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:6 )
+	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+
+pkg_setup() {
+# Shark support disabled for now - still experimental and needs sys-devel/llvm
+#	if use shark ; then
+#	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
+#		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
+#		errror "without the shark USE flag turned on."
+#		die "Rebuild without the shark USE flag on."
+#	  fi
+#	  if ( ! use zero ) ; then
+#		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
+#		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
+#	  fi
+#	fi
+
+	if use nsplugin && ! use webstart ; then
+		elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
+	fi
+
+	# quite a hack since java-config does not provide a way for a package
+	# to limit supported VM's for building and their preferred order
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	elif has_version "dev-java/icedtea:${SLOT}"; then
+		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version dev-java/icedtea6; then
+		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version dev-java/icedtea6-bin; then
+		JAVA_PKG_FORCE_VM="icedtea6-bin"
+	elif has_version dev-java/gcj-jdk; then
+		JAVA_PKG_FORCE_VM="gcj-jdk"
+	elif has_version dev-java/cacao; then
+		JAVA_PKG_FORCE_VM="cacao"
+	else
+		JAVA_PKG_FORCE_VM=""
+		# don't die just yet if merging a binpkg - bug #258423
+		DIE_IF_NOT_BINPKG=true
+	fi
+
+	# if the previous failed, don't even run java eclasses pkg_setup
+	# as it might also die when no VM is present
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+		java-vm-2_pkg_setup
+		java-pkg-2_pkg_setup
+	fi
+
+	VMHANDLE="icedtea${SLOT}"
+}
+
+src_unpack() {
+	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
+		die "Unable to find a supported VM for building"
+	fi
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+unset_vars() {
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+}
+
+src_configure() {
+	local config procs rhino_jar
+	local vm=$(java-pkg_get-current-vm)
+	local vmhome="/usr/$(get_libdir)/jvm/${vm}"
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
+		# If we are upgrading icedtea, then we don't need to bootstrap.
+		config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
+	elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
+		# For other 1.5 JDKs e.g. GCJ, CACAO.
+		config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
+		config="${config} --with-jdk-home=${vmhome}"
+	else
+		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
+		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
+	fi
+
+	# OpenJDK-specific parallelism support.
+	procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
+	if [[ -n ${procs} ]] ; then
+		config="${config} --with-parallel-jobs=${procs}";
+		einfo "Configuring using --with-parallel-jobs=${procs}"
+	fi
+
+	if use_zero ; then
+		config="${config} --enable-zero"
+	else
+		config="${config} --disable-zero"
+	fi
+
+	if use javascript ; then
+		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
+	fi
+
+	if use hs20 ; then
+		config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}"
+	fi
+
+	if use cacao ; then
+		config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
+	fi
+
+	if use jamvm ; then
+		config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
+	fi
+
+	unset_vars
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_with javascript rhino ${rhino_jar}) \
+		$(use_enable cacao) \
+		$(use_enable jamvm) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable xrender) \
+		$(use_enable systemtap) \
+		$(use_enable nio2) \
+		$(use_enable nss) \
+		|| die "configure failed"
+}
+
+src_compile() {
+	# Newer versions of Gentoo's ant add
+	# an environment variable so it works properly...
+	export ANT_RESPECT_JAVA_HOME=TRUE
+	# ant -diagnostics in Ant 1.8.0 fails without these
+	# otherwise we try to load the least that's needed to avoid possible classpath collisions
+	export ANT_TASKS="xerces-2 xalan ant-nodeps"
+
+	# Paludis does not respect unset from src_configure
+	unset_vars
+	emake || die "make failed"
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${D}/${dest}"
+	dodir "${dest}" || die
+
+	dodoc README NEWS AUTHORS THANKYOU || die
+	dosym "/usr/share/doc/${PF}" "/usr/share/doc/${PN}${SLOT}"
+
+	cd "${S}/openjdk.build/j2sdk-image" || die
+
+	if use doc ; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die "Failed to install documentation"
+	fi
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
+
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	cp src.zip "${ddest}" || die
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in /usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	sed -e "s#@SLOT@#${SLOT}#g" \
+		-e "s#@PV@#${ICEDTEA_VER}#g" \
+		-e "s#@LIBDIR@#$(get_libdir)#g" \
+		< "${FILESDIR}/icedtea.env" > "${T}/icedtea.env"
+	set_java_env "${T}/icedtea.env"
+}
+
+use_zero() {
+	use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea/icedtea-6.1.10.ebuild b/dev-java/icedtea/icedtea-6.1.10.ebuild
index 29f58fb8fa2f..0f046b858601 100644
--- a/dev-java/icedtea/icedtea-6.1.10.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.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/icedtea/icedtea-6.1.10.ebuild,v 1.2 2011/03/29 09:08:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.ebuild,v 1.3 2011/04/08 13:14:26 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -57,7 +57,7 @@ RDEPEND=">=net-print/cups-1.2.12
 	 >=x11-libs/libXdmcp-1.0.2
 	 >=x11-libs/libXtst-1.0.3
 	 virtual/jpeg
-	 >=media-libs/libpng-1.2
+	 =media-libs/libpng-1.4*:0
 	 >=media-libs/giflib-4.1.6
 	 >=sys-libs/zlib-1.2.3
 	 x11-proto/inputproto
diff --git a/dev-java/icedtea/icedtea-6.1.9.7-r1.ebuild b/dev-java/icedtea/icedtea-6.1.9.7-r1.ebuild
index 9857946e608c..2728de59f11e 100644
--- a/dev-java/icedtea/icedtea-6.1.9.7-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.9.7-r1.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/icedtea/icedtea-6.1.9.7-r1.ebuild,v 1.2 2011/03/29 09:08:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.7-r1.ebuild,v 1.3 2011/04/08 13:14:26 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -55,7 +55,7 @@ RDEPEND=">=net-print/cups-1.2.12
 	 >=x11-libs/libXdmcp-1.0.2
 	 >=x11-libs/libXtst-1.0.3
 	 virtual/jpeg
-	 >=media-libs/libpng-1.2
+	 =media-libs/libpng-1.4*:0
 	 >=media-libs/giflib-4.1.6
 	 >=sys-libs/zlib-1.2.3
 	 x11-proto/inputproto
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 6c255c651e13..2c0310fc84db 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -15,7 +15,6 @@
 <longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
 <use>
   <flag name="cacao">Use the CACAO virtual machine instead of HotSpot on x86, amd64 or SPARC architectures.</flag>
-  <flag name="hs16">Use the new version of HotSpot (16).</flag>
   <flag name="hs19">Use the new version of HotSpot (19).</flag>
   <flag name="hs20">Use the new version of HotSpot (20).</flag>
   <flag name="jamvm">Use the JamVM virtual machine instead of HotSpot.</flag>