From: Joshua Nichols <nichoj@gentoo.org>
Date: Wed, 23 Nov 2005 04:32:50 +0000 (+0000)
Subject: Updated /usr/bin/j to use java-config for building classpath and finding java executa... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d21967a1f5ed99ac933408a9255e01365cb0b9fa;p=gentoo.git

Updated /usr/bin/j to use java-config for building classpath and finding java executable, instead of being hardcoded to the environment that was used at build time (bug #108794).
Package-Manager: portage-2.0.51.22-r3
---

diff --git a/dev-util/j/ChangeLog b/dev-util/j/ChangeLog
index 7ef03ea96aec..b29e5038acf5 100644
--- a/dev-util/j/ChangeLog
+++ b/dev-util/j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/j
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/j/ChangeLog,v 1.4 2005/05/07 15:08:53 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/j/ChangeLog,v 1.5 2005/11/23 04:32:50 nichoj Exp $
+
+  23 Nov 2005; <nichoj@gentoo.org> j-0.20.2.ebuild:
+  Updated /usr/bin/j to use java-config for building classpath and finding java
+  executable, instead of being hardcoded to the environment that was used at
+  build time (bug #108794).
 
   07 May 2005; David Holm <dholm@gentoo.org> j-0.20.2.ebuild:
   Added to ~ppc.
diff --git a/dev-util/j/Manifest b/dev-util/j/Manifest
index 2f7a174176ad..cb0372692c71 100644
--- a/dev-util/j/Manifest
+++ b/dev-util/j/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 09372898067baac0ef1a0aff7a3074a3 j-0.20.2.ebuild 850
-MD5 65b239fbdeaae70dab2f08de0f0d6dd5 ChangeLog 531
+MD5 b8347035d11acdf4a0444308f1bbaa95 j-0.20.2.ebuild 1121
+MD5 9af8c65c1b7c5c1ffaf2095013d7cb4c ChangeLog 770
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 5db38fba0110d1a97df3e6a9cead72ed files/digest-j-0.20.2 61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC2VUB/rLF9B432nYRAunyAJ99LFhnO5VwuWtZynRyGVsfI9onHgCfdQ0X
-6NP7qU3zREKEXUYkgLxYZz8=
-=6Dn3
+iD8DBQFDg/EqndWRXhKOboURAtVZAJ9L3FnyftFLOVZQBFQ40A32xat7ZACdEI3j
+OuHhbZjwCnLgIAL6YNB0ffM=
+=pwOI
 -----END PGP SIGNATURE-----
diff --git a/dev-util/j/j-0.20.2.ebuild b/dev-util/j/j-0.20.2.ebuild
index 71a8c42a55a2..fe1f89249fac 100644
--- a/dev-util/j/j-0.20.2.ebuild
+++ b/dev-util/j/j-0.20.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/j/j-0.20.2.ebuild,v 1.7 2005/07/16 18:41:43 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/j/j-0.20.2.ebuild,v 1.8 2005/11/23 04:32:50 nichoj Exp $
 
 inherit java-pkg
 
@@ -26,8 +26,17 @@ src_compile() {
 		--mandir=/usr/share/man \
 		|| die "./configure failed"
 	emake || die
+
+	# Fix the j script to use java-config, instead of hard-coded paths
+	sed -e 's/@JAVA@/$(java-config --java)/' \
+		-e 's/@JAVA_OPTIONS@//' \
+		-e 's/@CLASSPATH@/$(java-config -p xerces-2,j)/' j.in > j
+
 }
 
 src_install() {
 	einstall || die
+
+	java-pkg_dojar ${D}/usr/share/j/j.jar
+	rm ${D}/usr/share/j/j.jar
 }