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, 14 insertions, 27 deletions

diff --git a/dev-java/compaq-jre/Manifest b/dev-java/compaq-jre/Manifest
index 358c088af942..9a2b0b883b10 100644
--- a/dev-java/compaq-jre/Manifest
+++ b/dev-java/compaq-jre/Manifest
@@ -1,7 +1,5 @@
-MD5 36f913d195ba852eb5f4d5233438c2c9 ChangeLog 555
-MD5 446d8254d56a5e590ed78ab4a97a4948 compaq-jre-1.3.1.ebuild 1370
+MD5 dad711485e08dca670811a0367a93244 ChangeLog 909
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 fb19f414ab8edda0af58e5ebc7ba73c3 compaq-jre-1.3.1-r1.ebuild 1235
-MD5 eb44f0683c4a6844017e205581f072d2 files/compaq-jre-1.3.1 579
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-compaq-jre-1.3.1 0
+MD5 086a32e7b8714aed524f5d6469b3d7bd compaq-jre-1.3.1-r1.ebuild 1238
+MD5 3a79e7182ca14824b22fefe6c4af76a7 files/compaq-jre-1.3.1 584
 MD5 4c552a6669f3e2e9d6f530bdebae0bc2 files/digest-compaq-jre-1.3.1-r1 74
diff --git a/dev-java/compaq-jre/compaq-jre-1.3.1.ebuild b/dev-java/compaq-jre/compaq-jre-1.3.1-r1.ebuild
index 50361a434622..642afe62b5c2 100644
--- a/dev-java/compaq-jre/compaq-jre-1.3.1.ebuild
+++ b/dev-java/compaq-jre/compaq-jre-1.3.1-r1.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-jre/compaq-jre-1.3.1.ebuild,v 1.5 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1-r1.ebuild,v 1.1 2004/01/10 15:20:27 agriffis Exp $
 
 IUSE="doc"
 
 inherit java
 
-At="jre-1.3.1-1-linux-alpha.tgz"
 S=${WORKDIR}/jre1.3.1
-SRC_URI=""
+SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/jre-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"
-HOMEPAGE="http://h18012.www1.hp.com/java/documentation/1.3.1/linux/docs/index.html"
 DEPEND="virtual/glibc
 	app-arch/rpm2targz
-	>=dev-java/java-config-0.2.5
 	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"
@@ -23,30 +22,20 @@ PROVIDE="virtual/jre-1.3.1
 	virtual/java-scheme-2"
 LICENSE="compaq-sdla"
 SLOT="1.3"
-KEYWORDS="-x86 -ppc -sparc alpha"
+KEYWORDS="-* alpha"
 
 src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	tar zxf ${DISTDIR}/${At}
-	rpm2targz jre-1.3.1-1-linux-alpha.rpm
+	rpm2targz ${DISTDIR}/jre-1.3.1-1-linux-alpha.rpm
 	tar zxf jre-1.3.1-1-linux-alpha.tar.gz >& /dev/null
 	mv usr/java/jre1.3.1 .
 }
 
 src_install () {
-	local dirs="bin lib"
 	dodir /opt/${P}
-
-
-	for i in $dirs ; do
-		cp -a $i ${D}/opt/${P}/
-	done
+	cp -a bin lib ${D}/opt/${P}
 
 	dodoc COPYRIGHT CHANGES LICENSE
 	dohtml readme.html Welcome.html
-
 	doman man/man1/*.1
 
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
@@ -56,4 +45,3 @@ pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
 }
-
diff --git a/dev-java/compaq-jre/files/compaq-jre-1.3.1 b/dev-java/compaq-jre/files/compaq-jre-1.3.1
index eceec181996b..cd7368db8aef 100644
--- a/dev-java/compaq-jre/files/compaq-jre-1.3.1
+++ b/dev-java/compaq-jre/files/compaq-jre-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-jre/files/compaq-jre-1.3.1,v 1.2 2002/12/15 17:03:34 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/files/compaq-jre-1.3.1,v 1.3 2004/01/10 15:20:27 agriffis Exp $
 
 VERSION="Compaq JRE @PV@"
 JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/lib/rt.jar:.
+CLASSPATH=/opt/@P@/jre/lib/rt.jar:/opt/@P@/jre/lib/tools.jar:.
 JRE_HOME=/opt/@P@
 ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
 ADDLDPATH="/opt/@P@/jre/lib/"
diff --git a/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1 b/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1
+++ /dev/null
diff --git a/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r1 b/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r1
new file mode 100644
index 000000000000..83c657349f6d
--- /dev/null
+++ b/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r1
@@ -0,0 +1 @@
+MD5 f6cc82115339b683951f8de591961f83 jre-1.3.1-1-linux-alpha.rpm 11934556