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

[James Le Cuirot]

commit:     fe6640c6f9d32ab761602cbc0615435e56fd0eff
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 21:06:56 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 21:06:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6640c6

dev-java/cacao: Remove in favour of java-overlay version

Doing this early because I didn't realise pushing an eclass change
would cause cache generation breakage against a masked ebuild.

 dev-java/cacao/Manifest                       |  1 -
 dev-java/cacao/cacao-0.99.4.ebuild            | 83 ---------------------------
 dev-java/cacao/files/0.93-no-exec-stack.patch | 13 -----
 dev-java/cacao/files/cacao.env                | 18 ------
 dev-java/cacao/metadata.xml                   | 14 -----
 5 files changed, 129 deletions(-)

diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest
deleted file mode 100644
index aa6afd7..0000000
--- a/dev-java/cacao/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cacao-0.99.4.tar.bz2 2876200 SHA256 1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56 SHA512 f53d07acad7541d761383239776ec5423a66fb9963ad587d3fcddf7257625b51dd8f2ccd2ff8279ea3f148291b26fad1e02d57b529bd0cafe14ecd5ad82767b4 WHIRLPOOL c472c0966184c5bb48fa86ec41d78fbbcb6d2a27dc7177e12606cf7f26a7fe4e941bfa1b2c52d3845d879d08994c7404c1fd3ac515463662cd28305814d5ac26

diff --git a/dev-java/cacao/cacao-0.99.4.ebuild b/dev-java/cacao/cacao-0.99.4.ebuild
deleted file mode 100644
index 7d5a641..0000000
--- a/dev-java/cacao/cacao-0.99.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-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.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-CLASSPATH_SLOT=0.98
-COMMON_DEPEND="
-	dev-java/gnu-classpath:${CLASSPATH_SLOT}
-	|| ( dev-java/eclipse-ecj dev-java/ecj-gcj )
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-java/junit:4
-		${AUTOTOOLS_DEPEND}
-	)
-"
-
-CLASSPATH_DIR=/usr/gnu-classpath-${CLASSPATH_SLOT}
-
-src_prepare() {
-	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"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# A compiler can be forced with the JAVAC variable if needed
-	unset JAVAC
-	append-flags -fno-strict-aliasing
-	econf --bindir=/usr/${PN}/bin \
-		--libdir=/usr/${PN}/lib \
-		--datarootdir=/usr/${PN}/share \
-		--disable-dependency-tracking \
-		--with-java-runtime-library-prefix=${CLASSPATH_DIR}
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodir /usr/bin
-	dosym /usr/${PN}/bin/cacao /usr/bin/cacao || die
-	dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs"
-
-	for files in ${CLASSPATH_DIR}/bin/g*; do
-		dosym $files \
-			/usr/${PN}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
-	done
-
-	dodir /usr/${PN}/jre/lib
-	dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip /usr/${PN}/jre/lib/rt.jar
-	dodir /usr/${PN}/lib
-	dosym ${CLASSPATH_DIR}/share/classpath/tools.zip /usr/${PN}/lib/tools.jar
-
-	dosym /usr/bin/ecj /usr/${PN}/bin/javac || die
-
-	local libarch="${ARCH}"
-	[ ${ARCH} == x86 ] && libarch="i386"
-	[ ${ARCH} == x86_64 ] && libarch="amd64"
-	dodir /usr/${PN}/jre/lib/${libarch}/client
-	dodir /usr/${PN}/jre/lib/${libarch}/server
-	dosym /usr/${PN}/lib/libjvm.so /usr/${PN}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/${PN}/lib/libjvm.so /usr/${PN}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${CLASSPATH_DIR}/lib/classpath/libjawt.so /usr/${PN}/jre/lib/${libarch}/libjawt.so
-	set_java_env
-}

diff --git a/dev-java/cacao/files/0.93-no-exec-stack.patch b/dev-java/cacao/files/0.93-no-exec-stack.patch
deleted file mode 100644
index cac6e71..0000000
--- a/dev-java/cacao/files/0.93-no-exec-stack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur cacao-0.93.old/src/vm/jit/i386/asmpart.S cacao-0.93/src/vm/jit/i386/asmpart.S
---- cacao-0.93.old/src/vm/jit/i386/asmpart.S	2005-12-21 12:31:29.808539216 +0200
-+++ cacao-0.93/src/vm/jit/i386/asmpart.S	2005-12-21 12:33:06.350862552 +0200
-@@ -40,6 +40,9 @@
- 
- #include "vm/jit/methodheader.h"
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
- 
- /* define it like the risc way */
- 

diff --git a/dev-java/cacao/files/cacao.env b/dev-java/cacao/files/cacao.env
deleted file mode 100644
index 52d41f1..0000000
--- a/dev-java/cacao/files/cacao.env
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="CACAO @PV@"
-JAVA_HOME=/usr/@PN@
-JDK_HOME=/usr/@PN@
-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.5"
-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/metadata.xml b/dev-java/cacao/metadata.xml
deleted file mode 100644
index d554f88..0000000
--- 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@g.o</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>