Version bump and added proper dependencies. Fixes bug #115738.

(Portage version: 2.1_pre2)

5 files changed, 187 insertions, 2 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 611b7cbe3216..207fc5025250 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.132 2005/12/16 15:30:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.133 2005/12/28 20:51:11 betelgeuse Exp $
+
+*sun-jdk-1.3.1.17 (28 Dec 2005)
+
+  28 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
+  +files/sun-jdk-1.3.1.17, +sun-jdk-1.3.1.17.ebuild:
+  Version bump and added proper dependencies. Fixes bug #115738.
 
   16 Dec 2005; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.4.2.10.ebuild:
   No longer needs the javaws hack, was fixed upstream #115772
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 9ad799e1e20c..dba5d80a8617 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,6 +1,7 @@
-MD5 40b0cb18a760f977cad2cdf0b83301ed ChangeLog 27115
+MD5 167812fc18335b822684705754ac1024 ChangeLog 27320
 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78
 MD5 7339eea38c2cfdfdc4cd777a02c4cbc1 files/digest-sun-jdk-1.3.1.16 76
+MD5 368b26d168ecbf956f69a0ebe8780433 files/digest-sun-jdk-1.3.1.17 76
 MD5 ce8f1c0c94a74aadae5d58b68c254161 files/digest-sun-jdk-1.4.2.09 140
 MD5 26916b6de74c3d0ffd1eb22f64073ead files/digest-sun-jdk-1.4.2.10 140
 MD5 40541411b01ed36dc30322d7a5ab2ee9 files/digest-sun-jdk-1.5.0.05 212
@@ -8,6 +9,7 @@ MD5 7aea6ff8bf86dffb57bf2427771e6ad7 files/digest-sun-jdk-1.5.0.06 212
 MD5 64ade01a917993ba9712b2c0d2f4a580 files/javaws-waitid.c 833
 MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328
 MD5 0b7cc36964f2fa50ad778e865f0cc851 files/sun-jdk-1.3.1.16 471
+MD5 c4bae3bfedca87915ab63bea0cba2957 files/sun-jdk-1.3.1.17 471
 MD5 ca5181076e4ba09c94548af2da8690dd files/sun-jdk-1.4.2.09 646
 MD5 6149010c1ed7dcc5a315c6d9674c970b files/sun-jdk-1.4.2.10 640
 MD5 50d600429785f626eef0bb4048cbc009 files/sun-jdk-1.5.0.05 613
@@ -15,6 +17,7 @@ MD5 e20a02a5f2add3d89fcc46f9284efc42 files/sun-jdk-1.5.0.06 619
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 MD5 6e6334f4e89e27aca419bc2dea752336 sun-jdk-1.2.2.017.ebuild 2898
 MD5 89ea449d6a1117e1995a2d7bf53a3d0d sun-jdk-1.3.1.16.ebuild 4149
