Version bump. Remove old vulnerable versions.

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

6 files changed, 21 insertions, 333 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index eda7af08fc07..57f2d750cebf 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.64 2008/12/10 22:07:16 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.65 2009/02/05 21:36:01 serkan Exp $
+
+*emul-linux-x86-java-1.6.0.12 (05 Feb 2009)
+
+  05 Feb 2009; Serkan Kaba <serkan@gentoo.org>
+  -emul-linux-x86-java-1.4.2.18.ebuild,
+  -emul-linux-x86-java-1.5.0.16.ebuild,
+  -emul-linux-x86-java-1.6.0.07.ebuild,
+  -emul-linux-x86-java-1.6.0.10.ebuild,
+  +emul-linux-x86-java-1.6.0.12.ebuild:
+  Version bump. Remove old vulnerable versions.
 
   10 Dec 2008; Markus Meier <maekke@gentoo.org>
   emul-linux-x86-java-1.4.2.19.ebuild, emul-linux-x86-java-1.5.0.17.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 73a5c52d19c0..cde370f90132 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -6,26 +6,20 @@ AUX construct.sh 6964 RMD160 8e3de41f59023cb9bf6040fe5f5a36d1b39552e3 SHA1 bc240
 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_18-linux-i586.bin 14379606 RMD160 725d9aeac47ee775cf904676c27a12b598847b74 SHA1 7558ba72c1002b6a0dd362041693bd3baa28cbc6 SHA256 75750575b54d15b47b5b7d50e03cc111e958edc1c6b18cc55cc582853d612206
 DIST j2re-1_4_2_19-linux-i586.bin 14384815 RMD160 54b15f0ea03c7cb7e35b91fe8a6269e21a0d39b2 SHA1 7b230633bf6eaf3581f69d668542431c5833184a SHA256 d1d2f7cd9f0cddee9f65a0d093a0718faceb4b013b0658a92457512f84c8e973
-DIST jdk-5.0u16-dlj-linux-i586.bin 49676902 RMD160 e358a1c3e554eb06cd4362ad175a95004661f38e SHA1 56e29e2d96fca31f6b0e34c208c13c82c523098d SHA256 0df21a7e636740c9812e3e1cd4002e914150acf3c806930d5128d05b37c28a08
 DIST jdk-5.0u17-dlj-linux-i586.bin 49690762 RMD160 a9baa1a26acf284b31b7b81278bd32a7dada7c38 SHA1 d9f72fbb0aed5c27d7d40671a318597906771fd9 SHA256 427a6abd1435c23bf3bc953cca13a0d3b22f3be5e1c1bb14d21ac88e898c021a
-DIST jdk-6u10-dlj-linux-i586.bin 80041857 RMD160 a280938fb2ff5208294b76afa9e8c8f459f64841 SHA1 f4dc9d497042c5196afb7ae75257de8614673ea6 SHA256 dae79e8c56090ac3fb4ac3fe0df9faf6a0c9694a89ef978dce0ab970557ad264
 DIST jdk-6u11-dlj-linux-i586.bin 80060361 RMD160 ad6a4f82d103fb7e101351b7347ca8a9992a72db SHA1 6c1bb54d383e1fff69c5e33bfe9e3fcc05c653ab SHA256 c41faea381c3abae0e973a19b88f6e17f83c66fc6bc602a05ccd9a1c3d8a9303
-DIST jdk-6u7-dlj-linux-i586.bin 78515200 RMD160 1c626fa6a16be412f082bdadcb4c3018bd0e188d SHA1 1a697ed721260331918fa34913203c78562d1d63 SHA256 b57a1f49ca3c9d3dd45b3fc2ab569d84d159a076124e842a9c8d82abce92ff8b
-EBUILD emul-linux-x86-java-1.4.2.18.ebuild 3527 RMD160 1fe42e6831ada25bb280cde700a7e98f1604e32c SHA1 c33c20ffa8447484bb7b842bc6d40205dc463606 SHA256 cf24e822c8cd15fec679aa12f1dd1dcad91de87adb2cffd56a54a8662583acd6
+DIST jdk-6u12-dlj-linux-i586.bin 80137544 RMD160 ecf3c45703950e946874b9347d9f0d2145da1d26 SHA1 bbbb8cd68fa206e85e78221f3600b41ceb306896 SHA256 97348da8b3c1d92421fffd24766127e0eba2770ab10b014855e867b4eedb680c
 EBUILD emul-linux-x86-java-1.4.2.19.ebuild 3525 RMD160 85fc676e851dd796e2c207029e050a3db17a43d1 SHA1 67663c8e09a985935255ba59981a9c7fc3d6b75f SHA256 87891a57830a900f3d48b7dd051244ca8599aed00b8257b6711600678fab106e
-EBUILD emul-linux-x86-java-1.5.0.16.ebuild 2865 RMD160 bb6fecb8ec6027f8f51e1d7b9cf62bcfbcbc7cae SHA1 74367b80f4caab89bd74b24930fbc01fd0226a41 SHA256 28875b0675993f36497f0742dfdb8284fa737b85a6f583114f69deeea37e1f79
 EBUILD emul-linux-x86-java-1.5.0.17.ebuild 2865 RMD160 122095cd87576e4a1238de4ef437001619f8df1c SHA1 efcb8f7071c1af246c14473745f2971e6364750f SHA256 8d0085cd176d2dcf77ef8b53be0ea9b472975bcb183dec9bada7c9b4140f9067
