From 46ead5da8e0aa9906fbe104a7939480ecd488447 Mon Sep 17 00:00:00 2001
From: wbrana <wbrana@gmail.com>
Date: Sat, 2 Feb 2013 18:16:05 +0100
Subject: [dev-java/oracle32-jdk-bin] version bump to 1.7.0.13

---
 dev-java/oracle32-jdk-bin/Manifest                 |   4 +-
 .../oracle32-jdk-bin-1.7.0.11.ebuild               | 226 ---------------------
 .../oracle32-jdk-bin-1.7.0.13.ebuild               | 226 +++++++++++++++++++++
 3 files changed, 228 insertions(+), 228 deletions(-)
 delete mode 100644 dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.11.ebuild
 create mode 100644 dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.13.ebuild

diff --git a/dev-java/oracle32-jdk-bin/Manifest b/dev-java/oracle32-jdk-bin/Manifest
index 52dee57..00e78c9 100644
--- a/dev-java/oracle32-jdk-bin/Manifest
+++ b/dev-java/oracle32-jdk-bin/Manifest
@@ -3,5 +3,5 @@ AUX oracle32-jdk-bin-1.7.env 1000 SHA256 a2422630fc1dd9851b580e42b065d44460d9ec8
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
 DIST javafx_samples-2_2_4-linux.zip 20499851 SHA256 205f8242cfc56e47586f9fa8b76a5f26aba920e82c85596c128d987f3cadfca7 SHA512 6c92f85255078c8e5f592ea121d49660daf912232bbe5a303228ef7799878dbc7200d4ddd44612cb89f76c70f87f0451ab34984a3b2cbd7543edbe6698cf468f WHIRLPOOL 941838762b0b42c95a2eb3ea25c3e3417da743de4ab667a0af7122eb7c88cd67e3aba57f9255f413b49727f8636692a8b87004008540c91729c91cdccd931999
 DIST jdk-7u10-linux-i586-demos.tar.gz 14742221 SHA256 82525dd8afdeea93e167ca1fa8ec111248d931786a7de8ada72bd04050adc70a SHA512 cb6fd0f8e99c4de7bd0fefff1b7c562ec6c11e587966160031e68ced43664ce7fd6d1e2e13b4aa9dc3465695fdec4b2794bf603414696546a0074d771830a89d WHIRLPOOL e6f873d9ccb147324bbdc5012bdcb177524f9f5097737543819b4eb18bf26a1742b02d724de1e4916ad622e31e041cd474a2f1b166f9e501de85bb0436d8b1fd
