Fix javaws symlinks, bug #504678.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x4E61DE84

4 files changed, 186 insertions, 41 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index c3c49fd9eaa0..28688fdaef0d 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/icedtea-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.71 2014/07/06 15:32:09 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.72 2014/10/05 22:10:31 caster Exp $
+
+*icedtea-bin-7.2.4.7-r1 (05 Oct 2014)
+*icedtea-bin-6.1.13.3-r4 (05 Oct 2014)
+
+  05 Oct 2014; Vlastimil Babka <caster@gentoo.org>
+  -icedtea-bin-6.1.13.3-r2.ebuild, +icedtea-bin-6.1.13.3-r4.ebuild,
+  +icedtea-bin-7.2.4.7-r1.ebuild:
+  Fix javaws symlinks, bug #504678.
 
   06 Jul 2014; Ralph Sennhauser <sera@gentoo.org>
   icedtea-bin-6.1.13.3-r3.ebuild:
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 3235cfe4611d..725a949e7964 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX fontconfig.Gentoo.properties.src 15624 SHA256 06dc1c588fdf939f3942d435a9a695679b9d6b44591f6efb7bef3a5e38972b59 SHA512 beaf931cee245eddb8d595dd2c74eff5eb2617ab1332cad0c0c70c1bd382ef35d702707549a552f27dc8fd56c7605957361fddf6e2420bb5d0a1f1cbea2a5a55 WHIRLPOOL 8a1819e3acf1c1e5fa0b6ddf37b2339361c818a72788a65cc1349af437239b4561276866af766162b697cb3d81b3aaee04bef4271afbd98eb286e84559fd43ab
 AUX icedtea-bin-6.env 1061 SHA256 a6aedf9a1a5eaa3bc5c26b0bd0ef5b79b12f7384e705a1f202929aee76399d92 SHA512 4a50072c1f4719dc2fcb70b3c3acd217359027968fbf585beaeede2c8fa8e9da97d8e2247c2c028e0456aed59c438abeab03b6e17d0c4d1fadf3a705db5446b0 WHIRLPOOL 61eb22e04523a20d4edc2f82a6d0d24823c326f40b6af4baff0bfc483956232e636c73080b68cdc4206d0b19f5161001af8d4da9d9a116107c5d26be1f06609d
@@ -14,23 +14,18 @@ DIST icedtea-bin-examples-6.1.13.3-amd64.tar.bz2 2168205 SHA256 6756045cb018acf3
 DIST icedtea-bin-examples-6.1.13.3-x86.tar.bz2 2134637 SHA256 82ebbc95be9a5648682282d76ebac2dd16bf51812c42baf48ef162b2da091461 SHA512 09c507c9359e28e5fa9fa03ab5759d86fcae26f3516a27cefc391cbc28338bf5fb6270f4cbef06cb3c9225618bc9d5c8fcdef7302d7cca1ec29787767036c44c WHIRLPOOL fd50454ad4a0f9a2e453a34dc1871cc1cdbdc569d1044fe0187327379da7b0f7230442a74dbbb6505ad58970a56955ab53b839f96dbf1fd4aade737a2a5df797
 DIST icedtea-bin-examples-7.2.4.7-amd64.tar.bz2 2339136 SHA256 35e8ff176bc68b616f2bf264fdc3b7689e85f27d4bd6eaaefb00f75aed955632 SHA512 ac32ff46161f5f3ad00cd8d680a54672bd9cbfc39ce75ba502a68fc9cad90f0328dd0aac15710fbfc112a66b54efd5a2a00f9ab937b0bfa0b964cf5d659c08b5 WHIRLPOOL 46f1febfd9a7928218d113161f9a637928b608fe01d165e6fc1fc816e6add4fd54846a70a1c32b941cf5f3e20877dd91cdeb67bdf1243542ecf796a55c6000c2
 DIST icedtea-bin-examples-7.2.4.7-x86.tar.bz2 2316379 SHA256 805c8b786c5f6bbdba0122f91ee2ecb103aeb5abd6ca98d9e915a14703b18b45 SHA512 9bf8339c70a033c84762032ea6bb694a810f7318105c6159c0b8bef7f335dba79b25c600313426328fe50625a46bcd11266dd8087650ad86d22b18665d4e207b WHIRLPOOL 25aabed258575ed67f1c2d241cb72db102f9bcd75b7352fa8af3175a822e7b913335f734b4a78c91e6833d1afc2b23bdcd6b968a9f1ff024f09993fc1bb24d5f
