Version bump, fixes JDWP threadid problems. Remove old.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

6 files changed, 15 insertions, 331 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 2016bf55280a..668e237dc31f 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.76 2009/08/11 05:57:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.77 2009/08/18 10:11:50 caster Exp $
+
+*emul-linux-x86-java-1.6.0.16 (18 Aug 2009)
+
+  18 Aug 2009; Vlastimil Babka <caster@gentoo.org>
+  -emul-linux-x86-java-1.5.0.18.ebuild,
+  -emul-linux-x86-java-1.5.0.19.ebuild,
+  -emul-linux-x86-java-1.6.0.13.ebuild,
+  -emul-linux-x86-java-1.6.0.14.ebuild,
+  +emul-linux-x86-java-1.6.0.16.ebuild:
+  Version bump, fixes JDWP threadid problems. Remove old.
 
   11 Aug 2009; Markus Meier <maekke@gentoo.org>
   emul-linux-x86-java-1.5.0.20.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 432fd866bbd0..8599f1f4812e 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,31 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80
 AUX construct.sh 6964 RMD160 8e3de41f59023cb9bf6040fe5f5a36d1b39552e3 SHA1 bc24071dba36878abf7a2da88bfc063eb3727da1 SHA256 47847c81ee85bd1b7dba6e91c2d7757c15a8930f4748dc926e00553bc89fcbd6
 AUX emul-linux-x86-java-1.4.env 857 RMD160 65dc6da72579122d52475e5fe2c965f7aaea92f2 SHA1 2564ffbdf2bf885a5ba1ce58a6d3643a140c1e0e SHA256 6651a792e2f4f5d582ede77459591d8cdb8e59419b88659720fcf828e60aebf3
 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_19-linux-i586.bin 14384815 RMD160 54b15f0ea03c7cb7e35b91fe8a6269e21a0d39b2 SHA1 7b230633bf6eaf3581f69d668542431c5833184a SHA256 d1d2f7cd9f0cddee9f65a0d093a0718faceb4b013b0658a92457512f84c8e973
-DIST jdk-5.0u18-dlj-linux-i586.bin 49702576 RMD160 be719b111ce24d5a14b0ed8ad26a9335283866f7 SHA1 2be236e00cf95a7ba1d2a48156eecd6bd367445d SHA256 460dd267a532d9965e65aec8be8288870ff4aadc0cabe331dd4a1d4c058c53be
-DIST jdk-5.0u19-dlj-linux-i586.bin 49754865 RMD160 85531baed424aa400aa75598a8a9d09e22281e03 SHA1 8510b2b2d1c16e2fb3988fe4f94424d19bf179ec SHA256 7e5cd192c7058b6b9b34f34df315451439175ee55a1c8be80428c188345b86dc
 DIST jdk-5.0u20-dlj-linux-i586.bin 49764253 RMD160 22148cb268decb1237e2d74764726ca7c5de3387 SHA1 128aa89d06c3f39bee7866882ff2b4d4d33bfaa4 SHA256 10b1beea2e8d2733255095ba6fe55065e66e9fc2e0116f240eea2ce680195206
-DIST jdk-6u13-dlj-linux-i586.bin 80161911 RMD160 8167ed89d38722577547d4f46f5fa06cf07fedf3 SHA1 ef9177f519ad03669921876fd711c1c02f306abf SHA256 a07d48549bb48becf7a1185b2ce908797a9dcfcc834ff111e8b6d9ad19ce60d7
-DIST jdk-6u14-dlj-linux-i586.bin 81803297 RMD160 db35274bd08422f97f454dbcadb79abdc9e4ab13 SHA1 ce7fcdeb9275820b98a54ecf7a44ed30557b8233 SHA256 08ff9c6a89da117f7e6eabcc21da36900fab56a4fb9b4e8ff5cb3c267b4ec0a0
 DIST jdk-6u15-dlj-linux-i586.bin 81819735 RMD160 593d067c222bd05d640b24fd9cba20915a795de2 SHA1 d09eea7fb48cd662abafbf490b0cb8340936095a SHA256 d0e14d777d2f49da7d98fc27790c766d4d47d19a973c0855b2b9250ab4fdd815
+DIST jdk-6u16-dlj-linux-i586.bin 81822282 RMD160 139f37a96c39cc5a7e08a8141298521b9af0cbf4 SHA1 0e284828613cc67b7ea7ce93264f7e6700e5a85d SHA256 46ebe41e8b22ddd3eb313222c755ff4bcfed4128503e861308f240a6ddea5ea3
 EBUILD emul-linux-x86-java-1.4.2.19.ebuild 3574 RMD160 388fe86f06cf787092edf09423952728bb0bd90c SHA1 f7e4b280906c26a3d4b313443781ea9d8700ebe5 SHA256 7c1c2cc940a58ce0daafa531a17b8e70c880b9eaf4e8bac5992b43d80436a983
