Cleanup.

(Portage version: 2.1.3_rc8)

13 files changed, 7 insertions, 1023 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index b234313df745..67026ead8110 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.210 2007/07/22 18:49:44 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.211 2007/07/22 20:53:02 caster Exp $
+
+  22 Jul 2007; Vlastimil Babka <caster@gentoo.org> -sun-jdk-1.4.2.14.ebuild,
+  -sun-jdk-1.5.0.11.ebuild, -sun-jdk-1.5.0.11-r1.ebuild,
+  -sun-jdk-1.6.0-r1.ebuild, -sun-jdk-1.6.0-r2.ebuild,
+  -sun-jdk-1.6.0.01.ebuild:
+  Cleanup.
 
   22 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
   sun-jdk-1.5.0.12.ebuild:
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.14 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.14
deleted file mode 100644
index 1b91fb6dbb3e..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.14
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c5f5ae15bc73f17f22c3ddaf45ee45ad j2sdk-1_4_2_14-linux-i586.bin 36368335
-RMD160 8dfd1755625e50d0b2a3dc25ddcaff17afddca6c j2sdk-1_4_2_14-linux-i586.bin 36368335
-SHA256 f2d374cde37149bdcce00bc9afdd25a4d43c9ae1d4dc871fdb951e7cc57ebb68 j2sdk-1_4_2_14-linux-i586.bin 36368335
-MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
-RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 jce_policy-1_4_2.zip 12195
-SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097 jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.11 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.11
deleted file mode 100644
index e6f312fcc9a8..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.11
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ace2fc1b8c9d381b4e297c66c5a9caa7 jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
-RMD160 bd865019d3fb2268800696207dba158ea2986a7f jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
-SHA256 98df66902f42f764cb89b12a1502b976f2e5ddb2aa5000e14846b90cef74e0db jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
-MD5 9dfdad6a166ed403513c0a5509d82e4b jdk-1_5_0_11-dlj-linux-i586.bin 49598681
-RMD160 74c5bd78450397006ea145580c3554d77b64a31d jdk-1_5_0_11-dlj-linux-i586.bin 49598681
-SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705 jdk-1_5_0_11-dlj-linux-i586.bin 49598681
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.11-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.11-r1
deleted file mode 100644
index e6f312fcc9a8..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.11-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ace2fc1b8c9d381b4e297c66c5a9caa7 jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
-RMD160 bd865019d3fb2268800696207dba158ea2986a7f jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
-SHA256 98df66902f42f764cb89b12a1502b976f2e5ddb2aa5000e14846b90cef74e0db jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
-MD5 9dfdad6a166ed403513c0a5509d82e4b jdk-1_5_0_11-dlj-linux-i586.bin 49598681
-RMD160 74c5bd78450397006ea145580c3554d77b64a31d jdk-1_5_0_11-dlj-linux-i586.bin 49598681
-SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705 jdk-1_5_0_11-dlj-linux-i586.bin 49598681
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0-r1
deleted file mode 100644
index 95693b0f544e..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0-r1
+++ /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/files/digest-sun-jdk-1.6.0-r2 b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0-r2
deleted file mode 100644
index 95693b0f544e..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0-r2
+++ /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/files/digest-sun-jdk-1.6.0.01 b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0.01
deleted file mode 100644
index 7f5d8d6c8fb8..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0.01
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 177f241f071396f5f3d3c42ed82c2ecc jdk-6u1-dlj-linux-amd64.sh 56395232
-RMD160 90f03c9359808126c73abedabed765a1191e04f0 jdk-6u1-dlj-linux-amd64.sh 56395232
-SHA256 13b40146ef514ff6756b35a7d26ed2e8e84cadcfbbd24d1cbb35d871d9b7e78b jdk-6u1-dlj-linux-amd64.sh 56395232
-MD5 644a588f1ea9417fbf23b3e5505bbf8c jdk-6u1-dlj-linux-i586.sh 62818812
-RMD160 2858ae3036db3315c6bbd2bd43cd05cf0af6e43e jdk-6u1-dlj-linux-i586.sh 62818812
-SHA256 1a49eaadcaf480c9eec4aa558ab7392e93b7c88b8f79f53be9a8fc03a6714ddc jdk-6u1-dlj-linux-i586.sh 62818812
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild
deleted file mode 100644
index cf0d61ca12ae..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.14.ebuild
+++ /dev/null
@@ -1,187 +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.4.2.14.ebuild,v 1.4 2007/07/22 09:33:41 graaff Exp $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-inherit pax-utils java-vm-2 eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_P=j2sdk${MY_PV}
-MY_PVB=${PV%.*}
-
-At="j2sdk-${PV//./_}-linux-i586.bin"
-jce_policy="jce_policy-${MY_PVB//./_}.zip"
-
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI="${At}
-		jce? ( ${jce_policy} )"
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples nsplugin jce"
-
-DEPEND="sys-apps/sed
-	app-arch/unzip"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )
-	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
-	)"
-
-JAVA_PROVIDE="jdbc-stdext"
-
-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/javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemrsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so
-	opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so
-	opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
-	opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(first select 'Accept License', then click on 'self-extracting file'"
-	einfo "under 'Linux Platform - Java(TM) 2 SDK, Standard Edition')"
-	einfo "and move it to ${DISTDIR}"
-	if use jce; then
-		echo
-		einfo "Also download ${jce_policy} from:"
-		einfo ${DOWNLOAD_URL_JCE}
-		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}.bin. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
-			die "cannot read ${jce_policy}. Please check the permission and try again."
-		fi
-	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
-		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 include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -dPR $i ${D}/opt/${P}/
-	done
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*)
-
-	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt || die
-	dohtml README.html || die
-	dodir /opt/${P}/share/
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-	fi
-
-	cp -pPR src.zip "${D}/opt/${P}/"
-
-	if use jce ; then
-		# Using unlimited jce while still retaining the strong jce
-		# May have repercussions when you find you cannot symlink libraries
-		# in classpaths.
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jce_policy}
-		mv jce unlimited-jce
-		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/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	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}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
-	fi
-
-	# bug #147259
-	dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
-	dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
-
-	# 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
-
-	# 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
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		ewarn "Some parts of Sun's JDK require X11 libraries to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-	elog "Starting with 1.4.2.14 the src.zip is installed to the standard"
-	elog "location only (/opt/${P}/) and not /opt/${P}/share/"
-	elog "as we used to. See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
-	elog "http://java.sun.com/j2se/1.4.2/docs/tooldocs/linux/jdkfiles.html"
-	elog "for more details."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.11-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.11-r1.ebuild
deleted file mode 100644
index e03b3512da70..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.11-r1.ebuild
+++ /dev/null
@@ -1,163 +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.11-r1.ebuild,v 1.3 2007/07/22 09:33:41 graaff Exp $
-
-inherit java-vm-2 eutils pax-utils
-
-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"
-
-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="strip"
-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="
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXt
-		)"
-
-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}/${A}" ]; then
-		die "cannot read ${A}. Please check the permission and try again."
-	fi
-
-	sh "${DISTDIR}/${A}" --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 || die
-	dohtml README.html || die
-	dodir /opt/${P}/share/
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-	dosym "/opt/${P}/src.zip" /opt/${P}/share || die
-
-	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 || die
-		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 || die
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar \
-			${D}/opt/${P}/jre/lib/security/strong-jce || die
-		local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
-		dosym ${jcedir}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-		dosym ${jcedir}/local_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-	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
-	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		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 \
-			|| die "Failed to sed .desktop file"
-
-		domenu ${T}/sun_java-${SLOT}.desktop
-	fi
-
-	# 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="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 " 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."
-
-	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"
-	elog ""
-	elog "Starting with 1.5.0.11-r1 the src.zip is installed to the standard"
-	elog "location. It is still symlinked to the old location (/opt/${P}/share)"
-	elog "but it will be removed if there will be 1.5.0.12."
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
-	elog "http://java.sun.com/j2se/1.5.0/docs/tooldocs/linux/jdkfiles.html"
-	elog "for more details."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
deleted file mode 100644
index e7f5f864264b..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
+++ /dev/null
@@ -1,155 +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.11.ebuild,v 1.7 2007/07/22 09:33:41 graaff Exp $
-
-inherit java-vm-2 eutils pax-utils
-
-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"
-
-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="strip"
-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="
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXt
-		)"
-
-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}/${A}" ]; then
-		die "cannot read ${A}. Please check the permission and try again."
-	fi
-
-	sh "${DISTDIR}/${A}" --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 || die
-	dohtml README.html || die
-	dodir /opt/${P}/share/
-
-	cp -pPR src.zip ${D}/opt/${P}/share/ || die
-
-	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 || die
-		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 || die
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar \
-			${D}/opt/${P}/jre/lib/security/strong-jce || die
-		local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
-		dosym ${jcedir}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-		dosym ${jcedir}/local_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-	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
-	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		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 \
-			|| die "Failed to sed .desktop file"
-
-		domenu ${T}/sun_java-${SLOT}.desktop
-	fi
-
-	# 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="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 " 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."
-
-	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/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
deleted file mode 100644
index ad9beb526aa6..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,157 +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.6.0-r1.ebuild,v 1.10 2007/07/22 09:33:41 graaff 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"
-
-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="strip"
-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}
-	x86? ( =virtual/libstdc++-3.3 )
-	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
-		)"
-
-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}/${A} ]; then
-		die "cannot read ${A}. Please check the permission and try again."
-	fi
-
-	sh ${DISTDIR}/${A} --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
-
-	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			${T}/sun_jdk-${SLOT}.desktop
-
-		domenu ${T}/sun_jdk-${SLOT}.desktop
-	fi
-
-	# 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="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 " 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"
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r2.ebuild
deleted file mode 100644
index c9abfe560b50..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,165 +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.6.0-r2.ebuild,v 1.3 2007/07/22 09:33:41 graaff 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"
-
-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="strip"
-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}
-	x86? ( =virtual/libstdc++-3.3 )
-	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
-		)"
-
-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}/${A} ]; then
-		die "cannot read ${A}. Please check the permission and try again."
-	fi
-
-	sh ${DISTDIR}/${A} --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 -pP src.zip "${D}/opt/${P}/" || die
-	dosym /opt/${P}/src.zip /opt/${P}/share/src.zip || die
-
-	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
-
-	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			${T}/sun_jdk-${SLOT}.desktop
-
-		domenu ${T}/sun_jdk-${SLOT}.desktop
-	fi
-
-	# 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="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 " 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"
-	elog ""
-	elog "Starting with 1.6.0-r2 the src.zip is installed to the standard"
-	elog "location. It is still symlinked to the old location (/opt/${P}/share)"
-	elog "but the symlink will be removed with the next version bump."
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
-	elog "http://java.sun.com/javase/6/docs/technotes/tools/linux/jdkfiles.html"
-	elog "for more details."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.01.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.01.ebuild
deleted file mode 100644
index a7c344f36e84..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.01.ebuild
+++ /dev/null
@@ -1,159 +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.6.0.01.ebuild,v 1.3 2007/07/22 09:33:41 graaff Exp $
-
-inherit versionator java-vm-2 eutils pax-utils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.sh"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.sh"
-
-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="strip"
-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}
-	x86? ( =virtual/libstdc++-3.3 )
-	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
-		)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${A} ]; then
-		die "cannot read ${A}. Please check the permission and try again."
-	fi
-
-	sh ${DISTDIR}/${A} --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}
-
-	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
-	dodoc COPYRIGHT || die
-	dohtml README.html || die
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR demo sample "${D}/opt/${P}/" || die
-	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
-
-	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			${T}/sun_jdk-${SLOT}.desktop
-
-		domenu ${T}/sun_jdk-${SLOT}.desktop
-	fi
-
-	# 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="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 " 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"
-	elog ""
-	elog "Starting with 1.6.0-r2 the src.zip is installed to the standard"
-	elog "location. See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
-	elog "http://java.sun.com/javase/6/docs/technotes/tools/linux/jdkfiles.html"
-	elog "for more details."
-	elog ""
-	elog "Starting with 1.6.0.01 demo and sample directories have been moved"
-	elog "to top level from the share sub directory."
-}