Version bump, security bug #354231.

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

4 files changed, 367 insertions, 2 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index ff7ef0994ce2..84c1da998bb2 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.22 2011/02/02 00:06:07 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.23 2011/02/09 22:34:41 caster Exp $
+
+*icedtea-6.1.9.6 (09 Feb 2011)
+
+  09 Feb 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.6-sparc.patch,
+  +icedtea-6.1.9.6.ebuild:
+  Version bump, security bug #354231.
 
 *icedtea-6.1.9.5 (02 Feb 2011)
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index defdc359665e..f302d1593748 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,5 +1,6 @@
 AUX 6.1.9.4-sparc.patch 1518 RMD160 de412ef3e2c6f34a9dd7b126d9f154d23cfddc02 SHA1 811643c18cc88f0416b6136022de3678fdcbdf82 SHA256 7b6e6663babc24dc3a754087b33560f8a0338c1185b0a07656ee5a5be8dab7a6
 AUX 6.1.9.5-sparc.patch 1533 RMD160 1dcbcecffae67228d2e2298ca5f494e01bbb64df SHA1 000ebc47a8e70f5b09ea4e99b72ca555d50cd27b SHA256 1f980f06ec61441b78e1ca399b8d252a290ffc9c603860d2906bc3994b86a8c4
+AUX 6.1.9.6-sparc.patch 1533 RMD160 44843984c048821ee9625b53fc7e58d4c2651f7c SHA1 3af79d2792443272b1b10b87b465a0ec2e9fcce7 SHA256 42bf07d0c587bbd9655c6c795eae6bf527d4a9d77fca56f4d4aa2f9afcac5397
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
 AUX icedtea-old.env 1003 RMD160 35e073172fb9e598420cfc401afe4ea3420c6940 SHA1 fcfd197609783b22465c3380585baa29769d2df1 SHA256 d3e5645d11c52640dffa954ca130f13dac58ae76d2c3e96a73818cd3263cbb45
 AUX icedtea.env 1014 RMD160 566c46cd11c9d9b18d600702b1d4857cacc824ec SHA1 fb2439f39863088b5525102946d154fc54f14c08 SHA256 63d0c03dce0d546bcd9f52ebf7abb56e61f9acaeb659c9fbf19fec315a0cf5ae
@@ -7,11 +8,13 @@ DIST 13edc857b967.tar.gz 8401448 RMD160 3b0f967cebe2e564769ebbdc630c384458aa1f82
 DIST e321b101a9ee.tar.bz2 2727158 RMD160 16cb5c6f58197dbfd690e578418fadf911935ed7 SHA1 b41d54057cd98bddb8adb6bd4c1e50b08eaef411 SHA256 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
 DIST icedtea6-1.9.4.tar.gz 6501091 RMD160 8715b9d939310fea742fbc723455079ef0571c7d SHA1 225c8eb1643ae787a40ac16ba71150912f4b88e6 SHA256 2194b59d8c17ad6ff2fb495e10f9e6023993df5f8ce8a3739bf057f6562ef077
 DIST icedtea6-1.9.5.tar.gz 6538783 RMD160 660f23425f5408a145548e5697d8355cb3a1dcd6 SHA1 13b1267163bf40d1ffed374c6814a3a27f212b44 SHA256 dac8ad42c452b3211b4daf26446da090f1f6c45952d9dbf52f66447adef73a29
+DIST icedtea6-1.9.6.tar.gz 6550463 RMD160 9b4dc6adde4bd01200698ebb7713225173767206 SHA1 e37c9cfaf93ac51b933c1eff51147886447e7e42 SHA256 100e61fbc3157b4839413951b0247f7ccabb0dcff6d037fbb372d5a13088adc2
 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
 EBUILD icedtea-6.1.9.4.ebuild 10841 RMD160 65b6b7af73587b72bcedd578ecfe89c022bc4c96 SHA1 37c0d937ea1473687dc7272344122e67103087ae SHA256 2256ab9758c7fa6af194bdb64be08609af15356bbd73f79abad0c71d1eedbec8
 EBUILD icedtea-6.1.9.5.ebuild 10865 RMD160 b710e19a671e0e5043f34e2f340440f898376a9f SHA1 87f01ed1d969a047039822b5a82c1c5dc2dd0752 SHA256 9c2cf7fb390f0559f34e778524055d16a35dc04c45ea77b3c0f2fcf64af8e08a
-MISC ChangeLog 4625 RMD160 fb2b74dd76a532b24a9220ab2c381ed92815f053 SHA1 52c02afdf80a5050447e7003156785c02c99ed9b SHA256 7c70c6b345115de58098fcce1310766c20c1ecb08d870258dc43a8660f766d59
+EBUILD icedtea-6.1.9.6.ebuild 10865 RMD160 33f909a762e22994aa92882e3e9c59c7e5c1356b SHA1 62df9c479f88761cd6fcd8cb96b77ea646816882 SHA256 f11312c46f50d40d96d42e25eb13896413606d082d67e417c98be90da9b1d66a
+MISC ChangeLog 4802 RMD160 7101a4d8e28f716fd45a53967c6232d83352b5c5 SHA1 432c00ba42880cbfab51792c1d1a4cd5e86a22f2 SHA256 8139e4a725972b1778e7f752ecf5efde7ea27255d9b2aa025af971752050d844
 MISC metadata.xml 1488 RMD160 c219e274f64f63b4c4592f2e3e9a3ad057164c40 SHA1 7f502d7b065098357570a5e88066008eec7532b5 SHA256 cc617d5cc3325f92365746d0fcdb62cd247fa2077b2b8686dbe553c05c8c1311
