applied patch to fix insecure temporary file handling, see #86585

(Portage version: 2.0.51.19)

14 files changed, 19 insertions, 551 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 60e41419b6a6..c210213911f9 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.105 2005/03/25 00:31:18 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.106 2005/03/25 22:37:57 luckyduck Exp $
+
+*sun-jdk-1.5.0.02-r1 (25 Mar 2005)
+
+  25 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/sun-jdk-1.4.2.05,
+  -files/sun-jdk-1.4.2.06, -files/sun-jdk-1.5.0, -files/sun-jdk-1.5.0.01,
+  +sun-jdk-1.4.2.07-r1.ebuild, -sun-jdk-1.4.2.07.ebuild,
+  -sun-jdk-1.5.0.01.ebuild, +sun-jdk-1.5.0.02-r1.ebuild,
+  -sun-jdk-1.5.0.02.ebuild, -sun-jdk-1.5.0.ebuild:
+  applied patch to all versions, see #86585. also did some cleanup.
 
   25 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> sun-jdk-1.4.2.07.ebuild:
   applied patch which was suggested by taviso, fixes insecure temporary file
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index f559e672a98a..080ad345cf98 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,32 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5cb67200a128d1d6a1262317ac4ca085 sun-jdk-1.5.0.01.ebuild 7238
 MD5 9299ace5688576a9b9ab9ddf5a4dfca4 sun-jdk-1.3.1.13.ebuild 3802
+MD5 5dcd68e4be88d295eff7a42b2458586f sun-jdk-1.4.2.07-r1.ebuild 6479
 MD5 183d3481b4e5d7b6367616cff588b875 sun-jdk-1.2.2.017.ebuild 3149
-MD5 e81e89e624f706997ff97fd3c238976c sun-jdk-1.5.0.ebuild 7155
-MD5 fd3e7bb5b03956e4110e154f269003df sun-jdk-1.5.0.02.ebuild 7238
-MD5 788f0d28a03f8e09f86bcd198b591224 ChangeLog 21693
-MD5 80a2b054392616160bce25593068e23d sun-jdk-1.4.2.07.ebuild 6485
+MD5 b6586493c6f29ddcc0db7a5f300280a6 ChangeLog 22114
+MD5 63b093cede706e37fd91c98a768364f9 sun-jdk-1.5.0.02-r1.ebuild 7315
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
-MD5 e69378131ebaaa3322d156533d441dce files/digest-sun-jdk-1.5.0 206
 MD5 0f94a657aa38fbca24dd767967474bc4 files/sun-jdk-1.3.1.13 475
-MD5 13e855f76ac09be667d9e62a76f0d833 files/sun-jdk-1.4.2.05 499
-MD5 f755de7aae158d132ff66f60dadc00dd files/sun-jdk-1.4.2.06 495
 MD5 ca753d6c6afc7ee2df1192978846d0d4 files/sun-jdk-1.4.2.07 499
-MD5 0f587e6fab3e3304e94d2e0b691cd3fb files/sun-jdk-1.5.0.01 471
 MD5 7e47512a18f9af78546d9b528b3bfd47 files/sun-jdk-1.5.0.02 471
 MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328
 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78
-MD5 f0482e3f52521721aec8df64b7c2d0a7 files/sun-jdk-1.5.0 468
+MD5 087d481a89540a1b830bbb4559d74663 files/digest-sun-jdk-1.4.2.07-r1 140
 MD5 d1e29e8acce3cfec9912e23aa366478a files/digest-sun-jdk-1.3.1.13 76
