[gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     c1a617072e095ccd5621dbde4d6c497ff84490d0
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 22:28:55 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 22:43:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a61707

dev-java/oracle-jdk-bin: Version bump wrt bug #558102

This introduces support for arm64. Thanks to "shinydoofy" for the
patch. Unfortunately I don't have hardware to test this on.

Package-Manager: portage-2.2.20.1

 dev-java/oracle-jdk-bin/Manifest                   |  14 +
 .../oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild  | 340 +++++++++++++++++++++
 2 files changed, 354 insertions(+)

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 4fdc177..e3f3d4b 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -27,3 +27,17 @@ DIST jdk-8u51-solaris-sparcv9-demos.tar.gz 9787771 SHA256 5c4d765478be6b9ede7932
 DIST jdk-8u51-solaris-sparcv9.tar.gz 103599046 SHA256 4bdfdae59ec62248ed893feff2fb4be8a8639330599f53f5b03208349ae91513 SHA512 68a95f498aabff65489bd6f6756af7737f408cc0b7253ad9bcd9f57ab5f7a130b35c251426f7dc256e1797a70f5152ceea86a4ea46749375fb8acd51e4309601 WHIRLPOOL 2a690757a673ab5958057631fef7efd748c2c456ed978922220322a5e390aa6e7016a2d2438053f12bc6054c45288ff4722955fb9a1722798409085152d004c7
 DIST jdk-8u51-solaris-x64-demos.tar.gz 9759566 SHA256 3376f1083841bd376da78fd6f3eb4127da4e9493d6af8f7c32e1eabfd8cab67e SHA512 a3c5efa70f75aff606ddcd1f52260e71828ba5ad8848fbf6f1c5d3cbd44f4f0a0a9e3e5576a1d68735a4339ad6e43124049a06ac62c6718c5a2a8dd56a1af766 WHIRLPOOL ae710e2cf1e328647124b385d7b96ffcc5d9bfaf159976163c1ab5075637eccbdfff8b9cecff322ac40d5c717403f4f3508b3574d91a761b2122674bb2cd0cbd
 DIST jdk-8u51-solaris-x64.tar.gz 101131923 SHA256 7afdda5f4310fce88e68f9c383bcc57451416471bb3af00cd1dfe323f2440932 SHA512 d08b8f4499f448f4e495b226bd88f44d9a4fcff69788e893a40d1de5e7e16970a655955c6b52d94e1604027d7fc025b8b99ef7687bd3de1419937b00813f023c WHIRLPOOL 21bb40348963034a59ca25004ecfaa4daeed4a96c45f1060314062cbccdfa48c2615c54677c8a28cec492e7ad2b7b8e91c9e1e212ff239cd3d995c7d84596e35
+DIST jdk-8u60-linux-arm32-vfp-hflt-demos.tar.gz 10429990 SHA256 a2bea529e368fd3fbcce267cb8fbe71d307d1432666f2906ec5d92dcf5080993 SHA512 979a1720c3dbaf84f8c4c0c9d74a467f43bc7947d49ebf9f2f3eeace976f5cd157d97d466f2a92687d4c23dd87ece10406a49e8ee3b9d9849bfd267e85e1fbcb WHIRLPOOL 9153bb57060ca1fc1173a54104cbbe35c1a7f245f866990b6c152b15fe303a8ab2a44020491361c5bd571fd80284bc8a0944af0a16ad7d4736f466ea15071033
+DIST jdk-8u60-linux-arm32-vfp-hflt.tar.gz 81458766 SHA256 e44df9e97d388bc3f5cba76bd7ce93499b6fe7575082a02b7c5058d2ab151318 SHA512 b1dbaab5e585f6eae7ecd994803bd2e41087b0e4f8f624e5d569ccc36aa3bec1d6cf55cecd5aebd8ebdd98a50c31f5527e9dbd4ab21407875c5a7a8c5130f33f WHIRLPOOL 923af5fb33f2ef189fb96f5fc8e31fd78fd52f0c76a4e41db36286ff6f92a478d628ec638a54b2ca2f4d9eff33e82f7b2c117783cd353d44d627a5a7dd0e8b2c
+DIST jdk-8u60-linux-arm64-vfp-hflt-demos.tar.gz 10424281 SHA256 449ac37dc9d41546b2de0a00e652b1ea10c280fe0c05ebb6882ea2ae5106e115 SHA512 75f19bd5855a6414be9431e805e266647abde6d88cdc21c04a789e1dcf42fcc100b2f7c7d50bce7021883df5e9e0d631342985dcca79411fb23c1312149df04d WHIRLPOOL 476d8f9d042c683aa467c0b93343e51547dc4b3327ce2923292bb0d6b536c4dbd1fcc26d421a04ec19645debead421b84bfe7d5c39c40a703ca7f9e090a76de9
+DIST jdk-8u60-linux-arm64-vfp-hflt.tar.gz 78265108 SHA256 62310a69fa164c1be562dee18d668ef1d6f00cdd9001aa056f76f2c235742426 SHA512 2232975bc78e9a702ecfbd23d9b15f33862554a85519b92e5080cc99ea42cb66e257f93c5c586f1210d0dfb5a6264d9590e4437f37df26e75da3458cfba6d9ac WHIRLPOOL 6706f0b1b08f94670205bfb06f3c5b3d6149d7f4eb494c4872ccbeea90743bfe6c920c78105daf8b84401f7102d81c79f428cfdd6a96a7d81ddbcf883db5ff05
+DIST jdk-8u60-linux-i586-demos.tar.gz 55057546 SHA256 243b78d0ac472ce7da297f39df79e04c7b19c51f3879e366e93900f0153ccee5 SHA512 a856cdaa8a7ff83c510a2e1f5653e5fa72bfc16768661323eaa41676043fd4fbeacd64537dfaed5cacf256bb39e9431c1a308663685aa4aa9db47326d49b6466 WHIRLPOOL a4d01a49764a3c84b477d03aaec80a74dedb5c1451317cb1d2e084bdb982cf54e216d23230fdc603ce48ef0479cca4c6f83a0caf78133052e617283de07f7854
+DIST jdk-8u60-linux-i586.tar.gz 183321048 SHA256 e6a36b458351ed35bd7943739ba93d9a246e08a86433e148ff68b1b40d74c2e5 SHA512 0b7dc7c9e223b0e76b400b7b67962a2923853c4aba7cf62efeb7072e0c0cb074c40aa5a79c3c9df7d36f0c14c2a3873a2b21f5d9b439df47b3948b60221bae83 WHIRLPOOL 428503e07492d0a61b3941945d0a2a80191097b4bc753885a781126a200a4eb38e7f82236b3b44e02e4cd9166a92d1ae25acefdb9ae63072ff0e8c6e92af1120
+DIST jdk-8u60-linux-x64-demos.tar.gz 55115746 SHA256 c78c32fc334775e9455e5f4585eb13bdea6eface63c6a3bb4e2f39828e0fa784 SHA512 d0c1d61ed5f5d32b9adccb2dc2505419ee329ebdfbd6db6dfdddcc0c41063233652fb9b7f6589ad4f4c942c05e8ea93af77d9676f47d4eb4db079f29e0604659 WHIRLPOOL 450a18c56c870ce3315bdac5562e66d4ae2354cb3e3ce36964af1e6588d92996ea5ef9f34cf6dd38ffbb456848b7387738d1ea0944d5ef1540b2519844c17b29
+DIST jdk-8u60-linux-x64.tar.gz 181238643 SHA256 ebe51554d2f6c617a4ae8fc9a8742276e65af01bd273e96848b262b3c05424e5 SHA512 52d605a8ed2a851131d1ed137e482b55b1e2737767b62e5f1b0c8012f4e3df2da7a6638b8b08a8a88ae7772e9e0bc8dcca2b9afe06dc152147cae7efacbea9f1 WHIRLPOOL 7b942b8bf68d7f746d9691cf4d5599203a12f098b867a41b101731df3021568cd085a9795bf7abdd411261fbf5d8f1af3ada26c8ea9052f5b2e8a3ae56371a02
+DIST jdk-8u60-macosx-x64.dmg 238098128 SHA256 554f4fef08a5ea5b5b6e90cacb62a7a390d94d96c27fa2a5d6b44fc73e45465e SHA512 64e06cbb0a45ca704323d864c68907fc11762ad941d99ee0318efe4e4714557a4e887528ce6db0f923ae402fe2079ecfcdb0737215bc04765b7075624f5c9fd8 WHIRLPOOL f413d5d06f64891ec41a21fb738afce250eb3f0af0e85bb6e15916e72ef299dc36f33000dcfa6d06f1f817eb7a2f8b680038f912929632b3c0fd4b9a3fad9e21
+DIST jdk-8u60-macosx-x86_64-demos.zip 55654014 SHA256 ed5edf5b9224d2daad43ce0a1bdf2940abeb6bdc3f8ab620a8c1664c9e700d95 SHA512 77efd52274581dee3cb97d4d1281e5d17684a620fb17be2cc415efa503db400d88e8a6bdde63af376a97bfb2fbfc5d52719141bbb94dcbc5db228db1c0f3f732 WHIRLPOOL 994cbabc16196a464eccbb094b2b1ded9840de5913e5909c7d6604e1e7e94fe5c0eeda3a368a64734725a4fb148f4fa1d3203845a64db529032efec12bf2c68b
+DIST jdk-8u60-solaris-sparcv9-demos.tar.gz 9788289 SHA256 4150c1f04d3a1c95c6df64b8fe01a20c74af010e2d45c4c1c85eeab0f04dadd8 SHA512 793b8005428d0afc554c809e1fadcb95172d55fde1d9ab610849d1365960087de21d70a8625369bf08074c9c28cc905763b775b6d54b5da0a8e860f963976024 WHIRLPOOL 083e45b77a365b918f8682ba8aba397fc612bc9576b77eb03ec132d7469a54b2e15dc3664f6b545da3982291e9a1b4ac9059e2757671332e58b261768e92f26c
+DIST jdk-8u60-solaris-sparcv9.tar.gz 103832192 SHA256 5c274c13d5fcdb11aef7374c515a17381a1bddce5bb4dcb4c8ffd8c00bd71ce7 SHA512 5cf1d3c03d0877839c00af4f5b62229c7adacbd2c14046e159850d0f03567faaf26e958a7eb388f107922bc0d8af158f198e48deca9dca85433bec660dd18432 WHIRLPOOL 398be55a0edd005783da0f3158c160ff5ec54ae43eba56b4269225d862688a48cba6172243a62777dbdbd0f3711cc4ac992a933b2027c8936111dae28274aeb6
+DIST jdk-8u60-solaris-x64-demos.tar.gz 9736761 SHA256 d3130796caa8e15a93588064cbd289d52c26740d7534186bedf0c550f94df91c SHA512 504eb553f302f089419537002790882d40248489650becaeddec79e7a48558569cd63d1ad078e7747314683214ada26623b12bdc39d8b2f2fafad409dc86ef66 WHIRLPOOL 057de5eed6192c180ce2aa52156e181735f7c8d37b53e0c2eda4533ee81e71d0cb963a9571d93e3d6d605991b1e9e66ee53355413aacae54eac6946edf6500de
+DIST jdk-8u60-solaris-x64.tar.gz 101412950 SHA256 1e9c033fda2fc7c550965b21592bcd928990f60dc9a76f54ee7cb1c57814fa7e SHA512 0834a7a65b427319aa2b7bac4c1958c378b6c17b8ccbea10333aa70d3bdc24a013d89c93a3d515d9c3b5ea941b381168d489533c6abaf3dece598b553257e92e WHIRLPOOL 3a597fcd98ec9ec74d7b12a2f93276e97fff7a3bc0292252603a19f9bc46665927aef95e6ae1e3779b5ea4234ecc9ccf36f709fcca1ff30bca04ec93ca3dc2aa

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild
new file mode 100644
index 0000000..21c8c97
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
+
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
+DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
+	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+	fi
+	SRC_URI+=" )"
+done
+unset d
+SRC_URI+=" jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="jce? ( app-arch/unzip )
+	examples? ( x64-macos? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jdk"
+
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}" ; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
+
+	if [[ -n "${unavailable}" ]] ; then
+		if [[ -z ${_check_tarballs_available_once} ]] ; then
+			einfo
+			einfo "Oracle requires you to download the needed files manually after"
+			einfo "accepting their license through a javascript capable web browser."
+			einfo
+			_check_tarballs_available_once=1
+		fi
+		einfo "Download the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		einfo
+		einfo "If the above mentioned urls do not point to the correct version anymore,"
+		einfo "please download the files from Oracle's java download archive:"
+		einfo
+		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
+		einfo
+	fi
+}
+
+pkg_nofetch() {
+	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+	fi
+	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+
+	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		pushd "${T}" > /dev/null
+		mkdir dmgmount
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount
+		local update=$(get_version_component_range 4)
+		[[ ${#update} == 1 ]] && update="0${update}"
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
+		hdiutil detach "${T}"/dmgmount
+		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
+		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
+		popd > /dev/null
+	else
+		default
+	fi
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
+	mv "${WORKDIR}"/jdk* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby ; then
+		cp -pPR	db "${ddest}" || die
+	fi
+
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	if use jce ; then
+		dodir "${dest}"/jre/lib/security/strong-jce
+		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		mv "${ddest}"/jre/lib/security/local_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		install_mozilla_plugin "${dest}/${nsplugin}"
+	fi
+
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	if [[ -d jre/lib/desktop ]] ; then
+		# Install desktop file for the Java Control Panel.
+		# Using ${PN}-${SLOT} to prevent file collision with jre and or
+		# other slots.  make_desktop_entry can't be used as ${P} would
+		# end up in filename.
+		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+			sun-jcontrol-${PN}-${SLOT}.png || die
+		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+			-e "s#Application;##" \
+			-e "/Encoding/d" \
+			jre/lib/desktop/applications/sun_java.desktop \
+			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+	fi
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.*
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/jre/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		# Fix miscellaneous install_name issues.
+		pushd "${ddest}"/jre/lib > /dev/null || die
+		local lib needed nlib npath
+		for lib in \
+			decora_sse glass jfx{media,webkit} \
+			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
+		; do
+			lib=lib${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${lib}"
+		done
+		popd > /dev/null
+
+		# This is still jdk1{5,6}, even on Java 8, so don't change it
+		# until you know different.
+		for nlib in jdk1{5,6} ; do
+			install_name_tool -change \
+				/usr/lib/libgcc_s_ppc64.1.dylib \
+				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+			install_name_tool -id \
+				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+		done
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}