Fix bug 18773 by updating env.d file to include tools.jar. Additionally update this ebuild to download the rpm directly. There doesn't appear to be a web page for it any longer.

5 files changed, 67 insertions, 7 deletions

diff --git a/dev-java/compaq-jdk/ChangeLog b/dev-java/compaq-jdk/ChangeLog
index 153fc511a7a0..1a1899ddb2b7 100644
--- a/dev-java/compaq-jdk/ChangeLog
+++ b/dev-java/compaq-jdk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/compaq-jdk
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/ChangeLog,v 1.4 2003/05/09 19:54:41 taviso Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/ChangeLog,v 1.5 2004/01/10 02:51:09 agriffis Exp $
+
+*compaq-jdk-1.3.1-r1 (08 Jan 2004)
+
+  08 Jan 2004; Aron Griffis <agriffis@gentoo.org> compaq-jdk-1.3.1-r1.ebuild,
+  files/compaq-jdk-1.3.1:
+  Fix bug 18773 by updating env.d file to include tools.jar.  Additionally
+  update this ebuild to download the rpm directly.  There doesn't appear to be
+  a web page for it any longer.
 
   09 May 2003; Tavis Ormandy <taviso@gentoo.org> compaq-jdk-1.3.1.ebuild:
   updating openmotif dependency.
diff --git a/dev-java/compaq-jdk/Manifest b/dev-java/compaq-jdk/Manifest
index 356f0e13bb58..b6ce251418e0 100644
--- a/dev-java/compaq-jdk/Manifest
+++ b/dev-java/compaq-jdk/Manifest
@@ -1,7 +1,7 @@
-MD5 126b799670ea0ffce6159dbe06b51ad2 ChangeLog 755
+MD5 5b5e033fa2293899bd591e1b6a3c427f ChangeLog 883
 MD5 f873446901e6360e3316f08309471b88 compaq-jdk-1.3.1.ebuild 1465
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 bb7da4a4dacde9e9d9c083d01023111b compaq-jdk-1.3.1-r1.ebuild 1328
-MD5 42031940f880d4b0b92d194f55940c88 files/compaq-jdk-1.3.1 615
+MD5 b6be7becb020d674d532527dc62228d1 compaq-jdk-1.3.1-r1.ebuild 1331
+MD5 f954d19483f88e46f00557b3e7cf8c66 files/compaq-jdk-1.3.1 620
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-compaq-jdk-1.3.1 0
 MD5 b575f6634b78c6d9d63f83534bf15654 files/digest-compaq-jdk-1.3.1-r1 74
diff --git a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..18057088ca8a
--- /dev/null
+++ b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild,v 1.1 2004/01/10 02:51:09 agriffis Exp $
+
+IUSE="doc"
+
+inherit java
+
+S=${WORKDIR}/jdk1.3.1
+SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/jdk-1.3.1-1-linux-alpha.rpm"
+HOMEPAGE="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/"
+DESCRIPTION="Compaq Java Development Kit 1.3.1 for Alpha/Linux/GNU"
+DEPEND="virtual/glibc
+	app-arch/rpm2targz
+	dev-libs/libots
+	dev-libs/libcpml
+	>=dev-java/java-config-0.2.5
+	>=x11-libs/openmotif-2.1.30-r1
+	doc? ( ~dev-java/java-sdk-docs-1.3.1 )"
+RDEPEND="$DEPEND"
+PROVIDE="virtual/jre-1.3.1
+	virtual/jdk-1.3.1
+	virtual/java-scheme-2"
+LICENSE="compaq-sdla"
+SLOT="1.3"
+KEYWORDS="-* alpha"
+
+src_unpack() {
+	rpm2targz ${DISTDIR}/jdk-1.3.1-1-linux-alpha.rpm
+	tar xzf jdk-1.3.1-1-linux-alpha.tar.gz >& /dev/null
+	mv usr/java/jdk1.3.1 .
+}
+
+src_install () {
+	dodir /opt/${P}
+	cp -a bin include include-old jre lib ${D}/opt/${P}
+
+	dodoc COPYRIGHT README LICENSE
+	dohtml README.html
+	doman man/man1/*.1
+
+	dodir /opt/${P}/share
+	cp -a demo src.jar ${D}/opt/${P}/share
+
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
+}
+
+pkg_postinst () {
+	# Set as default VM if none exists
+	java_pkg_postinst
+}
diff --git a/dev-java/compaq-jdk/files/compaq-jdk-1.3.1 b/dev-java/compaq-jdk/files/compaq-jdk-1.3.1
index 1341058c6bba..55da89bd10c5 100644
--- a/dev-java/compaq-jdk/files/compaq-jdk-1.3.1
+++ b/dev-java/compaq-jdk/files/compaq-jdk-1.3.1
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
 # Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/files/compaq-jdk-1.3.1,v 1.1 2002/12/15 14:52:42 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/files/compaq-jdk-1.3.1,v 1.2 2004/01/10 02:51:10 agriffis Exp $
 
 VERSION="Compaq JDK @PV@"
 JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/jre/lib/rt.jar:.
+CLASSPATH=/opt/@P@/jre/lib/rt.jar:/opt/@P@/jre/lib/tools.jar:.
 JDK_HOME=/opt/@P@
 JAVAC=${JAVA_HOME}/bin/javac
 ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
diff --git a/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r1 b/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r1
new file mode 100644
index 000000000000..b53708a161b3
--- /dev/null
+++ b/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r1
@@ -0,0 +1 @@
+MD5 5ffba433b84e5c818445cc83ada05b99 jdk-1.3.1-1-linux-alpha.rpm 23450390