-DIST jdk-7u11-linux-i586.tar.gz 97470187 SHA256 7f8efcbba7d32236a1a9858660ae4e42e32510a487cebffbcf934999deb53d35 SHA512 f7e2d360a08ca39203245c0b4ed0880b1105d86387edadcf3f240c1164a06ddcc3f44036dd0c825609c972bb5c123d836a3ff39790b36379375892a084eb799f WHIRLPOOL 6c6492e1e56abfa5acfab55cb1ca4020f75581f221a6f5ad05fe5be46af84420ebec36a69b07e58d1a726cce9ed412c10e51015f9c30ee95450e4dc461bd7f4c
-EBUILD oracle32-jdk-bin-1.7.0.11.ebuild 6981 SHA256 63505f42b105edf9bdaa97c5111b3ffe637ed3decc9a2ac97b2afa399d0f3ad8 SHA512 807628f314050c89bdd65796fc8cb017ce93c37b6482d6971935f1050f6bbd71ab5361889b8008174c4fb810732ccb95f161f0d69e2cf8e9c7efca1221e07226 WHIRLPOOL deaf45ede8f04875cdef6bb9cadf554d193b5de5b42a0cdb60961f66f0a0bfc17b06ebd6d0c6e213fedc20523e122669b7c0157de6dfdbb553ce279858e96238
+DIST jdk-7u13-linux-i586.tar.gz 97489971 SHA256 644eefe01ddbb25d966502b96d6fd1c42ce90967eb166dafa2937fc008cca6c5 SHA512 5de9b23742a27c0f93f81a896e0fd3fb3ff0feff85e4ae9c3c99bc4e3fd9e5386bd42b110c6992c9c3a980b4cbde80382e7b91ea22d2554c5025221eae35b0f7 WHIRLPOOL c667da1bb8c76f315e73c546efd305211d26ea975e304f3bc8f45fa26487e96f8502cc57468655d416529a85ea22aea5fa844c25e6c5717084576d43e24175c5
+EBUILD oracle32-jdk-bin-1.7.0.13.ebuild 6981 SHA256 63505f42b105edf9bdaa97c5111b3ffe637ed3decc9a2ac97b2afa399d0f3ad8 SHA512 807628f314050c89bdd65796fc8cb017ce93c37b6482d6971935f1050f6bbd71ab5361889b8008174c4fb810732ccb95f161f0d69e2cf8e9c7efca1221e07226 WHIRLPOOL deaf45ede8f04875cdef6bb9cadf554d193b5de5b42a0cdb60961f66f0a0bfc17b06ebd6d0c6e213fedc20523e122669b7c0157de6dfdbb553ce279858e96238
diff --git a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.11.ebuild b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.11.ebuild
deleted file mode 100644
index 8eafff6..0000000
--- a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.11.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.9.ebuild,v 1.2 2012/10/23 05:06:57 nativemad Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils prefix versionator
-
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html"
-# api and fx docs for 7u6
-#DOCS_URI=http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
-
-# This is a list of archs supported by this update
-# arm currently missing
-JDK_AVAILABLE=(amd64)
-DEMOS_AVAILABLE=(amd64)
-
-FX_VERSION="2_2_4"
-UPDATE="$(get_version_component_range 4)"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-S="${WORKDIR}/jdk$(get_version_component_range 1-3)_${UPDATE}"
-# for when oracle messes with us again.
-DEMOS_PV="$(get_version_component_range 2)u10"
-DEMOS_S="${WORKDIR}/jdk$(get_version_component_range 1-3)_10"
-
-at_amd64="jdk-${MY_PV}-linux-i586.tar.gz"
-
-fx_demos_linux="javafx_samples-${FX_VERSION}-linux.zip"
-demos_amd64="${fx_demos_linux} jdk-${DEMOS_PV}-linux-i586-demos.tar.gz"
-
-# docs #67266
-#JDK_API_DOCS="jdk-${MY_PV}-apidocs.zip"
-#FX_API_DOCS="javafx-${FX_VERSION}-apidocs.zip"
-
-JCE_DIR="UnlimitedJCEPolicy"
-JCE_FILE="${JCE_DIR}JDK7.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${JDK_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ("
-	SRC_URI+=" $(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 )" # doc? ( Oracle-DLA-JavaSE )
-SLOT="1.7"
-KEYWORDS="~amd64"
-IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel +source"
-
-RESTRICT="fetch strip"
-QA_PREBUILT="*"
-
-RDEPEND="
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libX11
-	)
-	alsa? ( media-libs/alsa-lib )
-	doc? ( dev-java/java-sdk-docs:1.7 )
-	fontconfig? ( media-libs/fontconfig )
-	!prefix? ( sys-libs/glibc )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="
-	jce? ( app-arch/unzip )
-	examples? ( kernel_linux? ( app-arch/unzip ) )
-	pax_kernel? ( sys-apps/paxctl )"
-
-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=done
-		fi
-		einfo "Downlod the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		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_prepare() {
-	if use jce; then
-		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
-	fi
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	if use amd64; then
-		bin/java -client -Xshare:dump || die
-	fi
-	bin/java -server -Xshare:dump || die
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use amd64; then
-		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
-			{,jre/}lib/i386/libjavaplugin_nscp*.so
-		rm -vrf jre/plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use amd64 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
-			{,jre/}lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use derby; then
-		cp -pPR db "${ddest}" || die
-	fi
-
-	if use examples; then
-		cp -pPR "${DEMOS_S}"/{demo,sample} "${ddest}" || die
-		if use kernel_linux && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-			cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
-				"${ddest}"/javafx-samples || die
-		fi
-	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}"/jre/lib/${arch}/libnpjp2.so
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# 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
-
-	# 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/7/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
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir {} + || die
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.13.ebuild b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.13.ebuild
new file mode 100644
index 0000000..8eafff6
--- /dev/null
+++ b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.13.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.9.ebuild,v 1.2 2012/10/23 05:06:57 nativemad Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html"
+# api and fx docs for 7u6
+#DOCS_URI=http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+# This is a list of archs supported by this update
+# arm currently missing
+JDK_AVAILABLE=(amd64)
+DEMOS_AVAILABLE=(amd64)
+
+FX_VERSION="2_2_4"
+UPDATE="$(get_version_component_range 4)"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+S="${WORKDIR}/jdk$(get_version_component_range 1-3)_${UPDATE}"
+# for when oracle messes with us again.
+DEMOS_PV="$(get_version_component_range 2)u10"
+DEMOS_S="${WORKDIR}/jdk$(get_version_component_range 1-3)_10"
+
+at_amd64="jdk-${MY_PV}-linux-i586.tar.gz"
+
+fx_demos_linux="javafx_samples-${FX_VERSION}-linux.zip"
+demos_amd64="${fx_demos_linux} jdk-${DEMOS_PV}-linux-i586-demos.tar.gz"
+
+# docs #67266
+#JDK_API_DOCS="jdk-${MY_PV}-apidocs.zip"
+#FX_API_DOCS="javafx-${FX_VERSION}-apidocs.zip"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${JDK_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ("
+	SRC_URI+=" $(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 )" # doc? ( Oracle-DLA-JavaSE )
+SLOT="1.7"
+KEYWORDS="~amd64"
+IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel +source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.7 )
+	fontconfig? ( media-libs/fontconfig )
+	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	jce? ( app-arch/unzip )
+	examples? ( kernel_linux? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+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=done
+		fi
+		einfo "Downlod the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		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_prepare() {
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
+	fi
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	if use amd64; then
+		bin/java -client -Xshare:dump || die
+	fi
+	bin/java -server -Xshare:dump || die
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use amd64; then
+		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
+			{,jre/}lib/i386/libjavaplugin_nscp*.so
+		rm -vrf jre/plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use amd64 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
+			{,jre/}lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby; then
+		cp -pPR db "${ddest}" || die
+	fi
+
+	if use examples; then
+		cp -pPR "${DEMOS_S}"/{demo,sample} "${ddest}" || die
+		if use kernel_linux && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+			cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
+				"${ddest}"/javafx-samples || die
+		fi
+	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}"/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# 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
+
+	# 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/7/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
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir {} + || die
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
-- 
cgit v1.2.3-65-gdbad