Version bump, security bug #404095.

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

3 files changed, 344 insertions, 16 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index eb40fa03f238..e806acac1384 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.63 2012/02/08 15:09:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.64 2012/02/18 23:14:45 caster Exp $
+
+*icedtea-6.1.11.1 (18 Feb 2012)
+
+  18 Feb 2012; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.11.1.ebuild:
+  Version bump, security bug #404095.
 
   08 Feb 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-6.1.10.4-r1.ebuild,
   -icedtea-6.1.10.4-r2.ebuild, -icedtea-6.1.10.4-r3.ebuild, metadata.xml:
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index d4b4afb5eddc..6ed48f8f9b57 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontconfig.Gentoo.properties.src 15602 RMD160 d5ae1cb403072b630c126a908d14b5b462e1514f SHA1 04af30bfae3decf6fdb51187a07bf75fb04a83f0 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
 AUX icedtea-6_pax_kernel_support.patch 4152 RMD160 a1800e5985d90db6e4827b0bea784cb034962c69 SHA1 625177d004e57cad81d522d1436aaa33dba45a6a SHA256 4a6f3462e9dd47dcc5941dd67a56bbd9ea874dca2a94566f0f38c2d241efeb74
@@ -17,6 +14,7 @@ DIST cff92704c4e0.tar.gz 4261719 RMD160 cf01828a98a6e3139ce33761b2b0f87b0ee6ad48
 DIST f0f676c5a2c6.tar.gz 8506038 RMD160 e00e7b602758eaa6cfdd04b109d99694ce2ae94c SHA1 bdc450f5a1b75b2445c960f43dbc7f605042a3c8 SHA256 aaa322239c181e50a61ec71869843eee7a0a82a9b80f113d32faf2a59d7ba5c4
 DIST icedtea-2.0.tar.gz 4516180 RMD160 91e75405713ead34c7831fd23ce66871bf888427 SHA1 aa2399f951044b82f5ecf7318a8358eb08413afb SHA256 2485d5e7807658bc3488c7e6d4720ef1261a31dd698ce2641f541119e0c2387a
 DIST icedtea6-1.10.5.tar.gz 6831721 RMD160 24e3c22dafaba9aac21b84643127c2e92f1dc2dd SHA1 ba260275bcfbbbaff153c99b066d2f4ba7a12270 SHA256 7d0f9e833a42b6af308a34d432431f0528a2efa52d7837aa446d1c4c27161a0c
+DIST icedtea6-1.11.1.tar.gz 6344427 RMD160 fdcaba8fced7ecd30b17ca351424610e254ff735 SHA1 24c8a6e3f641b626349b8d199880b0a79213a814 SHA256 bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c
 DIST icedtea6-1.11.tar.gz 6334120 RMD160 7037d10072335e1abba264c59713c378c47ba950 SHA1 ec53c683043716bd29611ecb3e9c6f2e89984e72 SHA256 e7d2bc08008de918ca54f8dcd1f8d75c7829948da6b1a9c06761c74a563c3eba
 DIST jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz 293833 RMD160 b34f4684e0c918c36d9fb9316a4ae7737b712296 SHA1 60d5782ccb9707699f9dfbfcf647a5c862ef4691 SHA256 b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a
 DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
@@ -27,20 +25,10 @@ DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 RMD160 eef414a11dbcaafd2f830ca34227a
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
 DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 RMD160 d0e21619c3f287b821da114b986336e106cba16c SHA1 5d6fe1e3ef84d6699bff18eabf109e63d6c0a1c3 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227
 EBUILD icedtea-6.1.10.5.ebuild 11267 RMD160 c5f2a5edb83f89fa8c4c73a0748049701f7bb9e1 SHA1 f4a94369b18c824b9b69aa2aab0a9535cff82f48 SHA256 3a3c0b6481daee7265e6a6852da0f53b2734896fb9a751191ae0a01383be106d
+EBUILD icedtea-6.1.11.1.ebuild 10828 RMD160 e5f4b0ca1efd9a57164eeda1055b9f3441b2a784 SHA1 59385ef59351808f77052652cbcdd18f39ebb015 SHA256 e632185450f4a5877fa1a98f2b762d1c4d2a557b5846ff20afadacf845bc6cdc
 EBUILD icedtea-6.1.11.ebuild 10824 RMD160 f564eddcddf925ca7f4f1ae61c858b84a3b91edc SHA1 8ba853e05af1338938154608e64d79d7eabc51d5 SHA256 a441ca27b59da5ab88881c9b63b44bdaa7252e466482c5c83db3ade4afc10d52
 EBUILD icedtea-7.2.0-r1.ebuild 10801 RMD160 c9ff94b4bfea1a7fa93457a4be2fb90fc24c5823 SHA1 e4bf6bf1fe1d1db7eb5fd963ed3600c9725fa0c1 SHA256 eb9e2c4e0bdd19cac0d903356f3a673b7ab68cef38cbf68423cba858b534c9fa
 EBUILD icedtea-7.2.0-r2.ebuild 11502 RMD160 f610645dbe8a6c2828730cf08cc88fcb16c6755a SHA1 bfff69d1d821f4e92bb8d4996b951103d81279a2 SHA256 2fa6ff0b5bcfb0cbd4ca77dca6a8e23408f29fe41da1c45f655cc8021d47ec87
 EBUILD icedtea-7.2.0-r3.ebuild 13812 RMD160 07d5d6f9fa70f3a61b009d71c7cb9dce333ffa59 SHA1 e2b173afed251761040c9dc5570f875fd8e98bf8 SHA256 c4c8dcdb805deb035282ffbfc6b53daecf272859013d5d6a909c93779856aa49
