Removal due to EOL and security, bug #292001. Do this to avoid pulling other 1.5 JDK 'emerge -av --depclean sun-jdk:1.5 jdk:1.5 jre:1.5'. No package in main gentoo tree on relevant arches depends on 1.5 JDK. If you need 1.5 java, layman -a java-overlay.

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

4 files changed, 9 insertions, 164 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 6c3e82d92123..54e3bc57c121 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.287 2010/07/08 22:20:52 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.288 2010/09/16 11:15:10 caster Exp $
+
+  16 Sep 2010; Vlastimil Babka <caster@gentoo.org>
+  -sun-jdk-1.5.0.22-r1.ebuild, -files/sun-jdk-1.5.env:
+  Removal due to EOL and security, bug #292001. Do this to avoid pulling
+  other 1.5 JDK 'emerge -av --depclean sun-jdk:1.5 jdk:1.5 jre:1.5'. No
+  package in main gentoo tree on relevant arches depends on 1.5 JDK. If you
+  need 1.5 java, 'layman -a java-overlay'.
 
 *sun-jdk-1.6.0.21 (08 Jul 2010)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 7385d19a8c1f..8fcaf5445f67 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,14 +1,10 @@
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
-AUX sun-jdk-1.5.env 859 RMD160 657a54eebf4f8773204ca442e48845e163a67154 SHA1 59241ca2cf7f5b2c2f5dcc3d69accb43d8ffb419 SHA256 6e5998ae21e11ee3981f613f4ca6615aebeec024fd6b9926e6097fb1ba976585
 AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8
-DIST jdk-5.0u22-dlj-linux-amd64.bin 44213188 RMD160 00cecc02b5a02b00732954f5dab6091697462796 SHA1 5f94db1c775bac2ebcff74581f92891f0a9b4922 SHA256 1182d9c8d06fad7e8fbbb994c06f75b32a096fa50e448a7cbf455825ff4b0b21
-DIST jdk-5.0u22-dlj-linux-i586.bin 49782555 RMD160 f015e1502b357cccd45695a5c4bc41ba113d3a30 SHA1 611e56dd3dc0e25b286c374c60b56b5e76569fb2 SHA256 1c2e853b60e408176ec924e717fb7ec7953a9dddbfc397de91536e9084cf9e46
 DIST jdk-6u20-dlj-linux-amd64.bin 84885416 RMD160 4a62ba9ea54128fe227afd3ff1678286d41616df SHA1 3612cd55715cee3c02894818f9edbd08d71bdea1 SHA256 1e482a05a3741f215613fed15e5d6644520614533b2393ec807674cc2e2d8a88
 DIST jdk-6u20-dlj-linux-i586.bin 84828910 RMD160 6f015c434363e8ac89cdf435c3c71634dea01d8a SHA1 b9866ab9923ba88d95fe3629ece3a6dbbbad1300 SHA256 dbfc1338fd18b59b66701de87ee8d553b8a7fce348966ee8a50728d08e474dbe
 DIST jdk-6u21-dlj-linux-amd64.bin 83943620 RMD160 1f92cffd74d1b719c47e518ff2e0b67a1a9f0c6e SHA1 daa6a31e3e3bac4d3ce7fdea6f063ea1a26ce855 SHA256 64ae764d69eb3172c813bf749653e1bb7329ae96af4677e0012732d28d3127aa
 DIST jdk-6u21-dlj-linux-i586.bin 83916252 RMD160 8901ce27934a7038cd025913bcba6e44b62bfd88 SHA1 7ed1d64dca5f1b3bdf2031b08c56f79a51b16929 SHA256 64d171d38781077b014e49ac2ebe90b6e9de152f033c8a592b3f9661ff57914a
-EBUILD sun-jdk-1.5.0.22-r1.ebuild 4188 RMD160 1ea9e630494ec8d58ad8f2fa4aec4612c9adcec6 SHA1 08927124f3fc4c135db56e4bd3868755b5a743f8 SHA256 31c586d5703d1496de96043d9498afb22ef8c837a6a3605c8caf535fc19f9be0
 EBUILD sun-jdk-1.6.0.20.ebuild 5146 RMD160 d1da3addbfe607b71d11d0751e9def2d137dd684 SHA1 9929aade4d970907d22ea1fcc518d86491d2a04d SHA256 fec342133d3b56bd19fd5ebfc0f0924c478d28a3afeca79a31b86d9ec55ab9e3
 EBUILD sun-jdk-1.6.0.21.ebuild 5148 RMD160 acc09d2ab56022b4d9f9221dc38003ca570cd917 SHA1 6e4ee0d2e25e23b7355074f8de298e5cf2564eec SHA256 96e63170640a944015c0ed4ead4d7ecb25075a868da1aec2e6902e882080d9bf
-MISC ChangeLog 53532 RMD160 5ad07be33abf2ae700191abb724cd519c3d77f8e SHA1 e73ec2a6cff007f8c1f0222bccd348333923e801 SHA256 a93f62cd12f638937228e5f1cfc34ef11e2ed1b0c174cdc2ef851548eae8665c
+MISC ChangeLog 53903 RMD160 0b4c901f352fdc3bed28d5cfe0673cd6f25af0a2 SHA1 a0f94a405e112a72c33f1c6ebaca83df7d60ca82 SHA256 603dcaf9d138182b3f8aeefa6594eb4e1d860f13a9aa870df0841f42b258ed43
 MISC metadata.xml 429 RMD160 e6edae84d0d56c48e9d6e631d1f0612535f26f2d SHA1 4b6faf61f3869bbbccc405c7c07932dd630737ea SHA256 2fef8162216b2e78806cdc6ba5b0ff2619a482aa3ce0ecf909ffa17ba309428c
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.env b/dev-java/sun-jdk/files/sun-jdk-1.5.env
deleted file mode 100644
index 3715d68d65aa..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.5.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.5.env,v 1.2 2008/01/18 14:47:34 caster Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="/opt/@P@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.22-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.22-r1.ebuild
deleted file mode 100644
index 3dd964158b77..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.22-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2010 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.22-r1.ebuild,v 1.1 2010/03/31 16:11:10 caster Exp $
-
-JAVA_VM_BUILD_ONLY="TRUE"
-
-inherit versionator java-vm-2 eutils pax-utils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's Java SE Development Kit"
-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 odbc"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
-QA_DT_HASH="opt/${P}/.*"
-
-DEPEND="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/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXtst
-			x11-libs/libXt
-			x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-src_unpack() {
-	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This needs to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	# see bug #207282
-	if use x86; then
-		einfo "Creating the Class Data Sharing archives"
-		"${S}"/bin/java -client -Xshare:dump || die
-	fi
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-	dodoc COPYRIGHT README.html || die
-	dohtml README.html || die
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR demo "${D}/opt/${P}/" || die
-		cp -pPR sample "${D}/opt/${P}/" || die
-	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
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	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 ""
-}