-EBUILD emul-linux-x86-java-1.5.0.18.ebuild 2887 RMD160 368079fcc2bd06fc6ee61a4ec8e4df1da0f9c968 SHA1 a2ba000eaae67fe57e7771c4095c66205ce47c95 SHA256 302cc31d503db45f1f745db582b1ccce5b1a323b75bbe7bd9ad21081f05b829c
-EBUILD emul-linux-x86-java-1.5.0.19.ebuild 2887 RMD160 28c617a51c0f0429a21b4253217a2dafd86fd3cf SHA1 1c897cbb9649df32f60924e8fdbf0a0322191f6c SHA256 a0bb2007fdb59b8fff45563fead3871048421e990b2b641c7dda5318ac48d565
 EBUILD emul-linux-x86-java-1.5.0.20.ebuild 2887 RMD160 a702c035727b63bab2599021521b768bfebb4d4a SHA1 c4d2c2059529b08521ccdda35626a62b026d45a7 SHA256 53e578cee3f1b4cbb4a2c7dffb8a5318535531200187b640ee6cc0a48641610e
-EBUILD emul-linux-x86-java-1.6.0.13.ebuild 3246 RMD160 3bf47aa3bb202e4d21cab7e5b90a7305daeb7b0e SHA1 4da69cf51cb414a4aedda6791169627a95eb685e SHA256 242c2f6252f129e2918ea90b822ce64fdd5b13a08b1984dae3aaad6d89a32f05
-EBUILD emul-linux-x86-java-1.6.0.14.ebuild 3247 RMD160 fda86bdc97891d18536e6125b9ee354a7d160e73 SHA1 35519b1e7ef93b499df7cd5f947b877fbdc84125 SHA256 dcc16abe98be2473b102f4f0ba5a6d2524de1122f73b42274c7b5aa9c54e479a
 EBUILD emul-linux-x86-java-1.6.0.15.ebuild 3246 RMD160 6593606772e6cb5723b77ce05524bef870a60842 SHA1 33e0fbd0fe39ddc62ec58eae1291cf4c8640666f SHA256 9570a7beefe2c7bbb6f998040a5181a172a18e80cf57d04e415e662092f327d3
-MISC ChangeLog 15737 RMD160 113e6ba25e2421a82a0fd0c3e098b607c399ba99 SHA1 a8068ad9b30780598dcac6caab190c742967139a SHA256 7715ac12be465130b1c9f3851a649cb002d340dd2e0e926a04e0798041ee65a4
+EBUILD emul-linux-x86-java-1.6.0.16.ebuild 3247 RMD160 72ceacc230533bbd5a3a4c4fbd9838ed9dabcf5e SHA1 3f3d3ed2a9b39fea4a1951cf91197013fb6d9147 SHA256 dc11e3eeadc9179baa5142ffdbfa914ef2dbcf2930d115efd9ce3c19d5c66134
+MISC ChangeLog 16092 RMD160 7f9775996f3fd87816cd3e90ce744cd9b8b10217 SHA1 f7df4040800bbf0b2cdf2aa528ecd07320ddd736 SHA256 f9852de879b0ab865eba92d9b3190469be69a7732db9cce0f0d091c2260b4a7e
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqBCH4ACgkQkKaRLQcq0GIOEQCdEti2ZOtW96Ep8u0T+NoEqWzZ
-BFIAnijL8+nmVZrVqv4Bxn4YsN/zyNMd
-=OIUg
------END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.18.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.18.ebuild
deleted file mode 100644
index 5d1ab13482ca..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.18.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 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.18.ebuild,v 1.4 2009/05/29 20:34:25 caster 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="Sun's Java SE Runtime Environment (32bit)"
-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"
-QA_DT_HASH="opt/${P}/.*"
-
-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.5.0.19.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.19.ebuild
deleted file mode 100644
index 68b893cda580..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.19.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 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.19.ebuild,v 1.2 2009/08/02 13:12:44 maekke 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="Sun's Java SE Runtime Environment (32bit)"
-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"
-QA_DT_HASH="opt/${P}/.*"
-
-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.13.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.13.ebuild
deleted file mode 100644
index c6632a810951..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.13.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2009 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.13.ebuild,v 1.4 2009/05/29 20:34:25 caster 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="Sun's Java SE Runtime Environment (32bit)"
-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"
-QA_DT_HASH="opt/${P}/.*"
-
-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
-		install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
-	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
-
-	elog
-	elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
-	elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
-	ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
-	elog "For more info see https://jdk6.dev.java.net/plugin2/"
-	elog
-
-	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/emul-linux-x86-java-1.6.0.14.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.16.ebuild
index 78052e09d3c7..9b7ffa030fc4 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.14.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.14.ebuild,v 1.1 2009/05/31 11:26:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.16.ebuild,v 1.1 2009/08/18 10:11:50 caster Exp $
 
 inherit versionator pax-utils java-vm-2 eutils