Version bump, bug #431692. Version 1.7.0.5 is no longer officially available...

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

4 files changed, 46 insertions, 741 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 22b54858d473..2bb03f0b6801 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.20 2012/07/23 15:52:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.21 2012/08/19 17:59:31 caster Exp $
+
+*oracle-jdk-bin-1.7.0.6 (19 Aug 2012)
+
+  19 Aug 2012; Vlastimil Babka <caster@gentoo.org>
+  -oracle-jdk-bin-1.7.0.3.ebuild, -oracle-jdk-bin-1.7.0.4.ebuild,
+  -oracle-jdk-bin-1.7.0.5.ebuild, +oracle-jdk-bin-1.7.0.6.ebuild:
+  Version bump, bug #431692. Version 1.7.0.5 is no longer officially
+  available...
 
 *oracle-jdk-bin-1.7.0.5-r2 (23 Jul 2012)
 
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.3.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.3.ebuild
deleted file mode 100644
index 5b52c5b2baff..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.3.ebuild
+++ /dev/null
@@ -1,351 +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.3.ebuild,v 1.3 2012/05/05 15:08:57 sera 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/jdk-7u3-download-1501626.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}"
-
-X86_AT="jdk-${MY_PV}-linux-i586.tar.gz"
-AMD64_AT="jdk-${MY_PV}-linux-x64.tar.gz"
-SOL_X86_AT="jdk-${MY_PV}-solaris-i586.tar.gz"
-SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.tar.gz"
-SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.tar.gz"
-SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-
-X86_DEMOS="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-AMD64_DEMOS="jdk-${MY_PV}-linux-x64-demos.tar.gz"
-SOL_X86_DEMOS="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
-SOL_AMD64_DEMOS="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-SOL_SPARC_DEMOS="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
-SOL_SPARCv9_DEMOS="jdk-${MY_PV}-solaris-sparcv9-demos.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="
-	x86? (
-		${X86_AT}
-		examples? (
-			${X86_DEMOS}
-		)
-	)
-	amd64? (
-		${AMD64_AT}
-		examples? (
-			${AMD64_DEMOS}
-		)
-	)
-	x86-solaris? (
-		${SOL_X86_AT}
-		examples? (
-			${SOL_X86_DEMOS}
-		)
-	)
-	x64-solaris? (
-		${SOL_X86_AT} ${SOL_AMD64_AT}
-		examples? (
-			${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS}
-		)
-	)
-	sparc-solaris? (
-		${SOL_SPARC_AT}
-		examples? (
-			${SOL_SPARC_DEMOS}
-		)
-	)
-	sparc64-solaris? (
-		${SOL_SPARC_AT} ${SOL_SPARCv9_AT}
-		examples? (
-			${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS}
-		)
-	)
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.7"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X alsa derby doc examples jce nsplugin +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 )
-	!prefix? ( sys-libs/glibc )"
-DEPEND="
-	jce? ( app-arch/unzip )"
-
-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
-
-	if use x86; then
-		DEMOS=${X86_DEMOS}
-	elif use amd64; then
-		DEMOS=${AMD64_DEMOS}
-	elif use x86-solaris; then
-		DEMOS=${SOL_X86_DEMOS}
-	elif use x64-solaris; then
-		DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
-	elif use sparc-solaris; then
-		DEMOS=${SOL_SPARC_AT}
-	elif use sparc64-solaris; then
-		DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
-	fi
-
-	einfo "Please download ${AT} from:"
-	einfo "${JDK_URI}"
-	einfo "and move it to ${DISTDIR}"
-
-	if use examples; then
-		einfo "Also download ${DEMOS} from:"
-		einfo "${JDK_URI}"
-		einfo "and move it to ${DISTDIR}"
-	fi
-
-	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 x86; 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() {
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; 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 x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
-			{,jre/}lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir /opt/${P}
-	cp -pPR bin include jre lib man "${ED}"/opt/${P} || die
-
-	if use derby; then
-		cp -pPR db "${ED}"/opt/${P} || die
-	fi
-
-	if use examples; then
-		cp -pPR demo sample "${ED}"/opt/${P} || die
-	fi
-
-	# Remove empty dirs we might have copied
-	rmdir -v $(find "${D}" -type d -empty) || die
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	if use jce; then
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/US_export_policy.jar
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			/opt/${P}/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
-	fi
-
-	if use source; then
-		cp src.zip "${ED}"/opt/${P} || 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
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/jre/lib/
-	doins "${T}"/fontconfig.properties
-
-	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/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}/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}/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}/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}/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/oracle-jdk-bin/oracle-jdk-bin-1.7.0.4.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.4.ebuild
deleted file mode 100644
index 70649b09ae32..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.4.ebuild
+++ /dev/null
@@ -1,364 +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.4.ebuild,v 1.1 2012/05/05 19:25:15 sera 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/jdk-7u4-downloads-1591156.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}"
-
-X86_AT="jdk-${MY_PV}-linux-i586.tar.gz"
-AMD64_AT="jdk-${MY_PV}-linux-x64.tar.gz"
-SOL_X86_AT="jdk-${MY_PV}-solaris-i586.tar.gz"
-SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.tar.gz"
-SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.tar.gz"
-SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-
-X86_DEMOS="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-AMD64_DEMOS="jdk-${MY_PV}-linux-x64-demos.tar.gz"
-SOL_X86_DEMOS="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
-SOL_AMD64_DEMOS="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-SOL_SPARC_DEMOS="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
-SOL_SPARCv9_DEMOS="jdk-${MY_PV}-solaris-sparcv9-demos.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="
-	x86? (
-		${X86_AT}
-		examples? (
-			${X86_DEMOS}
-		)
-	)
-	amd64? (
-		${AMD64_AT}
-		examples? (
-			${AMD64_DEMOS}
-		)
-	)
-	x86-solaris? (
-		${SOL_X86_AT}
-		examples? (
-			${SOL_X86_DEMOS}
-		)
-	)
-	x64-solaris? (
-		${SOL_X86_AT} ${SOL_AMD64_AT}
-		examples? (
-			${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS}
-		)
-	)
-	sparc-solaris? (
-		${SOL_SPARC_AT}
-		examples? (
-			${SOL_SPARC_DEMOS}
-		)
-	)
-	sparc64-solaris? (
-		${SOL_SPARC_AT} ${SOL_SPARCv9_AT}
-		examples? (
-			${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS}
-		)
-	)
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X alsa derby doc examples jce nsplugin +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 )
-	!prefix? ( sys-libs/glibc )"
-DEPEND="
-	jce? ( app-arch/unzip )"
-
-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
-
-	if use x86; then
-		DEMOS=${X86_DEMOS}
-	elif use amd64; then
-		DEMOS=${AMD64_DEMOS}
-	elif use x86-solaris; then
-		DEMOS=${SOL_X86_DEMOS}
-	elif use x64-solaris; then
-		DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
-	elif use sparc-solaris; then
-		DEMOS=${SOL_SPARC_AT}
-	elif use sparc64-solaris; then
-		DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
-	fi
-
-	einfo "Please download ${AT} from:"
-	einfo "${JDK_URI}"
-	einfo "and move it to ${DISTDIR}"
-
-	if use examples; then
-		einfo "Also download ${DEMOS} from:"
-		einfo "${JDK_URI}"
-		einfo "and move it to ${DISTDIR}"
-	fi
-
-	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 x86; 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() {
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; 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 x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
-			{,jre/}lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir /opt/${P}
-	cp -pPR bin include jre lib man "${ED}"/opt/${P} || die
-
-	if use derby; then
-		cp -pPR db "${ED}"/opt/${P} || die
-	fi
-
-	if use examples; then
-		cp -pPR demo sample "${ED}"/opt/${P} || die
-	fi
-
-	# Remove empty dirs we might have copied
-	rmdir -v $(find "${D}" -type d -empty) || die
-
-	dodoc COPYRIGHT
-	dohtml README.html
-
-	if use jce; then
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/US_export_policy.jar
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			/opt/${P}/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
-	fi
-
-	if use source; then
-		cp src.zip "${ED}"/opt/${P} || 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
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/jre/lib/
-	doins "${T}"/fontconfig.properties
-
-	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/oracle-jdk-bin/oracle-jdk-bin-1.7.0.5.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.6.ebuild
index b333a79f9e41..8467d9bbe161 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.5.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.6.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.2 2012/07/09 07:14:37 jdhore Exp $
+# $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"
 
@@ -48,11 +48,11 @@ SRC_URI="
 		examples? ( ${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS} ) )
 	jce? ( ${JCE_FILE} )"
 
