Security bump #499464

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

3 files changed, 333 insertions, 10 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index cd8dbbff1aa7..7f60bf46ad6b 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.113 2013/12/10 18:32:55 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.114 2014/01/29 21:26:17 sera Exp $
+
+*icedtea-6.1.13.1 (29 Jan 2014)
+
+  29 Jan 2014; Ralph Sennhauser <sera@gentoo.org> +icedtea-6.1.13.1.ebuild:
+  Security bump #499464
 
   10 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -icedtea-6.1.12.4.ebuild,
   -icedtea-6.1.12.5.ebuild, -icedtea-6.1.12.6.ebuild, -icedtea-7.2.3.12.ebuild,
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 027558240daa..562cc93656b5 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -16,20 +16,25 @@ DIST icedtea-2.4-jdk-7958751eb9ef.tar.gz 45252720 SHA256 4df06346d197180bbb9d182
 DIST icedtea-2.4-langtools-3c8eb52a32ea.tar.gz 2321300 SHA256 462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91 SHA512 917e313dc897ea8548616ad766bc5b937eafe1219b9ff344c89bee02d3432f21559f6a02027031ff4f6b0957be4e8ea41b3f646f86a09d7f1ebe809639896b95 WHIRLPOOL 0d0b4a973d6e334176790190e467cfb8f9096119fcab8f63d4aa3689b3bd434db4de842dfe7ec4dfce819028e07df1491fc43c4825a75f33f46cd8d08de1b981
 DIST icedtea-2.4-openjdk-e2f5917da3c1.tar.gz 136580 SHA256 75a18abd117e3295c6de4d3450f0094a9abc08f2168e2911bce25d1e153107b9 SHA512 b1657f421ea64d076c3738533039b769de18c5ceec8c0e76cec5f12fe7c79c0bb585cc4bfeebe038dfae30f648287b79d8660e1decb907739ff213382504fe48 WHIRLPOOL 34e946d78d7c18d8ba91a7f7b996079fe98413268c33a8e0f29b7dc64843b6c0981ea33148981c8afa73fbfc69e51bfd09f0f5f2af876e54a54c18ac3eac9c17
 DIST icedtea-2.4.3.tar.xz 3417116 SHA256 9289d25867b39756d62ba16eda5834655609a6962e0eaf2edacc04e3b629c806 SHA512 700496b3e09fd0a72fd672e91b9fe4d7296db3bdd1f344582d72cad64ef4aa5fe12ee13150d9555ebce90024c9aa8e9cc630acc66b4bf9c43a264091a441df2c WHIRLPOOL 88986669a6f1d00d453f509874add60c60a6aff257808d24ac7fa625c8ca238ce8be0167019a6e472132c5a0c6eea07462714c2dffc8b6c72b9adc039342d91a
+DIST icedtea-6.1.13-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
+DIST icedtea-6.1.13-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
 DIST icedtea6-1.12.7.tar.xz 9219124 SHA256 56e180666f9c6a38aa725033b60bbdf5bf4f652ad9f6876eedc56a27497158a8 SHA512 32b5af24e48c5265efac53fd44312433a0014325a1f74eb62fdde1562e8cfc8508dcf08c29fcbde1a14ae54213459b826772dfbf12d1460ecd3435cb1e89213d WHIRLPOOL 4b497017a1e7712c25aa035168e93e5dcf4be93d6605954efeceacf1bfcb73738726bb955f0db46bc8a12f6ccdbb8ebcde335e2b648685e4291d13dfad68f38f
+DIST icedtea6-1.13.1.tar.xz 4963036 SHA256 5b2fe75660282889217fe997e9c8f9e70982f2c72fc2ca59db80e7da7380d7c1 SHA512 0406eecfe0e22942a3b709826a6311f8efa9a1b80fbacfbb9cb700ce6870d1ce33bb005798631453b1e7012d802d9347c5a6c70e6b4f29770dd6e64a4fc08a68 WHIRLPOOL dc9bb11637f22d48db762b44f561ffa2eeb5cc12efbfeb3cf38fc23267d0a96dc0fd8f36173b5b90ac38c808301c7b34df7a0dcb539416f04103bd4ebe7dae0e
 DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 SHA512 4198f11b2f49c9bc5ffbeadf2d0d87dfa413a918d49faff3a043266bf4a2fa99579fba3c6d75164d87e88b8fc5c97c3c1527560eb25c55cdd42ad813c8e175e8 WHIRLPOOL 5038258710f2c0eac1a5a1957629998d931d49a6145450485b84e21988d8fdfa5127dc0852067319fb2ac054f621ec511c0d8e01961943c7e4a223049317b894
+DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256 ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512 3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55 WHIRLPOOL 4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f
 EBUILD icedtea-6.1.12.7.ebuild 9665 SHA256 964fe8b39411b0f3d3c261a4d341dda965334bb5efdaa2fdb1d0c5b3862261ab SHA512 79cf2005725acf0e7cd2cde7b8b5963690d5da65edebf604460fb72f65ce51e44cc7da63a051d3818e5d77c8fa40d3add5aaa84026761f529adff8171d8930a6 WHIRLPOOL 54c7e8440d9277607c808384324a125f394b2fe11b287e75d72e618884b8c0eb102f8127c084cf57fbb0f33551f239b6975300f29d4e2ae8c3c4f18274b448e7
+EBUILD icedtea-6.1.13.1.ebuild 9568 SHA256 459443d3b322b3bd94f06a660bf6d5863618167bb5384a4bdcb2cdafeb3ae6ec SHA512 f5edaffcf44a9d74b0fcc6e7cbafa42c353789517566c502dc550f88d1a97f173d493c378a77bbbdf857df3433251e83b1bdeb9dbb3f7efae49c97c8aa1503de WHIRLPOOL ae3f118381157ff51670edd260e07bd9937d2aad08fc827504ee9abe21305e1c55398524684d3d4f0e1989916e84094f8e931adba15420eaed85640f7c41b4c2
 EBUILD icedtea-7.2.4.3.ebuild 12225 SHA256 456cb3c62ce2bf07aa5335f306c8e0e02c7324f53938931b6b3e9d5656d2da8a SHA512 328c378160a81313f552051a9e4e3a405a7b6a064722d238ed0887dd46ded512b37edecc1ebc4d611dfe627148115177ff427154d5b763e1f55f3b24e567b3d4 WHIRLPOOL d675c21a6fbcee44d61f1765d32b5a41af36f90aa49bea78ee058ffd5e339aa4eb9094998f3781db0c0fbec806323f0baf0a7fd6610203507bda301d0e7e684f
