Add dependency on app-emulation/emul-linux-x86-compat for Java Web Start.

Package-Manager: portage-2.1.4

3 files changed, 111 insertions, 3 deletions

diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 6e58b68499ed..1667e409156a 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -28,6 +28,7 @@ SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585 files/ja
 DIST j2re-1_4_2_16-linux-i586.bin 14388621 RMD160 46885501b413a73a08f50695c335e11291389376 SHA1 7abc5f9354bc00109766f8f6302e39c4da938bcb SHA256 9293d00a35b31e7f78f6338ead3a811d2732290b90a3711814ee64cea5842045
 DIST jdk-1_5_0_13-dlj-linux-i586.bin 49672592 RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed SHA1 a025d81df269ed6ce663a34f52e5f0ea2a462bf2 SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0
 DIST jdk-6u3-dlj-linux-i586.bin 68613151 RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c SHA1 86ba73cdcc2c22782a04b8191f157a5ac7caa490 SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b
+DIST jdk-6u4-dlj-linux-i586.bin 70455896 RMD160 3300edb3fb5e3ac4e32781ee7bc8cc6273b7c76d SHA1 24601838ae7216cbc5d75170b6aebf5e4012dec1 SHA256 955186f497a50106cd1788fcaf032eedc560985826c8a6c3cb7ab43220cad23c
 EBUILD emul-linux-x86-java-1.4.2.16.ebuild 3769 RMD160 7a3507a376ce676b9a5fff849bc2bdebead25caf SHA1 9ba38f1e8b0b755d108597fc2cd159ce81ae8e7c SHA256 6fc5a292379bafb258675280bf776cdec26b2e247681172df38b611577cd540a
 MD5 df3a59c2421df89b4d4ff5b1e57cf41a emul-linux-x86-java-1.4.2.16.ebuild 3769
 RMD160 7a3507a376ce676b9a5fff849bc2bdebead25caf emul-linux-x86-java-1.4.2.16.ebuild 3769
@@ -40,6 +41,10 @@ EBUILD emul-linux-x86-java-1.6.0.03.ebuild 2685 RMD160 762b2560025c42c000f238faa
 MD5 5dd6a78054509107a99d55b3650c4742 emul-linux-x86-java-1.6.0.03.ebuild 2685
 RMD160 762b2560025c42c000f238faa88cfbd4d6989a15 emul-linux-x86-java-1.6.0.03.ebuild 2685
 SHA256 9cd0604f86dc6502afc35128e548387ba8745bd95f26e9766d67982ce54fcb6f emul-linux-x86-java-1.6.0.03.ebuild 2685
+EBUILD emul-linux-x86-java-1.6.0.04.ebuild 2686 RMD160 bb7111041a318706635655adefdefd51e1c1aed2 SHA1 108bea8082d06f38af0368feb6a935dd48266534 SHA256 1d03023a645676915c2316fc4ac4705e243e5c5022f7691e0d41acafa4f46c4a
+MD5 4cc247b2adaf48578b99d78d4767e837 emul-linux-x86-java-1.6.0.04.ebuild 2686
+RMD160 bb7111041a318706635655adefdefd51e1c1aed2 emul-linux-x86-java-1.6.0.04.ebuild 2686
+SHA256 1d03023a645676915c2316fc4ac4705e243e5c5022f7691e0d41acafa4f46c4a emul-linux-x86-java-1.6.0.04.ebuild 2686
 MISC ChangeLog 9136 RMD160 f90c0ce4b878a75ebbe09db641030b9931411411 SHA1 2f666e16606a659ccb3a7e93354a38a5a49c6719 SHA256 e52e51b81f429ab93ee640e005077bbc5ed9280f15d1c9a3e9896be3f8dadf15
 MD5 5eadf096cd00422db9bca83536e961a4 ChangeLog 9136
 RMD160 f90c0ce4b878a75ebbe09db641030b9931411411 ChangeLog 9136
@@ -57,10 +62,13 @@ SHA256 64d81a18e9672595ef8fdbdd4e9123083b8831d3142e060e87b3861b3fdf65fc files/di
 MD5 cc80cebc2acd7f33a0b03e523bbfda2d files/digest-emul-linux-x86-java-1.6.0.03 265
 RMD160 67439e1f6b5c6ba8932fc1565f34c3fefdd6dace files/digest-emul-linux-x86-java-1.6.0.03 265
 SHA256 9de00bbf3a63d22b98592407b2cb73646beff9f4004257517ed27256bbede581 files/digest-emul-linux-x86-java-1.6.0.03 265
+MD5 6fc6d48cb5164b8984ee41ca1a92380b files/digest-emul-linux-x86-java-1.6.0.04 265
+RMD160 a26937edb0c0d732fb28a81d03c05fa6599b4236 files/digest-emul-linux-x86-java-1.6.0.04 265
+SHA256 ff2db63af17b1c7fea89099f575fb0bb7bded48b36b994262be677845149f98e files/digest-emul-linux-x86-java-1.6.0.04 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHWf85cxLzpIGCsLQRAj67AJ9cjNwpjzUrp5aJqkYC80zm+fGpAwCeL5Lm
-4tXeIAtfOMDhyyUiezVRfJ4=
-=UohX
+iD8DBQFHnMNCcxLzpIGCsLQRAjFKAJ9pzXP3Q0GRhdRD2RGle/tTEJmG4ACgk3jb
+z6Rl+DoKaaNEr4ASW3fTtUk=
+=DSxQ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.04.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.04.ebuild
new file mode 100644
index 000000000000..d62c9544f0dc
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.04.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2007 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.04.ebuild,v 1.1 2008/01/27 17:45:24 betelgeuse 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() {
+	if [[ ! -r ${DISTDIR}/${A} ]]; then
+		die "cannot read ${DISTDIR}/${A}. Please check the permission and try again."
+	fi
+
+	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"
+
+	"${S}"/bin/java -client -Xshare:dump
+}
+
+src_install() {
+	local dirs="bin lib man javaws plugin"
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
+
+	pax-mark m $(list-paxables "${D}"/opt/${P}/bin/*)
+
+	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."
+}
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.04 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.04
new file mode 100644
index 000000000000..3c572f3deffa
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.04
@@ -0,0 +1,3 @@
+MD5 d5bba61ea1e0b76090b855ff49ec1d6a jdk-6u4-dlj-linux-i586.bin 70455896
+RMD160 3300edb3fb5e3ac4e32781ee7bc8cc6273b7c76d jdk-6u4-dlj-linux-i586.bin 70455896
+SHA256 955186f497a50106cd1788fcaf032eedc560985826c8a6c3cb7ab43220cad23c jdk-6u4-dlj-linux-i586.bin 70455896