-DIST icedtea-bin-nsplugin-6.1.13.3-amd64.tar.bz2 1021983 SHA256 43842371bca084a09214d1315dad3068c7e751338f054fecb76978881f19ef28 SHA512 df78a640067b04ea99883c65d84b052f09eec8ec6528d0cbf6e64485342ef94abca6c96bc5d6058eae459855ae3dcf5c7b45ae7a8db820ceadbdae188c89876b WHIRLPOOL 814196b7e4518d002ccdbc0061527f32ea4e715bc44855e5fc9a16d3274476f640d14f00fc464c6d0a4f1205dffff008591141727aaaf2099b30b335415dd2d1
-DIST icedtea-bin-nsplugin-6.1.13.3-x86.tar.bz2 1017653 SHA256 e64016b4fe16ed4fad08eac393557e07a25682b030953f33d4b753c1c1320586 SHA512 8561e3f0933c46b3093a61bec1ff65da1c9659a90e1d11d318c71f2bb5ca934cc53abc318f307de1841ac170b67e6dd8ff2ce955c4e84833f6d25ce8f0411d00 WHIRLPOOL 407659f02b9062f482f45706241eb2d418fea1a90813b214b32ada9db0ee1dbfbc2630ec1e72fc4b025fc9951245137c35186f1ef3837d0936f20d66d63dc28f
 DIST icedtea-bin-src-6.1.13.3.tar.bz2 41192099 SHA256 801380a78185d0b2b4035d876e9e73f4d6c073732c8b369f191638a55df563bb SHA512 d368bdeace6cf364db6394bc5dfe5b0081f9209ad98c057a5fe2096d227b82baca2317b2b5cc885cd210b1d1b4ee8fe44aa25678ee875340a94e11de76643c71 WHIRLPOOL 71003e4f84311260da1c814ee07e7a531ae98c287c77936b3f35379b3e49fc50782d9f8c2f6ac57dd92bb66374d7f6b58ae4088d2cea570bd7ccacdb330feb38
 DIST icedtea-bin-src-7.2.4.7.tar.bz2 41388334 SHA256 4e6c1320d2c63727b521355018e024ad1f60c96e3ef7ca6f57faaf34aed83c47 SHA512 44a284b857a100b44ef5e7cbce50304f7f11bfeaf3149f85a89e8ae2f83c5e7e571b6bf4504581c55afcc6a5be272714638175b9884c785f3e909d4e567c01d1 WHIRLPOOL 6d0a41c00e52a4a3fe07f8ebf1630c6e007c2f7cc7b3b68c7130aecc951cc010abfab06cfb21d56867ff4260e52ee4b60525c8525d4ba9345580aaf2f0510e24
-EBUILD icedtea-bin-6.1.13.3-r2.ebuild 4373 SHA256 fd69d4fddcf4e95c4b09b9cce6a5d868d831330de97bd489a9c07a0ab033014e SHA512 eb0cf952f503762c5c782e274bfaec57b138118d363d67b428899057e648f7925caa03acd6c9c140a19eaf0b5422c881cd14efa3a91c3566936161fd6c8631ca WHIRLPOOL 799f79e54a32be5582b1e7317a8127b226785f254063ef5fab6c466f6679be108faf9c4379d92a4c1d0fc1682a8ef2aba69ad246e51111e78900f3eb00de50f3
 EBUILD icedtea-bin-6.1.13.3-r3.ebuild 4608 SHA256 584b12dca3758089b42ae18d043cb2678c2ba8f9c4b5aa95295aacf0f7525d4f SHA512 51ca3f47b9e9fddae999bdd974bf3c2efe77faed992e7f12779575c66240d8fdf90441da3dae602a4e191c79f6b99273aaa6674b678787e06e39385300395f30 WHIRLPOOL 01008fd1372bea252833f19122c099e9c0238f40fccf153b63b31ae16f3aa08d6916539088373bbe8aacaa0bba9ac9b10a67da4e401a7594caa2b6fa53619177
