Please see the ChangeLog.

8 files changed, 112 insertions, 168 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index c3af2d7a8417..b7c3b4e6db1d 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.58 2003/11/20 12:03:31 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.59 2003/12/07 17:41:49 strider Exp $
+
+  07 Dec 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.3.1.09.ebuild,
+  sun-jdk-1.4.1.05.ebuild, sun-jdk-1.4.2.01.ebuild, sun-jdk-1.4.2.02.ebuild,
+  files/sun-jdk-1.4.2.01:
+  Adding some advices to pkg_postinst, Fixes to bug #31291.
+  Thanks to Douglas Pollock <douglas.pollock@magma.ca> for his comment found on the sun-jdk 1.2.2 ebuild that he sent. (See the ebuilds).
 
   20 Nov 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.1.05.ebuild:
   Moved to stable.
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 213d5a1502ef..f762cee6b27b 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,14 +1,11 @@
-MD5 a4bc4e8cada67b3447119752ac799a76 sun-jdk-1.3.1.09.ebuild 2462
-MD5 a27270569e9d31ac566b1ffa17223c8e sun-jdk-1.4.2.01.ebuild 3727
-MD5 a5fbe842394b0ac80f33a028431d9af1 ChangeLog 13010
-MD5 142486b879adceb127a04766b92b5dc0 sun-jdk-1.4.2.02.ebuild 3710
+MD5 557a8106bfd2f760b2b941def5db1482 sun-jdk-1.3.1.09.ebuild 3647
+MD5 2f90bff21c016b4d03353d4561f7e2c4 ChangeLog 13388
+MD5 2d34399cec82d8f328704a02c84e4fb1 sun-jdk-1.4.2.02.ebuild 5168
 MD5 3624458aaf058b4b4b2cf00e096c5c84 metadata.xml 382
-MD5 f8da2a2754319ecc0b74709cb6d2eea8 sun-jdk-1.4.1.05.ebuild 1911
+MD5 6763f397514bbea3d499047aec998b5c sun-jdk-1.4.1.05.ebuild 3097
 MD5 20129e994188aa6a6f1b4690cbb91ca9 files/sun-jdk-1.3.1.09 648
 MD5 440220b7275afac3cce9a222d39a2fde files/sun-jdk-1.4.1.05 581
-MD5 ccd9bd0dbf7649c2e5681e9cda01f99c files/sun-jdk-1.4.2.01 519
 MD5 ccd9bd0dbf7649c2e5681e9cda01f99c files/sun-jdk-1.4.2.02 519
 MD5 951b3321a6c971e8af7c5b12816f3db0 files/digest-sun-jdk-1.3.1.09 76
 MD5 c79470c52b4a6023145cc947d213b59b files/digest-sun-jdk-1.4.1.05 76
-MD5 389f348934b4a924a337f7cf3dad6479 files/digest-sun-jdk-1.4.2.01 76
 MD5 f53dfb087680ab4b2c36d29fcf0e4496 files/digest-sun-jdk-1.4.2.02 76
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.01 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.01
deleted file mode 100644
index f9f2eaebf3c9..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.01
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07dbf14a3098b4e38cac57ad520ff474 j2sdk-1_4_2_01-linux-i586.bin 35796720
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.2.01 b/dev-java/sun-jdk/files/sun-jdk-1.4.2.01
deleted file mode 100644
index ea03125e02f4..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.2.01
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Karl Trygve Kalleberg
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar:/opt/@P@/jre/lib/rt.jar
-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 CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
index 5d07637f2da5..81609241d397 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.3.1.09.ebuild,v 1.2 2003/09/12 04:40:27 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild,v 1.3 2003/12/07 17:41:49 strider Exp $
 
 IUSE="doc"
 
