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

2024-04-15 Thread Florian Schmaus
commit: c57dc44b2f864ea1ff8e4e55a3f4f26767763462
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon Apr 15 08:18:20 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon Apr 15 08:18:20 2024 +
URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=c57dc44b

dev-java/cacao: treeclean

Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/cacao/ChangeLog   | 125 -
 dev-java/cacao/Manifest|   1 -
 dev-java/cacao/cacao-1.6.0-r4.ebuild   | 115 --
 dev-java/cacao/files/cacao.env |  18 -
 dev-java/cacao/files/javac.in  |  57 -
 dev-java/cacao/files/support-7.patch   |  20 -
 dev-java/cacao/files/system-boehm-gc.patch |  47 ---
 dev-java/cacao/metadata.xml|  14 
 8 files changed, 397 deletions(-)

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
deleted file mode 100644
index 0451cb93..
--- a/dev-java/cacao/ChangeLog
+++ /dev/null
@@ -1,125 +0,0 @@
-# ChangeLog for dev-java/cacao
-# 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 $
-
-  06 Nov 2018; Andrew John Hughes 
-  cacao-1.6.0-r4.ebuild:
-  dev-java/cacao: Use relative symlinks as suggested by repoman
-
-*cacao-1.6.0-r4 (03 Nov 2018)
-
-  03 Nov 2018; Andrew John Hughes 
-  +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 
-  +cacao-1.6.0-r3.ebuild, -cacao-1.6.0-r2.ebuild, files/javac.in:
-  Make default source/target 1.6 for CACAO JDK as it's reporting as a 1.6 JDK.
-
-  08 Jul 2015; Andrew John Hughes 
-  cacao-1.6.0-r2.ebuild:
-  Add use of EPREFIX and get_libdir to CACAO ebuild.
-
-*cacao-1.6.0-r2 (08 Jul 2015)
-
-  08 Jul 2015; Andrew John Hughes 
-  +cacao-1.6.0-r2.ebuild, -cacao-1.6.0-r1.ebuild, files/cacao.env:
-  Update CACAO to match new GNU Classpath ebuild. Cleanup file placement and 
PaX
-  mark VM.
-
-*cacao-1.6.0-r1 (20 Sep 2013)
-
-  20 Sep 2013; Andrew John Hughes 
-  +cacao-1.6.0-r1.ebuild, -cacao-1.6.0.ebuild, files/javac.in:
-  Don't set classpath if $CLASSPATH is set.
-
-  11 Mar 2013; Andrew John Hughes  files/javac.in:
-  Set classpath to current directory if not set in javac wrapper.
-
-  31 Jan 2013; Andrew John Hughes  cacao-1.6.0.ebuild,
-  +files/javac.in:
-  Use a script to help ecj emulate javac (based on the one in IcedTea)
-
-*cacao-1.6.0 (05 Jan 2013)
-
-  05 Jan 2013; Andrew John Hughes  
+cacao-1.6.0.ebuild,
-  +files/support-7.patch, +files/cacao.env, +files/system-boehm-gc.patch,
-  +metadata.xml:
-  Add support for CACAO 1.6.0 using GNU Classpath 0.99.0.
-
-  14 Jun 2012; Tim Harder  cacao-0.99.4.ebuild:
-  Update HOMEPAGE.
-
-  18 Dec 2011; Ralph Sennhauser  cacao-0.99.4.ebuild:
-  Fix dependency on ecj, eselect-ecj's PDEPEND doesn't guarantee it's
-  availability at build time.
-
-  23 May 2010; Petteri Räty  cacao-0.99.4.ebuild:
-  Fix tests to find junit4. They still fail. See bug #321189.
-
-  16 May 2010; Petteri Räty  cacao-0.99.4.ebuild:
-  Update HOMEPAGE. Fixes bug #319791.
-
-  31 Jul 2009; Petteri Räty  +files/cacao.env:
-  Add missing cacao.env. Fixes bug #279032.
-
-  16 Jul 2009; Petteri Räty  cacao-0.99.4.ebuild:
-  Fix whitespace issue reported by pcheck.
-
-  16 Jul 2009; Petteri Räty  -cacao-0.91.ebuild,
-  -cacao-0.95.ebuild:
-  Remove old non working versions.
-
-  16 Jul 2009; Petteri Räty  cacao-0.99.4.ebuild:
-  Add ~ppc and ~ppc64 as gnu_andres has tested those.
-
-*cacao-0.99.4 (16 Jul 2009)
-
-  16 Jul 2009; Petteri Räty  +cacao-0.99.4.ebuild:
-  Version bump. Thanks to gnu_andrew. Fixes bug #179100, bug #183116.
-
-  21 Feb 2007; Piotr Jaroszyński  ChangeLog:
-  Transition to Manifest2.
-
-  06 Oct 2006; Vlastimil Babka  cacao-0.95.ebuild:
-  Fixed typo in DEPEND wrt bug #150283.
-
-  15 May 2006; Petteri Räty  -cacao-0.93.ebuild,
-  -cacao-0.94.ebuild:
-  Removed old versions.
-
-*cacao-0.95 (25 Mar 2006)
-
-  25 Mar 2006; Petteri Räty  +cacao-0.95.ebuild:
-  Version bump.
-
-*cacao-0.94 (05 Feb 2006)
-
-  05 Feb 2006; Petteri Räty  +cacao-0.94.ebuild:
-  Version bump. Fixes bug #121279.
-
-  22 Dec 2005; Joshua Nichols  cacao-0.93.ebuild:
-  Added ~amd64 keyword (bug #116259).
-
-*cacao-0.93 (21 Dec 2005)
-
-  21 Dec 2005; Petteri Räty 
-  +files/0.93-no-exec-stack.patch, +cacao-0.93.ebuild:
-  Version bump. Now uses external gnu-classpath.
-
-  26 Jul 2005; Thomas Matthijs  cacao-0.91.ebuild:
-  removed inherit java-pkg, doesnt seem to use anything from it
-
-  12 Jun 2005; Karl Trygve Kalleberg  cacao-0.91.ebuild:
-  Fix for #91358.
-
-  03 May 2005; David Holm  cacao-0.91.ebuild:
-  Added to ~ppc.
-
-*cacao-0.91 (20 Feb 2005)
-
-  20 Feb 2005; Karl Trygve Kalleberg  +metadata.xml,
-  

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

2021-12-05 Thread Florian Schmaus
commit: f74dfb0ac5e7cfba70811c910400ca9c827bd9ec
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sun Dec  5 11:06:12 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Dec  5 11:06:12 2021 +
URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=f74dfb0a

dev-java/cacao: update to EAPI 6

Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/cacao/cacao-1.6.0-r4.ebuild | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev-java/cacao/cacao-1.6.0-r4.ebuild 
b/dev-java/cacao/cacao-1.6.0-r4.ebuild
index 8b57d2b5..e509dffc 100644
--- a/dev-java/cacao/cacao-1.6.0-r4.ebuild
+++ b/dev-java/cacao/cacao-1.6.0-r4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 AUTOTOOLS_AUTO_DEPEND="no"
 
 inherit autotools eutils flag-o-matic java-pkg-2 java-vm-2
@@ -26,14 +27,18 @@ DEPEND="${COMMON_DEPEND}
)
 "
 
