Version bump and some bug fixes. Closes #41870, #44256, #33165

5 files changed, 220 insertions, 12 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 2a5a73fd08d6..d9501dd224a8 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.68 2004/03/02 08:54:26 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.69 2004/03/11 01:32:12 zx Exp $
+
+*sun-jdk-1.4.2.04 (10 Mar 2004)
+
+  10 Mar 2004; Chris Aniszczyk <zx@gentoo.org> sun-jdk-1.4.2.04.ebuild,
+  files/sun-jdk-1.4.2.04:
+  Version bump + fixes.
+  Closes #41870, #44256, #33165
 
   01 Mar 2004; <mkennedy@gentoo.org> files/sun-jdk-1.3.1.09,
   files/sun-jdk-1.3.1.10, files/sun-jdk-1.4.1.06, files/sun-jdk-1.4.2.03,
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index d632cb7b8308..9cd589f2b52d 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,17 +1,20 @@
-MD5 f395f41d2233f3ebdd2a9bbfbc30dd2e sun-jdk-1.3.1.09.ebuild 4477
-MD5 2ef9bad411274beb4d386491d6b21fa0 sun-jdk-1.3.1.10.ebuild 4508
-MD5 daafd81762c49a5402fb2c4c35612d8b sun-jdk-1.5.0_beta1-r1.ebuild 6744
-MD5 ecf9a8654508280f6f9081b7a4d614e9 sun-jdk-1.4.2.03.ebuild 6009
-MD5 0bcb44e4cb6027ed2fd576fa868242c9 sun-jdk-1.4.1.06.ebuild 3325
-MD5 06114cd01f70fa8203f1e556d6d72682 ChangeLog 15179
+MD5 986c19752e7bfc9ba5ba2e5a56dd4eb1 sun-jdk-1.3.1.09.ebuild 4476
+MD5 a4c701051ba67e4e3a149dc58d081420 sun-jdk-1.4.2.04.ebuild 5990
+MD5 e1a746fcb754b85b9b213201e93cf5fd sun-jdk-1.3.1.10.ebuild 4507
+MD5 5137d8aa8a9958961607b262521383ef sun-jdk-1.5.0_beta1-r1.ebuild 6743
+MD5 8f3b363627a175883b665188f75a8a5d sun-jdk-1.4.2.03.ebuild 6008
+MD5 09b20f6b7dbfa5cf4b3dde48f99dea52 sun-jdk-1.4.1.06.ebuild 3324
+MD5 17657e20daa324fb641dfbb4c9fe7dfe ChangeLog 15364
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
-MD5 41998d0664732a0724913e8fcbb99116 files/sun-jdk-1.5.0_beta1 511
-MD5 42d4a2a3c9334183f92434b45d7e3fe3 files/sun-jdk-1.3.1.09 453
-MD5 35745057c34f459f6cea66005147f14f files/sun-jdk-1.3.1.10 453
-MD5 44786dcd795cb85c1a4778424d5d4711 files/sun-jdk-1.4.1.06 454
-MD5 2b6d570db89c9f518f4b9126337ce6f5 files/sun-jdk-1.4.2.03 508
+MD5 23dc72c0593598205f5a04485fa26c43 files/sun-jdk-1.5.0_beta1 510
+MD5 4a5fc5c0684f6b528b3ae31a97f84f2b files/sun-jdk-1.3.1.09 452
+MD5 511ddb04ecb42c5574987c882c7f34a2 files/sun-jdk-1.3.1.10 452
+MD5 cb0de5062b15a7a2932f93d3fc06a75c files/sun-jdk-1.4.1.06 453
+MD5 1e16ba898d1d2c316071a9cedbc8cb86 files/sun-jdk-1.4.2.03 507
+MD5 95de036c7345d0fd444408a855b47925 files/sun-jdk-1.4.2.04 501
 MD5 e089ba4610fef6873f7babe744e4e2d6 files/digest-sun-jdk-1.5.0_beta1-r1 157
 MD5 951b3321a6c971e8af7c5b12816f3db0 files/digest-sun-jdk-1.3.1.09 76
 MD5 7b0d2e578d7bc3c00ab9b67590b7b3ca files/digest-sun-jdk-1.3.1.10 76
 MD5 758406756bec272a9edfb8f09979c1f9 files/digest-sun-jdk-1.4.1.06 76
 MD5 cecdd73e91e2ceba74fa83949b359c02 files/digest-sun-jdk-1.4.2.03 76
+MD5 e11eda1d48aafd7605f595a9884230e3 files/digest-sun-jdk-1.4.2.04 76
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.04 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.04
new file mode 100644
index 000000000000..77fb6bf66673
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.04
@@ -0,0 +1 @@
+MD5 cc27ac6189062214c072cb5b4ae068fa j2sdk-1_4_2_04-linux-i586.bin 35829260
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.2.04 b/dev-java/sun-jdk/files/sun-jdk-1.4.2.04
new file mode 100644
index 000000000000..3417d1136c8d
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.2.04
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.04,v 1.1 2004/03/11 01:32:12 zx 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.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.04.ebuild
new file mode 100644
index 000000000000..20bda92c307d
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.04.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.04.ebuild,v 1.1 2004/03/11 01:32:12 zx Exp $
+
+IUSE="doc gnome kde mozilla"
+
+inherit java nsplugins
+
+At="j2sdk-1_4_2_04-linux-i586.bin"
+S="${WORKDIR}/j2sdk1.4.2_04"
+DESCRIPTION="Sun's J2SE Development Kit, version 1.4.2_04"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
+SRC_URI=${At}
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa"
+RESTRICT="fetch"
+
+DEPEND=">=dev-java/java-config-1.1.5
+	sys-apps/sed
+	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"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${HOMEPAGE}
+	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}"
+}
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	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/
+
+	local plugin_dir="ns610"
+	if has_version '>=gcc-3.2*' ; then
+		plugin_dir="ns610-gcc32"
+	fi
+	if [ "`use mozilla`" ] ; then
+		install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	fi
+	inst_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+
+	# 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
+		einfo "********************************************************"
+		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"
+		einfo "********************************************************"
+		echo
+	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
+		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
+
+	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
+	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
+	einfo "*********************************************************"
+	eerror "Some parts of Sun's JDK require XFree86 to be installed."
+	eerror "Be careful which Java libraries you attempt to use."
+	einfo "*********************************************************"
+	echo
+
+	einfo "******************************************************"
+	einfo " After installing ${P} this"
+	einfo " was set as the default JVM to run."
+	einfo " When finished please run the following so your"
+	einfo " enviroment gets updated."
+	eerror "    /usr/sbin/env-update && source /etc/profile"
+	einfo " Or use java-config program to set your preferred VM"
+	einfo "******************************************************"
+
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	sleep 8
+
+}