Fix broken paths in files/compaq-jre-1.3.1 for bug 33682

4 files changed, 60 insertions, 5 deletions

diff --git a/dev-java/compaq-jre/ChangeLog b/dev-java/compaq-jre/ChangeLog
index c1ac2a437019..8f0ce741d8d1 100644
--- a/dev-java/compaq-jre/ChangeLog
+++ b/dev-java/compaq-jre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/compaq-jre
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/ChangeLog,v 1.7 2004/01/13 03:41:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/ChangeLog,v 1.8 2004/01/15 17:03:11 agriffis Exp $
+
+*compaq-jre-1.3.1-r3 (15 Jan 2004)
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> compaq-jre-1.3.1-r3.ebuild,
+  files/compaq-jre-1.3.1:
+  Fix broken paths in files/compaq-jre-1.3.1 for bug 33682
 
 *compaq-jre-1.3.1-r2 (12 Jan 2004)
 
diff --git a/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild b/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..2ef9fc0ba28c
--- /dev/null
+++ b/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
@@ -0,0 +1,48 @@
+# 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-r3.ebuild,v 1.1 2004/01/15 17:03:11 agriffis Exp $
+
+IUSE="doc"
+
+inherit java fixheadtails
+
+S=${WORKDIR}/jre${PV}
+SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/jre-${PV}-1-linux-alpha.rpm"
+HOMEPAGE="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/"
+DESCRIPTION="Compaq Java Development Kit ${PV} 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-${PV} )"
+RDEPEND="$DEPEND"
+PROVIDE="virtual/jre-${PV}
+	virtual/java-scheme-2"
+LICENSE="compaq-sdla"
+SLOT="1.3"
+KEYWORDS="-* alpha"
+
+src_unpack() {
+	rpm2targz ${DISTDIR}/jre-${PV}-1-linux-alpha.rpm
+	tar zxf jre-${PV}-1-linux-alpha.tar.gz >& /dev/null
+	mv usr/java/jre${PV} .
+	ht_fix_file jre${PV}/bin/.java_wrapper
+}
+
+src_install () {
+	dodir /opt/${P}
+	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
+}
+
+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 cd7368db8aef..2c71b5d9f1bd 100644
--- a/dev-java/compaq-jre/files/compaq-jre-1.3.1
+++ b/dev-java/compaq-jre/files/compaq-jre-1.3.1
@@ -2,12 +2,12 @@
 # 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.3 2004/01/10 15:20:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/files/compaq-jre-1.3.1,v 1.4 2004/01/15 17:03:11 agriffis Exp $
 
 VERSION="Compaq JRE @PV@"
 JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/jre/lib/rt.jar:/opt/@P@/jre/lib/tools.jar:.
+CLASSPATH=/opt/@P@/lib/rt.jar:/opt/@P@/lib/tools.jar:.
 JRE_HOME=/opt/@P@
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="/opt/@P@/jre/lib/"
+ADDPATH="${JAVA_HOME}/bin"
+ADDLDPATH="/opt/@P@/lib/alpha/:/opt/@P@/lib/alpha/classic/:/opt/@P@/lib/alpha/native_threads/"
 ENV_VARS="JAVA_HOME CLASSPATH JRE_HOME ADDPATH ADDLDPATH"
diff --git a/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r3 b/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r3
new file mode 100644
index 000000000000..83c657349f6d
--- /dev/null
+++ b/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r3
@@ -0,0 +1 @@
+MD5 f6cc82115339b683951f8de591961f83 jre-1.3.1-1-linux-alpha.rpm 11934556