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

5 files changed, 66 insertions, 5 deletions

diff --git a/dev-java/compaq-jdk/ChangeLog b/dev-java/compaq-jdk/ChangeLog
index 968d45ca0ef6..566f58ad85e3 100644
--- a/dev-java/compaq-jdk/ChangeLog
+++ b/dev-java/compaq-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/compaq-jdk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/ChangeLog,v 1.7 2004/01/13 03:50:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/ChangeLog,v 1.8 2004/01/15 17:02:45 agriffis Exp $
+
+*compaq-jdk-1.3.1-r3 (15 Jan 2004)
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> compaq-jdk-1.3.1-r3.ebuild,
+  files/compaq-jdk-1.3.1:
+  Fix broken paths in files/compaq-jdk-1.3.1 for bug 33682
 
 *compaq-jdk-1.3.1-r2 (12 Jan 2004)
 
diff --git a/dev-java/compaq-jdk/Manifest b/dev-java/compaq-jdk/Manifest
index 54ee9cc34921..404047daf1e1 100644
--- a/dev-java/compaq-jdk/Manifest
+++ b/dev-java/compaq-jdk/Manifest
@@ -1,7 +1,9 @@
-MD5 b2ff99984e20f4f063651645357d00ed ChangeLog 1086
+MD5 f4499dbba7316bfab3d8568a2bf767da ChangeLog 1286
+MD5 93c089a8f3ea66ecfc5dde4d72a2c3f7 compaq-jdk-1.3.1-r3.ebuild 1415
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 93c089a8f3ea66ecfc5dde4d72a2c3f7 compaq-jdk-1.3.1-r2.ebuild 1415
 MD5 b6be7becb020d674d532527dc62228d1 compaq-jdk-1.3.1-r1.ebuild 1331
-MD5 f954d19483f88e46f00557b3e7cf8c66 files/compaq-jdk-1.3.1 620
+MD5 26b2072cde6eaacce0bafcd8e04f8518 files/compaq-jdk-1.3.1 717
 MD5 b575f6634b78c6d9d63f83534bf15654 files/digest-compaq-jdk-1.3.1-r1 74
 MD5 b575f6634b78c6d9d63f83534bf15654 files/digest-compaq-jdk-1.3.1-r2 74
+MD5 b575f6634b78c6d9d63f83534bf15654 files/digest-compaq-jdk-1.3.1-r3 74
diff --git a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..f9f0f00f7f50
--- /dev/null
+++ b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild
@@ -0,0 +1,52 @@
+# 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-r3.ebuild,v 1.1 2004/01/15 17:02:45 agriffis Exp $
+
+IUSE="doc"
+
+inherit java fixheadtails
+
+S=${WORKDIR}/jdk${PV}
+SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/jdk-${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/jdk-${PV}
+	virtual/java-scheme-2"
+LICENSE="compaq-sdla"
+SLOT="1.3"
+KEYWORDS="-* alpha"
+
+src_unpack() {
+	rpm2targz ${DISTDIR}/jdk-${PV}-1-linux-alpha.rpm
+	tar xzf jdk-${PV}-1-linux-alpha.tar.gz >& /dev/null
+	mv usr/java/jdk${PV} .
+	ht_fix_file jdk${PV}/bin/.java_wrapper jdk${PV}/jre/bin/.java_wrapper
+}
+
+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 55da89bd10c5..01e5b422a3f6 100644
--- a/dev-java/compaq-jdk/files/compaq-jdk-1.3.1
+++ b/dev-java/compaq-jdk/files/compaq-jdk-1.3.1
@@ -2,7 +2,7 @@
 # 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.2 2004/01/10 02:51:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/files/compaq-jdk-1.3.1,v 1.3 2004/01/15 17:02:45 agriffis Exp $
 
 VERSION="Compaq JDK @PV@"
 JAVA_HOME=/opt/@P@
@@ -10,6 +10,6 @@ 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"
-ADDLDPATH="/opt/@P@/jre/lib/"
+ADDLDPATH="/opt/@P@/jre/lib/alpha/:/opt/@P@/jre/lib/alpha/classic/:/opt/@P@/jre/lib/alpha/native_threads/:/opt/@P@/lib/alpha/"
 
 ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r3 b/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r3
new file mode 100644
index 000000000000..b53708a161b3
--- /dev/null
+++ b/dev-java/compaq-jdk/files/digest-compaq-jdk-1.3.1-r3
@@ -0,0 +1 @@
+MD5 5ffba433b84e5c818445cc83ada05b99 jdk-1.3.1-1-linux-alpha.rpm 23450390