| 1 |
commit: 51ca03c7506a55950dc295cd591ddcb0973b5290 |
| 2 |
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
| 3 |
AuthorDate: Sat Nov 3 20:29:38 2018 +0000 |
| 4 |
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
| 5 |
CommitDate: Thu Jan 3 05:03:08 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=51ca03c7 |
| 7 |
|
| 8 |
dev-java/cacao: Ensure we use this VM to run the GNU Classpath tools. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.50, Repoman-2.3.10 |
| 11 |
|
| 12 |
Signed-off-by: Andrew John Hughes <gnu_andrew <AT> member.fsf.org> |
| 13 |
|
| 14 |
dev-java/cacao/ChangeLog | 8 ++++++- |
| 15 |
dev-java/cacao/Manifest | 2 +- |
| 16 |
...cacao-1.6.0-r3.ebuild => cacao-1.6.0-r4.ebuild} | 25 ++++++++++++---------- |
| 17 |
3 files changed, 22 insertions(+), 13 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog |
| 20 |
index ff205401..0512ca95 100644 |
| 21 |
--- a/dev-java/cacao/ChangeLog |
| 22 |
+++ b/dev-java/cacao/ChangeLog |
| 23 |
@@ -1,7 +1,13 @@ |
| 24 |
# ChangeLog for dev-java/cacao |
| 25 |
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.22 2012/06/14 21:25:44 radhermit Exp $ |
| 28 |
|
| 29 |
+*cacao-1.6.0-r4 (03 Nov 2018) |
| 30 |
+ |
| 31 |
+ 03 Nov 2018; Andrew John Hughes <gnu_andrew@××××××××××.org> |
| 32 |
+ +cacao-1.6.0-r4.ebuild, -cacao-1.6.0-r3.ebuild: |
| 33 |
+ dev-java/cacao: Ensure we use this VM to run the GNU Classpath tools. |
| 34 |
+ |
| 35 |
*cacao-1.6.0-r3 (03 Aug 2015) |
| 36 |
|
| 37 |
03 Aug 2015; Andrew John Hughes <gnu_andrew@××××××××××.org> |
| 38 |
|
| 39 |
diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest |
| 40 |
index 3952cff8..c011bd4a 100644 |
| 41 |
--- a/dev-java/cacao/Manifest |
| 42 |
+++ b/dev-java/cacao/Manifest |
| 43 |
@@ -1 +1 @@ |
| 44 |
-DIST cacao-1.6.0.tar.gz 4434778 SHA256 f68658f04d51c690cfc21f21998c22f738b84b7fd408666afe82e8087fbcc843 SHA512 a0b7c88254ee9a0160fdc5022714e339541c0631b1f9f15a4eba7c90aa5ea469ce19e1bc015c8abe0b1925337b767b5fa0480ad062fc3e3d3d3c3c580b05bd9b WHIRLPOOL 85fcb8124c02ef34b3ea696402e93a90ca86f9e33d003db705fe0fa279d7276452f08a78119148202df0e0c42c0f645ee831134c4b13869ee795bd7cab8e8b63 |
| 45 |
+DIST cacao-1.6.0.tar.gz 4434778 BLAKE2B e694e88a59be7b1cf5df3bde602f609ee0a13cf7f513c72c4938b765436a1f8aef0d5d2c31f72e826d0b2cea4eeac157e7c4dda2b99cd44c0b6da155b8f6e5e3 SHA512 a0b7c88254ee9a0160fdc5022714e339541c0631b1f9f15a4eba7c90aa5ea469ce19e1bc015c8abe0b1925337b767b5fa0480ad062fc3e3d3d3c3c580b05bd9b |
| 46 |
|
| 47 |
diff --git a/dev-java/cacao/cacao-1.6.0-r3.ebuild b/dev-java/cacao/cacao-1.6.0-r4.ebuild |
| 48 |
similarity index 92% |
| 49 |
rename from dev-java/cacao/cacao-1.6.0-r3.ebuild |
| 50 |
rename to dev-java/cacao/cacao-1.6.0-r4.ebuild |
| 51 |
index d78360de..1c56a1d1 100644 |
| 52 |
--- a/dev-java/cacao/cacao-1.6.0-r3.ebuild |
| 53 |
+++ b/dev-java/cacao/cacao-1.6.0-r4.ebuild |
| 54 |
@@ -1,6 +1,5 @@ |
| 55 |
-# Copyright 1999-2015 Gentoo Foundation |
| 56 |
+# Copyright 1999-2018 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Id$ |
| 59 |
|
| 60 |
EAPI=5 |
| 61 |
AUTOTOOLS_AUTO_DEPEND="no" |
| 62 |
@@ -67,22 +66,26 @@ src_install() { |
| 63 |
|
| 64 |
dodir ${JDK_DIR}/bin |
| 65 |
dosym /usr/libexec/${PN}/cacao ${JDK_DIR}/bin/java |
| 66 |
- for files in ${CLASSPATH_DIR}/g*; do |
| 67 |
- if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then |
| 68 |
- dosym $files ${JDK_DIR}/bin/javadoc || die |
| 69 |
- else |
| 70 |
- dosym $files \ |
| 71 |
- ${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die |
| 72 |
- fi |
| 73 |
- done |
| 74 |
|
| 75 |
dodir ${JDK_DIR}/jre/lib |
| 76 |
dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar |
| 77 |
dodir ${JDK_DIR}/lib |
| 78 |
dosym /usr/share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar |
| 79 |
|
| 80 |
- local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" |
| 81 |
exeinto ${JDK_DIR}/bin |
| 82 |
+ for files in ${CLASSPATH_DIR}/g*; do |
| 83 |
+ # Need to alter scripts to make sure our VM is invoked |
| 84 |
+ if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then |
| 85 |
+ dest=javadoc |
| 86 |
+ else |
| 87 |
+ dest=$(echo $files|sed "s#$(dirname $files)/g##") |
| 88 |
+ fi |
| 89 |
+ cat ${files} | \ |
| 90 |
+ sed -e "s#/usr/bin/java#/usr/libexec/${PN}/cacao#" | \ |
| 91 |
+ newexe - ${dest} |
| 92 |
+ done |
| 93 |
+ |
| 94 |
+ local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" |
| 95 |
cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#/usr/libexec/${PN}/cacao#" \ |
| 96 |
-e "s#@ECJ_JAR@#${ecj_jar}#" \ |
| 97 |
-e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \ |
Archives