[gentoo-commits] proj/java:master commit in: dev-java/cacao/

["Andrew John Hughes" <gnu_andrew@member.fsf.org>]

commit:     51ca03c7506a55950dc295cd591ddcb0973b5290
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Sat Nov  3 20:29:38 2018 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Thu Jan  3 05:03:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=51ca03c7

dev-java/cacao: Ensure we use this VM to run the GNU Classpath tools.

Package-Manager: Portage-2.3.50, Repoman-2.3.10

Signed-off-by: Andrew John Hughes <gnu_andrew <AT> member.fsf.org>

 dev-java/cacao/ChangeLog                           |  8 ++++++-
 dev-java/cacao/Manifest                            |  2 +-
 ...cacao-1.6.0-r3.ebuild => cacao-1.6.0-r4.ebuild} | 25 ++++++++++++----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index ff205401..0512ca95 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-java/cacao
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.22 2012/06/14 21:25:44 radhermit Exp $
 
+*cacao-1.6.0-r4 (03 Nov 2018)
+
+  03 Nov 2018; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +cacao-1.6.0-r4.ebuild, -cacao-1.6.0-r3.ebuild:
+  dev-java/cacao: Ensure we use this VM to run the GNU Classpath tools.
+
 *cacao-1.6.0-r3 (03 Aug 2015)
 
   03 Aug 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest
index 3952cff8..c011bd4a 100644
--- a/dev-java/cacao/Manifest
+++ b/dev-java/cacao/Manifest
@@ -1 +1 @@
-DIST cacao-1.6.0.tar.gz 4434778 SHA256 f68658f04d51c690cfc21f21998c22f738b84b7fd408666afe82e8087fbcc843 SHA512 a0b7c88254ee9a0160fdc5022714e339541c0631b1f9f15a4eba7c90aa5ea469ce19e1bc015c8abe0b1925337b767b5fa0480ad062fc3e3d3d3c3c580b05bd9b WHIRLPOOL 85fcb8124c02ef34b3ea696402e93a90ca86f9e33d003db705fe0fa279d7276452f08a78119148202df0e0c42c0f645ee831134c4b13869ee795bd7cab8e8b63
+DIST cacao-1.6.0.tar.gz 4434778 BLAKE2B e694e88a59be7b1cf5df3bde602f609ee0a13cf7f513c72c4938b765436a1f8aef0d5d2c31f72e826d0b2cea4eeac157e7c4dda2b99cd44c0b6da155b8f6e5e3 SHA512 a0b7c88254ee9a0160fdc5022714e339541c0631b1f9f15a4eba7c90aa5ea469ce19e1bc015c8abe0b1925337b767b5fa0480ad062fc3e3d3d3c3c580b05bd9b

diff --git a/dev-java/cacao/cacao-1.6.0-r3.ebuild b/dev-java/cacao/cacao-1.6.0-r4.ebuild
similarity index 92%
rename from dev-java/cacao/cacao-1.6.0-r3.ebuild
rename to dev-java/cacao/cacao-1.6.0-r4.ebuild
index d78360de..1c56a1d1 100644
--- a/dev-java/cacao/cacao-1.6.0-r3.ebuild
+++ b/dev-java/cacao/cacao-1.6.0-r4.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 AUTOTOOLS_AUTO_DEPEND="no"
@@ -67,22 +66,26 @@ src_install() {
 
 	dodir ${JDK_DIR}/bin
 	dosym /usr/libexec/${PN}/cacao ${JDK_DIR}/bin/java
-	for files in ${CLASSPATH_DIR}/g*; do
-		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
-			dosym $files ${JDK_DIR}/bin/javadoc || die
-		else
-			dosym $files \
-				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
-		fi
-	done
 
 	dodir ${JDK_DIR}/jre/lib
 	dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
 	dodir ${JDK_DIR}/lib
 	dosym /usr/share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
 
-	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
 	exeinto ${JDK_DIR}/bin
+	for files in ${CLASSPATH_DIR}/g*; do
+		# Need to alter scripts to make sure our VM is invoked
+		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
+			dest=javadoc
+		else
+			dest=$(echo $files|sed "s#$(dirname $files)/g##")
+		fi
+		cat ${files} | \
+			sed -e "s#/usr/bin/java#/usr/libexec/${PN}/cacao#" | \
+			newexe - ${dest}
+	done
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
 	cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#/usr/libexec/${PN}/cacao#" \
 		-e "s#@ECJ_JAR@#${ecj_jar}#" \
 		-e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \