aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Schmaus <flow@gentoo.org>2024-04-15 10:18:20 +0200
committerFlorian Schmaus <flow@gentoo.org>2024-04-15 10:18:20 +0200
commitc57dc44b2f864ea1ff8e4e55a3f4f26767763462 (patch)
tree6c781c2efefc1f2c67045eb0582a275676d6d0de
parentdev-java/jamvm: treeclean (diff)
downloadjava-c57dc44b2f864ea1ff8e4e55a3f4f26767763462.tar.gz
java-c57dc44b2f864ea1ff8e4e55a3f4f26767763462.tar.bz2
java-c57dc44b2f864ea1ff8e4e55a3f4f26767763462.zip
dev-java/cacao: treeclean
Signed-off-by: Florian Schmaus <flow@gentoo.org>
-rw-r--r--dev-java/cacao/ChangeLog125
-rw-r--r--dev-java/cacao/Manifest1
-rw-r--r--dev-java/cacao/cacao-1.6.0-r4.ebuild115
-rw-r--r--dev-java/cacao/files/cacao.env18
-rw-r--r--dev-java/cacao/files/javac.in57
-rw-r--r--dev-java/cacao/files/support-7.patch20
-rw-r--r--dev-java/cacao/files/system-boehm-gc.patch47
-rw-r--r--dev-java/cacao/metadata.xml14
8 files changed, 0 insertions, 397 deletions
diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
deleted file mode 100644
index 0451cb93..00000000
--- 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 <gnu_andrew@member.fsf.org>
- 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 <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>
- +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_andrew@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_andrew@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_andrew@member.fsf.org>
- +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 <andrew@gentoo.org> files/javac.in:
- Set classpath to current directory if not set in javac wrapper.
-
- 31 Jan 2013; Andrew John Hughes <andrew@gentoo.org> 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 <gnu_andrew@member.fsf.org> +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 <radhermit@gentoo.org> cacao-0.99.4.ebuild:
- Update HOMEPAGE.
-
- 18 Dec 2011; Ralph Sennhauser <sera@gentoo.org> 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 <betelgeuse@gentoo.org> cacao-0.99.4.ebuild:
- Fix tests to find junit4. They still fail. See bug #321189.
-
- 16 May 2010; Petteri Räty <betelgeuse@gentoo.org> cacao-0.99.4.ebuild:
- Update HOMEPAGE. Fixes bug #319791.
-
- 31 Jul 2009; Petteri Räty <betelgeuse@gentoo.org> +files/cacao.env:
- Add missing cacao.env. Fixes bug #279032.
-
- 16 Jul 2009; Petteri Räty <betelgeuse@gentoo.org> cacao-0.99.4.ebuild:
- Fix whitespace issue reported by pcheck.
-
- 16 Jul 2009; Petteri Räty <betelgeuse@gentoo.org> -cacao-0.91.ebuild,
- -cacao-0.95.ebuild:
- Remove old non working versions.
-
- 16 Jul 2009; Petteri Räty <betelgeuse@gentoo.org> 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 <betelgeuse@gentoo.org> +cacao-0.99.4.ebuild:
- Version bump. Thanks to gnu_andrew. Fixes bug #179100, bug #183116.
-
- 21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
- Transition to Manifest2.
-
- 06 Oct 2006; Vlastimil Babka <caster@gentoo.org> cacao-0.95.ebuild:
- Fixed typo in DEPEND wrt bug #150283.
-
- 15 May 2006; Petteri Räty <betelgeuse@gentoo.org> -cacao-0.93.ebuild,
- -cacao-0.94.ebuild:
- Removed old versions.
-
-*cacao-0.95 (25 Mar 2006)
-
- 25 Mar 2006; Petteri Räty <betelgeuse@gentoo.org> +cacao-0.95.ebuild:
- Version bump.
-
-*cacao-0.94 (05 Feb 2006)
-
- 05 Feb 2006; Petteri Räty <betelgeuse@gentoo.org> +cacao-0.94.ebuild:
- Version bump. Fixes bug #121279.
-
- 22 Dec 2005; Joshua Nichols <nichoj@gentoo.org> cacao-0.93.ebuild:
- Added ~amd64 keyword (bug #116259).
-
-*cacao-0.93 (21 Dec 2005)
-
- 21 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
- +files/0.93-no-exec-stack.patch, +cacao-0.93.ebuild:
- Version bump. Now uses external gnu-classpath.
-
- 26 Jul 2005; Thomas Matthijs <axxo@gentoo.org> cacao-0.91.ebuild:
- removed inherit java-pkg, doesnt seem to use anything from it
-
- 12 Jun 2005; Karl Trygve Kalleberg <karltk@gentoo.org> cacao-0.91.ebuild:
- Fix for #91358.
-
- 03 May 2005; David Holm <dholm@gentoo.org> cacao-0.91.ebuild:
- Added to ~ppc.
-
-*cacao-0.91 (20 Feb 2005)
-
- 20 Feb 2005; Karl Trygve Kalleberg <karltk@gentoo.org> +metadata.xml,
- +cacao-0.91.ebuild:
- Initial import. Ebuild submitted by myself.
diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest
deleted file mode 100644
index c011bd4a..00000000
--- a/dev-java/cacao/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cacao-1.6.0.tar.gz 4434778 BLAKE2B e694e88a59be7b1cf5df3bde602f609ee0a13cf7f513c72c4938b765436a1f8aef0d5d2c31f72e826d0b2cea4eeac157e7c4dda2b99cd44c0b6da155b8f6e5e3 SHA512 a0b7c88254ee9a0160fdc5022714e339541c0631b1f9f15a4eba7c90aa5ea469ce19e1bc015c8abe0b1925337b767b5fa0480ad062fc3e3d3d3c3c580b05bd9b
diff --git a/dev-java/cacao/cacao-1.6.0-r4.ebuild b/dev-java/cacao/cacao-1.6.0-r4.ebuild
deleted file mode 100644
index e509dffc..00000000
--- a/dev-java/cacao/cacao-1.6.0-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools eutils flag-o-matic java-pkg-2 java-vm-2
-
-DESCRIPTION="Cacao Java Virtual Machine"
-HOMEPAGE="http://www.cacaojvm.org/"
-SRC_URI="http://www.complang.tuwien.ac.at/cacaojvm/download/${P}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-COMMON_DEPEND="
- dev-java/gnu-classpath:0
- || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* )
- >=dev-libs/boehm-gc-7.2d
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
- test? (
- dev-java/junit:4
- ${AUTOTOOLS_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
- eautoreconf
-}
-
-src_configure() {
- # A compiler can be forced with the JAVAC variable if needed
- unset JAVAC
- append-flags -fno-strict-aliasing
- econf --bindir=/usr/libexec/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
- --datarootdir="${EPREFIX}"/usr/share/${PN} \
- --disable-dependency-tracking \
- --with-java-runtime-library-prefix="${EPREFIX}"/usr \
- --with-jni_h="${EPREFIX}"/usr/include/classpath \
- --with-jni_md_h="${EPREFIX}"/usr/include/classpath
-}
-
-src_install() {
- local libdir=$(get_libdir)
- local CLASSPATH_DIR=/usr/libexec/gnu-classpath
- local JDK_DIR=/usr/${libdir}/${PN}-jdk
-
- emake DESTDIR="${D}" install || die "make install failed"
- dodir /usr/bin
- dosym ../libexec/${PN}/cacao /usr/bin/cacao || die
- dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs"
-
- dodir ${JDK_DIR}/bin
- dosym ../../../libexec/${PN}/cacao ${JDK_DIR}/bin/java
-
- dodir ${JDK_DIR}/jre/lib
- dosym ../../../../share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
- dodir ${JDK_DIR}/lib
- dosym ../../../share/classpath/tools.zip ${JDK_DIR}/lib/tools.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#" \
- -e "s#@TOOLS_JAR@#/usr/share/classpath/tools.zip#" \
- | newexe - javac
-
- local libarch="${ARCH}"
- [ ${ARCH} == x86 ] && libarch="i386"
- [ ${ARCH} == x86_64 ] && libarch="amd64"
- dodir ${JDK_DIR}/jre/lib/${libarch}/client
- dodir ${JDK_DIR}/jre/lib/${libarch}/server
- 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"
- # 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"
-
- pax-mark ${pax_markings} "${ED}"/usr/libexec/${PN}/cacao
-}
diff --git a/dev-java/cacao/files/cacao.env b/dev-java/cacao/files/cacao.env
deleted file mode 100644
index 8ce46da7..00000000
--- a/dev-java/cacao/files/cacao.env
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="CACAO JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin"
-ROOTPATH="${JAVA_HOME}/bin"
-LDPATH="${JAVA_HOME}/lib"
-INFOPATH="${JAVA_HOME}/info"
-MANPATH="${JAVA_HOME}/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.6"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH INFOPATH MANPATH"
diff --git a/dev-java/cacao/files/javac.in b/dev-java/cacao/files/javac.in
deleted file mode 100644
index 70803c85..00000000
--- a/dev-java/cacao/files/javac.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
-use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
-
-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.6'
- unless grep {$_ eq '-source'} @ARGV;
-push @target15, '-target', '1.6'
- unless grep {$_ eq '-target'} @ARGV;
-push @cp, '-cp', '.'
- unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
-my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
-
-# Work around ecj's inability to handle duplicate command-line
-# options and unknown javac options.
-sub gen_ecj_opts
-{
- my @new_args = @{$_[0]};
-
- for my $opt (NO_DUP_ARGS)
- {
- my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
- if (@indices > 1) {
- shift @indices; # keep last instance only
- splice @new_args, $_, 2 for @indices;
- }
- }
-
- for my $opt (STRIP_ARGS)
- {
- my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
- splice @new_args, $_, 1 for @indices;
- }
-
- return \@new_args;
-}
-
-sub split_vm_args
-{
- my @new_args = @{$_[0]};
-
- my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
- my @javac_args = grep $_ !~ /^-J/, @new_args;
-
- return (\@vm_args, \@javac_args);
-}
-
-my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
-my @CLASSPATH = ('@ECJ_JAR@');
-push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
-$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
-exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
diff --git a/dev-java/cacao/files/support-7.patch b/dev-java/cacao/files/support-7.patch
deleted file mode 100644
index 09f355cb..00000000
--- a/dev-java/cacao/files/support-7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/vm/global.h~ 2012-09-03 17:10:00.000000000 +0100
-+++ src/vm/global.h 2013-01-04 19:20:08.749292760 +0000
-@@ -143,14 +143,14 @@
-
- /* some Java related defines **************************************************/
-
--#define JAVA_VERSION "1.5.0" /* this version is supported by CACAO */
--#define CLASS_VERSION "50.0"
-+#define JAVA_VERSION "1.6.0" /* this version is supported by CACAO */
-+#define CLASS_VERSION "51.0"
-
-
- /* Java class file constants **************************************************/
-
- #define MAGIC 0xCAFEBABE
--#define MAJOR_VERSION 50
-+#define MAJOR_VERSION 51
- #define MINOR_VERSION 0
-
-
diff --git a/dev-java/cacao/files/system-boehm-gc.patch b/dev-java/cacao/files/system-boehm-gc.patch
deleted file mode 100644
index 27b62581..00000000
--- a/dev-java/cacao/files/system-boehm-gc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -691,6 +691,8 @@
-
- AC_CHECK_ENABLE_PIC_ASM
-
-+PKG_CHECK_MODULES([BOEHM], bdw-gc,,AC_MSG_ERROR[boehm-gc not found])
-+
- dnl Define version numbers.
- AC_VERSION_DETAIL
- AC_VERSION_CONFIG
-@@ -793,12 +795,6 @@
- )
-
-
--dnl We only build the shared library objects but we use it as
--dnl noinst_LTLIBRARIES.
--ac_configure_args="$ac_configure_args --disable-static"
--AC_CONFIG_SUBDIRS(src/mm/boehm-gc)
--
--
- AC_OUTPUT
-
-
-diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am
---- a/src/mm/Makefile.am
-+++ b/src/mm/Makefile.am
-@@ -35,14 +35,13 @@
- endif
-
- if ENABLE_GC_BOEHM
--SUBDIRS = \
-- boehm-gc
--
- GC_FILE = \
- gc-boehm.cpp
-
--GC_LIB = \
-- $(top_builddir)/src/mm/boehm-gc/libgc.la
-+AM_CPPFLAGS += $(BOEHM_CFLAGS)
-+
-+GC_LIB = $(BOEHM_LIBS)
-+
- endif
-
- if ENABLE_GC_CACAO
diff --git a/dev-java/cacao/metadata.xml b/dev-java/cacao/metadata.xml
deleted file mode 100644
index d554f885..00000000
--- a/dev-java/cacao/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-
-<longdescription>
-CACAO is started out as a research JIT compiler for Java to explore new
-implementation techniques. It is now a full-blown Java Virtual Machine
-based on GNU Classpath.
-</longdescription>
-</pkgmetadata>