+MD5 1ad50bb2a8dd03c34d28e5f2dc58a46f sun-jdk-1.3.1.17.ebuild 4768
 MD5 668a0b7c052c6d32ec1183e8beef1d09 sun-jdk-1.4.2.09.ebuild 6866
 MD5 83dc22985f33cfd084346449b3d209d8 sun-jdk-1.4.2.10.ebuild 6773
 MD5 881e1d3c90a77528a35f1953302c7450 sun-jdk-1.5.0.05.ebuild 7350
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.17 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.17
new file mode 100644
index 000000000000..5bd82d282211
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.17
@@ -0,0 +1 @@
+MD5 cf2de94fb5437473da035470ef496fe7 j2sdk-1_3_1_17-linux-i586.bin 26660449
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1.17 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.17
new file mode 100644
index 000000000000..f2fc442d8a72
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.3.1.17
@@ -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.3.1.17,v 1.1 2005/12/28 20:51:11 betelgeuse 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.3.1.17.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.17.ebuild
new file mode 100644
index 000000000000..c579e3202daf
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.17.ebuild
@@ -0,0 +1,163 @@
+# 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.3.1.17.ebuild,v 1.1 2005/12/28 20:51:11 betelgeuse Exp $
+
+inherit java eutils
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_P=jdk${MY_PV}
+MY_PVB=${PV%.*}
+
+At="j2sdk-${PV//./_}-linux-i586.bin"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="${At}"
+DESCRIPTION="Sun Java Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.3/"
+DEPEND="virtual/libc
+	>=dev-java/java-config-0.2.7
+	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
+RDEPEND="sys-libs/lib-compat
+	doc? ( =dev-java/java-sdk-docs-1.3.1* )
+	nsplugin? ( dev-libs/glib x11-libs/gtk+ )
+	browserplugin? ( dev-libs/glib x11-libs/gtk+ )
+	mozilla? ( dev-libs/glib x11-libs/gtk+ )
+	X? ( || (	(
+					x11-libs/libX11
+					x11-libs/libXext
+					x11-libs/libXp
+					x11-libs/libXt
+					x11-libs/libXtst
+				)
+				virtual/x11
+			)
+		)"
+
+PROVIDE="virtual/jre
+	virtual/jdk"
+LICENSE="sun-bcla-java-vm"
+SLOT="1.3"
+KEYWORDS="-* ~x86"
+RESTRICT="fetch stricter"
+
+IUSE="X doc browserplugin nsplugin mozilla"
+# 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"
+
+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}"
+}
+
+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
+	rm install.sfx
+
+	sed "s/head -1/head -n 1/" -i ${MY_P}/bin/.java_wrapper
+}
+
+src_install() {
+	local dirs="bin include include-old jre lib man"
+	dodir /opt/${P}
+
+	for i in ${dirs} ; do
+		if [ "${i}" == "bin" ] ; then
+			dodir /opt/${P}/${i}
+			cp -dPR ${i}/.java_wrapper ${D}/opt/${P}/bin/
+			cp -dPR ${i}/* ${D}/opt/${P}/bin/
+		elif [ "${i}" == "jre" ] ; then
+			dodir /opt/${P}/${i}
+			dodir /opt/${P}/${i}/bin
+			cp -dPR ${i}/bin/.java_wrapper ${D}/opt/${P}/${i}/bin/
+			cp -dPR ${i}/bin/* ${D}/opt/${P}/${i}/bin/
+			cp -dPR	${i}/CHANGES \
+				${i}/COPYRIGHT \
+				${i}/ControlPanel.html \
+				${i}/LICENSE \
+				${i}/README \
+				${i}/Welcome.html \
+				${i}/lib \
+				${i}/plugin \
+				${D}/opt/${P}/${i}/
+		else
+			cp -dPR ${i} ${D}/opt/${P}/
+		fi
+	done
+
+	dodoc COPYRIGHT README LICENSE
+	dohtml README.html
+
+	dodir /opt/${P}/share/
+	cp -a demo src.jar ${D}/opt/${P}/share/
+
+	local javaplugin="/opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so"
+
+	if use nsplugin ||       # global useflag for netscape-compat plugins
+	   use browserplugin ||  # deprecated but honor for now
+	   use mozilla; then     # wrong but used to honor it
+		install_mozilla_plugin  ${javaplugin}
+	else
+		rm "${D}/${javaplugin}" || die "Removing javaplugin failed."
+	fi
+
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
+}
+
+pkg_postinst () {
+	# Set as default VM if none exists
+	java_pkg_postinst
+
+	if ! use nsplugin && ( use browserplugin || use mozilla ); then
+		echo
+		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
+		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
+		ewarn "update your USE to include 'nsplugin'."
+	fi
+
+	if use nsplugin || use browserplugin || use mozilla; then
+		echo
+		ewarn "The javaplugin in this version does not work with"
+		ewarn "Firefox 1.5."
+	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" "javah" "javadoc"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.3.1.09/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/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 + hardened@gentoo.org"
+	fi
+
+	if ! use X; then
+		echo
+		eerror "Some parts of Sun's JDK require X11 to be installed."
+		eerror "Be careful which Java libraries you attempt to use."
+	fi
+}