Version bump. Thanks to gnu_andrew. Fixes bug #179100, bug #183116.

(Portage version: 2.2_rc33/cvs/Linux i686)

2 files changed, 71 insertions, 2 deletions

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index 676bf6dc511b..4e607e1e526b 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/cacao
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.13 2007/02/21 23:29:54 peper Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.14 2009/07/16 20:50:55 betelgeuse Exp $
+
+*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.
diff --git a/dev-java/cacao/cacao-0.99.4.ebuild b/dev-java/cacao/cacao-0.99.4.ebuild
new file mode 100644
index 000000000000..16d6fa4280ad
--- /dev/null
+++ b/dev-java/cacao/cacao-0.99.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/cacao-0.99.4.ebuild,v 1.1 2009/07/16 20:50:55 betelgeuse Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic 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=""
+CLASSPATH_SLOT=0.98
+DEPEND="
+	dev-java/gnu-classpath:${CLASSPATH_SLOT}
+	app-admin/eselect-ecj
+"
+RDEPEND="${DEPEND}"
+
+CLASSPATH_DIR=/usr/gnu-classpath-${CLASSPATH_SLOT}
+
+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_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
+}
+