Version bump for bug #194699.

Package-Manager: portage-2.1.3.9

6 files changed, 231 insertions, 8 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 07c6e678dcd1..df39aefba5b7 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,14 @@
 # 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.39 2007/08/17 10:17:35 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.40 2007/10/04 13:20:34 betelgeuse Exp $
+
+*emul-linux-x86-java-1.6.0.03 (04 Oct 2007)
+*emul-linux-x86-java-1.5.0.13 (04 Oct 2007)
+
+  04 Oct 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +emul-linux-x86-java-1.5.0.13.ebuild,
+  +emul-linux-x86-java-1.6.0.03.ebuild:
+  Version bump for bug #194699.
 
   17 Aug 2007; Petteri Räty <betelgeuse@gentoo.org>
   -emul-linux-x86-java-1.5.0.11.ebuild, -emul-linux-x86-java-1.6.0.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index a0f9e2865f7e..c47eb3bf5868 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -27,7 +27,9 @@ RMD160 e87fe605d34fd6060f58f511deea5a935697be9f files/javasettings_Linux_x86.xml
 SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585 files/javasettings_Linux_x86.xml 1601
 DIST j2re-1.4.2-03-linux-i586.bin 13541431 RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 SHA1 30b37bc8dcb5617971d2ae95e2f7227359d39991 SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef
 DIST jdk-1_5_0_12-dlj-linux-i586.bin 49646174 RMD160 0865c93170fcf443c61a83660228cbc4a91523b9 SHA1 ff909ca469587ae132816868c5f201757e533ed0 SHA256 2a9b782300930a239c88e93c9c4e0c34715fb6dddb88cb82ba214dba3f4c9eb0
+DIST jdk-1_5_0_13-dlj-linux-i586.bin 49672592 RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed SHA1 a025d81df269ed6ce663a34f52e5f0ea2a462bf2 SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0
 DIST jdk-6u2-dlj-linux-i586.bin 58408110 RMD160 3b0c124693401ebc07dea50dfbf05bc9c2d47c28 SHA1 d3e58749ffb457ea338facb86bd800d084e98fe1 SHA256 6d25968debfcac1397fb3dc36c505d0cce8f787f0fc135aab8d6a7d517df68c2
+DIST jdk-6u3-dlj-linux-i586.bin 68613151 RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c SHA1 86ba73cdcc2c22782a04b8191f157a5ac7caa490 SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b
 EBUILD emul-linux-x86-java-1.4.2.03-r2.ebuild 3121 RMD160 bb4a2c437847c7622063c391da4bec7a23f28c2c SHA1 ddee75489ad0380b8dd087d339420e988c36ae2d SHA256 be51b6b17e56b6a6e22a68c723b200c28c80f176d5484001579d65136905fcf3
 MD5 a6f99f18b7ecf2dfc83973e1816ac846 emul-linux-x86-java-1.4.2.03-r2.ebuild 3121
 RMD160 bb4a2c437847c7622063c391da4bec7a23f28c2c emul-linux-x86-java-1.4.2.03-r2.ebuild 3121
@@ -36,14 +38,22 @@ EBUILD emul-linux-x86-java-1.5.0.12.ebuild 3137 RMD160 027c16d703452a7058d5c3e8e
 MD5 7859b17b1fa33de57d61e4f58ca6e773 emul-linux-x86-java-1.5.0.12.ebuild 3137
 RMD160 027c16d703452a7058d5c3e8e76a017f7c793fdb emul-linux-x86-java-1.5.0.12.ebuild 3137
 SHA256 620ed81817df144067bebb1e7de5d4c2ef95a17ae29d2ae147e76dde9993bac9 emul-linux-x86-java-1.5.0.12.ebuild 3137
+EBUILD emul-linux-x86-java-1.5.0.13.ebuild 2732 RMD160 60e806febcdb86bab7518aadd64cb5c4e44d9569 SHA1 cc41bf12ae972236c07444b3343ac4ce3974e4b3 SHA256 da88e9c66878f63df6ffed5201b95f331e1e3f29b1486139419679f730ca73a0
+MD5 11aa99d8cbf7d16d36a3bbdc202747c7 emul-linux-x86-java-1.5.0.13.ebuild 2732
+RMD160 60e806febcdb86bab7518aadd64cb5c4e44d9569 emul-linux-x86-java-1.5.0.13.ebuild 2732
+SHA256 da88e9c66878f63df6ffed5201b95f331e1e3f29b1486139419679f730ca73a0 emul-linux-x86-java-1.5.0.13.ebuild 2732
 EBUILD emul-linux-x86-java-1.6.0.02.ebuild 2644 RMD160 deb196a31b792d8feb7e18e720ef4e76c954d488 SHA1 703595fc584a0ccf23420108b3252fd152aa89bb SHA256 ec67f2b8e4b100f706ea5986b62b033e662ac8fc42c93a4aa2043f8174ac506e
 MD5 b9e2097ec2b5eaf59f0f9afd9712c0a4 emul-linux-x86-java-1.6.0.02.ebuild 2644
 RMD160 deb196a31b792d8feb7e18e720ef4e76c954d488 emul-linux-x86-java-1.6.0.02.ebuild 2644
 SHA256 ec67f2b8e4b100f706ea5986b62b033e662ac8fc42c93a4aa2043f8174ac506e emul-linux-x86-java-1.6.0.02.ebuild 2644