-LICENSE="Oracle-BCLA-JavaSE"
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.7"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-IUSE="X alsa derby doc examples jce nsplugin +source"
+IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel +source"
 RESTRICT="fetch strip"
 
 RDEPEND="
@@ -65,9 +65,13 @@ RDEPEND="
 	)
 	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 )"
+	jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
 
 S="${WORKDIR}/jdk${S_PV}"
 
@@ -141,6 +145,9 @@ src_compile() {
 }
 
 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 x86; then
@@ -156,15 +163,15 @@ src_install() {
 			{,jre/}lib/${arch}/libjavaplugin_jni.so
 	fi
 
-	dodir /opt/${P}
-	cp -pPR bin include jre lib man "${ED}"/opt/${P} || die
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
 
 	if use derby; then
-		cp -pPR db "${ED}"/opt/${P} || die
+		cp -pPR db "${ddest}" || die
 	fi
 
 	if use examples; then
-		cp -pPR demo sample "${ED}"/opt/${P} || die
+		cp -pPR demo sample "${ddest}" || die
 	fi
 
 	# Remove empty dirs we might have copied
@@ -174,23 +181,23 @@ src_install() {
 	dohtml README.html
 
 	if use jce; then
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${ED}"/opt/${P}/jre/lib/security/strong-jce || die
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/US_export_policy.jar
-		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			/opt/${P}/jre/lib/security/local_policy.jar
+		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 /opt/${P}/jre/lib/${arch}/libnpjp2.so
+		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
 	fi
 
 	if use source; then
-		cp src.zip "${ED}"/opt/${P} || die
+		cp src.zip "${ddest}" || die
 	fi
 
 	# Install desktop file for the Java Control Panel.
@@ -205,11 +212,16 @@ src_install() {
 		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
 	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
 
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/jre/lib/
-	doins "${T}"/fontconfig.properties
+	# 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