Version bump. Fixes security bug #178851. Depend on the emul-linux packages instead of the 64 bit packages for alsa and xlibs.

Package-Manager: portage-2.1.2.7

4 files changed, 125 insertions, 5 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 82f469c55732..49a98f64a474 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.26 2007/05/14 09:42:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.27 2007/06/02 16:41:18 betelgeuse Exp $
+
+*emul-linux-x86-java-1.6.0.1 (02 Jun 2007)
+
+  02 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +emul-linux-x86-java-1.6.0.1.ebuild:
+  Version bump. Fixes security bug #178851. Depend on the emul-linux
+  packages instead of the 64 bit packages for alsa and xlibs.
 
   14 May 2007; Vlastimil Babka <caster@gentoo.org>
   -emul-linux-x86-java-1.5.0.10.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 2e774718b2fb..8ced56b44a0b 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX construct-1.6.sh 6798 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 SHA1 014a26831f8f3cee9653d42cd194216cda2e1787 SHA256 32639949b003703e236257f3d2d3272659ab89c80b2819bdb552af2d5f3070d7
 MD5 7d7c11a7876fbf6faa240eba586f7793 files/construct-1.6.sh 6798
 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 files/construct-1.6.sh 6798
@@ -25,6 +28,7 @@ SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585 files/ja
 DIST j2re-1.4.2-03-linux-i586.bin 13541431 RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 SHA1 30b37bc8dcb5617971d2ae95e2f7227359d39991 SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef
 DIST jdk-1_5_0_11-dlj-linux-i586.bin 49598681 RMD160 74c5bd78450397006ea145580c3554d77b64a31d SHA1 965e4983da769b6c5d6ec79c942337bc8bee5c8a SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705
 DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467
+DIST jdk-6u1-dlj-linux-i586.sh 62818812 RMD160 2858ae3036db3315c6bbd2bd43cd05cf0af6e43e SHA1 1f35c785e810d3c0ff012c79c7ffa509eb01dae5 SHA256 1a49eaadcaf480c9eec4aa558ab7392e93b7c88b8f79f53be9a8fc03a6714ddc
 EBUILD emul-linux-x86-java-1.4.2.03-r2.ebuild 3149 RMD160 b5e0cd50d9cf33184e19e8b784dffef97263ce3b SHA1 e2dd29f4e49f2ed8fb92d453e675bb0b358c51b4 SHA256 aca891a5d3a66dde9012574993ba4ecfded64de5932eb803b3f2f9b37a116a58
 MD5 4db47caa79be0629b0f7bf551fff6a48 emul-linux-x86-java-1.4.2.03-r2.ebuild 3149
 RMD160 b5e0cd50d9cf33184e19e8b784dffef97263ce3b emul-linux-x86-java-1.4.2.03-r2.ebuild 3149
@@ -37,14 +41,18 @@ EBUILD emul-linux-x86-java-1.6.0-r1.ebuild 2860 RMD160 88c2159ece2fdd328ca0b7ae2
 MD5 47b14108a1d3cc32ba4c4508dd115252 emul-linux-x86-java-1.6.0-r1.ebuild 2860
 RMD160 88c2159ece2fdd328ca0b7ae2f2c64427a4a46e5 emul-linux-x86-java-1.6.0-r1.ebuild 2860
 SHA256 82681168a1460fa1e9c977418ef8dd10960897b48e89cd232047515d77f6561c emul-linux-x86-java-1.6.0-r1.ebuild 2860
+EBUILD emul-linux-x86-java-1.6.0.1.ebuild 2555 RMD160 a9ab9c22c09704ced739c4aa16a79d2745e2b707 SHA1 4b86448e35d9fcea2116c8c2fb8ee77605962ce3 SHA256 3c509707e76a683b324e78671675e55cc5657710ffee67e3fee760f5aa50144a
+MD5 5dc68a31b7958c6d9a9fe5489dbcb2f0 emul-linux-x86-java-1.6.0.1.ebuild 2555
+RMD160 a9ab9c22c09704ced739c4aa16a79d2745e2b707 emul-linux-x86-java-1.6.0.1.ebuild 2555
+SHA256 3c509707e76a683b324e78671675e55cc5657710ffee67e3fee760f5aa50144a emul-linux-x86-java-1.6.0.1.ebuild 2555
 EBUILD emul-linux-x86-java-1.6.0.ebuild 3714 RMD160 28c3092cc930ab5101d07f18ed579b069728c33a SHA1 461317c58e1b188d7b79933d2882af3e91fe81a7 SHA256 e9cd04ef4df8d93c3ac85d3705668c15c53589ecc9041646739db628cc4b6a72
 MD5 6a7c2c1b0bf52d52a3f5146f27c11aaa emul-linux-x86-java-1.6.0.ebuild 3714
 RMD160 28c3092cc930ab5101d07f18ed579b069728c33a emul-linux-x86-java-1.6.0.ebuild 3714
 SHA256 e9cd04ef4df8d93c3ac85d3705668c15c53589ecc9041646739db628cc4b6a72 emul-linux-x86-java-1.6.0.ebuild 3714
