Version bump.

Package-Manager: portage-2.1.5_rc4

3 files changed, 110 insertions, 2 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 0553402b0aa2..41f428ba8147 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.51 2008/03/28 23:21:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.52 2008/04/19 11:38:18 caster Exp $
+
+*emul-linux-x86-java-1.6.0.06 (19 Apr 2008)
+
+  19 Apr 2008; Vlastimil Babka <caster@gentoo.org>
+  +emul-linux-x86-java-1.6.0.06.ebuild:
+  Version bump.
 
   28 Mar 2008; Vlastimil Babka <caster@gentoo.org>
   emul-linux-x86-java-1.5.0.15.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 9b83b55b923a..99d831bd077a 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -6,9 +6,11 @@ AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53
 DIST j2re-1_4_2_17-linux-i586.bin 14376647 RMD160 62de02a90f67d8965cebc563636d688f6745b7ca SHA1 a4282ea13048c76274222476abfb0954d42c35b8 SHA256 18aa1f5a4b223d3858d1d75913bb036963be4a9bb9b9bdc38ae2b714e1408654
 DIST jdk-5.0u15-dlj-linux-i586.bin 49670009 RMD160 b7fcb7e92c91cf4ef428a434c35c400832d08f8d SHA1 e52af3bc81f268d73a94772428d612769473834b SHA256 b4b340f86e3c8f3bb2f9fa1762f1c3f428cee1efc658c4fb8793f5cf299b2ad5
 DIST jdk-6u5-dlj-linux-i586.bin 70537386 RMD160 bd1bd2a6601b7e972c9c5f3e1cce4ce7d408b055 SHA1 ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542 SHA256 b0f78f2e6baf88c1d7dc9334c6b86e621b2c9d629f5617f3f57a3bd7cbad0c99
+DIST jdk-6u6-dlj-linux-i586.bin 70547201 RMD160 a24417210333fd7f16ee844c010f27d1460b1064 SHA1 a14c3003425b99ca2b89ebf7a82a8a33b0139894 SHA256 35ad958d88ed2af892c3879c815988bfae7775dd484e920186d1f8ad02a2c076
 EBUILD emul-linux-x86-java-1.4.2.17.ebuild 3534 RMD160 402ad696adc182da8a0a6a5312d9c000fd3034ca SHA1 234c0ab544dc5ba0a8974cd0c78ae9f153de6404 SHA256 63bbbe4a5db8be5578cd7d8a1839ffc97cd70d9a746da4c53b96b587a62e91e4
 EBUILD emul-linux-x86-java-1.5.0.15.ebuild 2838 RMD160 c68950a54fe2acd42e869ee6612a63958abfd8f7 SHA1 a0b373f0af7ca666c4d3925a57d57cc040730223 SHA256 35829ec438765b2ddb42fbb66579f6eaeec87a9bdb769db423965a61613c3506
 EBUILD emul-linux-x86-java-1.6.0.05-r1.ebuild 2844 RMD160 c378a4eb61dad6839aed544d4e6175a57f637a16 SHA1 44d9eab2dcfe91f6b5c57b1945b82afd1ed59731 SHA256 81000557dbd1c66ee8f24d0cb792f3fa85612371169345e6350e898997d6a41d
 EBUILD emul-linux-x86-java-1.6.0.05.ebuild 2685 RMD160 66e2518e36bf7973f748a4156ff0b58ced6273d2 SHA1 1cefe2490d3f0ce7f53c47f443a29d260249a1c2 SHA256 7a720d6b450faf79df29aa37fa81abbfb5ac49ff1dd8b24444e1855f6020cde5
-MISC ChangeLog 10558 RMD160 f9d404513cd019b9196bf133097c328c67d788f3 SHA1 218a0cbf230838fbbe874f481c2aa4f6d42e169b SHA256 2868efa142b1ab2e794b387df0a347317ea612b0c11864d3e6dac77bdbb2b31d
+EBUILD emul-linux-x86-java-1.6.0.06.ebuild 2841 RMD160 d6af47c1305ba794602c4f515569e7a4e077664b SHA1 f55bc2f4a5f8865b52711061b488ec7a591561eb SHA256 7fd97923f426d039fc42c5f4e6d8e177c0719be29fb3952d04e4f41cfce45e90
+MISC ChangeLog 10711 RMD160 45e9508e49fa0c32d6a84f7f1b8ce8ea92a55ea0 SHA1 f429ac8f16ed8220efdaf2563352fdd3b37e9046 SHA256 6e55eba2c15f173bded9131c01bfd97aceb5c11e17dbe5cba052cfdcdfb86faf
 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.06.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.06.ebuild
new file mode 100644
index 000000000000..99cfbe1fdf26
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.06.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 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.06.ebuild,v 1.1 2008/04/19 11:38:18 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="32bit version Sun's J2SE Development Kit"
+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"
+
+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
+	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
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	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."
+}