-MISC ChangeLog 13566 RMD160 55aa7035fc32a2e7e456d4f6ead4544a3dd29e9e SHA1 1fe9e40fdd3e7df689eb370f548b9b5a77645a11 SHA256 cbe9a936fe7ffa75fe3b1ebbe2dda545af987a07d749ea5b2b4515374a3a9359
+MISC ChangeLog 13717 RMD160 b31b28dd6a13d4c5c152431456c7a4c49da3cc02 SHA1 888d44b462bab17eda6c2a20ab1f02c283441362 SHA256 7d011173f0b7fa596e6cfea3057a534ca4046edc6b14c087624fbd83de756854
 MISC metadata.xml 1527 RMD160 f4c3b81c9dbd245fe86bde62f68de8bfdce86247 SHA1 019c890e1dbac991ca55b1cde57a5c21d055d857 SHA256 dea1435f46708be4a8dda218c537c63700bd2def279f7eccae2d80cf49c90c5b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPMpAdAAoJEIUJ+svaV163bEgIAJkz+EyUEpXALOTdn0VYz3Kw
-Qw+9V3xhtQ2zuA78JKan+lFYrvBiJchuSdrMANy1/KuQC0QFkL2L1fuLJM3JZPJ8
-77QkL4TyCqmWf+0SmhnozfY9Xo1oMM+0r/ID5lhv5KGP4x+oK80OiBYoqq23XGqs
-DtkWIMZLVMI4J2Qng5vh2Dbmrgq8BD8WJbQT12EhhaFkrlNFtCwp5FqGw3Gkj/AW
-yf7eo8TboKf0CfR0pO0ub2p1dPumfmWCjnFmyiZrEAldWx+42ecvltQ2b+gQD24w
-jiXIn7IKZHk3TGyVjUm5ZikDK8GO1Er50Sp4VW/Nk0eE7XyFbePLLQxkq8xai3A=
-=ZKp0
------END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.11.1.ebuild b/dev-java/icedtea/icedtea-6.1.11.1.ebuild
new file mode 100644
index 000000000000..e9980dc8515d
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.11.1.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.1.ebuild,v 1.1 2012/02/18 23:14:45 caster Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+OPENJDK_BUILD="24"
+OPENJDK_DATE="14_nov_2011"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jaxp144_03.zip"
+JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+CACAO_TARBALL="cff92704c4e0.tar.gz"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+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}
+	!amd64? ( !sparc? ( !x86? (
+		http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
+	) ) )"
+
+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"
+
+IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source systemtap test +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	dev-libs/glib
+	>=media-libs/freetype-2.3.5
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	>=x11-libs/libXp-1.0.0
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6
+	>=media-libs/libpng-1.2
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			!ppc? ( !ppc64? ( media-fonts/lklug ) )
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# !eclipse-ecj-3.7 - bug #392587
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.1
+	dev-java/ant-nodeps
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	dev-util/pkgconfig
+	sys-apps/lsb-release
+	|| ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )
+	${X_DEPEND}
+	jbootstrap? (
+		|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
+	)
+	pax_kernel? ( sys-apps/paxctl )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:6 )
+	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+# 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() {
+	# 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-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea-6"
+	elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea6-bin"
+	elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea-bin-6"
+	elif has_version dev-java/gcj-jdk; then
+		JAVA_PKG_FORCE_VM="gcj-jdk"
+	else
+		die "Unable to find a supported VM for building"
+	fi
+
+	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+java_prepare() {
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
+	eautoreconf
+}
+
+src_configure() {
+	local config bootstrap
+	local vm=$(java-pkg_get-current-vm)
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
+		use jbootstrap && bootstrap=yes
+	elif has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
+		bootstrap=yes
+	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)"
+	fi
+
+	if [[ ${bootstrap} ]]; then
+		config="${config} --enable-bootstrap"
+
+		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
+		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+		# Don't use eclipse-ecj-3.7 #392587
+		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
+		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
+		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
+			ecj_jar="${ecj_jar%/lib/ecj.jar}"
+			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
+			ewarn "Found usable: ${ecj_all[@]##*/}"
+			ewarn "using ${ecj_all##*/} instead"
+			ecj_jar="${ecj_all}"/lib/ecj.jar
+		fi
+		config="${config} --with-ecj-jar=${ecj_jar}"
+	else
+		config="${config} --disable-bootstrap"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO
+	if ! has "${ARCH}" amd64 sparc x86; then
+		config="${config} --enable-cacao --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
+	fi
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if use javascript ; then
+		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
+	else
+		config="${config} --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	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-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax paxctl)
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# Load the least that's needed to avoid possible classpath collisions.
+	export ANT_TASKS="ant-nodeps"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake -j1 check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS THANKYOU
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die
+	fi
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/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 "${EPREFIX}"/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
+
+	# Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	if ! use X || ! use alsa || ! use cups; then
+		java-vm_revdep-mask "${dest}"
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}