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

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

commit:     7cd3070313c45ac8c3eb980b4fca054298f7bf2c
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 11:44:55 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 20:05:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd30703

dev-java/oracle-jdk-bin: Remove vulnerable 1.8.0.144 wrt bug #635030

Package-Manager: Portage-2.3.12, Repoman-2.3.2

 dev-java/oracle-jdk-bin/Manifest                   |  15 -
 .../oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild | 355 ---------------------
 2 files changed, 370 deletions(-)

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 94e378c0ffa..eee50b1bac3 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,18 +1,3 @@
-DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jdk-8u144-linux-arm32-vfp-hflt-demos.tar.gz 10431600 SHA256 b113da60e5b0d30e58723a1bd56d46d25767b6c893910ab8bad08f43e463ee86 SHA512 36bc18b6d8d028fc9737803cdf913378c7501aede301c6013567f7eff1b326f44381522a3c5c38869799df6ef4aa4d83912332c3787a305fe6cfe6746a0f906b WHIRLPOOL 8f9da8cdee641320ee86c130db0010bbfc0823cc8e1ecf68e4698d7470b709251c8af56a617ffe3bdd567b77de5a3c0c29caefb8d52a75799d533316cf42ac13
-DIST jdk-8u144-linux-arm32-vfp-hflt.tar.gz 81674263 SHA256 cbbd390e19ab4c473e05f60602ce2804db25e4e35be5ab95f4f1a2aeb5b72383 SHA512 673a2ec7704a921db19e904bf8e8594b003b855de5cecab4419c502b235156a28262643ac235401c96014792897bbc1a51f78ced30e09439628ecd16d841377c WHIRLPOOL feb03cf10b692edf0b94cd46a1fb9cca9e9b1361efb1786d492a52c3ace889c3f294a163ec8bd617be87525957b62d6f1a1383b815ec65b732b70b6a327c5793
-DIST jdk-8u144-linux-arm64-vfp-hflt-demos.tar.gz 10427473 SHA256 ec66001b2f6a6814c4cf6d28f7c59ee5d335cbf50d8a3557c5e9eb46adf09630 SHA512 cbe861d234ca95e542c38ac72a1d84cd36ed895f4c72fbc45e1d4e5e4e73dd10f4b28f2bddb86a9b848b0edf304cc18b8e9b605ac1b94a1d35117fc75dd00748 WHIRLPOOL 39567c138d9c099a7c0e0b642a550d4ad9b53e533520601a1dec0d51a9bff45aa9afe5b31b1b015db8648b2648a609f9e284036b2db98f145b57c5a3a477e43f
-DIST jdk-8u144-linux-arm64-vfp-hflt.tar.gz 78463505 SHA256 bbcf4a0805f9bcead32fd988b74cee61ef6ad90e6d1b4e0dce432ac3fd8e0168 SHA512 42d3db36d7adf5461024202260b940d824c58c35edeb89b7be6f98147f1d556e95ee2f37b35c4468fd4d175f3381ce5bda9d9c2f730d054a7b8e669b469e18d0 WHIRLPOOL 7a0d15c8c5512de0cce0deade9b5f87f505e351c903d04152e860261f4d790e8e656aeb0740bfa9f69f0c2b80fc55a701d8f49ed3d7e1edfcb5293e95a22504e
-DIST jdk-8u144-linux-i586-demos.tar.gz 55071167 SHA256 3e8f02f32b129d681f5f2a0178373d750f4c2352acf55785fdca70c8f9aaf595 SHA512 4f3d5f8ecd56a7955e30cfea12dea4dadad0e955c3b160fddec59e759a9a6653bcb009bccae289fa022dba931fcede8a98d18770a8c18cc49d9da4f8ea0980d6 WHIRLPOOL aed2d4bdcebbaa0ae4adfd3e4eb000ef1499fef1ccc76f4bf00ce63fe5f695777fc3e8c2fd75b852fde8cfa1b06cb5c41c870b802074ec38f6512d296a67da96
-DIST jdk-8u144-linux-i586.tar.gz 188157665 SHA256 624c090647629394ef0ee08d9d8ac5d3d5a9a60fa245fefb2eb417c36c7cb7c4 SHA512 06e08a512af60bafdf3220ab916461c3bac61a3cac19877e9dd0c004c28168243c5f92f3104da1dcfd5eae98e882b224929f72692603455815c0ce8615f5ae9c WHIRLPOOL 79859bb345787155935885b872b6f072b68e81fb0008661344502d461ffd7aac88fe4cc9a2ff03f241ffcd41c0880907cd5353bcaf2f5bf7112dde1057209f85
-DIST jdk-8u144-linux-x64-demos.tar.gz 55093539 SHA256 67fcbd3b54aea3791d10eb3cd74a8fe42c286f0854b6a984b768f9c9c7513ffc SHA512 7f49d29e323237f0144e00883634779809bf41ab0b50875a3a36020521f716149cb38db522763a56249d34a1c3ee6f778b6ecf45b06b492064cc1fce854f9d24 WHIRLPOOL 74db7026f97ed61134313ed6b853d609684e7316d68b3f4880e12fadd9c6d267e79c0b8e10f69fb3f21af29d910cf2ab423b7c23a5f80dfce51389832bdc1aae
-DIST jdk-8u144-linux-x64.tar.gz 185515842 SHA256 e8a341ce566f32c3d06f6d0f0eeea9a0f434f538d22af949ae58bc86f2eeaae4 SHA512 e84bd22105586b4f1cb770942755c3b4ee7e2ca2a94bf0e7d48e5d44586a103dd28432664fd84b260b8bf1d64a1e9dbf49549f194e7202015e603865f4ae1e69 WHIRLPOOL 832b2b2b4790a9ed7499192248f30c9e56d357d52549c39314f992c3757b69ba9cc725356966ad0229c4053b63a56362a26d1a9b2f447c00b5f3d927e1926d8f
-DIST jdk-8u144-macosx-x64.dmg 237607747 SHA256 2450b35e10295ccf3fb1596bdea6f8f5670f7200ae3ac592eb6a54cc030cf94b SHA512 7eab6126044e230bebb1a5817b046bd64d3f57a3dbd3efc6c77411008b2aff7d4bee190906cb19a5ed330a8220b8b6dc47c9fc193eaa9a3c1f74ebbffcee0d6f WHIRLPOOL 7477673f2380a22b8ae9a7381d6b86611c0fbb32a3d94d81247d86924599b2317a7d598521aea51a729a9f553b7e4065799bd935fb0a3c0f53732cd448dcd5f6
-DIST jdk-8u144-macosx-x86_64-demos.zip 55667110 SHA256 d665713ddca2d771a56cef17fe16b9972ad6fed3fe716b18b690cbd8e0e99475 SHA512 252138155cce08eb8c68f1b3e10c621edca1292d69a69d3022bd32d45cb6c2095329cc3ece375124bdd1774e9e7dbae5f47a608f457a0655e2408614965c36bf WHIRLPOOL 86fa1e5b99c1beff5e7f6dd139629bd2f49700e8975be50c88f44d66bc5124bebfa42b487329e805aa79819f339405247750f6c55691af0c748ecdb555c0bf87
-DIST jdk-8u144-solaris-sparcv9-demos.tar.gz 9793649 SHA256 ceea29533ceb76ed1ee7f65b5935ef0fc53b0afee7c5f4ddb08d4face3b0838e SHA512 ba14fe455acc52f2f6da0c3d419d491f3a3123c7a0f80ce4d130e68a0492e7509e34709ca5921c6f266c468ba085f78d203d8018f1d9df26982e3d2dea72c1c5 WHIRLPOOL 5fe028f3959d2337416f8cb3b9b101dbba4ec42db18abec7641cac3133da44d0938f0429d43be3e2c159957fe5c351a6db81d6b08fddb55cb5abf7ef36e1885c
-DIST jdk-8u144-solaris-sparcv9.tar.gz 103999213 SHA256 fe8e6d12cac940569c5b2270d2d40ed57d6a0861d15d512e4d1cbc55277a2d2d SHA512 0a9ed86237ec253c009f68a3d6832610595623437d25d68c157ef2b5d59e0556acbe229be7b9a1713565b76604bd15474d2ce50ab7c593bf568226e9c1f6f6c7 WHIRLPOOL 24cee16e12c622cc675226842c28211b9d1a7e6079e0e0c0721e7f2cc2fe822e033ffbd405f7d509b5068531d7b9ce525a6628ee4cc3642400f33f7d8f86a8c3
-DIST jdk-8u144-solaris-x64-demos.tar.gz 9765361 SHA256 33f76fb0bec3f554aeb15c02e84c52cdeec77ac72f99f5247cee07035c7779b3 SHA512 a22e58c8a905d87e25184ea020c24dfe8afa4aa314093135643926ecbc734ca06ee58efbfffefc7dcbd013dbf0023ab515448fd48d4a731b656e2f47d22b98cb WHIRLPOOL 82cf282ecbb064567c96f4ee81560588d71e257504eb6b926d6fee8b114781eb5e3881035b250db2436b0a2579bb47309fb51e89f946f61c5b5e27e727749f33
-DIST jdk-8u144-solaris-x64.tar.gz 101700929 SHA256 9eea0096784e6c876aae6918bf4692096bd738200e717da09b4471bd1e706cf1 SHA512 fcd65f556d8565a29d4b7d3d5dec5c52c669c64db536c8ab01749f1f320232e8d42ba3d7012802033d9d7344b9abddd52140e345e4f95a025f00069901726f6b WHIRLPOOL f3ddd659003c5f2d39112132050bc441630c73208900babed8c1ec814c3d73271f8774e9411c8fc3e2eeae31f5312d6731520963c82f1c148d461eab0a355972
 DIST jdk-8u152-linux-arm32-vfp-hflt-demos.tar.gz 10405226 SHA256 5dba4af988562661f4543f210e0e16be9f4e11885e8addd9b7f8f6e2aa18741b SHA512 774b1957142ca489e362ef6ab48ce152196b64c00d779d051f76421fdf4a52cd7a741cfe3336b02c05f432fd2cb95728cdfd992f4ea3fee56047b40e7ce95053 WHIRLPOOL 1196d099f307f21b22e08c3b4badba33ee0475ebd70091ed98510730f7c492032e02a8dd475bd72b380eb9ceb8980e5a012c0be906d76afd2073e048d94f5909
 DIST jdk-8u152-linux-arm32-vfp-hflt.tar.gz 81729798 SHA256 35ab532355c72310c4c7add2b7c7f9d1eb0e045cf59d3fd69ee08fa6a9e610f0 SHA512 c548c18e2e2c9e2c87ad24841348b676628a33023a70aa0a5dab56d031c1d9c7a4813240a046db96631025d034ed333fec81c8099f02a7c9efd39fecd4592e32 WHIRLPOOL 32119379086fc008957bb6a00012d17e2f7d2a22ebd26f8b6e04a3d6476ab5d98a25bcc51cd5ce3c0eba6422581a050b809ffed2539819295aadef37d6e79383
 DIST jdk-8u152-linux-arm64-vfp-hflt-demos.tar.gz 10434504 SHA256 59c1787ad8b5f604293b09576fc8e872ad3fe32c0df3f3a62c9149dddfe25b24 SHA512 c41cb3f8394f98516e7dce52d8aaaea87d0e1675560292009eba0b4b3e993d1aaef7a7895dd83af2570486af6ca8913f280940d5f7e0051c3cc198a6387d9cd7 WHIRLPOOL ae3189cb9393ae9039ddb7a0c87db4ed30defc9cea5cc7d86de8bc32003f5d33c4200c20a3a10658c21f3099c2d455c3660fd1b4d0b222398cf084d776e36ae6

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild
deleted file mode 100644
index c3bbb1d5803..00000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
-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? (
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-		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 )"
-
-DEPEND="app-arch/zip
-	jce? ( app-arch/unzip )
-	examples? ( x64-macos? ( app-arch/unzip ) )"
-
-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 || die
-		mkdir dmgmount || die
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount || die
-		printf -v update "%02d" $(get_version_component_range 4) || die
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg || die
-		hdiutil detach "${T}"/dmgmount || die
-		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv || die
-		mv Contents/Home "${WORKDIR}"/jdk${MY_PV} || die
-		popd > /dev/null || die
-		use jce && unpack "${JCE_FILE}"
-	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
-
-	default
-
-	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
-		# Mark this binary early to run it now.
-		pax-mark m ./bin/javap
-
-		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
-		eqawarn
-		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
-	fi
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-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 commercial; then
-		rm -vfr lib/missioncontrol jre/lib/jfr* || die
-	fi
-
-	if use headless-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* bin/javapackager || 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
-
-	# Packaged as dev-util/visualvm but some users prefer this version.
-	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || 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
-		local nsplugin_link=${nsplugin##*/}
-		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
-		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
-	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.* || die
-	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.
-		local lib
-		for lib in decora_sse glass prism_{common,es2,sw} ; do
-			lib=lib${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${ddest}"/jre/lib/${lib} || die
-		done
-	fi
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}