+EBUILD icedtea-bin-6.1.13.3-r4.ebuild 4542 SHA256 44992b1032d054b83bf1050543e3891618ffaa3829bbea5908928aee0c152bbf SHA512 22a8223ec25c2ab35479438b33eecaa0214b73d51ff9999621408dba8599a7d48fb15969dbc2adf564a4b6b773ea77d8f5d82a944e9f1baa09663c75c4211461 WHIRLPOOL f08c48cd671bb492ebc3d75f11544b3de28b43f8a0b0ec0db50fbf351b9049b79932479c6eb4f5e6f9e9740b136925c2aacb89bfaba52a3b279157cc79464f97
+EBUILD icedtea-bin-7.2.4.7-r1.ebuild 4180 SHA256 3a678f1e0977c6f8008ad76f42f9690c70cc753bdf7d51a9350198d5e673c5d2 SHA512 93304c0cd8e9c6850751b5d4441112e2ba4f627436eef3aed10b9e9d8dc840849d3433e0aaebc1881774f391d2325dec52cdff7b2172162fbbc7732065013d9b WHIRLPOOL 215013d1f6856d714c5011e5baf3b99861793b2151a4307c258d69fe172c19fe9258e05e992f29a13d01f258f171c4787f5a015644c3eb694312fe5cc40bee19
 EBUILD icedtea-bin-7.2.4.7.ebuild 4269 SHA256 ae2ad973eab94cd59bed13f6ed118d5957a4a0c663d288d85b999c785f9baed0 SHA512 a603b023988c1f87158e3995e3ad054fc14af9f2a30a172ad8c486826c762b875820521b59c9d5fd6e07fa482728a6d1bd4ffc0710146989c75919c641e74ff8 WHIRLPOOL a2d772020f1497544d06b4a204d70360712efa8678ed3ac4d312b2078b2423c96c2f31e049c1cd94ba21818c696d3dcfc2524bbba0bc560e4a6e90878a3343a3
-MISC ChangeLog 25432 SHA256 50fafbd709a357071529c0d50d438e960fe09693d78216b6c86126719e12733b SHA512 eed1da9bd501a04145a89eba324fed147af8d3fb5e4998e75dd3423c58f9f66573850158496749d47cf0cc8a17f6801ae1708c1d1354a38eb4c61da4e3b6badd WHIRLPOOL 181ec7c0dbb32fd0c7d37f0a441fb6742a818d7614fa4ec8553c4afcb01d4d3f6769c848accf92fde41f7fa07b24f69451a198bd5c9e1258d77a4004c2663780
+MISC ChangeLog 25702 SHA256 12ff24026188ea4abebb2a3620d8afdd4d3a2af3a5b7b72ad309913149be7c65 SHA512 af94b17aa2d8849c99f63580ea2ff541971ce32e7604170e3c2cb5d731c66ff8ad129d8fad31f2ab04d760d6853418bcb5c59c16564678b1be30f2f3ed78f7aa WHIRLPOOL 51748d0690507b0fe75afd5f637e62fb64f87747df20c95a7f9e7cb96121419ceab7deed207b74f7161cb68f142b4edb917cd8450c088b37b86e9908ab71095d
 MISC metadata.xml 257 SHA256 37f9ed73f859488e9c2867d732418cb2085c859c37cff96e08c0ff27bf5e5681 SHA512 5379f4a96e1e75fe55ce5a09b065eb6776cdee3c8ace023465c9b45c10e53f3be937a163f0e6a087f0b5a4e9f47399084600da73d4ea19039a40a4ba93585420 WHIRLPOOL 5a24444176940118d01866d9db3a46efbc421bd230941563d2a4157aac018268b422c1eaddde7f9950e6bc13c9b4189b23a2798a2a1ee694d9b386f6a1da5615
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTuWwHAAoJELjwI6Q8XPdaqiAIAIOhkvvbPP3v0jvGD27C2Qls
-saFwdgQtWFYDAzLCGtMlpUUEUrWj5E/a3XJ0QhWnrTThki4HbMbjoyPBXCssMORY
-EQ8E7UHf70DMJK6zqG6YZ9AyRNde5kaY1JMCZVrjq5r3RQ8V6jq61tunD7ev5h8M
-w+IbbE9Ex7ekmEOCpjbXcgfNUiQ/2cwXiBVefrU0DleAXiD2csBTfQBGkL2jtNqQ
-wLqvH8elj1v7Np1D/Pvokke3RGeoIpwkt8rVwM93alJGHvcN7lvEi40ubwG19jXK
-51s0JB0kdLusZaI9x4jHIvTuQ6LK53owOTRdCaHj5X3dQ8+aFrSg6gvJg4YZl+g=
-=mT/V
+iEYEAREKAAYFAlQxwdwACgkQtbrAj05h3oQYDQCcCNtX0270FVPe1TTY0oWpa5Ha
+pGYAoKeewytvAVBOw40cA3labovRWsR/
+=wuAs
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r4.ebuild
index b772fb5a18fe..ae238f054480 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r4.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild,v 1.1 2014/06/27 14:34:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r4.ebuild,v 1.1 2014/10/05 22:10:31 caster Exp $
 
 EAPI="5"
 
