Version bump. Fixes bug #181896 and part of fixing bug #163724.

(Portage version: 2.1.4.4)

4 files changed, 122 insertions, 2 deletions

diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
index d64ba04521d0..2269c0ae28da 100644
--- a/dev-java/jamvm/ChangeLog
+++ b/dev-java/jamvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jamvm
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.25 2007/02/28 14:03:45 betelgeuse Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.26 2008/03/03 17:27:52 betelgeuse Exp $
+
+*jamvm-1.5.0 (03 Mar 2008)
+
+  03 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> +files/jamvm-1.5.0.env,
+  +files/classes-location.patch, +jamvm-1.5.0.ebuild:
+  Version bump. Fixes bug #181896 and part of fixing bug #163724.
 
 *jamvm-1.4.5 (28 Feb 2007)
 
diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/classes-location.patch
new file mode 100644
index 000000000000..57d046a81882
--- /dev/null
+++ b/dev-java/jamvm/files/classes-location.patch
@@ -0,0 +1,27 @@
+diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac
+--- jamvm-1.5.0.old/configure.ac	2008-03-03 17:31:46.000000000 +0200
++++ jamvm-1.5.0/configure.ac	2008-03-03 17:36:14.000000000 +0200
+@@ -208,6 +208,7 @@
+     install_dir=$prefix
+ fi
+ AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
++AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)])
+ 
+ AC_ARG_ENABLE(zip,
+     [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
+diff -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h
+--- jamvm-1.5.0.old/src/class.h	2008-03-03 17:31:46.000000000 +0200
++++ jamvm-1.5.0/src/class.h	2008-03-03 17:36:51.000000000 +0200
+@@ -39,10 +39,10 @@
+    separate class files in a directory structure */
+ 
+ #ifdef USE_ZIP
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
++#define JAMVM_CLASSES PKGDATADIR"/classes.zip"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
+ #else
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
++#define JAMVM_CLASSES PKGDATADIR"/classes"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
+ #endif
+ 
diff --git a/dev-java/jamvm/files/jamvm-1.5.0.env b/dev-java/jamvm/files/jamvm-1.5.0.env
new file mode 100644
index 000000000000..4282230a48d2
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-1.5.0.env
@@ -0,0 +1,11 @@
+VERSION="JamVM @PV@"
+JAVA_HOME=/opt/@PN@
+BOOTCLASSPATH="/opt/jamvm/classes.zip:/opt/gnu-classpath-0.97/share/classpath/glibj.zip"
+JDK_HOME=/opt/@PN@
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.5"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH"
diff --git a/dev-java/jamvm/jamvm-1.5.0.ebuild b/dev-java/jamvm/jamvm-1.5.0.ebuild
new file mode 100644
index 000000000000..20211397d2b8
--- /dev/null
+++ b/dev-java/jamvm/jamvm-1.5.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.5.0.ebuild,v 1.1 2008/03/03 17:27:53 betelgeuse Exp $
+
+EAPI=1
+
+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}"
+DEPEND="${DEPEND}"
+PDEPEND="dev-java/eclipse-ecj:3.3 dev-java/gjdoc"
+
+pkg_setup() {
+	if use libffi && ! built_with_use sys-devel/gcc libffi; then
+		eerror "sys-devel/gcc not built with libffi support"
+		eerror "rebuild sys-devel/gcc with USE=\"libffi\" or"
+		eerror "turn off the libffi use flag on on ${PN}"
+		die "Rebuild sys-devel/gcc with libffi"
+	fi
+	java-vm-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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
+}
+
+src_compile() {
+	filter-flags "-fomit-frame-pointer"
+
+	# Keep libjvm.so out of /usr
+	# http://bugs.gentoo.org/show_bug.cgi?id=181896
+	econf \
+		$(use_enable debug trace) \
+		$(use_enable libffi ffi) \
+		--prefix=/opt/${PN} \
+		--datadir=/opt/ \
+		--bindir=/usr/bin \
+		--with-classpath-install-dir=/opt/gnu-classpath-${CLASSPATH_SLOT} \
+		|| die "configure failed."
+	emake || die "make failed."
+}
+
+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
+}