From c02151fc120384762cec395867456ec4e735d07b Mon Sep 17 00:00:00 2001
From: wbrana <wbrana@gmail.com>
Date: Thu, 20 Jun 2013 19:08:45 +0200
Subject: [dev-java/oracle32-jdk-bin] version bump to 1.7.0.25

---
 dev-java/oracle32-jdk-bin/Manifest                 |   8 +-
 .../oracle32-jdk-bin-1.7.0.21.ebuild               | 226 ---------------------
 .../oracle32-jdk-bin-1.7.0.25.ebuild               | 226 +++++++++++++++++++++
 3 files changed, 230 insertions(+), 230 deletions(-)
 delete mode 100644 dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.21.ebuild
 create mode 100644 dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.25.ebuild

diff --git a/dev-java/oracle32-jdk-bin/Manifest b/dev-java/oracle32-jdk-bin/Manifest
index 917d979..16e9b3f 100644
--- a/dev-java/oracle32-jdk-bin/Manifest
+++ b/dev-java/oracle32-jdk-bin/Manifest
@@ -1,7 +1,7 @@
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle32-jdk-bin-1.7.env 1000 SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f SHA512 3bab31d62740b959fcf028b94d5db31f682eadff2497dafbd945aed3464a6e5dd6a6ac8b5bb62cb41c901aadefc5314f9b7fb451a46449f5c2fc818d8c88fa6f WHIRLPOOL 74dccbc5c880721d4347b631b3af9368440f20112ac1e70764ff732289c1cef24e6fb4a4a7eb3ca2f5afedab83d6db4dc324c508922de47f8f435048c4884b2a
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
-DIST javafx_samples-2_2_21-linux.zip 20501613 SHA256 91739e0d85971df6e01d5c6ff7f8e1af676cdeb91c8cd51024e62f3c44eecc42 SHA512 03243e27afd5720762c7b8ce09cf7dce16eca41ce76799b5828e022ca259228e9f57b8796708dc7a44abb5b2b4a1b1c9e83b165b4af808f25660c6b4b36aea56 WHIRLPOOL e63a8d0036912830ed77e5253ffadd4d612f5006c1a0dbba8eb4445520e2f309ebff1e679e9e88ddd6d2c844b5adcbe69d7b4d83813cf2e5da9123ef66c2358e
-DIST jdk-7u21-linux-i586-demos.tar.gz 14742700 SHA256 cb9d79eecfd233e168b977e6e81d597741eb7caf7710f86be45fe529f7cde00f SHA512 64d85af775516cd8140c3f6ce44a6fd1d46cf03a22a1899a389b8fdcd2e42a0dfa4ce04a57d68426211c8483d5a2ea942a8c0e7d37fffbba6bb6149d2e376d75 WHIRLPOOL d95eb9d92d255c42d92b9270f61796acc83d96ca4ef24b9d2247501a5347bbccfb6469c705e1abbab8cdb37fec68a5eda79556bb8dc5769678b3a06b125fa0f3
-DIST jdk-7u21-linux-i586.tar.gz 97585097 SHA256 15616f80f1c6d331d9a54bed7efa0d504cdf1a026d371a7a735117885d86e369 SHA512 12d3ea28e90a0d1387ab7e5093f4c4dc4d54c43f5c6fbf5614304362773e9977de7d36f6b4475accd0a29dbf75b109ad17e1f99045ab311aa54df8454af6d968 WHIRLPOOL 9f1afbeea08043f80975786783fd07dc6136718028280a83df9427ba014d018bb5506d5c2ed2293365095d9941cce2ea077fc56ca72cd9df39a2e1cceba25d13
-EBUILD oracle32-jdk-bin-1.7.0.21.ebuild 6982 SHA256 e74a3832d4ae0c00bbe23fa34444eaeea7219f172421c2d594820c1c476c31c0 SHA512 5bdffe6e795c659263c06575bfd5c913f94ee498fd253d74f0215bbd952eebe829544466b77c5dd843aadf969937f4ba568b019946f1ac89f2090ab2943724b7 WHIRLPOOL 0967d2822227f867b6b95454178b2f9b009943239823d49833dfe023adabfa13617b966315770373238cd44c7332ed76525ecaa77d9a9d358db3729cf9beb671
+DIST javafx_samples-2_2_25-linux.zip 20405501 SHA256 952c4c7d016d429319801871095e2d1918604b70076a6766ce5b87bfd8e672e6 SHA512 01eeea9c5c924a2e7bb16e3388584f86d749b1bf4c8fc2a22ec6fef2236108e2255dac145a0554a9d7f7156b900ba6b171dd1871865bbc34f3a480822a2dd10a WHIRLPOOL 248145b1e28018fc59f2d08a79cd773d1a178365874d2fc4a4801ca7e6b8f8c1daeb95f90b7d926e5ab2931c89a0fadea7aaec495e19351911b3e4ab101615fd
+DIST jdk-7u25-linux-i586-demos.tar.gz 14762641 SHA256 b6d9a86acb272a32c68c03f885e6b2cc4cc43e7be36d709e0adc4c5856ad835a SHA512 d3eef7dd3de2f348fb6808694f718ba75b2b80a22a491ca9c3cffa722c43e83383ee2e15188c1a7a8d9a2cab4defbfdc761be877eab642c308896254eaf12959 WHIRLPOOL f1b9b42fa616d4d082af339b98a4e0d9810e64def44878438a1c5366a10c3a628739a08f80aba2b685eeecf915511739242d0d5c3dfc3b1f429197afc0eafb74
+DIST jdk-7u25-linux-i586.tar.gz 97643815 SHA256 dd89b20afa939992bb7fdc44837fa64f0a98d7ee1e5706fe8a2d9e2247ba6de7 SHA512 bfc634d19e9158d9e664dac38ace2a77a6e48740010a55cb307947b2f08d43ccfd46d96331109d7de77ddc5c1bcbc7521ca6b9b80ddd2cdfd320df62f4f458f7 WHIRLPOOL c72b321bb4a74753ada3ec2c38b28536adb45f564b16207e21fb4d09ebe56924c4eed133823d7f01a7f35d6afc0874907f9eeff75e39111f8edc66b1acaffedb
+EBUILD oracle32-jdk-bin-1.7.0.25.ebuild 6982 SHA256 6af5bd648654d304584e3d370004d557fd95c66b7e2e13b9006b3696b80dcffd SHA512 18dd26d4fbbbae2fa6da6d9629a34194a1cd57df1ee2d8dd63deccdc1fe4a3a943526d5a6005393ec8f12760d2742c4b85b1a1f5d07987b901d394b0f34b64eb WHIRLPOOL e686d6dd12e5e14014b40cbc0d86ff82196e5f35a752a5ce5d3f83877fcb486b884fc82cbb0269894a473437c36c607c7da056d982cdee5d9334f49163471de7
diff --git a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.21.ebuild b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.21.ebuild
deleted file mode 100644
index cf96012..0000000
--- a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.21.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_21"
-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)u21"
-DEMOS_S="${WORKDIR}/jdk$(get_version_component_range 1-3)_21"
-
-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.25.ebuild b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.25.ebuild
new file mode 100644
index 0000000..ce90bed
--- /dev/null
+++ b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.25.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_25"
+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)u25"
+DEMOS_S="${WORKDIR}/jdk$(get_version_component_range 1-3)_25"
+
+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