+PATCHES=(
+   "${FILESDIR}/system-boehm-gc.patch"
+   "${FILESDIR}/support-7.patch"
+)
+
 src_prepare() {
+   eapply_user
if use test; then
sed -ie "s:/usr/share/java/junit4.jar:$(java-config -p 
junit-4):" \
./tests/regression/bugzilla/Makefile.am \
./tests/regression/base/Makefile.am || die "sed failed"
fi
-   epatch "${FILESDIR}/system-boehm-gc.patch"
-   epatch "${FILESDIR}/support-7.patch"
eautoreconf
 }
 
@@ -50,10 +55,6 @@ src_configure() {
--with-jni_md_h="${EPREFIX}"/usr/include/classpath
 }
 
-src_compile() {
-   default
-}
-
 src_install() {
local libdir=$(get_libdir)
local CLASSPATH_DIR=/usr/libexec/gnu-classpath



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

2019-01-02 Thread Andrew John Hughes
commit: 51ca03c7506a55950dc295cd591ddcb0973b5290
Author: Andrew John Hughes  member  fsf  org>
AuthorDate: Sat Nov  3 20:29:38 2018 +
Commit: Andrew John Hughes  member  fsf  org>
CommitDate: Thu Jan  3 05:03:08 2019 +
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  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 
+  +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 

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#" \



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

2019-01-02 Thread Andrew John Hughes
commit: bce5025738d771b4931527f10d7932c7f5ab0f98
Author: Andrew John Hughes  member  fsf  org>
AuthorDate: Tue Nov  6 20:14:07 2018 +
Commit: Andrew John Hughes  member  fsf  org>
CommitDate: Thu Jan  3 05:03:34 2019 +
URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=bce50257

dev-java/cacao: Use relative symlinks as suggested by repoman

Package-Manager: Portage-2.3.50, Repoman-2.3.10

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

 dev-java/cacao/ChangeLog |  4 
 dev-java/cacao/cacao-1.6.0-r4.ebuild | 16 
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index 0512ca95..0451cb93 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -2,6 +2,10 @@
 # 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 $
 
+  06 Nov 2018; Andrew John Hughes 
+  cacao-1.6.0-r4.ebuild:
+  dev-java/cacao: Use relative symlinks as suggested by repoman
+
 *cacao-1.6.0-r4 (03 Nov 2018)
 
   03 Nov 2018; Andrew John Hughes 

diff --git a/dev-java/cacao/cacao-1.6.0-r4.ebuild 
b/dev-java/cacao/cacao-1.6.0-r4.ebuild
index 1c56a1d1..8b57d2b5 100644
--- a/dev-java/cacao/cacao-1.6.0-r4.ebuild
+++ b/dev-java/cacao/cacao-1.6.0-r4.ebuild
@@ -61,16 +61,16 @@ src_install() {
 
emake DESTDIR="${D}" install || die "make install failed"
dodir /usr/bin
-   dosym /usr/libexec/${PN}/cacao /usr/bin/cacao || die
+   dosym ../libexec/${PN}/cacao /usr/bin/cacao || die
dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs"
 
dodir ${JDK_DIR}/bin
-   dosym /usr/libexec/${PN}/cacao ${JDK_DIR}/bin/java
+   dosym ../../../libexec/${PN}/cacao ${JDK_DIR}/bin/java
 
dodir ${JDK_DIR}/jre/lib
-   dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
+   dosym ../../../../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
+   dosym ../../../share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
 
exeinto ${JDK_DIR}/bin
for files in ${CLASSPATH_DIR}/g*; do
@@ -97,15 +97,15 @@ src_install() {
[ ${ARCH} == x86_64 ] && libarch="amd64"
dodir ${JDK_DIR}/jre/lib/${libarch}/client
dodir ${JDK_DIR}/jre/lib/${libarch}/server
-   dosym /usr/${libdir}/${PN}/libjvm.so 
${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
-   dosym /usr/${libdir}/${PN}/libjvm.so 
${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
-   dosym /usr/${libdir}/classpath/libjawt.so 
${JDK_DIR}/jre/lib/${libarch}/libjawt.so
+   dosym ../../../../../../${libdir}/${PN}/libjvm.so 
${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
+   dosym ../../../../../../${libdir}/${PN}/libjvm.so 
${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
+   dosym ../../../../../${libdir}/classpath/libjawt.so 
${JDK_DIR}/jre/lib/${libarch}/libjawt.so
set_java_env
 
# Can't use java-vm_set-pax-markings as doesn't work with symbolic links
# Ensure a PaX header is created.
local pax_markings="C"
-   # Usally disabeling MPROTECT is sufficent.
+   # Usually dislabeling MPROTECT is sufficent.
local pax_markings+="m"
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as 
well.
use x86 && pax_markings+="sp"



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

2015-08-10 Thread Andrew John Hughes
commit: d51ef07080d7d18282827a6978995862f5931c45
Author: Andrew John Hughes gnu_andrew AT member DOT fsf DOT org
AuthorDate: Mon Aug  3 00:17:59 2015 +
Commit: Andrew John Hughes gnu_andrew AT member DOT fsf DOT org
CommitDate: Mon Aug  3 00:17:59 2015 +
URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=d51ef070

Make default source/target 1.6 for CACAO JDK as it's reporting as a 1.6 JDK.

Package-Manager: portage-2.2.20

 dev-java/cacao/ChangeLog| 6 ++
 dev-java/cacao/{cacao-1.6.0-r2.ebuild = cacao-1.6.0-r3.ebuild} | 0
 dev-java/cacao/files/javac.in   | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index 44d56b7..ff20540 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 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-r3 (03 Aug 2015)
+
+  03 Aug 2015; Andrew John Hughes gnu_and...@member.fsf.org
+  +cacao-1.6.0-r3.ebuild, -cacao-1.6.0-r2.ebuild, files/javac.in:
+  Make default source/target 1.6 for CACAO JDK as it's reporting as a 1.6 JDK.
+
   08 Jul 2015; Andrew John Hughes gnu_and...@member.fsf.org
   cacao-1.6.0-r2.ebuild:
   Add use of EPREFIX and get_libdir to CACAO ebuild.

diff --git a/dev-java/cacao/cacao-1.6.0-r2.ebuild 
b/dev-java/cacao/cacao-1.6.0-r3.ebuild
similarity index 100%
rename from dev-java/cacao/cacao-1.6.0-r2.ebuild
rename to dev-java/cacao/cacao-1.6.0-r3.ebuild

diff --git a/dev-java/cacao/files/javac.in b/dev-java/cacao/files/javac.in
index 8eeda68..70803c8 100644
--- a/dev-java/cacao/files/javac.in
+++ b/dev-java/cacao/files/javac.in
@@ -8,9 +8,9 @@ my $ECJ_WARNINGS=-nowarn;
 my ( @bcoption, @source15, @target15, @cp );
 push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
 unless grep {$_ eq '-bootclasspath'} @ARGV;
-push @source15, '-source', '1.5'
+push @source15, '-source', '1.6'
 unless grep {$_ eq '-source'} @ARGV;
-push @target15, '-target', '1.5'
+push @target15, '-target', '1.6'
 unless grep {$_ eq '-target'} @ARGV;  
 push @cp, '-cp', '.'
 unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};



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

2015-07-08 Thread Andrew John Hughes
commit: 2751be30317cc1be4365735eac78ed1391945dc8
Author: Andrew John Hughes gnu_andrew AT member DOT fsf DOT org
AuthorDate: Wed Jul  8 18:28:35 2015 +
Commit: Andrew John Hughes gnu_andrew AT member DOT fsf DOT org
CommitDate: Wed Jul  8 18:28:35 2015 +
URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=2751be30

Update CACAO to match new GNU Classpath ebuild. Cleanup file placement and PaX 
mark VM.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/cacao/ChangeLog |   9 ++-
 dev-java/cacao/Manifest  |  24 +++-
 dev-java/cacao/cacao-1.6.0-r1.ebuild |  96 --
 dev-java/cacao/cacao-1.6.0-r2.ebuild | 110 +++
 dev-java/cacao/files/cacao.env   |   8 +--
 5 files changed, 129 insertions(+), 118 deletions(-)

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index 8c3269e..d62bca7 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-java/cacao
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 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-r2 (08 Jul 2015)
+
+  08 Jul 2015; Andrew John Hughes gnu_and...@member.fsf.org
+  +cacao-1.6.0-r2.ebuild, -cacao-1.6.0-r1.ebuild, files/cacao.env:
+  Update CACAO to match new GNU Classpath ebuild. Cleanup file placement and 
PaX
+  mark VM.
+
 *cacao-1.6.0-r1 (20 Sep 2013)
 
   20 Sep 2013; Andrew John Hughes gnu_and...@member.fsf.org

diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest
index 1bdde59..63f243f 100644
--- a/dev-java/cacao/Manifest
+++ b/dev-java/cacao/Manifest
@@ -1,28 +1,18 @@
 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA256
 
-AUX cacao.env 620 SHA256 
dd41402ec64a24c7bcd57723962a188139e7bcd7fd5647e1d7f5bcf791cd8d49 SHA512 
4b89c9ea8aa5a821df177c21d6f1efa29063ae5030edc1cd32029b54a305cb867ba8fc8b5f1c8c5bd174c9298be47138d06f28827c4c04fc43aad17baceddbb2
 WHIRLPOOL 
35ece180d8284f7a8d71c392c73522897615c4529ba6786f503fae10b5b90a0a72b276a37b93aea6a524c18d206a75dae93cacd51caca440363535bb7781c990
+AUX cacao.env 702 SHA256 
19f28634b6751f54668221281ea1e4361ac52ed892a82b6a5d25b7adcaa8db29 SHA512 
3f1689a90ff3b559045bef1fb8ce08731c53b8a15a4fd4211509e1ee29d8954825ffc9924ac3a61c63a699df9c6a3bdd78d45412e39eb9a56a56136abbe0df45
 WHIRLPOOL 
61c57739827db37a953fb8d9b843809d89802a65433420d24efd02707cf47427936d1c4d32dba49b52b09f70e79d8aad036f23e56d282b2f7c6cb12a984367ec
 AUX javac.in 1739 SHA256 
3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 
65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
 WHIRLPOOL 
2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
 AUX support-7.patch 668 SHA256 
fefe2435f0471bb097d99c932b80d4dc74bb2646dd3f3f74140f69fbc3e8043a SHA512 
f170eab7242f0400a520ccdfee70a2dda7c5393613edeccf512fbc6a3064de71a030165eb51f0164d04a7964ca612ca0728eb8c59d9de8e11f5f93fa6289bb81
 WHIRLPOOL 
f6d7d81139791e6a068fd634ae5017bd437f1c71309e79f8f5ccf2c432eae3533714fc3ad21cf173e5e815515b25156241d5c64bc8f1b8291a0f1cf53ba52983
 AUX system-boehm-gc.patch 847 SHA256 
b3b04dbfbc31e83f46fdc3e80391730e54866bce010148b86ae4f4a97717aece SHA512 
1329bb10a0297e2182b6628148437779bcd4fb079759e602fa6388154ff5b88a06623d1ee246156f75b7ecaea29c72a884a5cc3ea34c1d516f3a84ee1b6c1d59
 WHIRLPOOL 
28fa685b5624058529410bbce7cba7822f7c4c51a784dd284e2b0b2a02e52175122fe059a62d218aad96d1c8f2a355996df0c693e64c00e2bbb46c0f7423f270
 DIST cacao-1.6.0.tar.gz 4434778 SHA256 
f68658f04d51c690cfc21f21998c22f738b84b7fd408666afe82e8087fbcc843 SHA512 
a0b7c88254ee9a0160fdc5022714e339541c0631b1f9f15a4eba7c90aa5ea469ce19e1bc015c8abe0b1925337b767b5fa0480ad062fc3e3d3d3c3c580b05bd9b
 WHIRLPOOL 
85fcb8124c02ef34b3ea696402e93a90ca86f9e33d003db705fe0fa279d7276452f08a78119148202df0e0c42c0f645ee831134c4b13869ee795bd7cab8e8b63
-EBUILD cacao-1.6.0-r1.ebuild 2961 SHA256 
a675726912a510d15d35960b666e99ae136251909d263e21bef5d9b21da8ba19 SHA512 
f93121a4f9acd2c6be7757099eb10152646ae60c9fdd1d99c63ef8e8766c15b44e84e52650a2d61b8e667d85b9b20429b6138c55adfeaa0d1905a21a
 WHIRLPOOL 
0a34f0e34688ec2763e2888e2dd03be76af4e1aef227babb77b1aea7716894c6c708a10c9d2f853d3e6b6baf77eebeadc2e5bc204eb9af47bc0256e6ed0b2fda
-MISC ChangeLog 3496 SHA256 
ce92c97c21aa368bca850cc618190a6c4c98fdb0553687af16b3baaeb8343a97 SHA512 
f72bd31d8f2fc7995d1bdd8495578394124047c0f62d9c27a522d6e6df0b9c59eb4e8eed1a21ef9f41ef94356dc0ed1694107b444034509093f7815fd4275b26
 WHIRLPOOL 
01230101d88df63f89daff2bbe27bc7c44f49e56657a6e832aed4c6364fd148c57e1315337891cf54e7aa1c718ed6ea3594da08eb161a1293d4da416e4ec22b8
+EBUILD cacao-1.6.0-r2.ebuild 3441 SHA256 

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

2015-07-08 Thread Andrew John Hughes
commit: f4c194fb8fdfe5f213ac701f4d3e24ff58031e63
Author: Andrew John Hughes gnu_andrew AT member DOT fsf DOT org
AuthorDate: Wed Jul  8 19:20:03 2015 +
Commit: Andrew John Hughes gnu_andrew AT member DOT fsf DOT org
CommitDate: Wed Jul  8 19:20:03 2015 +
URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=f4c194fb

Add use of EPREFIX and get_libdir to CACAO ebuild.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/cacao/ChangeLog |  4 
 dev-java/cacao/Manifest  | 10 +-
 dev-java/cacao/cacao-1.6.0-r2.ebuild | 19 ++-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index d62bca7..44d56b7 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 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 $
 
+  08 Jul 2015; Andrew John Hughes gnu_and...@member.fsf.org
+  cacao-1.6.0-r2.ebuild:
+  Add use of EPREFIX and get_libdir to CACAO ebuild.
+
 *cacao-1.6.0-r2 (08 Jul 2015)
 
   08 Jul 2015; Andrew John Hughes gnu_and...@member.fsf.org

diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest
index 63f243f..c1a7afc 100644
--- a/dev-java/cacao/Manifest
+++ b/dev-java/cacao/Manifest
@@ -6,13 +6,13 @@ AUX javac.in 1739 SHA256 
3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5
 AUX support-7.patch 668 SHA256 
fefe2435f0471bb097d99c932b80d4dc74bb2646dd3f3f74140f69fbc3e8043a SHA512 
f170eab7242f0400a520ccdfee70a2dda7c5393613edeccf512fbc6a3064de71a030165eb51f0164d04a7964ca612ca0728eb8c59d9de8e11f5f93fa6289bb81
 WHIRLPOOL 
f6d7d81139791e6a068fd634ae5017bd437f1c71309e79f8f5ccf2c432eae3533714fc3ad21cf173e5e815515b25156241d5c64bc8f1b8291a0f1cf53ba52983
 AUX system-boehm-gc.patch 847 SHA256 
b3b04dbfbc31e83f46fdc3e80391730e54866bce010148b86ae4f4a97717aece SHA512 
1329bb10a0297e2182b6628148437779bcd4fb079759e602fa6388154ff5b88a06623d1ee246156f75b7ecaea29c72a884a5cc3ea34c1d516f3a84ee1b6c1d59
 WHIRLPOOL 
28fa685b5624058529410bbce7cba7822f7c4c51a784dd284e2b0b2a02e52175122fe059a62d218aad96d1c8f2a355996df0c693e64c00e2bbb46c0f7423f270
 DIST cacao-1.6.0.tar.gz 4434778 SHA256 
f68658f04d51c690cfc21f21998c22f738b84b7fd408666afe82e8087fbcc843 SHA512 
a0b7c88254ee9a0160fdc5022714e339541c0631b1f9f15a4eba7c90aa5ea469ce19e1bc015c8abe0b1925337b767b5fa0480ad062fc3e3d3d3c3c580b05bd9b
 WHIRLPOOL 
85fcb8124c02ef34b3ea696402e93a90ca86f9e33d003db705fe0fa279d7276452f08a78119148202df0e0c42c0f645ee831134c4b13869ee795bd7cab8e8b63
-EBUILD cacao-1.6.0-r2.ebuild 3441 SHA256 
53f5ae4bb6b56d5e65a6c28e7374bdc78e04216f29c5f06759cc5712e036f65f SHA512 
9fefde9d2f5ed6c4c8fda90c0d92f4d12120babdf7139becede2c8f778ac384221d60df016348a01d6b164d3b29d07b019ecf0b81b66118d26d13689ac34ca93
 WHIRLPOOL 
4123d9e8ed1483fa0d7d38faafec8aa576c90c820f1e39bbeb0b0ca0d4ce482f373e797bfdd738a20a7b188129f07fde264a09b5ee61f6215ced4e40f189d09a
-MISC ChangeLog 3749 SHA256 
1e7c94d5438bdf6cea48cc25017ad8168513e11806987fb9cff24a191fd2b8c2 SHA512 
667448008732ec2177244983e0ffcd1bda5d056cd94c60194ac3b8a1764dfe780727dd31978d9b73b879a5b3651ef1b9d20a8217daae83013bc9dace582db6fc
 WHIRLPOOL 
593beae549430108a03d71ccf7540ce23fdfcea6164379b111510009e35f2c02000dde85e130473c7ce22631fb94901ba42963ca8332259347a130def90cb6d8
+EBUILD cacao-1.6.0-r2.ebuild 3543 SHA256 
544a4f4d08389c2f166a0115d7abf56daff30b24f3ab8518206256992becb182 SHA512 
f9b555cc8e32f7eb060c15ba7414b795ad2349b26b2c8fa656a22c856c36892c3da5b046cb6fd3824370300c339e5473d67176fdeed0012a4bc04e9a5b8a9465
 WHIRLPOOL 
9fe1a893b76a7eec05647d6f333da9d344400b6d70721a17a8f8291853a36b0f8a9f5a670220fbaca375a9d72e67000e508a558742e89fb534fcf6993539975b
+MISC ChangeLog 3890 SHA256 
30f5aea8f8832ea917cb835e70addc0f87b6a3e762d736e0abca3124a8a08ffc SHA512 
fa6d598f799e070f4a4e3444f8c9b703318a1c34e11b0d43967d67b2e2c7e866260552ea02f25d717e038541fdd3a8f48c3c0b936d4dbd5c4257643e22880901
 WHIRLPOOL 
e123bf9a41fda3f16bbad3960834b83804855fb6e518b19e4dff702144ed0afbbce56640c71370587fab3d75daa17fadc9f0eed16b1392d4273f396b99afb5ff
 MISC metadata.xml 364 SHA256 
4d63397a708380d2d8dbd5c15b9a246c4edb9d63cf630a06d16c3533ad17ab66 SHA512 
d5ef277e6ceea9305e15e8ccacd2f99f678c961a4667bec15b7980d2d38d0d1dfa99e518937a821cda6cc60737286e121be77a090182e694cda4ff3ea5666757
 WHIRLPOOL 
cf485290f09ec9369f66269a5e84ad28305cec43a02ffb52a75661fba4737ca929df96d8ef1ee3d373faffa76f1bcd297d9e109d9726e7459f9a4adaa47438bf
 -BEGIN PGP SIGNATURE-
 Version: GnuPG v2
 
-iF4EARYIAAYFAlWda88ACgkQz9oPmzWWQiKJ+gEAn/7DfcQ1ORS8Ei3QzL8i2fdM
-BRscYnVPZg0mejpf0QUBAO0mHbrnq+y+m+EM4tjJB35hiCp6HC9dvSGnnzocDisJ
-=Sadv
+iF4EARYIAAYFAlWdd+MACgkQz9oPmzWWQiKXSgD+LQ32aJkCUWBPAPYvjCCeY4M5
+QbL0ZBu5FcKxZP3u2AkBAIjt97rsWPcbKNtBsq5Tre0bZ66NCyWWwyrXVYElyCAL
+=BxWv
 -END PGP SIGNATURE-

diff --git a/dev-java/cacao/cacao-1.6.0-r2.ebuild