-EBUILD emul-linux-x86-java-1.6.0.07.ebuild 2865 RMD160 5546eeff303c0486aafbcaad979e2770c1b8e8c0 SHA1 5eaa44771e789d4ef592db48e9073dc21fd04f1c SHA256 ab211b486b67af06c341e91483398a4fcc4b6b7782c627df0755b76e5a002de8
-EBUILD emul-linux-x86-java-1.6.0.10.ebuild 3226 RMD160 f93110d3dbc38fc788126e1311610f074cf26bdc SHA1 ada2816cbced0a44bd1dd9bdf439f3eacef2f64e SHA256 dc4efdd434ff62f398452ef45949c18095f08919b8f5b645fe5fe952c9aaea36
 EBUILD emul-linux-x86-java-1.6.0.11.ebuild 3224 RMD160 1048c973d3d3266016d026cf7de7675b3181b56e SHA1 8d7d4359001f66a01d526819028b050cda7d1240 SHA256 0a174c69ca92ce89e1e48dbf1138aa88fbafd98616c8c991749866889a5ed17d
-MISC ChangeLog 13409 RMD160 2b40236c602835a7055f76d02b20affffccdeb76 SHA1 dc4b5bc08c5ed3c68eb7f5996f799052d7c29f6d SHA256 ada08ce7eadf9aa3d947f21545d5265e10178107c91d13dad216982d69ecff16
+EBUILD emul-linux-x86-java-1.6.0.12.ebuild 3225 RMD160 7a18756d7441abacb57037c9dfac7da02467d1c2 SHA1 92901402779fc930e7c913b36ac55086b77465fd SHA256 1afff10740c9d0da1176307c6ce310138f852cc911f0f4b498abef086bc461fd
+MISC ChangeLog 13750 RMD160 c22e818552466546e993afdb10bddda39895d77b SHA1 904b5f39e431ffe6d77e187d1f29b33fee9793ad SHA256 678f059b30e30f364523d049bdf1dfe6ce13b232a4d3ebe3059c041bcde957c7
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklAPasACgkQkKaRLQcq0GJUdwCdEWdT8+4RfY2rQe2sfoL8OYCr
-+cIAniToAC5nVri3vrLhHT/+032uXbTd
-=TbcY
+iEYEARECAAYFAkmLW8oACgkQRh6X64ivZaJjIwCeOOjN1Q17YyW1ZfWqaZ1Zl0w1
+xNYAnjJrjr9AyXt8ajRHHgO/403nwrd2
+=0Ysg
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.18.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.18.ebuild
deleted file mode 100644
index 6f126fdc645c..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.18.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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.4.2.18.ebuild,v 1.2 2008/07/12 21:41:57 ken69267 Exp $
-
-inherit multilib eutils pax-utils java-vm-2
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_PV2=${PV//./_}
-MY_PN=j2re
-At="${MY_PN}-${MY_PV2}-linux-i586.bin"
-S="${WORKDIR}/j2re${MY_PV}"
-DESCRIPTION="Sun's JRE (32bit)"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI=${At}
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="-* amd64"
-# pre stripped
-RESTRICT="fetch strip"
-IUSE="X alsa nsplugin"
-
-DEPEND=""
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )"
-
-DL_PREFIX="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef="
-DOWNLOAD_URL="${DL_PREFIX}${MY_PN}-${MY_PV}-oth-JPR@CDS-CDS_Developer"
-
-QA_TEXTRELS_amd64="opt/${P}/lib/i386/libawt.so
-	opt/${P}/plugin/i386/ns4/libjavaplugin.so
-	opt/${P}/plugin/i386/ns610/libjavaplugin_oji.so
-	opt/${P}/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r "${DISTDIR}"/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	#Search for the ELF Header
-	testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001')
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} "${DISTDIR}"/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f "${S}"/lib/unpack ]; then
-		UNPACK_CMD="${S}"/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		local PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar \
-			lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} "${S}"/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/"
-
-	pax-mark srpm $(list-paxables "${D}"/opt/${P}/bin/*)
-
-	dodoc CHANGES COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html ControlPanel.html || die
-
-	if use nsplugin; then
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	fi
-
-	# bug #147259
-	dosym ../javaws/javaws /opt/${P}/bin/javaws
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${D}/opt/${P}/.systemPrefs/.system.lock"
-	chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock"
-	touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
-	chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
-
-	# 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}/" \
-#		-e "s/\(Name=Java\)/\1 Control Panel/" \
-#		"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
-#		"${T}/sun_java-jre.desktop"
-#	domenu "${T}/sun_java-jre.desktop"
-
-	set_java_env
-	java-vm_revdep-mask
-}
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
deleted file mode 100644
index 2ab77a8e990c..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.16.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.3 2008/09/16 20:09:04 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 Runtime Environment"
-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.07.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.07.ebuild
deleted file mode 100644
index 6ae671286352..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.07.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.3 2008/09/16 20:09:04 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 Runtime Environment"
-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."
-}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.10.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.12.ebuild
index 5c7e7372377e..c1c62b7c528c 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.10.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.10.ebuild,v 1.2 2008/11/17 21:45:33 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.12.ebuild,v 1.1 2009/02/05 21:36:01 serkan Exp $
 
 inherit versionator pax-utils java-vm-2 eutils
 
@@ -16,7 +16,7 @@ SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
 
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 RESTRICT="strip"
 IUSE="X alsa nsplugin"