Version bump for bug #184407.

Package-Manager: portage-2.1.3_rc8

4 files changed, 121 insertions, 8 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 87634f610b49..46caed6f0fab 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.32 2007/07/02 13:54:09 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.33 2007/07/12 21:14:29 betelgeuse Exp $
+
+*emul-linux-x86-java-1.6.0.02 (12 Jul 2007)
+
+  12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +emul-linux-x86-java-1.6.0.02.ebuild:
+  Version bump for bug #184407.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   emul-linux-x86-java-1.4.2.03-r2.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index ce7cbef6b7f5..2913458f717b 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -30,6 +30,7 @@ DIST jdk-1_5_0_11-dlj-linux-i586.bin 49598681 RMD160 74c5bd78450397006ea145580c3
 DIST jdk-1_5_0_12-dlj-linux-i586.bin 49646174 RMD160 0865c93170fcf443c61a83660228cbc4a91523b9 SHA1 ff909ca469587ae132816868c5f201757e533ed0 SHA256 2a9b782300930a239c88e93c9c4e0c34715fb6dddb88cb82ba214dba3f4c9eb0
 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
+DIST jdk-6u2-dlj-linux-i586.bin 58408110 RMD160 3b0c124693401ebc07dea50dfbf05bc9c2d47c28 SHA1 d3e58749ffb457ea338facb86bd800d084e98fe1 SHA256 6d25968debfcac1397fb3dc36c505d0cce8f787f0fc135aab8d6a7d517df68c2
 EBUILD emul-linux-x86-java-1.4.2.03-r2.ebuild 3142 RMD160 374bd8b1b06cda8107d9613dda5ea12a389ad68c SHA1 59d1144db339048171f9bcef03d01457df9559f0 SHA256 c673fc47e40f9548e1ac3dab0c7bc30d9f371dff4c436c443d6f3eefafe1ccf6
 MD5 858ea905559c6ccda24835a037154074 emul-linux-x86-java-1.4.2.03-r2.ebuild 3142
 RMD160 374bd8b1b06cda8107d9613dda5ea12a389ad68c emul-linux-x86-java-1.4.2.03-r2.ebuild 3142
@@ -50,14 +51,18 @@ EBUILD emul-linux-x86-java-1.6.0.01.ebuild 2589 RMD160 9da4e27272563bbe69d30a1ef
 MD5 b0874ba868a51867635bfc1b7d0a7e88 emul-linux-x86-java-1.6.0.01.ebuild 2589
 RMD160 9da4e27272563bbe69d30a1efe54892f2cebfd4e emul-linux-x86-java-1.6.0.01.ebuild 2589
 SHA256 9c987ef60ea0db6b5f2005f9090db06ce8f4ee93fb94e1d9769dc61b3b7d5491 emul-linux-x86-java-1.6.0.01.ebuild 2589
+EBUILD emul-linux-x86-java-1.6.0.02.ebuild 2645 RMD160 93594f249ddee96f5c2689273518dc2680327867 SHA1 4418ef8f5ac1b0db3da381307ad5a8e3a81f09c5 SHA256 66504bdea88eca219701f17f4e2e5c5aaac53516704288aa550818d33a58448b
+MD5 047b816b7ffbbcdf251b8d40879d8b30 emul-linux-x86-java-1.6.0.02.ebuild 2645
+RMD160 93594f249ddee96f5c2689273518dc2680327867 emul-linux-x86-java-1.6.0.02.ebuild 2645
+SHA256 66504bdea88eca219701f17f4e2e5c5aaac53516704288aa550818d33a58448b emul-linux-x86-java-1.6.0.02.ebuild 2645
 EBUILD emul-linux-x86-java-1.6.0.ebuild 3709 RMD160 f547ac4e5e9c907abaa946cf7bd0bd1a9da6f6ca SHA1 bdb616d2bcb65b62fb2900891703b6b5738aa210 SHA256 df247a0dddec589332a5dd5df3c445dbfb98e7d9b4e76777450543235e0242d3
 MD5 c357ea75e5dc4add6e3a830180ae6bba emul-linux-x86-java-1.6.0.ebuild 3709
 RMD160 f547ac4e5e9c907abaa946cf7bd0bd1a9da6f6ca emul-linux-x86-java-1.6.0.ebuild 3709
 SHA256 df247a0dddec589332a5dd5df3c445dbfb98e7d9b4e76777450543235e0242d3 emul-linux-x86-java-1.6.0.ebuild 3709
