Removed unused versions.

(Portage version: 2.1.2_rc4-r7)
 (Signed Manifest commit)

5 files changed, 7 insertions, 361 deletions

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 9db33e70df72..51779a4b5ade 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -29,10 +29,6 @@ EBUILD sun-jdk-1.4.2.13.ebuild 6310 RMD160 c05da39110b45b95820b4e47575f672f29c1f
 MD5 f40a87fe0d39910fa54dfa7bf7ddaa31 sun-jdk-1.4.2.13.ebuild 6310
 RMD160 c05da39110b45b95820b4e47575f672f29c1f3db sun-jdk-1.4.2.13.ebuild 6310
 SHA256 7ff87aa6eaec9342d1a690e75a3ef4c94f2bf6b6a1f0265fb2e3b9bd9d2be47d sun-jdk-1.4.2.13.ebuild 6310
-EBUILD sun-jdk-1.5.0.09-r1.ebuild 5231 RMD160 b35a3b02d08d5ee8e40f2bbfa360d8c5990cd315 SHA1 a01cc4592139ae819ef96303c2a8da5f1066e3fb SHA256 4e24ab7bb8c7dc6c42cca935531456673dc9e23dd5d70c7aa0b06a568827f011
-MD5 a763353a5d95665a495aa3b4b7339a43 sun-jdk-1.5.0.09-r1.ebuild 5231
-RMD160 b35a3b02d08d5ee8e40f2bbfa360d8c5990cd315 sun-jdk-1.5.0.09-r1.ebuild 5231
-SHA256 4e24ab7bb8c7dc6c42cca935531456673dc9e23dd5d70c7aa0b06a568827f011 sun-jdk-1.5.0.09-r1.ebuild 5231
 EBUILD sun-jdk-1.5.0.09.ebuild 5108 RMD160 854cc1ff1f98e670d0661938f22b3c314760ed45 SHA1 fc83b49fd9c383cf53afce7420941f2901d894f8 SHA256 95b452e0c8d00f1ce66f5da4c7a021810bbbdaa2314baac06ea0315a5211f4a1
 MD5 3bc4f287898f9562f1e49dda55aca391 sun-jdk-1.5.0.09.ebuild 5108
 RMD160 854cc1ff1f98e670d0661938f22b3c314760ed45 sun-jdk-1.5.0.09.ebuild 5108
@@ -45,14 +41,10 @@ EBUILD sun-jdk-1.6.0-r1.ebuild 4824 RMD160 15a3ce002ae8dda240ffbbfa127e9f71f3599
 MD5 9831e5ead1ed407c14cdab5decda9694 sun-jdk-1.6.0-r1.ebuild 4824
 RMD160 15a3ce002ae8dda240ffbbfa127e9f71f35991c8 sun-jdk-1.6.0-r1.ebuild 4824
 SHA256 13895e542e43718c3497739ee71f25d5ac5e8ac87d7b1a0419118a0600d24dce sun-jdk-1.6.0-r1.ebuild 4824
-EBUILD sun-jdk-1.6.0.ebuild 4631 RMD160 0cb09d8a889fef8d20f5f8a1da1830cbfc78a2b3 SHA1 1c4156581260485573da3fea61436a30db271fcc SHA256 6ea733df558f7504ce3ee7759481fac2e456a7e5ee947316bb66925b60fc3c23
-MD5 d72a0e789e04a3f5f960e8ae37103aaa sun-jdk-1.6.0.ebuild 4631
-RMD160 0cb09d8a889fef8d20f5f8a1da1830cbfc78a2b3 sun-jdk-1.6.0.ebuild 4631
-SHA256 6ea733df558f7504ce3ee7759481fac2e456a7e5ee947316bb66925b60fc3c23 sun-jdk-1.6.0.ebuild 4631
-MISC ChangeLog 35623 RMD160 3f758f78efb475cacd8ba23ca896b0c2f4aad600 SHA1 e303d6c37bdf8afdc27d8e5a8e0d68c5e774aab5 SHA256 385e9dc4d5d8b1b346a3eadc496392daa6f54c16e8df1f3bd58f8072ceec5dab
-MD5 74c1e702a667c59e0135dae943f81d1d ChangeLog 35623
-RMD160 3f758f78efb475cacd8ba23ca896b0c2f4aad600 ChangeLog 35623
-SHA256 385e9dc4d5d8b1b346a3eadc496392daa6f54c16e8df1f3bd58f8072ceec5dab ChangeLog 35623
+MISC ChangeLog 35758 RMD160 67e66ba988f36ccb22dd4202b0610e82d13e6b58 SHA1 6648d3f1fb5751cf193b04d64827ebd0a8760ebe SHA256 2dba2e671427bad7b963a67c3e45b87c495567f266fecea13ac805c7b0566190
+MD5 8abb06600495428a4a31e1c6c24d8226 ChangeLog 35758
+RMD160 67e66ba988f36ccb22dd4202b0610e82d13e6b58 ChangeLog 35758
+SHA256 2dba2e671427bad7b963a67c3e45b87c495567f266fecea13ac805c7b0566190 ChangeLog 35758
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
@@ -63,22 +55,16 @@ SHA256 c4db2c43fa08b705c1e9ba316c8cecbcd2d3a7be5d3014cf4bf02e53b214b155 files/di
 MD5 8409e421272b316b007ee383c1d8508b files/digest-sun-jdk-1.5.0.09 563
 RMD160 93a25e28b116cacea4f5295169e9bb091b46575b files/digest-sun-jdk-1.5.0.09 563
 SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/digest-sun-jdk-1.5.0.09 563