-MISC ChangeLog 7722 RMD160 331fdbc4b72821b3b311a33516f35a1f6dc8eb77 SHA1 9b8b357c23c50cac5848961fb52d054af47ae09e SHA256 4646cde4c1d6da85e50d9379aa5cbc029e05965f16ad3875856cf9be8fc721d3
-MD5 ba128588fb62fa582558a1497311ede0 ChangeLog 7722
-RMD160 331fdbc4b72821b3b311a33516f35a1f6dc8eb77 ChangeLog 7722
-SHA256 4646cde4c1d6da85e50d9379aa5cbc029e05965f16ad3875856cf9be8fc721d3 ChangeLog 7722
+EBUILD emul-linux-x86-java-1.6.0.03.ebuild 2645 RMD160 9a49753aa635c897547f072ed0992643e63853e7 SHA1 f7967e3cbe1e81f4d53c91f3a19ce43faef6faa5 SHA256 e3e8eaa4eb14ce956643e4f303c5626b8e4297f20bdabddfebec6ba2edc49648
+MD5 228be283a0605580614fc685ba4048f4 emul-linux-x86-java-1.6.0.03.ebuild 2645
+RMD160 9a49753aa635c897547f072ed0992643e63853e7 emul-linux-x86-java-1.6.0.03.ebuild 2645
+SHA256 e3e8eaa4eb14ce956643e4f303c5626b8e4297f20bdabddfebec6ba2edc49648 emul-linux-x86-java-1.6.0.03.ebuild 2645
+MISC ChangeLog 7977 RMD160 213535de16665347376d948d2b5c39f0911b43af SHA1 4179cb81f6762399c507f8da0e0ebb58a823c04f SHA256 2cfe2c12a4d9cfee5b27bca89e121a8910c7968d3a5184776bf092c2cba86822
+MD5 282f85910a354ffc6faf8f737d44adff ChangeLog 7977
+RMD160 213535de16665347376d948d2b5c39f0911b43af ChangeLog 7977
+SHA256 2cfe2c12a4d9cfee5b27bca89e121a8910c7968d3a5184776bf092c2cba86822 ChangeLog 7977
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
 MD5 d7708cacbaa71dba43d860aa46c2ea82 metadata.xml 179
 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe metadata.xml 179
@@ -54,13 +64,19 @@ SHA256 6789ba158a0706630e8bc169dc0242f9639582c9b73cf01ae4840c862f6140b1 files/di
 MD5 0d96221fc33f680529da21231473fd01 files/digest-emul-linux-x86-java-1.5.0.12 280
 RMD160 ae7dbe5d2a37e6717924e67b5a46d3dd94245983 files/digest-emul-linux-x86-java-1.5.0.12 280
 SHA256 c1f2ae4e1b177f5c22ac2816f61303fd5da311b0aca7ff9b8165b78cd2046e1c files/digest-emul-linux-x86-java-1.5.0.12 280
+MD5 284741d08d36584c75c07a3a8ab2524b files/digest-emul-linux-x86-java-1.5.0.13 280
+RMD160 bf76a3f65884e8a264479b4a065f729009306c19 files/digest-emul-linux-x86-java-1.5.0.13 280
+SHA256 64d81a18e9672595ef8fdbdd4e9123083b8831d3142e060e87b3861b3fdf65fc files/digest-emul-linux-x86-java-1.5.0.13 280
 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
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGxXYScxLzpIGCsLQRAnApAJ9ERYOtvWZfQII9h3ibfIly5o6rrwCgiud5
-Hwer2yzUhzVr3x6O+IX+l3U=
-=RFUk
+iD8DBQFHBOitcxLzpIGCsLQRAvnOAKCGaf1w9O6DEwZz5gUVm4WZGJn3oQCeNb94
+9YrzfNZnBejnVbRq6thVaNM=
+=sb29
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild
new file mode 100644
index 000000000000..6c1fe38d90e7
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.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.5.0.13.ebuild,v 1.1 2007/10/04 13:20:34 betelgeuse Exp $
+
+inherit pax-utils eutils java-vm-2
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+
+At="jdk-${MY_PVA}-dlj-linux-i586.bin"
+DESCRIPTION="32bit version Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="http://download.java.net/dlj/binaries/${At}"
+
+SLOT="1.5"
+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"
+
+src_unpack() {
+	if [[ ! -r ${DISTDIR}/${At} ]]; then
+		die "cannot read ${At}. 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.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+
+	${S}/bin/java -client -Xshare:dump
+}
+
+src_install() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark m $(list-paxables ${S}/bin/*)
+
+	dodir /opt/${P}
+	cp -pPR bin lib man javaws plugin "${D}/opt/${P}/" || die "failed to copy"
+
+	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
+
+	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."
+
+	echo
+	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
+	elog "The epoll-based implementation of SelectorProvider is not selected by"
+	elog "default."
+	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
+}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild
new file mode 100644
index 000000000000..b9f831affa44
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.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.03.ebuild,v 1.1 2007/10/04 13:20:34 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 )"
+
+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.5.0.13 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.13
new file mode 100644
index 000000000000..06828ece2881
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.13
@@ -0,0 +1,3 @@
+MD5 3775996d369c6e157576a06c4957ca51 jdk-1_5_0_13-dlj-linux-i586.bin 49672592
+RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed jdk-1_5_0_13-dlj-linux-i586.bin 49672592
+SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0 jdk-1_5_0_13-dlj-linux-i586.bin 49672592
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.03 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.03
new file mode 100644
index 000000000000..e229163ce4c7
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.03
@@ -0,0 +1,3 @@
+MD5 e39a322d8e3c89d3e679047cdeab50f7 jdk-6u3-dlj-linux-i586.bin 68613151
+RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c jdk-6u3-dlj-linux-i586.bin 68613151
+SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b jdk-6u3-dlj-linux-i586.bin 68613151