Fix the mess created in -r1, now installs to the correct part of the selected JRE or JDK home

4 files changed, 60 insertions, 4 deletions

diff --git a/dev-java/jai/ChangeLog b/dev-java/jai/ChangeLog
index aaad3a40cf3a..9bac9ad76d6c 100644
--- a/dev-java/jai/ChangeLog
+++ b/dev-java/jai/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jai
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jai/ChangeLog,v 1.2 2004/03/06 21:03:50 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jai/ChangeLog,v 1.3 2004/03/19 21:22:18 lostlogic Exp $
+
+*jai-1.1.2-r2 (19 Mar 2004)
+
+  19 Mar 2004; Brandon Low <lostlogic@gentoo.org> jai-1.1.2-r2.ebuild:
+  Fix the mess created in -r1, now installs to the correct part of the selected
+  JRE or JDK home
 
 *jai-1.1.2-r1 (09 Mar 2004)
 
diff --git a/dev-java/jai/Manifest b/dev-java/jai/Manifest
index 30c701bc06e0..2ee95d739e32 100644
--- a/dev-java/jai/Manifest
+++ b/dev-java/jai/Manifest
@@ -1,6 +1,8 @@
-MD5 3872227d30ffd32cb1113d9f36368cf5 jai-1.1.2-r1.ebuild 1178
-MD5 372414e0c947ac0b8201d87cd9601d0f jai-1.1.2.ebuild 2447
-MD5 eeea2b91e05be26cb443dd0bfe33b3d7 ChangeLog 591
+MD5 f531c3095b553a5a5477d5d438a16fc1 jai-1.1.2-r2.ebuild 1344
+MD5 a630f7d188d82374c068d60b9618ba3c jai-1.1.2-r1.ebuild 1179
+MD5 ee5dbafbd6fc86e97c55144b0c6e3ab7 jai-1.1.2.ebuild 2448
+MD5 f4b5625632f8284483b7a79a8477ce14 ChangeLog 798
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 e60e96e8d350d2e30cf45902dd277268 files/digest-jai-1.1.2 78
 MD5 e60e96e8d350d2e30cf45902dd277268 files/digest-jai-1.1.2-r1 78
+MD5 e60e96e8d350d2e30cf45902dd277268 files/digest-jai-1.1.2-r2 78
diff --git a/dev-java/jai/files/digest-jai-1.1.2-r2 b/dev-java/jai/files/digest-jai-1.1.2-r2
new file mode 100644
index 000000000000..36646eea3bad
--- /dev/null
+++ b/dev-java/jai/files/digest-jai-1.1.2-r2
@@ -0,0 +1 @@
+MD5 16f19a3853194f9422fc79819be00ed0 jai-1_1_2-lib-linux-i586-jdk.bin 2674372
diff --git a/dev-java/jai/jai-1.1.2-r2.ebuild b/dev-java/jai/jai-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..5a6bd4f929cd
--- /dev/null
+++ b/dev-java/jai/jai-1.1.2-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jai/jai-1.1.2-r2.ebuild,v 1.1 2004/03/19 21:22:18 lostlogic Exp $
+
+DESCRIPTION="JAI is a class library for managing images."
+HOMEPAGE="http://java.sun.com/products/java-media/jai/"
+SRC_URI="jai-1_1_2-lib-linux-i586-jdk.bin"
+LICENSE="sun-bcla-jai"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~alpha"
+DEPEND=""
+RDEPEND=">=virtual/jdk-1.3"
+IUSE=""
+RESTRICT="fetch"
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+	#Search for the ELF Header
+	testExp=`echo -e "\177\105\114\106\001\001\001"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${SRC_URI} | cut -d: -f1`
+	tail -n +${startAt} ${DISTDIR}/${SRC_URI} > install.sfx
+	chmod +x install.sfx
+	./install.sfx || die
+	rm install.sfx
+}
+
+src_install() {
+	start=${D}
+	jre=""
+	java_home="$(java-config --jdk-home)"
+	if [ ! -z java_home ]; then
+		jre="jre/"
+	else
+		java_home="$(java-config --jre-home)"
+		if [ -z java_home ]; then
+			die "You must have a JVM selected in order to install JAI"
+		fi
+	fi
+	einfo "Installing JAI into current JAVA home: ${java_home}"
+	dodir ${java_home}/${jre}
+	cp -a ${S}/jre/* ${D}/${java_home}/${jre}
+	dodoc COPYRIGHT-jai.txt README-jai.txt
+}