From 0aa500b93adda5f4fbbb6f9e0f60ddf28b55c5d0 Mon Sep 17 00:00:00 2001
From: wbrana <wbrana@gmail.com>
Date: Wed, 17 Oct 2012 18:12:35 +0200
Subject: [dev-java/oracle32-jdk-bin] version bump to 1.7.0.9

---
 dev-java/oracle32-jdk-bin/Manifest                 |   4 +-
 .../oracle32-jdk-bin-1.7.0.7.ebuild                | 305 ---------------------
 .../oracle32-jdk-bin-1.7.0.9.ebuild                | 305 +++++++++++++++++++++
 3 files changed, 307 insertions(+), 307 deletions(-)
 delete mode 100644 dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.7.ebuild
 create mode 100644 dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.9.ebuild

diff --git a/dev-java/oracle32-jdk-bin/Manifest b/dev-java/oracle32-jdk-bin/Manifest
index a460ffb..fe17feb 100644
--- a/dev-java/oracle32-jdk-bin/Manifest
+++ b/dev-java/oracle32-jdk-bin/Manifest
@@ -1,5 +1,5 @@
 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 jdk-7u7-linux-i586.tar.gz 97373835 SHA256 d54497580794091831cac86f93b066e0a4105b08acaf2c5d430dea87d2bf7ffe SHA512 67b45f68cffd4212abfe7b4ec2ddab06214ba38b45bdf6cff96ec51be4c57d33e6ccceab75655b2d08b6c88aedc423372b80ef1d7a7a4b326696b89808329cc3 WHIRLPOOL 50d1ffb69dab9e2eaac02eb6e3d3f0aac4ef1317ec1b1f55a11dc7d21944e37170d0ab9c5516d23452b8bd17e3d49a0cf4f09649bdd92b9058931a169f6da0fc
