Version bump. Fix quoting.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 x86_64

6 files changed, 224 insertions, 12 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index a97392a0c98b..c10d6704eb04 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.55 2008/05/22 20:37:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.56 2008/07/09 20:08:28 serkan Exp $
+
+*emul-linux-x86-java-1.6.0.07 (09 Jul 2008)
+*emul-linux-x86-java-1.5.0.16 (09 Jul 2008)
+
+  09 Jul 2008; Serkan Kaba <serkan@gentoo.org>
+  emul-linux-x86-java-1.5.0.15.ebuild, +emul-linux-x86-java-1.5.0.16.ebuild,
+  emul-linux-x86-java-1.6.0.05.ebuild, +emul-linux-x86-java-1.6.0.07.ebuild:
+  Version bump. Fix quoting.
 
   22 May 2008; Markus Meier <maekke@gentoo.org>
   emul-linux-x86-java-1.6.0.06.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 943db3d79993..67d3e8af6e6a 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -7,20 +7,24 @@ AUX emul-linux-x86-java-1.4.env 857 RMD160 65dc6da72579122d52475e5fe2c965f7aaea9
 AUX emul-linux-x86-java-1.5.env 855 RMD160 e9ce4d40ee6a8bd9b0720e00838c399d5f3fdca0 SHA1 d989ddc315757eb44aff787ea2c70a6dc848130d SHA256 d36f364c0855d13d7ec2eb4ea3cdbaa483318f1f57b7720edfa5eb0050a12cdb
 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df
 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-5.0u15-dlj-linux-i586.bin 620540 RMD160 b79e8c61a232d27ac67cebdbe7a5cab9f69018de SHA1 58ba76de5a5ca7237d6b6c3e690e617e1462597d SHA256 d3a9d8feed49ea96c7b85463c6cff4d32e3416249eb6b3744eaf3c9e7805ca71
+DIST jdk-5.0u16-dlj-linux-i586.bin 49676902 RMD160 e358a1c3e554eb06cd4362ad175a95004661f38e SHA1 56e29e2d96fca31f6b0e34c208c13c82c523098d SHA256 0df21a7e636740c9812e3e1cd4002e914150acf3c806930d5128d05b37c28a08
 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
+DIST jdk-6u7-dlj-linux-i586.bin 78515200 RMD160 1c626fa6a16be412f082bdadcb4c3018bd0e188d SHA1 1a697ed721260331918fa34913203c78562d1d63 SHA256 b57a1f49ca3c9d3dd45b3fc2ab569d84d159a076124e842a9c8d82abce92ff8b
 EBUILD emul-linux-x86-java-1.4.2.17.ebuild 3620 RMD160 a1819db8cb1d8c2b94a010cac7b5157a88680478 SHA1 650ff8bc26cbd04edfca159c30f74e686110c3b5 SHA256 438925b2dc98e6cf3fc740b2edf791ae33d2fe891ea96a0140ab7ed9c4192dcd
-EBUILD emul-linux-x86-java-1.5.0.15.ebuild 2859 RMD160 5f7e9c8c8c45599eda0fc99ec7c2d44953940887 SHA1 a66299ac28fac100c1413827668fa65ab739971e SHA256 2b63d2b75062caaf9cdc6c9f068917fc8c58203673ebaf60e0202d59f2252b35
+EBUILD emul-linux-x86-java-1.5.0.15.ebuild 2861 RMD160 697dcd62e683f284930c67644d725f467f9dcf31 SHA1 5cdaa43a2202c897a952d8c61c607b4d2fa9255f SHA256 75426942212fde9ea5d2e4fc7bb86938f7661c58db249fa893dbf9752eeefe32
+EBUILD emul-linux-x86-java-1.5.0.16.ebuild 2862 RMD160 82f935c6a51f0a70b717a96edeaf154aabf5343e SHA1 3585c37edb8a282f17a13a4013e672e3a93e842e SHA256 c3dcf195628110558bbd1346d659c319385b777a67a603faa1a697c1019585dd
 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