diff --git a/dev-java/icedtea/files/6.1.9.6-sparc.patch b/dev-java/icedtea/files/6.1.9.6-sparc.patch
new file mode 100644
index 000000000000..ea41ad005ab1
--- /dev/null
+++ b/dev-java/icedtea/files/6.1.9.6-sparc.patch
@@ -0,0 +1,29 @@
+diff -Nru icedtea6-1.9.6.orig/Makefile.am icedtea6-1.9.6/Makefile.am
+--- icedtea6-1.9.6.orig/Makefile.am	2011-02-09 10:48:29.464832314 +0000
++++ icedtea6-1.9.6/Makefile.am	2011-02-09 13:01:39.430490143 +0000
+@@ -327,7 +327,8 @@
+ 	patches/openjdk/6795356-proxylazyvalue-leak.patch \
+ 	patches/openjdk/6687968-pngimagereader_mem_leak.patch \
+ 	patches/openjdk/6541476-png-iTXt-chunk.patch \
+-	patches/openjdk/6782079-png_metadata_oom.patch
++	patches/openjdk/6782079-png_metadata_oom.patch \
++	patches/g344659-sparc_fscanf_fix.patch
+ 
+ if WITH_ALT_HSBUILD
+ ICEDTEA_PATCHES += \
+diff -Nru icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch
+--- icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch	1970-01-01 01:00:00.000000000 +0100
++++ icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch	2011-02-09 13:01:39.430490143 +0000
+@@ -0,0 +1,12 @@
++diff -uNr openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp
++--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp	2010-06-21 22:12:15.000000000 +0100
+++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp	2010-11-29 20:15:36.179541001 +0000
++@@ -35,7 +35,7 @@
++   }
++ 
++   while (!feof(fp)) {
++-    if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) {
+++    if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu[0]) == 1) {
++       if (strstr(cpu, "Niagara") != NULL) {
++         rv = true;
++       }
diff --git a/dev-java/icedtea/icedtea-6.1.9.6.ebuild b/dev-java/icedtea/icedtea-6.1.9.6.ebuild
new file mode 100644
index 000000000000..e3eb681ca3db
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.9.6.ebuild
@@ -0,0 +1,327 @@
+# 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.6.ebuild,v 1.1 2011/02/09 22:34:42 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 autotools 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="20"
+OPENJDK_DATE="21_jun_2010"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jdk6-jaxp-b20.zip"
+JAXWS_TARBALL="jdk6-jaxws-b20.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+HOTSPOT_TARBALL="13edc857b967.tar.gz"
+CACAO_TARBALL="e321b101a9ee.tar.bz2"
+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}
+		 http://hg.openjdk.java.net/hsx/hsx19/master/archive/${HOTSPOT_TARBALL}
+		 cacao? ( http://mips.complang.tuwien.ac.at/hg/cacao/archive/${CACAO_TARBALL} )"
+HOMEPAGE="http://icedtea.classpath.org"
+S=${WORKDIR}/${ICEDTEA_PKG}
+
+# Missing options:
+# shark - needs adding
+IUSE="cacao debug doc examples +hs19 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
+	 >=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
+	 nsplugin? ( >=net-libs/xulrunner-1.9.1 )
+	 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"
+
+# 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
+		eerror "WebStart is required if building the plugin."
+		die 'Re-try with USE="webstart"'
+	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_prepare() {
+	epatch "${FILESDIR}/${PV}-sparc.patch"
+	eautoreconf
+}
+
+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-openjdk=$(java-config -O)"
+	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-gcj-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 hs19 ; then
+		config="${config} --with-hotspot-build=hs19"
+	fi
+
+	unset_vars
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
+		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
+		--with-java="${vmhome}/bin/java" \
+		--with-javac="${vmhome}/bin/javac" \
+		--with-javah="${vmhome}/bin/javah" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nsplugin plugin) \
+		$(use_with javascript rhino ${rhino_jar}) \
+		$(use_enable cacao) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable xrender) \
+		$(use_enable systemtap) \
+		$(use_enable nio2) \
+		$(use_enable nss) \
+		$(use_enable webstart) \
+		|| 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 -j 1  || 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
+
+	if use nsplugin; then
+		local arch=${ARCH};
+		use x86 && arch=i386;
+		install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so";
+	fi
+
+	# 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
+
+	if use nsplugin; then
+		elog "The icedtea${SLOT} browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
+		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
+	fi
+}