-MD5 8409e421272b316b007ee383c1d8508b files/digest-sun-jdk-1.5.0.09-r1 563
-RMD160 93a25e28b116cacea4f5295169e9bb091b46575b files/digest-sun-jdk-1.5.0.09-r1 563
-SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/digest-sun-jdk-1.5.0.09-r1 563
 MD5 bfc73dd88d30c26b64d0590cb52d7547 files/digest-sun-jdk-1.5.0.10 563
 RMD160 ce0632d08fdd27b76bd6e2de244a0516555aeef0 files/digest-sun-jdk-1.5.0.10 563
 SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/digest-sun-jdk-1.5.0.10 563
-MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0 521
-RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0 521
-SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0 521
 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r1 521
 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r1 521
 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r1 521
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFpqEicxLzpIGCsLQRAibdAKCIHihK4sILQeUuOcQvoRbHUbxwyQCdHhSj
-23UHlL6aKwo+U0XpclVaUnA=
-=ZTPf
+iD8DBQFFpqGVcxLzpIGCsLQRAixrAJ9M7oMCAWWCb3v4Kn00qbqZ44u8OgCfeEWX
+OEy0HsXtPiwMuWZqSy37iYA=
+=n05z
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.09-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.09-r1
deleted file mode 100644
index fb32756cb7a5..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.09-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a210623300238ebb230d47c774c25779 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154
-RMD160 c7f4310ff6714d5dd33c10398c6615689f5523ff jdk-1_5_0_09-dlj-linux-amd64.bin 43863154
-SHA256 3f7f21671ebcb9c849b02d668d85cf6f161870c45f5bf82f5e3fed2a026f7f35 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154
-MD5 b937aef01669744686e84ac5f0cc3d97 jdk-1_5_0_09-dlj-linux-i586.bin 49504315
-RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e jdk-1_5_0_09-dlj-linux-i586.bin 49504315
-SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85 jdk-1_5_0_09-dlj-linux-i586.bin 49504315
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0 b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0
deleted file mode 100644
index 95693b0f544e..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2e0c075c27b09aed67f99475c3a19f83 jdk-6-dlj-linux-amd64.bin 56347832
-RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e jdk-6-dlj-linux-amd64.bin 56347832
-SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3 jdk-6-dlj-linux-amd64.bin 56347832
-MD5 f4481c4e064cec06a65d7751d9105c6d jdk-6-dlj-linux-i586.bin 62718862
-RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac jdk-6-dlj-linux-i586.bin 62718862
-SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 jdk-6-dlj-linux-i586.bin 62718862
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.09-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.09-r1.ebuild
deleted file mode 100644
index 03dd648060af..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.09-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.09-r1.ebuild,v 1.2 2007/01/05 23:43:09 caster Exp $
-
-inherit java-vm-2 eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-S="${WORKDIR}/jdk${MY_PVL}"
-
-X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
-if use x86; then
-	At=${X86_AT}
-elif use amd64; then
-	At=${AMD64_AT}
-fi
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="nostrip"
-IUSE="X alsa doc examples jce nsplugin"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
-
-DEPEND="
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	jce? ( =dev-java/sun-jce-bin-1.5.0* )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? ( || ( ( x11-libs/libICE
-				x11-libs/libSM
-		 		x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc COPYRIGHT README.html
-	dohtml README.html
-	dodir /opt/${P}/share/
-
-	cp -pPR src.zip ${D}/opt/${P}/share/
-
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-		if ( use x86 || use amd64 ); then
-			cp -pPR sample ${D}/opt/${P}/share/
-		fi
-	fi
-
-	if use jce; then
-		cd ${D}/opt/${P}/jre/lib/security
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	# 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}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-${SLOT}.desktop
-
-	domenu ${T}/sun_java-${SLOT}.desktop
-
-	# bug #56444
-	insinto /opt/${P}/jre/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	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."
-
-	echo
-	elog " Be careful: ${P}'s Java compiler uses"
-	elog " '-source 1.5' as default. Some keywords such as 'enum'"
-	elog " are not valid identifiers any more in that mode,"
-	elog " which can cause incompatibility with certain sources."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.ebuild
deleted file mode 100644
index e958547e491b..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.ebuild,v 1.1 2006/12/13 22:54:28 caster Exp $
-
-inherit java-vm-2 eutils pax-utils
-
-#MY_PVA=${PV//./_}
-MY_PVA=6
-S="${WORKDIR}/jdk${PV}"
-
-X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
-if use x86; then
-	At=${X86_AT}
-elif use amd64; then
-	At=${AMD64_AT}
-fi
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="nostrip"
-IUSE="X alsa doc examples jce nsplugin"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
-	opt/${P}/jre/lib/i386/libdeploy.so
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-
-DEPEND="
-	doc? ( =dev-java/java-sdk-docs-1.6.0* )
-	jce? ( =dev-java/sun-jce-bin-1.6.0* )"
-
-RDEPEND="
-	${DEPEND}
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-
-	# 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}{,/jre}/bin/*)
-
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc COPYRIGHT README.html
-	dohtml README.html
-	dodir /opt/${P}/share/
-
-	cp -pPR src.zip ${D}/opt/${P}/share/
-
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-		if ( use x86 || use amd64 ); then
-			cp -pPR sample ${D}/opt/${P}/share/
-		fi
-	fi
-
-	if use jce; then
-		cd ${D}/opt/${P}/jre/lib/security
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	# 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}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-${SLOT}.desktop
-
-	domenu ${T}/sun_java-${SLOT}.desktop
-
-	# bug #56444
-	insinto /opt/${P}/jre/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	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."
-
-	echo
-	elog " Be careful: ${P}'s Java compiler uses"
-	elog " '-source 1.6' as default. Some keywords such as 'enum'"
-	elog " are not valid identifiers any more in that mode,"
-	elog " which can cause incompatibility with certain sources."
-
-	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"
-}