-MD5 087d481a89540a1b830bbb4559d74663 files/digest-sun-jdk-1.4.2.07 140
-MD5 e94f26fe6387bf27dc7b105879ca1be6 files/digest-sun-jdk-1.5.0.01 212
-MD5 dc0cdafb5c99594fb0ef9daa13b35fcf files/digest-sun-jdk-1.5.0.02 212
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCQ1vj06ebR+OMO78RAvaBAJ9hPq6lS1Ul0je6AFhbB6FGzxYAAACcDUPt
-XmkIogLVAlvTm9vCBNKIORU=
-=Ykal
------END PGP SIGNATURE-----
+MD5 dc0cdafb5c99594fb0ef9daa13b35fcf files/digest-sun-jdk-1.5.0.02-r1 212
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.07 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.07-r1
index b576a1bd322a..b576a1bd322a 100644
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.07
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.07-r1
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0
deleted file mode 100644
index c1b3d6921f73..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 81d0511feb32e7b7d61f7c07ee0b15e9 jdk-1_5_0-linux-i586.bin 46087154
-MD5 5953d077a7062d4e4198f42628c4af60 jdk-1_5_0-linux-amd64.bin 42055844
-MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.01 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.01
deleted file mode 100644
index 67a58ab76aa1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.01
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3e3aa7f89685a30c5c343f8f70966800 jdk-1_5_0_01-linux-i586.bin 46120566
-MD5 99261de1c6c7774502eaa505cdfb1dec jdk-1_5_0_01-linux-amd64.bin 42091128
-MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.02 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.02-r1
index decf30bbef29..decf30bbef29 100644
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.02
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.02-r1
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.2.05 b/dev-java/sun-jdk/files/sun-jdk-1.4.2.05
deleted file mode 100644
index 0b4f78f5a769..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.2.05
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2004 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.4.2.05,v 1.2 2004/09/28 00:33:36 swegener Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
-ADDLDPATH="/opt/@P@/jre/lib"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.2.06 b/dev-java/sun-jdk/files/sun-jdk-1.4.2.06
deleted file mode 100644
index 7849923748eb..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.2.06
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2004 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.4.2.06,v 1.1 2004/10/12 21:40:42 axxo Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
-ADDLDPATH="/opt/@P@/jre/lib"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.0 b/dev-java/sun-jdk/files/sun-jdk-1.5.0
deleted file mode 100644
index 08e9d9c6b8cf..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2004 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.0,v 1.1 2004/09/30 14:34:05 axxo Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="/opt/@P@/jre/lib"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.0.01 b/dev-java/sun-jdk/files/sun-jdk-1.5.0.01
deleted file mode 100644
index edb637dd3ed0..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.5.0.01
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2004 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.0.01,v 1.1 2004/12/21 21:37:17 axxo Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="/opt/@P@/jre/lib"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.07.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild
index 649e4d4f403f..a21352626757 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.07.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild
@@ -1,6 +1,6 @@
 # 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/sun-jdk-1.4.2.07.ebuild,v 1.3 2005/03/25 00:31:18 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild,v 1.1 2005/03/25 22:37:57 luckyduck Exp $
 
 inherit java eutils
 