-MISC ChangeLog 25277 SHA256 7f185442f3bd2654f5590be2cd04418101788d0406de9def57dee3dd0d7457bb SHA512 3eb2e1fbc0a3a533dcb7a63ec0fdd03c07a0f499537440f98ea63c36b97819418399d6542902a96d4f38ca897fe3cb5804ad42e897ccb1b2e200017800cce661 WHIRLPOOL b334feda41123dbfa04c6b7da4520a74f277bee57aa2edec028e76438898c38e2cc159d4de733a87152443380992d9823162660aad686114fd1ac4eb938c29dd
+MISC ChangeLog 25409 SHA256 08db9ac7479770cd8e29496cf1eac41ab0ab30e635ce50dca5a1b14d3fecee4f SHA512 0e924f916d3bfc726c4929d3d3e9eceef86d38ce6e16364ca0f941f4455197b2444e916a9fd23e7baf1009647b9517586d8482dcf388ec20580534dfc47d0110 WHIRLPOOL a61b55a82990130ee9da5433c4f6d3dc333ec4609208d6a7b24d38c326d7d7f2b79e6fb5bbcf7d0886ef96735660dfc5c585c21da232b9c562b4a7884bfce9b8
 MISC metadata.xml 1524 SHA256 bbf85ab93611dba9d16ddb6f9889af231a9420a857b4c2b7360320a53b3dde1b SHA512 e1ab2d668de0086a5bda71a8323da63ae90e233a10df0af3eda9a2f2162a92a65e8a93ab8d752599b12e9b1dbad3776fbd86a01b38c59b9d60ad221c6779ba60 WHIRLPOOL 0ddd7461553ae3612ee53f1403dc66e17ab03428bd6eff7de5e3ad2db3d971cadc8be62b6fa0426733bd7ef5e4da9d2f0a9c04b0a97ede7bb908e14ec5141c01
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSp139AAoJEJWyH81tNOV9aE0IAJhom3oce7kFyb+PDxO8I1dK
-EnTZO9c1VI7GT7x7cuzGrqeVOTSYI7nr8u5zNB6c2mdEomKAYIA8JRmkr5nKNvBn
-wW29qrLgInaQ9BF2hG2q8UkXpOqrE9lby5g9rKdmghu0FcET1JiT2Pe+C9kPiAvL
-+3KQSiNeFytpLOK/Kxn8a/A5ULYbKcI8cEpws4Bo7TQUJxwXG9QBDvOCKcnecteD
-76eYq7A1y0GjWflIK2we+GB+AJTGBNuSD7DSFIYp3UokpJshImUsTaa9U+7vRZKI
-RCsncDtrBB04E+YbsG2RTGPSlR0tydq2plwlDXt3Li/P5y7dMZ7DF0KMWfYqDKM=
-=/M7J
+iQEcBAEBCAAGBQJS6XIHAAoJELjwI6Q8XPdak6oH/jK2HmyWxLxUSSnyXc5P+VRR
+9Os2Kf0MjabtitpQwsUH9EZ8bWH5bsBNfAikb0LHAie8Fsq+nj7x0pCSsiMbLcpM
+Vh+6Vvlvh4lLpeMAxVVswgal5K0xRaWXzO7SFnQq2gPN0h7H/ZiWa/fKaRvi/Qae
+N2ruyXEqu0WYMOSAueRRQkgWBMIHuyOWHOh0gNCsodxvZuh0WW9XfNE4cEKTIcQp
+UjtRPutOBjJH/iGK3s6VhkLhzQTP6GBgBzZWT6yBgylIw22sBA6vEJ3Vcp6dutq2
+HxDLV7HF0rXAyBWVzWvZn1prJJ5bhk7ZjkutC4vHFf6SEJnfclpNCsj6iNXVSEQ=
+=Tke1
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.13.1.ebuild b/dev-java/icedtea/icedtea-6.1.13.1.ebuild
new file mode 100644
index 000000000000..de6089cdd57a
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.13.1.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.1.ebuild,v 1.1 2014/01/29 21:26:17 sera 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 java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+ICEDTEA_BRANCH=$(get_version_component_range 1-3)
+OPENJDK_BUILD="30"
+OPENJDK_DATE="21_jan_2014"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
+# Download cacao and jamvm regardless for use with EXTRA_ECONF
+CACAO_TARBALL="68fe50ac34ec.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_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 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +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-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:0
+	>=media-libs/lcms-2.5
+	javascript? ( dev-java/rhino:1.6 )
+	kerberos? ( virtual/krb5 )
+	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-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	virtual/pkgconfig
+	sys-apps/lsb-release
+	${X_DEPEND}
+	pax_kernel? ( sys-apps/paxctl )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:6 )
+	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+java_prepare() {
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+}
+
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
+}
+
+src_configure() {
+	local config bootstrap enable_cacao
+	local vm=$(java-pkg_get-current-vm)
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	# Whether to bootstrap
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
+		fi
+	fi
+
+	if has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		bootstrap="enable"
+	fi
+
+	config="${config} --${bootstrap}-bootstrap"
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO
+	if ! has "${ARCH}" amd64 sparc x86; then
+		enable_cacao=yes
+	elif use cacao; then
+		ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+		ewarn 'If so, please rebuild with USE="-cacao"'
+		enable_cacao=yes
+	fi
+
+	if [[ ${enable_cacao} ]]; then
+		config="${config} --enable-cacao"
+	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-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		--disable-downloading \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(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
+
+	# With ant >=1.8.2 all required tasks are part of ant-core
+	export ANT_TASKS="none"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	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
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#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
+}