-MISC ChangeLog 6330 RMD160 bc7e8c3880bb3cefac9858eb918e57e13a1ce814 SHA1 d37ae45558861e132f23694607fa3ce85fba59b5 SHA256 a6b4aadfceb4ebb6dd4622b71ab1522c80ae862ec0c6bf2265358d39c1bfaeb1
-MD5 7bb59ae189f0fc0fe2d4e842b10b35ad ChangeLog 6330
-RMD160 bc7e8c3880bb3cefac9858eb918e57e13a1ce814 ChangeLog 6330
-SHA256 a6b4aadfceb4ebb6dd4622b71ab1522c80ae862ec0c6bf2265358d39c1bfaeb1 ChangeLog 6330
+MISC ChangeLog 6506 RMD160 3d6c1a0eb9d229eadd4410758d868d2e1c5d4831 SHA1 3bbf20a27724701561912aedbda27536478451c9 SHA256 e93af7a210a401cc3a0a748633b2b02168d3baea87f95f707182f81c2f0b08c0
+MD5 947d944d587698fc2b5a049accd071b1 ChangeLog 6506
+RMD160 3d6c1a0eb9d229eadd4410758d868d2e1c5d4831 ChangeLog 6506
+SHA256 e93af7a210a401cc3a0a748633b2b02168d3baea87f95f707182f81c2f0b08c0 ChangeLog 6506
 MISC metadata.xml 242 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 SHA1 fd426af5f6d4efa0adf65aded927fd242e6fdf26 SHA256 df247383374651f561e9833633c2d533fe78ede8430186e2017e6f54452afaa4
 MD5 6d8e6f3e73af8b455f7cc0ecbdfc7015 metadata.xml 242
 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 metadata.xml 242
@@ -80,10 +85,13 @@ SHA256 7bfbfcb961d132341e65eaf06b2fbf36ed8d1387b0fbaa35f160ffc2fb217abe files/di
 MD5 dc843f7bd8eea4347b7d2890eb5083f3 files/digest-emul-linux-x86-java-1.6.0.01 262
 RMD160 2a0369e312bf55ddb61e2e2d46c249e26face9f5 files/digest-emul-linux-x86-java-1.6.0.01 262
 SHA256 fe1e16a4b9463816e66b784e86c765b5d82f820be11867939e78daf7fc49a1b9 files/digest-emul-linux-x86-java-1.6.0.01 262
+MD5 5be2a04f7af1cb74822382632271e073 files/digest-emul-linux-x86-java-1.6.0.02 265
+RMD160 e36748f33160800177a0fa7c6b5fb5a11226bea1 files/digest-emul-linux-x86-java-1.6.0.02 265
+SHA256 d49ac42bd6f13a8df61fda465f544d350147740f73c891b487ba23fe8e0e2b5e files/digest-emul-linux-x86-java-1.6.0.02 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGiQOQppoStNGKGywRAm9+AKCq3VASn9cjPxmFOub6cXjYiiHmNgCfW8bt
-mtKD8ASi3qIld2oTKQRJmJY=
-=hdLu
+iD8DBQFGlpm4cxLzpIGCsLQRAoq+AJ9+Yn8JqnwaIppPMIhsKvX806troACfYjTo
+1wGvo8EXyy6lVKHxI93gkJI=
+=jtUt
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.02.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.02.ebuild
new file mode 100644
index 000000000000..caf2e853dec0
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.02.ebuild
@@ -0,0 +1,96 @@
+# 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.02.ebuild,v 1.1 2007/07/12 21:14:29 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/j2se/1.6.0/"
+#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"
+
+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.02 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.02
new file mode 100644
index 000000000000..b473f7cb64a1
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.02
@@ -0,0 +1,3 @@
+MD5 31fb431b22906344b4b0121e50bef84a jdk-6u2-dlj-linux-i586.bin 58408110
+RMD160 3b0c124693401ebc07dea50dfbf05bc9c2d47c28 jdk-6u2-dlj-linux-i586.bin 58408110
+SHA256 6d25968debfcac1397fb3dc36c505d0cce8f787f0fc135aab8d6a7d517df68c2 jdk-6u2-dlj-linux-i586.bin 58408110