@@ -35,7 +35,8 @@ src_unpack() {
 		eerror "cannot read ${At}. Please check the permission and try again."
 		die
 	fi
-	testExp=`echo -e "\0177\0105\0114\0106\0001\0001\0001"`
+	#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
@@ -90,6 +91,32 @@ src_install () {
 pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
-
 	inst_plugin /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so
+
+	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
+	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
+	if [ !"`use X`" ] ; then
+		einfo "********************************************************"
+		eerror "You're not using X so its possible that you dont have"
+		eerror "a X server installed, please read the following warn: "
+		eerror "Some parts of Sun's JDK require XFree86 to be installed."
+		eerror "Be careful which Java libraries you attempt to use."
+		einfo "********************************************************"
+		echo
+	fi
+
+	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
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.05.ebuild
index ac55d5e453f2..1af0adc3b94e 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.05.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.1.05.ebuild,v 1.2 2003/11/20 12:03:31 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.05.ebuild,v 1.3 2003/12/07 17:41:49 strider Exp $
 
 IUSE="doc"
 
@@ -37,7 +37,8 @@ src_unpack() {
 		eerror "cannot read ${At}. Please check the permission and try again."
 		die
 	fi
-	testExp=`echo -e "\0177\0105\0114\0106\0001\0001\0001"`
+	#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
@@ -74,4 +75,31 @@ pkg_postinst () {
 	java_pkg_postinst
 
 	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+
+	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
+	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
+	if [ !"`use X`" ] ; then
+		einfo "********************************************************"
+		eerror "You're not using X so its possible that you dont have"
+		eerror "a X server installed, please read the following warn: "
+		eerror "Some parts of Sun's JDK require XFree86 to be installed."
+		eerror "Be careful which Java libraries you attempt to use."
+		einfo "********************************************************"
+		echo
+	fi
+
+	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
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.01.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.01.ebuild
deleted file mode 100644
index a2f9f3a8393e..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.01.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2003 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.01.ebuild,v 1.5 2003/10/22 12:50:23 strider Exp $
-
-IUSE="doc gnome kde mozilla"
-
-inherit java nsplugins
-
-At="j2sdk-1_4_2_01-linux-i586.bin"
-S="${WORKDIR}/j2sdk1.4.2_01"
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.2"
-HOMEPAGE="http://java.sun.com/products/archive/j2se/1.4.2_01/index.html"
-SRC_URI=${At}
-RESTRICT="fetch"
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
-
-DEPEND=">=dev-java/java-config-0.2.7
-	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"
-
-RESTRICT="fetch"
-
-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"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${HOMEPAGE}
-	einfo "(select the \"Linux self-extracting file\" package format of the SDK)"
-	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
-	testExp=`echo -e "\0177\0105\0114\0106\0001\0001\0001"`
-	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 -a $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/gnome/apps/Internet
-		insinto /usr/share/gnome/apps/Internet
-		doins ${T}/sun_java.desktop
-	fi
-	if use kde ; then
-		dodir $KDEDIR/share/applnk/Internet
-		insinto $KDEDIR/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
-
-	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
-}
-
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild
index aa8b40b14134..c1b1634c239a 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.02.ebuild,v 1.1 2003/11/09 04:45:12 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild,v 1.2 2003/12/07 17:41:49 strider Exp $
 
 IUSE="doc gnome kde mozilla"
 
@@ -43,7 +43,8 @@ src_unpack() {
 		eerror "cannot read ${At}. Please check the permission and try again."
 		die
 	fi
-	testExp=`echo -e "\0177\0105\0114\0106\0001\0001\0001"`
+	#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
@@ -124,10 +125,42 @@ pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
 
-	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
-}
+	#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
+
+	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
+	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
+	if [ !"`use X`" ] ; then
+		einfo "********************************************************"
+		eerror "You're not using X so its possible that you dont have"
+		eerror "a X server installed, please read the following warn: "
+		eerror "Some parts of Sun's JDK require XFree86 to be installed."
+		eerror "Be careful which Java libraries you attempt to use."
+		einfo "********************************************************"
+		echo
+	fi
+
+	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
 
+}