Version bump.

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

3 files changed, 119 insertions, 2 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 4b1f238f3911..6f61c4a4fe5e 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.82 2010/01/02 10:48:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.83 2010/01/21 12:59:14 caster Exp $
+
+*emul-linux-x86-java-1.6.0.18 (21 Jan 2010)
+
+  21 Jan 2010; Vlastimil Babka <caster@gentoo.org>
+  +emul-linux-x86-java-1.6.0.18.ebuild:
+  Version bump.
 
   02 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-java-1.6.0.17.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 7cc37a87cff2..5e12e99ebf67 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -4,7 +4,9 @@ AUX emul-linux-x86-java-1.5.env 855 RMD160 e9ce4d40ee6a8bd9b0720e00838c399d5f3fd
 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df
 DIST jdk-5.0u22-dlj-linux-i586.bin 49782555 RMD160 f015e1502b357cccd45695a5c4bc41ba113d3a30 SHA1 611e56dd3dc0e25b286c374c60b56b5e76569fb2 SHA256 1c2e853b60e408176ec924e717fb7ec7953a9dddbfc397de91536e9084cf9e46
 DIST jdk-6u17-dlj-linux-i586.bin 81824577 RMD160 07ad522edd80e19e71152e37544128ddd600c42c SHA1 bca59cb275f37b492e69ceecbda75a573d94b553 SHA256 4ba74424271670cc65405d6ab9a5480cb299ce9fb19c800096ce012d7d662b2e
+DIST jdk-6u18-dlj-linux-i586.bin 84770500 RMD160 3c4f611e0593f6edb45f04399d9d049fae54359d SHA1 f7d0cefd581f523ac96ca99eb54ba4116fa29e0a SHA256 1097aa37004163878f61b3522fe7d13bdf7e1f10796fc43022011d4c5f4092bb
 EBUILD emul-linux-x86-java-1.5.0.22.ebuild 2887 RMD160 267a614a7019011b8f5e79d4d0cf348850dafb59 SHA1 51a50bc055103d9e56bd73da20b7eace95869f9e SHA256 a01fbad958cf88a68281fbeac02ff9a9abcd35d424105f46cbbee60b293391b4
 EBUILD emul-linux-x86-java-1.6.0.17.ebuild 3212 RMD160 3cb179bb1888324aeed38048842f2cfddfad8673 SHA1 ef8fbf3f2e859d1c43effdf31090ccc7e468c6bd SHA256 45c5e062d2f33475b74da90f214b7499786a2c50669d30e55bd9b8ea112e9f1e
-MISC ChangeLog 16961 RMD160 ef851c8328f9cdbe12a3fa8be74d5e9077450c85 SHA1 4c59f3f68b30c6f0d979e379f5ff1c7ec832727c SHA256 85d5ee3b94c7cb95f55726f888c0e9c801140a813788b91403aebfbc15bfd97d
+EBUILD emul-linux-x86-java-1.6.0.18.ebuild 3210 RMD160 58e669c0e94c0065474118e0decee03c18cad4f5 SHA1 f3386f954a9f4f4d8681d9c31281962f8012941c SHA256 d9714af4245046b3ae7128bcdd72001f58fc6b693ced70659959db6a65b14694
+MISC ChangeLog 17111 RMD160 9d081c9b109ac3462c05c33fc8fcff0450c95622 SHA1 14078c9d413eac00fd7f25a0064eba3997df1ccd SHA256 6b8471f1e807849c6be9770c87b945103c3d6652848218f1d32d6bf05a2cc6f8
 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.18.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.18.ebuild
new file mode 100644
index 000000000000..9a807b9076dc
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.18.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 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.18.ebuild,v 1.1 2010/01/21 12:59:14 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 )"
+
+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."
+}