Version Bump.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

2 files changed, 103 insertions, 2 deletions

diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
index 73559399eb15..e4f59bed3f2c 100644
--- a/dev-java/jamvm/ChangeLog
+++ b/dev-java/jamvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jamvm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.38 2009/07/19 13:45:51 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.39 2010/03/27 17:55:53 ali_bush Exp $
+
+*jamvm-1.5.4 (27 Mar 2010)
+
+  27 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +jamvm-1.5.4.ebuild:
+  Version Bump.
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> jamvm-1.5.0-r3.ebuild:
   ppc stable #272674
diff --git a/dev-java/jamvm/jamvm-1.5.4.ebuild b/dev-java/jamvm/jamvm-1.5.4.ebuild
new file mode 100644
index 000000000000..c4fa580222d7
--- /dev/null
+++ b/dev-java/jamvm/jamvm-1.5.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.5.4.ebuild,v 1.1 2010/03/27 17:55:53 ali_bush Exp $
+
+EAPI=2
+
+inherit autotools eutils flag-o-matic multilib java-vm-2
+
+DESCRIPTION="An extremely small and specification-compliant virtual machine."
+HOMEPAGE="http://jamvm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug libffi"
+
+CLASSPATH_SLOT=0.97
+RDEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT}
+	libffi? ( virtual/libffi )
+	amd64? ( virtual/libffi )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+PDEPEND="dev-java/ant-eclipse-ecj:3.3
+	dev-java/gjdoc"
+
+src_prepare() {
+	epatch "${FILESDIR}/classes-location.patch"
+	eautoreconf
+
+	# These come precompiled.
+	# configure script uses detects the compiler
+	# from PATH. I guess we should compile this from source.
+	# Then just make sure not to hit
+	# https://bugs.gentoo.org/show_bug.cgi?id=163801
+	#rm -v lib/classes.zip || die
+}
+
+CLASSPATH_DIR=/opt/gnu-classpath-${CLASSPATH_SLOT}
+
+src_configure() {
+	local myconf
+
+	filter-flags "-fomit-frame-pointer"
+
+	if use libffi; then
+		append-cflags "$(pkg-config --cflags-only-I libffi)"
+	fi
+
+	if use amd64; then
+		append-cflags "$(pkg-config --cflags-only-I libffi)"
+		myconf="--enable-ffi"
+	fi
+
+	# Keep libjvm.so out of /usr
+	# http://bugs.gentoo.org/show_bug.cgi?id=181896
+	econf \
+		$(use_enable debug trace) \
+		--prefix=/opt/${PN} \
+		--bindir=/usr/bin \
+		--datadir=/opt \
+		$(use_enable libffi ffi) \
+		--disable-dependency-tracking \
+		--with-classpath-install-dir=${CLASSPATH_DIR} \
+		${myconf}
+}
+
+create_launcher() {
+	local script="${D}/opt/${PN}/bin/${1}"
+	cat > "${script}" <<-EOF
+#!/bin/sh
+exec /usr/bin/jamvm \
+	-Xbootclasspath/p:"${CLASSPATH_DIR}/share/classpath/tools.zip" \
+	gnu.classpath.tools.${1}.Main "\$@"
+EOF
+	chmod +x "${script}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed."
+
+	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README \
+		|| die "dodoc failed"
+
+	set_java_env "${FILESDIR}/${PN}-1.5.0.env"
+
+	local bindir=/opt/${PN}/bin
+	dodir ${bindir}
+	dosym /usr/bin/jamvm ${bindir}/java
+	dosym /usr/bin/ecj-3.3 ${bindir}/javac
+	dosym /usr/bin/gjdoc ${bindir}/javadoc
+	for file in ${CLASSPATH_DIR}/bin/*; do
+		base=$(basename ${file})
+		create_launcher ${base#g}
+	done
+}