@@ -76,7 +76,7 @@ src_unpack() {
 	if [ -f ${S}/lib/unpack ]; then
 		UNPACK_CMD=${S}/lib/unpack
 		chmod +x $UNPACK_CMD
-		perl -pi -e 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#sg' $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
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.01.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild
index a702f636980f..7f8b9f3d8470 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.01.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild
@@ -1,6 +1,6 @@
 # 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/sun-jdk-1.5.0.01.ebuild,v 1.5 2005/03/08 16:18:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild,v 1.1 2005/03/25 22:37:57 luckyduck Exp $
 
 inherit java eutils
 
@@ -87,6 +87,7 @@ src_unpack() {
 	if [ -f ${S}/bin/unpack200 ]; then
 		UNPACK_CMD=${S}/bin/unpack200
 		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
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.02.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.02.ebuild
deleted file mode 100644
index 375ce79e0599..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.02.ebuild
+++ /dev/null
@@ -1,237 +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/sun-jdk-1.5.0.02.ebuild,v 1.1 2005/03/21 18:20:11 axxo Exp $
-
-inherit java eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-amd64file="jdk-${MY_PVA}-linux-amd64.bin"
-x86file="jdk-${MY_PVA}-linux-i586.bin"
-
-jcefile="jce_policy-${MY_PVA%_*}.zip"
-
-if use x86; then
-	At=${x86file}
-elif use amd64; then
-	At=${amd64file}
-fi
-
-S="${WORKDIR}/jdk${MY_PVL}"
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )
-		jce? ( $jcefile )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 ~amd64"
-RESTRICT="fetch nostrip"
-IUSE="doc gnome kde mozilla jce"
-
-#
-DEPEND=">=dev-java/java-config-1.2
-	sys-apps/sed
-	jce? ( app-arch/unzip )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
-
-RDEPEND="x86? ( sys-libs/lib-compat )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
-
-PROVIDE="virtual/jre-1.5
-	virtual/jdk-1.5"
-
-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"
-
-FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${FETCH_SDK}
-	einfo "(Select the Self-extracting (.bin) for Linux or Linux AMD64, depending on your arch)"
-	einfo "and move it to ${DISTDIR}"
-
-	if use jce; then
-		echo
-		einfo "Also download ${jcefile} from:"
-		einfo ${FETCH_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}. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jcefile} ]; then
-			die "cannot read ${jcefile}. Please check the permission and try again."
-		fi
-	fi
-
-	#Search for the ELF Header
-	testExp=`echo -e "\105\114\106"`
-	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}/bin/unpack200 ]; then
-		UNPACK_CMD=${S}/bin/unpack200
-		chmod +x $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
-		rm -f ${UNPACK_CMD}
-	else
-		die "unpack not found"
-	fi
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -a $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc COPYRIGHT LICENSE README.html
-	dohtml README.html
-	dodir /opt/${P}/share/
-	cp -a demo src.zip ${D}/opt/${P}/share/
-	if ( use x86 || use amd64 ); then
-		cp -a sample ${D}/opt/${P}/share/
-	fi
-
-	if use jce ; then
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce"
-		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 mozilla; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=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}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java.desktop
-
-	if use x86; then
-		if use gnome ; then
-			#TODO check this on Gnome
-			dodir /usr/share/gnome/apps/Internet
-			insinto /usr/share/gnome/apps/Internet
-			doins ${T}/sun_java.desktop
-		fi
-
-		if use kde ; then
-			dodir /usr/share/applnk/Internet
-			insinto /usr/share/applnk/Internet
-			doins ${T}/sun_java.desktop
-		fi
-	else
-		eerror "Sorry no kde, gnome support for your arch now."
-	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/jre
-	mkdir -p ${PREFS_LOCATION}/.systemPrefs
-	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.system.lock
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
-	fi
-	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-	fi
-
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	#Show info about netscape
-	if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# 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"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/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 + pappy@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-
-	echo
-	einfo " Be careful: ${P}'s Java compiler uses"
-	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
-	einfo " are not valid identifiers any more in that mode,"
-	einfo " which can cause incompatibility with certain sources."
-
-	ebeep 5
-	epause 8
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.ebuild
deleted file mode 100644
index ba183586efa1..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.ebuild
+++ /dev/null
@@ -1,233 +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/sun-jdk-1.5.0.ebuild,v 1.5 2005/01/14 23:49:23 karltk Exp $
-
-inherit java eutils
-
-amd64file="jdk-1_5_0-linux-amd64.bin"
-x86file="jdk-1_5_0-linux-i586.bin"
-
-jcefile="jce_policy-1_5_0.zip"
-
-if use x86; then
-	At=${x86file}
-elif use amd64; then
-	At=${amd64file}
-fi
-
-S="${WORKDIR}/jdk1.5.0"
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )
-		jce? ( $jcefile )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 ~amd64"
-RESTRICT="fetch nostrip"
-IUSE="doc gnome kde mozilla jce"
-
-#
-DEPEND=">=dev-java/java-config-1.2
-	sys-apps/sed
-	jce? ( app-arch/unzip )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
-
-RDEPEND="x86? ( sys-libs/lib-compat )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
-
-PROVIDE="virtual/jre-1.5
-	virtual/jdk-1.5"
-
-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"
-
-FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-1.5.0-oth-JPR&SiteId=JSC&TransactionId=noreg"
-FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-1.5.0-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${FETCH_SDK}
-	einfo "(Select the Linux or Linux AMD64 Self-extracting (.bin), depending on your arch)"
-	einfo "and move it to ${DISTDIR}"
-
-	if use jce; then
-		einfo "Also download ${jcefile} from:"
-		einfo ${FETCH_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}. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jcefile} ]; then
-			die "cannot read ${jcefile}. Please check the permission and try again."
-		fi
-	fi
-
-	#Search for the ELF Header
-	testExp=`echo -e "\105\114\106"`
-	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}/bin/unpack200 ]; then
-		UNPACK_CMD=${S}/bin/unpack200
-		chmod +x $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
-		rm -f ${UNPACK_CMD}
-	else
-		die "unpack not found"
-	fi
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -a $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc COPYRIGHT LICENSE README.html
-	dohtml README.html
-	dodir /opt/${P}/share/
-	cp -a demo src.zip ${D}/opt/${P}/share/
-	if ( use x86 || use amd64 ); then
-		cp -a sample ${D}/opt/${P}/share/
-	fi
-
-	if use jce ; then
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce"
-		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 mozilla; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=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}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java.desktop
-
-	if use x86; then
-		if use gnome ; then
-			#TODO check this on Gnome
-			dodir /usr/share/gnome/apps/Internet
-			insinto /usr/share/gnome/apps/Internet
-			doins ${T}/sun_java.desktop
-		fi
-
-		if use kde ; then
-			dodir /usr/share/applnk/Internet
-			insinto /usr/share/applnk/Internet
-			doins ${T}/sun_java.desktop
-		fi
-	else
-		eerror "Sorry no kde, gnome support for your arch now."
-	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/jre
-	mkdir -p ${PREFS_LOCATION}/.systemPrefs
-	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.system.lock
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
-	fi
-	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-	fi
-
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	#Show info about netscape
-	if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# 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"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/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 + pappy@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-
-	echo
-	einfo " Be careful: ${P}'s Java compiler uses"
-	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
-	einfo " are not valid identifiers any more in that mode,"
-	einfo " which can cause incompatibility with certain sources."
-
-	ebeep 5
-	epause 8
-}