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

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

commit:     eab5b3dc3812416483bc4ea1ff63bb79ab388bd5
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 16:32:32 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 16:32:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab5b3dc

dev-java/oracle-jdk-bin: Remove vulnerable 1.8.0.74 wrt bug #578160

Package-Manager: portage-2.2.28

 dev-java/oracle-jdk-bin/Manifest                   |  10 -
 .../oracle-jdk-bin/oracle-jdk-bin-1.8.0.74.ebuild  | 357 ---------------------
 2 files changed, 367 deletions(-)

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 83a9614..536f6ee 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -15,16 +15,6 @@ DIST jdk-7u80-solaris-sparcv9-demos.tar.gz 904770 SHA256 fa3a92e70e52b0bffdee8d2
 DIST jdk-7u80-solaris-sparcv9.tar.gz 19301205 SHA256 1a2bce541efe7b81cafe683626b3edea56918a8ca897ff36a2deaed00a7fce05 SHA512 93ea0e8f5ae611dd1a620dffd72e315ecb6ce8375bd902a793fab128ac7e95d2cb338df1c273a2c29af6194e7cbdb810d79193b413b4b101538c08ebeef1eb41 WHIRLPOOL c9ae1f1b561c4ec1d3c1a7f5008e80642b49a9fd1c6459f8ada65c01accc338280bdd683712d54a9b7741eeccf856b4f2ee82e898fbe1f39260d58efab217185
 DIST jdk-7u80-solaris-x64-demos.tar.gz 865205 SHA256 a08dd0665d35986675beeba0f80d5db54a91fb276d8641ce1ba16ba873a18682 SHA512 c53f026bfdfed8d83d42e3fce497baffeb370adf0423be2f891f6d200510088ac8227ae4f261ece059dbf29eb33cacafb20a0c328e7d8723387eba38def389d0 WHIRLPOOL 0539e964e194527055186b120df11e74ab3d9568fc2a5ff002ef405396f521a7c35013420067d37874b9602fe29d104dce63f22bfd687c45722689d62a8c552d
 DIST jdk-7u80-solaris-x64.tar.gz 17176587 SHA256 ccc156363e3080e92382cd675d96889460a4421464b4567333394c8405eeb709 SHA512 83ce229c3a38e454d9acafa189b3b6f247a4723ddb3c3fa08993323590949295b0f3740ab235c7c539f90a684b8cefad7839f82f566b7a141019b94af6cbad89 WHIRLPOOL 07412c6de5886c729b43726fb228783606b2a53c2a286b1af2dd5359975d1c75964a895d7da543f98c461adf0ab4b82fc32ebeb49e1835448effd93886f1b206
