version bump

Package-Manager: portage-2.0.51.19

5 files changed, 267 insertions, 6 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 7c083571c581..13637e74b567 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.102 2005/02/03 05:43:51 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.103 2005/03/21 18:20:11 axxo Exp $
+
+*sun-jdk-1.5.0.02 (21 Mar 2005)
+
+  21 Mar 2005; Thomas Matthijs <axxo@gentoo.org> +files/sun-jdk-1.5.0.02,
+  +sun-jdk-1.5.0.02.ebuild:
+  version bump
 
   02 Feb 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   sun-jdk-1.4.2.07.ebuild:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 4b7563394f27..1869e461a938 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -6,8 +6,9 @@ MD5 9299ace5688576a9b9ab9ddf5a4dfca4 sun-jdk-1.3.1.13.ebuild 3802
 MD5 a2ea64d7d46902fa9280b14c3a99af24 sun-jdk-1.4.2.06.ebuild 6393
 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 b198a28b00dc9afdf1b189370705a232 sun-jdk-1.4.2.05.ebuild 6420
-MD5 bacd01fd5d251c231191e7a78ba110a7 ChangeLog 21210
+MD5 eed345c96edce9a6a80c4603de56fb32 ChangeLog 21357
 MD5 1347f367e642eb20ff9c4ab907c51b6b sun-jdk-1.4.2.07.ebuild 6401
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 MD5 e69378131ebaaa3322d156533d441dce files/digest-sun-jdk-1.5.0 206
@@ -16,6 +17,7 @@ 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
@@ -24,10 +26,11 @@ MD5 dbb142ea361e1f8ac87d899f62f66c89 files/digest-sun-jdk-1.4.2.05 140
 MD5 25d7339acdf5210791eb94ee7bfc5e7e files/digest-sun-jdk-1.4.2.06 140
 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)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCLdCW/rLF9B432nYRArSOAJ40tSyDiCRcPwGga8UMpNH6+vs0TACeLzOe
-Vp6FcrFys5jE+P6cOdnq7O8=
-=yaoa
+iD8DBQFCPxDK/rLF9B432nYRApBiAKCSTUWk0bY/HnwrSDCOV+fTqD44ogCfXCyE
+F/3WqWLOinPeB6bxavdrsXU=
+=ULmF
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..decf30bbef29
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.02
@@ -0,0 +1,3 @@
+MD5 562d9797af801bfbe2b5e44417d8ccc4 jdk-1_5_0_02-linux-i586.bin 46155976
+MD5 db0d14713854fb3be9350fd68bf2674f jdk-1_5_0_02-linux-amd64.bin 42119076
+MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.0.02 b/dev-java/sun-jdk/files/sun-jdk-1.5.0.02
new file mode 100644
index 000000000000..86273095d89b
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.5.0.02
@@ -0,0 +1,12 @@
+# 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.02,v 1.1 2005/03/21 18:20:11 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.5.0.02.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.02.ebuild
new file mode 100644
index 000000000000..375ce79e0599
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.02.ebuild
@@ -0,0 +1,237 @@
+# 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
+}