Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 120 insertions, 2 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 4e5fcff91858..25f935ddf030 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.70 2009/05/29 20:34:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.71 2009/05/31 11:26:36 caster Exp $
+
+*emul-linux-x86-java-1.6.0.14 (31 May 2009)
+
+  31 May 2009; Vlastimil Babka <caster@gentoo.org>
+  +emul-linux-x86-java-1.6.0.14.ebuild:
+  Version bump.
 
   29 May 2009; Vlastimil Babka <caster@gentoo.org>
   emul-linux-x86-java-1.4.2.19.ebuild, -emul-linux-x86-java-1.5.0.17.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index f3828d780264..e830c17ff1bc 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -6,8 +6,10 @@ AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53
 DIST j2re-1_4_2_19-linux-i586.bin 14384815 RMD160 54b15f0ea03c7cb7e35b91fe8a6269e21a0d39b2 SHA1 7b230633bf6eaf3581f69d668542431c5833184a SHA256 d1d2f7cd9f0cddee9f65a0d093a0718faceb4b013b0658a92457512f84c8e973
 DIST jdk-5.0u18-dlj-linux-i586.bin 49702576 RMD160 be719b111ce24d5a14b0ed8ad26a9335283866f7 SHA1 2be236e00cf95a7ba1d2a48156eecd6bd367445d SHA256 460dd267a532d9965e65aec8be8288870ff4aadc0cabe331dd4a1d4c058c53be
 DIST jdk-6u13-dlj-linux-i586.bin 80161911 RMD160 8167ed89d38722577547d4f46f5fa06cf07fedf3 SHA1 ef9177f519ad03669921876fd711c1c02f306abf SHA256 a07d48549bb48becf7a1185b2ce908797a9dcfcc834ff111e8b6d9ad19ce60d7
+DIST jdk-6u14-dlj-linux-i586.bin 81803297 RMD160 db35274bd08422f97f454dbcadb79abdc9e4ab13 SHA1 ce7fcdeb9275820b98a54ecf7a44ed30557b8233 SHA256 08ff9c6a89da117f7e6eabcc21da36900fab56a4fb9b4e8ff5cb3c267b4ec0a0
 EBUILD emul-linux-x86-java-1.4.2.19.ebuild 3574 RMD160 388fe86f06cf787092edf09423952728bb0bd90c SHA1 f7e4b280906c26a3d4b313443781ea9d8700ebe5 SHA256 7c1c2cc940a58ce0daafa531a17b8e70c880b9eaf4e8bac5992b43d80436a983
 EBUILD emul-linux-x86-java-1.5.0.18.ebuild 2887 RMD160 368079fcc2bd06fc6ee61a4ec8e4df1da0f9c968 SHA1 a2ba000eaae67fe57e7771c4095c66205ce47c95 SHA256 302cc31d503db45f1f745db582b1ccce5b1a323b75bbe7bd9ad21081f05b829c
 EBUILD emul-linux-x86-java-1.6.0.13.ebuild 3246 RMD160 3bf47aa3bb202e4d21cab7e5b90a7305daeb7b0e SHA1 4da69cf51cb414a4aedda6791169627a95eb685e SHA256 242c2f6252f129e2918ea90b822ce64fdd5b13a08b1984dae3aaad6d89a32f05
-MISC ChangeLog 14823 RMD160 a3523cef6f096a2c912c1531d015fe86b439a30f SHA1 a93c0e3ec323515cbada0d5a8895412a541bd77b SHA256 c8de649be2dac33550f935757e6bee286e420a51059eb2b43ac836bf812c73b0
+EBUILD emul-linux-x86-java-1.6.0.14.ebuild 3247 RMD160 fda86bdc97891d18536e6125b9ee354a7d160e73 SHA1 35519b1e7ef93b499df7cd5f947b877fbdc84125 SHA256 dcc16abe98be2473b102f4f0ba5a6d2524de1122f73b42274c7b5aa9c54e479a
+MISC ChangeLog 14976 RMD160 274f68c86b653b5076cc58c1f9b5a2b2150d7947 SHA1 31638e33af5c4988d3a99e81ca9de8c00d54c4ef SHA256 b28a930023426f23d467705c426f0d8edb841e62ad818172c3e7fd32250182b8
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.14.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.14.ebuild
new file mode 100644
index 000000000000..78052e09d3c7
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.14.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.14.ebuild,v 1.1 2009/05/31 11:26:36 caster Exp $
+
+inherit versionator pax-utils java-vm-2 eutils
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+
+At="jdk-${MY_PV}-dlj-linux-i586.bin"
+DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
+HOMEPAGE="http://java.sun.com/javase/6/"
+#SRC_URI="http://download.java.net/dlj/binaries/${At}"
+SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
+
+SLOT="1.6"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64"
+RESTRICT="strip"
+IUSE="X alsa nsplugin"
+
+JAVA_VM_NO_GENERATION1=true
+
+RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
+	X? ( app-emulation/emul-linux-x86-xlibs )
+	app-emulation/emul-linux-x86-compat"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so
+	opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/server/libjvm.so"
+QA_DT_HASH="opt/${P}/.*"
+
+src_unpack() {
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This has to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"/bin/*)
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	"${S}"/bin/java -client -Xshare:dump || die
+	"${S}"/bin/java -server -Xshare:dump || die
+}
+
+src_install() {
+	local dirs="bin lib man javaws plugin"
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
+
+	dodoc README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
+	dodir /opt/${P}/share/
+
+	if use nsplugin; then
+		local plugin_dir="ns7-gcc29"
+		if has_version '>=sys-devel/gcc-3' ; then
+			plugin_dir="ns7"
+		fi
+
+		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
+	fi
+
+	# FIXME figure out how to handle the control pannel conflict with
+	# sun-jdk-bin
+
+	# install control panel for Gnome/KDE
+#	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+#		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+#		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
+#		${T}/sun_java-${SLOT}.desktop
+
+#	domenu ${T}/sun_java-${SLOT}.desktop
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	elog
+	elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
+	elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
+	ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
+	elog "For more info see https://jdk6.dev.java.net/plugin2/"
+	elog
+
+	if ! use X; then
+		local xwarn="X11 libraries and/or"
+	fi
+
+	echo
+	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
+}