+EBUILD emul-linux-x86-java-1.6.0.05.ebuild 2687 RMD160 2f129224df5bbe74a8c36735aeed6ce7e5e48c03 SHA1 4d558cbb114619db0bce2aeb9044d52797d22228 SHA256 d49b5313e8865a04a8e150b47e6f50baac676f642d97905cc0751160619888a6
 EBUILD emul-linux-x86-java-1.6.0.06.ebuild 2861 RMD160 129bb470111ed2960dde75165dbc9c0fed4d81e6 SHA1 739b93ed1733a3082507dacd0824126316d147d9 SHA256 83c5e5ee0ca188bdc67023fe33104f84548f6b074a015dedfea07859a1d3c4e1
-MISC ChangeLog 11184 RMD160 0da24bbc356912e992a149a3288d9cb2069f3ebd SHA1 ed90df4bfb41d5cec5513ed9564247680b3a44cf SHA256 9455d0572cbd79d3166184c16f11a22df62cf740cf33cb8ab8868273bc1ca606
+EBUILD emul-linux-x86-java-1.6.0.07.ebuild 2862 RMD160 0227ae321caa1934e04efd43d30b71788e4178de SHA1 d0cdef7a724d62b6b4fc5f08d983ccea4a6cade1 SHA256 c219379cd6671f9b0b616d6835922610a04c1124598391c72f06674e8863ffa9
+MISC ChangeLog 11504 RMD160 437bbfffce3e2a0a5b86a9ca49e0af2eea7da7e1 SHA1 8cc826684d22539cdc9f0ee31e71ecc7b8272b28 SHA256 526d3025856f28ab265e239a0e67242491d1f570fd6a00cc02dc53f9db0f277c
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg12cQACgkQkKaRLQcq0GIc2ACgoofD2gTFrAJE7tQVdvKp3gZn
-aQUAnAg38x37yKlPE2JPRxI4+Hb7Py8v
-=aZrz
+iEYEARECAAYFAkh1GscACgkQRh6X64ivZaJnfACfeJzqgjPl9Xh7P8DpvlBc217H
++XoAn2KlWRAOksKQ0xTuuVL0sBJSgR59
+=+baW
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
index 43e810bd7175..fc253335a534 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
@@ -1,6 +1,6 @@
 # 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.5.0.15.ebuild,v 1.6 2008/04/19 15:03:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild,v 1.7 2008/07/09 20:08:28 serkan Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -32,7 +32,7 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
 src_unpack() {
 	mkdir bundled-jdk
 	cd bundled-jdk
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
+	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"
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.16.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.16.ebuild
new file mode 100644
index 000000000000..cf5f6bd20a46
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.16.ebuild
@@ -0,0 +1,99 @@
+# 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.5.0.16.ebuild,v 1.1 2008/07/09 20:08:28 serkan Exp $
+
+inherit versionator pax-utils eutils java-vm-2
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2-3)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.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() {
+	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"
+}
+
+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
+}
+
+src_install() {
+	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
+	java-vm_revdep-mask
+}
+
+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.05.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05.ebuild
index fc13277a91a8..18a8513b6e1a 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05.ebuild
@@ -1,6 +1,6 @@
 # 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.05.ebuild,v 1.2 2008/03/27 19:34:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05.ebuild,v 1.3 2008/07/09 20:08:28 serkan Exp $
 
 inherit versionator pax-utils java-vm-2 eutils
 
@@ -35,7 +35,7 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
 
 src_unpack() {
 	if [[ ! -r "${DISTDIR}"/${A} ]]; then
-		die "cannot read ${DISTDIR}/${A}. Please check the permission and try again."
+		die "cannot read "${DISTDIR}"/${A}. Please check the permission and try again."
 	fi
 
 	mkdir bundled-jdk
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.07.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.07.ebuild
new file mode 100644
index 000000000000..b495423013c2
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.07.ebuild
@@ -0,0 +1,101 @@
+# 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.07.ebuild,v 1.1 2008/07/09 20:08:28 serkan 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
+	java-vm_revdep-mask
+}
+
+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."
+}