-inherit java-vm-2 multilib prefix
+inherit java-vm-2 multilib prefix versionator
 
 dist="http://dev.gentoo.org/~caster/distfiles/"
 TARBALL_VERSION="${PV}"
-PLUGIN_VERSION="${PV}"
 
 DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
 HOMEPAGE="http://icedtea.classpath.org"
@@ -20,17 +19,13 @@ SRC_URI="
 		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
 		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
 	)
-	nsplugin? (
-		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
-		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
-	)
 	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
 KEYWORDS="-* amd64 x86"
 
-IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source"
+IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
 REQUIRED_USE="nsplugin? ( X )"
 RESTRICT="strip"
 
@@ -57,13 +52,6 @@ COMMON_DEP="
 	>=sys-libs/glibc-2.15
 	>=sys-libs/zlib-1.2.3-r1
 	|| ( virtual/jpeg:62 media-libs/jpeg:62 )
-	nsplugin? (
-		>=dev-libs/atk-1.30.0
-		>=dev-libs/nspr-4.8
-		>=x11-libs/cairo-1.8.8
-		>=x11-libs/pango-1.24.5
-
-	)
 	selinux? ( sec-policy/selinux-java )"
 
 RDEPEND="${COMMON_DEP}
@@ -81,6 +69,9 @@ RDEPEND="${COMMON_DEP}
 	alsa? ( ${ALSA_COMMON_DEP} )
 	cups? ( ${CUPS_COMMON_DEP} )"
 
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
+
 src_install() {
 	local dest="/opt/${P}"
 	local ddest="${ED}/${dest}"
@@ -111,19 +102,21 @@ src_install() {
 		cp src.zip "${ddest}" || die
 	fi
 
-	if use nsplugin; then
-		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
-		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
-		docinto icedtea-web
-		dodoc ../doc/icedtea-web/*
-	fi
-
 	# Remove after next bump, handled by icedtea ebuild. 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
 
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+	fi
+
 	set_java_env
 	java-vm_revdep-mask "${dest}"
 	java-vm_sandbox-predict /proc/self/coredump_filter
@@ -142,12 +135,15 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
 	# Set as default VM if none exists
 	java-vm-2_pkg_postinst
-
-	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
-		elog "such as Firefox 3.5+ and recent Chromium versions."
-	fi
 }
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.4.7-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.4.7-r1.ebuild
new file mode 100644
index 000000000000..64ce0534002a
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.4.7-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.4.7-r1.ebuild,v 1.1 2014/10/05 22:10:31 caster Exp $
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix versionator
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=media-libs/fontconfig-2.6.0-r2:1.0
+		>=media-libs/freetype-2.4.9:2
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/libX11-1.4
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.6
+		x11-libs/libXrender
+		>=x11-libs/libXtst-1.2
+		>=x11-libs/pango-1.24.5"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	media-libs/lcms:2
+	>=media-libs/libpng-1.6:0=
+	>=sys-devel/gcc-4.5.4
+	>=sys-libs/glibc-2.15
+	>=sys-libs/zlib-1.2.3-r1
+	|| ( virtual/jpeg:62 media-libs/jpeg:62 )
+	selinux? ( sec-policy/selinux-java )"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+	if use doc; then
+		dohtml -r ../doc/html/*
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. 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
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+	fi
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}