-DIST jdk-8u74-linux-i586-demos.tar.gz 55071932 SHA256 9e5ee679e58248124c0dc9bdfdad08f40f0c4c74b2bdc547bc87d3ef6b5cfe50 SHA512 81a55a5cbda56779d57d80b50b53246717fe817019f0783242044fb205b4ce4791e46b7fac6f69a2e3bd2db17a81edc3ea82700205000f4a14ff2ba789a5b0c0 WHIRLPOOL c88ed72f9fb36825020b8ccb0b037c4a346c9f2c70878fb8974e1f9e29e4322cb4b8f30fe2a07c2942e5067d6a0f92dd72970a614bf599783fee0e4ec1717f95
-DIST jdk-8u74-linux-i586.tar.gz 183412791 SHA256 0805e407924eb6902d874412af397992c141827e05c205c2b2bfe6e5127a83ed SHA512 afd380c70f084a91f79c835a9406c94e74a1202fa364a274b832fa178c1fea39b79cd5ebceaa5dcc3510325449effecda14dfa94270031e506089734d6b5becf WHIRLPOOL 00111f943d6ca9fda26af52435a6e5ee613f633845716fce83947d996a07c872b1b67155c25f22d986da8e16f74ae802a58aaf9d2deca0a9a7a3f401a6b1991c
-DIST jdk-8u74-linux-x64-demos.tar.gz 55099385 SHA256 8108961b5d76ae7f06adb440e6ecfbc918f6bc90cb057831f27be9f00f464077 SHA512 8b4a4585a98c8f73de224509a3e58f21022204ecf71d82f45343143c5850a0d9d0f72d57217c1babb8defb7ae0f5c23be03d9545dcf9ce06be3da5f0dd3ed33a WHIRLPOOL f5a650130b89635bdd78e5ea508511bd21b3a13049d6a0a3dc731da666dad6863c2e0c646bd29715fca336ca2ee110a99b2f25d859b24c53959231eec0cd10ba
-DIST jdk-8u74-linux-x64.tar.gz 181302755 SHA256 0bfd5d79f776d448efc64cb47075a52618ef76aabb31fde21c5c1018683cdddd SHA512 01f407532dc5692b224e2db617f261c59d06d73a16abca50c989ce14fac52d87e8c4712b882b5e22944becc76f92080d485e79a4b87541f49e9eb4af191b6975 WHIRLPOOL 5e1b1af688a7e8fc257178cfe27c1561a59dfb27231cb311bbdefab5fdabd8bd81710584a2f85d0b08c28a559262bc9e64750f0fc748d563b945401fccfaa16a
-DIST jdk-8u74-macosx-x64.dmg 238306418 SHA256 52fc1bf96514553cd70e5dfa79b764f8522f23536c05ad413c5585755f08e998 SHA512 d5bbe190c385c1617bdf7f0d2273cfd1eb2d789cf8fe4cec4753e018fd4a859e67809ec2bcc4717449795f5c1a4ca4c2415ffa10cf673c9a501a1de4a21e1c16 WHIRLPOOL 13f4a3184a6c1896ae056fc1c12deb001d69ffe3f4e49b86cefe23d10e2028d87a557f3203ca8d66836ea189949c59c3abb7c5f10c70ba058a344a85ab3bb307
-DIST jdk-8u74-macosx-x86_64-demos.zip 55665443 SHA256 5c257c099802eb5edc15d3df2e8ac3e9c361d70b3f17239731249df7f21ecfa4 SHA512 e644b5dbeab44723bbac4f5e750e037f9fbfd1a309cc76fbfcb9a27a8656622fdc20ee1bcdcde2762c7c1c44e7347480412f6bd116bcc9ff80e1abc79c7084ec WHIRLPOOL de2d62666c59be3e183d8d263219c3e76e6d9616ccbbdb74666a41ae6a04634267429c47523144102d6abd9e441bf97c7d12cb9dcf9cfd09771c54eb7ac78b0d
-DIST jdk-8u74-solaris-sparcv9-demos.tar.gz 9778749 SHA256 cf7258803473a9222d0c43eb6c605c4eb040704f34421f8a7fc3a7011082054c SHA512 c57a02806fa8a3af9964f7f6c5d6d8f275852282441d09c6aecd1e429280210d4530d4d27ba6700979aa5d2ca44df92e4f4657dbf3513c1b9ce7fcf6d5aecb2b WHIRLPOOL facc2e3844c6c966b66e5da11a1515321bc43e83ffd7bdcfae923fc60ff0a8756389da2e23235647e8f022acde70a70b224126d9e54f9231bac602201a322ea1
-DIST jdk-8u74-solaris-sparcv9.tar.gz 103907265 SHA256 feac2fbf698c5605721c713eec8f46819ab1d4433160cae3baf352983d502b63 SHA512 a35703e85d1e98e8bd9c91e526e07061e6fb2b6085f0a06606811447c1f6c539d9d7e0f8bd7506f30e2929d2f5145a5e8431642dc8877e6e779d2df7c186f98d WHIRLPOOL 50db91e69765abb5febbc6f8c31ee6b3bc06f43cab625d0f3585ded2a7ad1c4e4b5f2bd9804bad814b11a623fb86985a4f0084b035b83ba77d21446ba212aafe
-DIST jdk-8u74-solaris-x64-demos.tar.gz 9720841 SHA256 f9bc5a01422ecc6a335dc11b03bf9d187f9c1e8d5dbd862f2fd67a5e60f10691 SHA512 c3d09afefe8161a702f0f91bb6b659825fb0a5efd8b3f75b949cd6dcc9b3f034e3c68dfd9bb659801831429b5cf050bca26e90ac403911d617033e9d2378b1b0 WHIRLPOOL 51c945e5c60362fbb31a2b43793d64c81387e335aa8366d6ef88a646992fb27bdc046e8325c00a9d0a00f9be4d2b32ddf3da8c05d35bd48093c834e82334b0c6
-DIST jdk-8u74-solaris-x64.tar.gz 100860086 SHA256 214aa329f50a381bacfb0754b01eafb50360c71ac005e903d121724584595716 SHA512 4ac8b7b2499167fe1f271680bc201d33daa48b8168b8145654f4e170c2ba2e71f968d6761a8d39ead9f5ec6542a4cb55060873922fa497c0d7bb644cc2cb2624 WHIRLPOOL 31c9929351ef1328b3e8c9b4d79783d91d5b2595eb26f6ad5960fb016c50c1bb2b73ffb8e80b59e774bb0b7ec57eb90c72fe844d27bfb8e4fde09de34db69e1c
 DIST jdk-8u77-linux-arm32-vfp-hflt-demos.tar.gz 10430328 SHA256 4c0b15e54eebd2a969391fe00824021204352fc7a947d916e5e49e40a0b47dd7 SHA512 83f72301477825f8edab92eb3ab235b11ea516321f21b28cff8d2877c7a4409493811bc942a134e9aa8762106d1c5c2f8f9a9967a9194195ee2a6a290eaf9e11 WHIRLPOOL af62a3fd120de9ac8fec8977fc346f1c4f64d488495bd6ce8a373d62e1ff46ee50372105d5a24ac50331acd515f52dab4af90a9a00fe321b71f36199aa769873
 DIST jdk-8u77-linux-arm32-vfp-hflt.tar.gz 81472238 SHA256 c3af7a080cd74f7350680a020749b8161f78f66d1f16cda91bf758c3e58b524b SHA512 85482f839c8321b5094b404ccfc6ff1bde355842a33bbef6719e3f387688bc5d6393397cb15bc84aaaa3aefa604a5dae67f2c5a2b95aa06b3f4c832d054805a9 WHIRLPOOL d57249869f3bb6b298e9e2c625e70b89ead02f944c22e080eb355c2da6f00ecafb09482c8b30ed713af51f4be121dacb18c48d7ef42a1dfc445cefa50a3412f5
 DIST jdk-8u77-linux-arm64-vfp-hflt-demos.tar.gz 10416390 SHA256 17ba8e737b511640c3f8729daa3558c0e43b2efaaf20ae95d3ebc40632d5ce31 SHA512 5a0f054c534a8eefd8f63c68d0e796cfbeedfb25fbe17bad1c0ebd6b1bede88a136e0a5dcba3dc0685b2cb2ffd82dc451db1c8d97c4024d6e3a5fbdb557f4215 WHIRLPOOL c6dbb762ec47e8b5ce969bcf552b466c3640157fdd00539b6848048ee5472a33bcac876a30c99f5191638de973549ea630f0cb119de4ed26d482bdb8ffea77b4

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.74.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.74.ebuild
deleted file mode 100644
index 342f799..0000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.74.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2016 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 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 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 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="alsa cups derby doc examples +fontconfig headless-awt 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? (
-		!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 )"
-
-# A PaX header isn't created by scanelf so depend on paxctl to avoid
-# fallback marking. See bug #427642.
-DEPEND="app-arch/zip
-	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
-		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
-
-	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
-		# Mark this binary early to run it now.
-		pax-mark Cm ./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 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
-
-	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.*
-	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 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 \
-				/usr/lib/libSystem.B.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
-}