-EBUILD oracle32-jdk-bin-1.7.0.7.ebuild 10086 SHA256 8af49611f55fd259878de4e6b7da564351b34c28e8f0052dc6b6bb0ac7c2b4f7 SHA512 21c990bfc407c952f3e64cbf127b2235d17cfcdb20d632e05e7ee73606bf5595778896a7632c51200af11938babf4fa0a76e79852926ec1bd3411015f6c96924 WHIRLPOOL 82b1bc6701c7404376f6431571cea65270bd51a23c6f9eb1f96e1caae7bbbfb394b2dabebfa74bc3254a1ad3429513d8d7b01d3f554ca0d1cec4155f68e182b2
+DIST jdk-7u9-linux-i586.tar.gz 97361259 SHA256 47e86ceb7f59c821a8d0c54f34530bca84e10c1849ed46da7f4fdb5f621bc8d6 SHA512 7353984417b91482fc4d0c1c8597c49f431d4b63502b446d0bea6f5d1080a7504ce0b8801debe75b38eb18551abc3f81264901f3df159b8f6af5e17668603122 WHIRLPOOL defb1480299e37009a95dda609e2efebf8c3a73f48c88f491983daea070459e1fd33f947fdb9ef73c96a1c832fdd6e38eac5f76627ab219e87c8ee3c16780f47
+EBUILD oracle32-jdk-bin-1.7.0.9.ebuild 10086 SHA256 51a61f2a9af4ea099bf8bb456319ee9056741945924e0bb7791f098b2b89c669 SHA512 16abe79a9a3b5aade4e7c8c138c8a896f050bf43008752450148317dc41c2fbe7986ddd6a4e505a05d65f6e57ad73cab76d80872ab8581a390892eb4b958ecf6 WHIRLPOOL d3056eaca863b56764cecc8a914044f51622de942626c50131c8c8680db34fbc85c46fc1be8ce8c20aaf0c770e1b2360065c4ac0aafb382cddd3acd0e952ae10
diff --git a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.7.ebuild b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.7.ebuild
deleted file mode 100644
index 8364eba..0000000
--- a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.7.ebuild
+++ /dev/null
@@ -1,305 +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.6.ebuild,v 1.1 2012/08/19 17:59:31 caster 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/jdk7u7-downloads-1836413.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
-
-UPDATE="$(get_version_component_range 4)"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
-
-AMD64_AT="jdk-${MY_PV}-linux-i586.tar.gz"
-
-JCE_DIR="UnlimitedJCEPolicy"
-JCE_FILE="${JCE_DIR}JDK7.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AMD64_AT} )
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.7"
-KEYWORDS="~amd64"
-
-IUSE="+X alsa derby doc +fontconfig jce nsplugin pax_kernel +source"
-RESTRICT="fetch strip"
-
-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 )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jdk${S_PV}"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	elif use x86-solaris; then
-		AT=${SOL_X86_AT}
-	elif use x64-solaris; then
-		AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
-	elif use sparc-solaris; then
-		AT=${SOL_SPARC_AT}
-	elif use sparc64-solaris; then
-		AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
-	fi
-
-	einfo "Please download ${AT} from:"
-	einfo "${JDK_URI}"
-	einfo "and move it to ${DISTDIR}"
-
-	if use jce; then
-		einfo "Also download ${JCE_FILE} from:"
-		einfo "${JCE_URI}"
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-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}"
-
-	# 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
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir {} + || die
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	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}.png#" \
-		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
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-QA_TEXTRELS_x86="
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/appletviewer
-	/opt/${P}/bin/apt
-	/opt/${P}/bin/extcheck
-	/opt/${P}/bin/idlj
-	/opt/${P}/bin/jar
-	/opt/${P}/bin/jarsigner
-	/opt/${P}/bin/java
-	/opt/${P}/bin/javac
-	/opt/${P}/bin/javadoc
-	/opt/${P}/bin/javah
-	/opt/${P}/bin/javap
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/jcmd
-	/opt/${P}/bin/jconsole
-	/opt/${P}/bin/jdb
-	/opt/${P}/bin/jhat
-	/opt/${P}/bin/jinfo
-	/opt/${P}/bin/jmap
-	/opt/${P}/bin/jps
-	/opt/${P}/bin/jrunscript
-	/opt/${P}/bin/jsadebugd
-	/opt/${P}/bin/jstack
-	/opt/${P}/bin/jstat
-	/opt/${P}/bin/jstatd
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/native2ascii
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmic
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/schemagen
-	/opt/${P}/bin/serialver
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/bin/wsgen
-	/opt/${P}/bin/wsimport
-	/opt/${P}/bin/xjc
-	/opt/${P}/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-	/opt/${P}/demo/jvmti/gctest/lib/libgctest.so
-	/opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so
-	/opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so
-	/opt/${P}/demo/jvmti/hprof/lib/libhprof.so
-	/opt/${P}/demo/jvmti/minst/lib/libminst.so
-	/opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so
-	/opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so
-	/opt/${P}/demo/jvmti/waiters/lib/libwaiters.so
-	/opt/${P}/jre/bin/java
-	/opt/${P}/jre/bin/java_vm
-	/opt/${P}/jre/bin/javaws
-	/opt/${P}/jre/bin/keytool
-	/opt/${P}/jre/bin/orbd
-	/opt/${P}/jre/bin/pack200
-	/opt/${P}/jre/bin/policytool
-	/opt/${P}/jre/bin/rmid
-	/opt/${P}/jre/bin/rmiregistry
-	/opt/${P}/jre/bin/servertool
-	/opt/${P}/jre/bin/tnameserv
-	/opt/${P}/jre/bin/unpack200
-	/opt/${P}/jre/lib/jexec
-	/opt/${P}/lib/jexec
-	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
-	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so"
-for java_system_arch in amd64 i386; do
-	QA_FLAGS_IGNORED+="
-		/opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so
-		/opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so
-		/opt/${P}/jre/lib/${java_system_arch}/libattach.so
-		/opt/${P}/jre/lib/${java_system_arch}/libawt.so
-		/opt/${P}/jre/lib/${java_system_arch}/libcmm.so
-		/opt/${P}/jre/lib/${java_system_arch}/libdcpr.so
-		/opt/${P}/jre/lib/${java_system_arch}/libdeploy.so
-		/opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so
-		/opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so
-		/opt/${P}/jre/lib/${java_system_arch}/libhprof.so
-		/opt/${P}/jre/lib/${java_system_arch}/libinstrument.so
-		/opt/${P}/jre/lib/${java_system_arch}/libioser12.so
-		/opt/${P}/jre/lib/${java_system_arch}/libj2gss.so
-		/opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so
-		/opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjava.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjawt.so
-		/opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjdwp.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjfr.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjpeg.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjsdt.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjsig.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so
-		/opt/${P}/jre/lib/${java_system_arch}/libjsound.so
-		/opt/${P}/jre/lib/${java_system_arch}/libkcms.so
-		/opt/${P}/jre/lib/${java_system_arch}/libmanagement.so
-		/opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnet.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnio.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so
-		/opt/${P}/jre/lib/${java_system_arch}/libnpt.so
-		/opt/${P}/jre/lib/${java_system_arch}/librmi.so
-		/opt/${P}/jre/lib/${java_system_arch}/libsaproc.so
-		/opt/${P}/jre/lib/${java_system_arch}/libsctp.so
-		/opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so
-		/opt/${P}/jre/lib/${java_system_arch}/libsunec.so
-		/opt/${P}/jre/lib/${java_system_arch}/libt2k.so
-		/opt/${P}/jre/lib/${java_system_arch}/libunpack.so
-		/opt/${P}/jre/lib/${java_system_arch}/libverify.so
-		/opt/${P}/jre/lib/${java_system_arch}/libzip.so
-		/opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so
-		/opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so
-		/opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so
-		/opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so"
-done
diff --git a/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.9.ebuild b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.9.ebuild
new file mode 100644
index 0000000..ef823bd
--- /dev/null
+++ b/dev-java/oracle32-jdk-bin/oracle32-jdk-bin-1.7.0.9.ebuild
@@ -0,0 +1,305 @@
+# 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.6.ebuild,v 1.1 2012/08/19 17:59:31 caster 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/jdk7u9-downloads-1859576.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+UPDATE="$(get_version_component_range 4)"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
+
+AMD64_AT="jdk-${MY_PV}-linux-i586.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AMD64_AT} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.7"
+KEYWORDS="~amd64"
+
+IUSE="+X alsa derby doc +fontconfig jce nsplugin pax_kernel +source"
+RESTRICT="fetch strip"
+
+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 )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jdk${S_PV}"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	elif use x86-solaris; then
+		AT=${SOL_X86_AT}
+	elif use x64-solaris; then
+		AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
+	elif use sparc-solaris; then
+		AT=${SOL_SPARC_AT}
+	elif use sparc64-solaris; then
+		AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
+	fi
+
+	einfo "Please download ${AT} from:"
+	einfo "${JDK_URI}"
+	einfo "and move it to ${DISTDIR}"
+
+	if use jce; then
+		einfo "Also download ${JCE_FILE} from:"
+		einfo "${JCE_URI}"
+		einfo "and move it to ${DISTDIR}"
+	fi
+}
+
+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}"
+
+	# 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
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir {} + || die
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	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}.png#" \
+		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
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+QA_TEXTRELS_x86="
+	opt/${P}/jre/lib/i386/client/libjvm.so
+	opt/${P}/jre/lib/i386/server/libjvm.so"
+QA_FLAGS_IGNORED="
+	/opt/${P}/bin/appletviewer
+	/opt/${P}/bin/apt
+	/opt/${P}/bin/extcheck
+	/opt/${P}/bin/idlj
+	/opt/${P}/bin/jar
+	/opt/${P}/bin/jarsigner
+	/opt/${P}/bin/java
+	/opt/${P}/bin/javac
+	/opt/${P}/bin/javadoc
+	/opt/${P}/bin/javah
+	/opt/${P}/bin/javap
+	/opt/${P}/bin/javaws
+	/opt/${P}/bin/jcmd
+	/opt/${P}/bin/jconsole
+	/opt/${P}/bin/jdb
+	/opt/${P}/bin/jhat
+	/opt/${P}/bin/jinfo
+	/opt/${P}/bin/jmap
+	/opt/${P}/bin/jps
+	/opt/${P}/bin/jrunscript
+	/opt/${P}/bin/jsadebugd
+	/opt/${P}/bin/jstack
+	/opt/${P}/bin/jstat
+	/opt/${P}/bin/jstatd
+	/opt/${P}/bin/keytool
+	/opt/${P}/bin/native2ascii
+	/opt/${P}/bin/orbd
+	/opt/${P}/bin/pack200
+	/opt/${P}/bin/policytool
+	/opt/${P}/bin/rmic
+	/opt/${P}/bin/rmid
+	/opt/${P}/bin/rmiregistry
+	/opt/${P}/bin/schemagen
+	/opt/${P}/bin/serialver
+	/opt/${P}/bin/servertool
+	/opt/${P}/bin/tnameserv
+	/opt/${P}/bin/unpack200
+	/opt/${P}/bin/wsgen
+	/opt/${P}/bin/wsimport
+	/opt/${P}/bin/xjc
+	/opt/${P}/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
+	/opt/${P}/demo/jvmti/gctest/lib/libgctest.so
+	/opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so
+	/opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so
+	/opt/${P}/demo/jvmti/hprof/lib/libhprof.so
+	/opt/${P}/demo/jvmti/minst/lib/libminst.so
+	/opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so
+	/opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so
+	/opt/${P}/demo/jvmti/waiters/lib/libwaiters.so
+	/opt/${P}/jre/bin/java
+	/opt/${P}/jre/bin/java_vm
+	/opt/${P}/jre/bin/javaws
+	/opt/${P}/jre/bin/keytool
+	/opt/${P}/jre/bin/orbd
+	/opt/${P}/jre/bin/pack200
+	/opt/${P}/jre/bin/policytool
+	/opt/${P}/jre/bin/rmid
+	/opt/${P}/jre/bin/rmiregistry
+	/opt/${P}/jre/bin/servertool
+	/opt/${P}/jre/bin/tnameserv
+	/opt/${P}/jre/bin/unpack200
+	/opt/${P}/jre/lib/jexec
+	/opt/${P}/lib/jexec
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so"
+for java_system_arch in amd64 i386; do
+	QA_FLAGS_IGNORED+="
+		/opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so
+		/opt/${P}/jre/lib/${java_system_arch}/libattach.so
+		/opt/${P}/jre/lib/${java_system_arch}/libawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libcmm.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdcpr.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdeploy.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so
+		/opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so
+		/opt/${P}/jre/lib/${java_system_arch}/libhprof.so
+		/opt/${P}/jre/lib/${java_system_arch}/libinstrument.so
+		/opt/${P}/jre/lib/${java_system_arch}/libioser12.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2gss.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjdwp.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjfr.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjpeg.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsdt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsig.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsound.so
+		/opt/${P}/jre/lib/${java_system_arch}/libkcms.so
+		/opt/${P}/jre/lib/${java_system_arch}/libmanagement.so
+		/opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnet.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnio.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnpt.so
+		/opt/${P}/jre/lib/${java_system_arch}/librmi.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsaproc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsctp.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsunec.so
+		/opt/${P}/jre/lib/${java_system_arch}/libt2k.so
+		/opt/${P}/jre/lib/${java_system_arch}/libunpack.so
+		/opt/${P}/jre/lib/${java_system_arch}/libverify.so
+		/opt/${P}/jre/lib/${java_system_arch}/libzip.so
+		/opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so
+		/opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so
+		/opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so"
+done
-- 
cgit v1.2.3-65-gdbad