Revbump to make the LDPATH variable useful for building JNI libraries (as used by lwjgl) instead of the bogus directories in java.library.path.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

4 files changed, 178 insertions, 5 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 012ce86c0639..fede26e25e08 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.5 2011/11/12 14:09:22 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.6 2011/11/17 22:49:56 caster Exp $
+
+*oracle-jdk-bin-1.7.0.1-r2 (17 Nov 2011)
+
+  17 Nov 2011; Vlastimil Babka <caster@gentoo.org>
+  +oracle-jdk-bin-1.7.0.1-r2.ebuild, files/oracle-jdk-bin-1.7.env:
+  Revbump to make the LDPATH variable useful for building JNI libraries (as
+  used by lwjgl) instead of the bogus directories in java.library.path.
 
   12 Nov 2011; Ralph Sennhauser <sera@gentoo.org> -oracle-jdk-bin-1.7.0.ebuild,
   -oracle-jdk-bin-1.7.0.1.ebuild:
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 91bdd491165f..0802a28acc21 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,8 +1,9 @@
 AUX fontconfig.Gentoo.properties 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
-AUX oracle-jdk-bin-1.7.env 1075 RMD160 41d907b09f7607d7bb41090aeba3709288392951 SHA1 7d32eec42464d0a869a63432b6c7d5cb6bb09064 SHA256 216a629d271095f87501a0872288b5da994796717097e3d9e6a6ecc2c00621eb
+AUX oracle-jdk-bin-1.7.env 1000 RMD160 9067112ce8a31b450755ce6bbcdd1b24d5307e12 SHA1 66d5a3df445baded9d2b16fc7f24d8fcb1c340bd SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f
 DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
 DIST jdk-7u1-linux-i586.tar.gz 96648208 RMD160 7a48b5ed92c34f3253e8a87e5ee53580a8e83736 SHA1 e581d977bdb8f2f7608d48b307ab3174a55f8f48 SHA256 acbfb8912a287facbee02ff138d94457aabab409b2f1d15855714ec9608a6cd4
 DIST jdk-7u1-linux-x64.tar.gz 94972183 RMD160 fc2efecd251ec552530ad57888cbdce163e009e6 SHA1 21ef2964df4575f1e5e935205700d06ee70f33b3 SHA256 f88070cfe7fe5ed60dfda7729cf9dd110b77840e2ca8cd14a86d5d2274b09c9c
 EBUILD oracle-jdk-bin-1.7.0.1-r1.ebuild 4838 RMD160 449dfe71f63badf64fc53540f39a871e921d1de2 SHA1 216fd012e9fc3a5f68afb8500a12a2ab6a0c55ad SHA256 7b59fd91d1170fab63ac69faf2fc380e29c1531c4c7a23372567f82c8b5770bc
-MISC ChangeLog 1200 RMD160 2aa82f841a5fdc5fe3dc2c50ed2f01ae82fa487f SHA1 f3a450de2b1d73571bce6a08ddf9bf8c73c536d0 SHA256 a089e6d28e06d2e75e66b3e41bcddc1a6518121f1a48611e3ab8a6a81995b8c5
+EBUILD oracle-jdk-bin-1.7.0.1-r2.ebuild 4840 RMD160 9bd276a1db625fc02d3892b9bf9d631b8155f953 SHA1 cecd1643cb0e692eb016af38c249a9a6afd02bc8 SHA256 5583c416ab99e4a8120ce1e5186501a2deaf9db8d39047819266caff07e2c325
+MISC ChangeLog 1511 RMD160 f48e7ac1be6240afc35e1c46151aff2f729b7b4d SHA1 f9709c8817cca9cfbd8c4c62e47bd40afb583e14 SHA256 c1dcfb03d588928599c10bdad00fa5b58d850416822203ea560919e310ba69b9
 MISC metadata.xml 447 RMD160 7d545e68fa24d3775c670d42dc2fae9a125f64a0 SHA1 be889d874ad2ab4f6a4be68ed2a33909c03ed1a2 SHA256 7f8266bbb1afdd6dcd6361bca86fc8178ce623c042a3eac3835bcbf03b6b9232
diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env
index 35359cbd7bb7..4b4091b5d3e9 100644
--- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env,v 1.1 2011/09/08 07:28:32 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env,v 1.2 2011/11/17 22:49:56 caster Exp $
 
 VERSION="Oracle JDK @PV@"
 JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
@@ -8,7 +8,7 @@ JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
 JAVAC=${JAVA_HOME}/bin/javac
 PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
 ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="@GENTOO_PORTAGE_EPREFIX@/usr/java/packages/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib64:@GENTOO_PORTAGE_EPREFIX@/lib64:@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
+LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
 MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.7"
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild
new file mode 100644
index 000000000000..58f917d73d04
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2011 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.1-r2.ebuild,v 1.1 2011/11/17 22:49:56 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils pax-utils prefix versionator
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+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"
+
+# check the URIs when bumping, no idea about their stability yet
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u1-download-513651.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+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} )
+	amd64? ( ${AMD64_AT} )
+	jce? ( ${JCE_FILE} )"
+SLOT="1.7"
+LICENSE="Oracle-BCLA-JavaSE"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch strip"
+IUSE="X alsa derby doc examples jce nsplugin"
+
+QA_TEXTRELS_x86="
+	opt/${P}/jre/lib/i386/client/libjvm.so
+	opt/${P}/jre/lib/i386/server/libjvm.so"
+
+DEPEND="jce? ( app-arch/unzip )"
+RDEPEND="${DEPEND}
+	doc? ( dev-java/java-sdk-docs:1.7 )
+	!prefix? ( sys-libs/glibc )
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)"
+
+S="${WORKDIR}/jdk${S_PV}"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_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() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This needs to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	if use x86; then
+		"${S}"/bin/java -client -Xshare:dump || die
+	fi
+	"${S}"/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 src.zip "${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/
+		dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			/opt/${P}/jre/lib/security/
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
+	# name to prevent file collision with jre and or other slots.
+	[[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die
+	sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT}/" \
+		-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
+		"${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \
+		"${T}"/${VMHANDLE}.desktop
+
+	domenu "${T}"/${VMHANDLE}.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
+}