version bump

5 files changed, 226 insertions, 11 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 69c1bd8dca36..0eef6958456f 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.92 2004/09/30 14:34:05 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.93 2004/10/12 21:40:42 axxo Exp $
+
+*sun-jdk-1.4.2.06 (12 Oct 2004)
+
+  12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +files/sun-jdk-1.4.2.06,
+  +sun-jdk-1.4.2.06.ebuild:
+  version bump
 
 *sun-jdk-1.5.0 (30 Sep 2004)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 7fbb47a96860..66356edf1ab5 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 31c381ae78737d7270b0fac321f878b9 sun-jdk-1.3.1.13.ebuild 3803
+MD5 c95e0518cf008865191e05b46b8785c2 sun-jdk-1.4.2.06.ebuild 6394
 MD5 8cd7b78a6f968cc64098ac22461a7f30 sun-jdk-1.2.2.017.ebuild 3149
 MD5 e5fdb7cb12af035716e81715eff30ad2 sun-jdk-1.5.0.ebuild 7123
 MD5 2ad661ec7ec297fbc0f63fc66cd1fe42 sun-jdk-1.4.2.05.ebuild 6420
@@ -10,15 +8,10 @@ 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 13e855f76ac09be667d9e62a76f0d833 files/sun-jdk-1.4.2.06 499
 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 d1e29e8acce3cfec9912e23aa366478a files/digest-sun-jdk-1.3.1.13 76
 MD5 dbb142ea361e1f8ac87d899f62f66c89 files/digest-sun-jdk-1.4.2.05 140
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBaBq+/rLF9B432nYRAnSnAJ4rp6a6ma6oTkuHpyhpxR9AaQCNtACeJRh0
-NPtRQzyKKJdLqcqcHlbmy2k=
-=KEMc
------END PGP SIGNATURE-----
+MD5 25d7339acdf5210791eb94ee7bfc5e7e files/digest-sun-jdk-1.4.2.06 140
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.06 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.06
new file mode 100644
index 000000000000..1d5ad32d5b73
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.06
@@ -0,0 +1,2 @@
+MD5 5e8e8bbdbd35b23987e06a070266c42c j2sdk-1_4_2_06-linux-i586.bin 36417364
+MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
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
new file mode 100644
index 000000000000..7849923748eb
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.2.06
@@ -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.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/sun-jdk-1.4.2.06.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.06.ebuild
new file mode 100644
index 000000000000..f66c94b6ebae
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.06.ebuild
@@ -0,0 +1,202 @@
+# 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/sun-jdk-1.4.2.06.ebuild,v 1.1 2004/10/12 21:40:42 axxo Exp $
+
+inherit java 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="doc gnome kde mozilla jce"
+
+DEPEND=">=dev-java/java-config-1.1.5
+	sys-apps/sed
+	app-arch/unzip
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+RDEPEND="sys-libs/lib-compat"
+
+PROVIDE="virtual/jre-1.4.2
+	virtual/jdk-1.4.2
+	virtual/java-scheme-2"
+
+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="pemsv"
+
+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"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${DOWNLOAD_URL}
+	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting."
+	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 ${MY_PV}.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 "\177\105\114\106\001\001\001"`
+	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
+		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
+
+	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
+	dohtml README.html
+	dodir /opt/${P}/share/
+	cp -a demo src.zip ${D}/opt/${P}/share/
+
+	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 mozilla; then
+		local plugin_dir="ns610"
+		if has_version '>=gcc-3.2*' ; then
+			plugin_dir="ns610-gcc32"
+		fi
+
+		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
+	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 gnome ; then
+		#TODO check this on Gnome
+		dodir /usr/share/applications
+		insinto /usr/share/applications
+		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
+
+	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.
+	touch /opt/${P}/.systemPrefs/.system.lock
+	chmod 644 /opt/${P}/.systemPrefs/.system.lock
+	touch /opt/${P}/.systemPrefs/.systemRootModFile
+	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
+
+	# 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/sun-jdk-1.4.2.03/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 XFree86 to be installed."
+	eerror "Be careful which Java libraries you attempt to use."
+
+	ebeep 5
+	epause 8
+}