-MISC ChangeLog 5008 RMD160 85b603fbcaa71d712994e3151efc9613650849bc SHA1 113abd3f5644bab8fb711e3c76b3e3ed35c996b4 SHA256 dc62421eb6c44525e27f0338b8b679d23e30bbf0ffdf513c55642f37db73925d
-MD5 47431609d8c537bd66785729078219ee ChangeLog 5008
-RMD160 85b603fbcaa71d712994e3151efc9613650849bc ChangeLog 5008
-SHA256 dc62421eb6c44525e27f0338b8b679d23e30bbf0ffdf513c55642f37db73925d ChangeLog 5008
+MISC ChangeLog 5280 RMD160 b6f761bed182062f39e45f7e1b43eef47fa2bebc SHA1 1091141b58ff39e706110425cc019571d4aa61ac SHA256 8ff00f51585873e373902f920c0a09d503d828c5a9df8f5cda018c3dfecaa25b
+MD5 8fa8ad6ee582d4920b132cf44028561d ChangeLog 5280
+RMD160 b6f761bed182062f39e45f7e1b43eef47fa2bebc ChangeLog 5280
+SHA256 8ff00f51585873e373902f920c0a09d503d828c5a9df8f5cda018c3dfecaa25b ChangeLog 5280
 MISC metadata.xml 242 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 SHA1 fd426af5f6d4efa0adf65aded927fd242e6fdf26 SHA256 df247383374651f561e9833633c2d533fe78ede8430186e2017e6f54452afaa4
 MD5 6d8e6f3e73af8b455f7cc0ecbdfc7015 metadata.xml 242
 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 metadata.xml 242
@@ -61,3 +69,13 @@ SHA256 7bfbfcb961d132341e65eaf06b2fbf36ed8d1387b0fbaa35f160ffc2fb217abe files/di
 MD5 35eac157f9b69bbbd07333c5a6a3f922 files/digest-emul-linux-x86-java-1.6.0-r1 259
 RMD160 1451526c43309c014d81ea9645251f568208a9b5 files/digest-emul-linux-x86-java-1.6.0-r1 259
 SHA256 7bfbfcb961d132341e65eaf06b2fbf36ed8d1387b0fbaa35f160ffc2fb217abe files/digest-emul-linux-x86-java-1.6.0-r1 259
+MD5 dc843f7bd8eea4347b7d2890eb5083f3 files/digest-emul-linux-x86-java-1.6.0.1 262
+RMD160 2a0369e312bf55ddb61e2e2d46c249e26face9f5 files/digest-emul-linux-x86-java-1.6.0.1 262
+SHA256 fe1e16a4b9463816e66b784e86c765b5d82f820be11867939e78daf7fc49a1b9 files/digest-emul-linux-x86-java-1.6.0.1 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGYZ23cxLzpIGCsLQRAvPOAJ9jo2dh8l1q7T5PWMDIHyvDVDk5ZgCfe4Kd
+rDTWaztEZRJyqoqqGxWBuOQ=
+=h7kV
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.1.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.1.ebuild
new file mode 100644
index 000000000000..f182cc9598a9
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.1.ebuild
@@ -0,0 +1,92 @@
+# 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.1.ebuild,v 1.1 2007/06/02 16:41:18 betelgeuse Exp $
+
+inherit versionator pax-utils java-vm-2 eutils
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+At="jdk-${MY_PV}-dlj-linux-i586.sh"
+DESCRIPTION="32bit version Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.6.0/"
+SRC_URI="http://download.java.net/dlj/binaries/${At}"
+
+SLOT="1.6"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64"
+RESTRICT="nostrip"
+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"
+
+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="virtual/x11 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.1 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.1
new file mode 100644
index 000000000000..aa5cf338b6c6
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.1
@@ -0,0 +1,3 @@
+MD5 644a588f1ea9417fbf23b3e5505bbf8c jdk-6u1-dlj-linux-i586.sh 62818812
+RMD160 2858ae3036db3315c6bbd2bd43cd05cf0af6e43e jdk-6u1-dlj-linux-i586.sh 62818812
+SHA256 1a49eaadcaf480c9eec4aa558ab7392e93b7c88b8f79f53be9a8fc03a6714ddc jdk-6u1-dlj-linux-i586.sh 62818812