Revbump to switch to gnu-classpath-0.98, move the install to /usr/lib/jamvm, apply stuff (compatibility symlinks) from java-overlay.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 121 insertions, 2 deletions

diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
index e4f59bed3f2c..bc97c4353f02 100644
--- a/dev-java/jamvm/ChangeLog
+++ b/dev-java/jamvm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jamvm
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.40 2010/03/27 22:32:16 caster Exp $
+
+*jamvm-1.5.4-r1 (27 Mar 2010)
+
+  27 Mar 2010; Vlastimil Babka <caster@gentoo.org> +jamvm-1.5.4-r1.ebuild,
+  +files/jamvm-1.5.4-r1.env:
+  Revbump to switch to gnu-classpath-0.98, move the install to
+  /usr/lib/jamvm, apply stuff (compatibility symlinks) from java-overlay.
 
 *jamvm-1.5.4 (27 Mar 2010)
 
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 70737e99555f..7e36b69de9d5 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,11 +1,13 @@
 AUX classes-location.patch 1184 RMD160 7ab849c181808d61bba64ed1a98a575ac14da4fd SHA1 632e5a2785435e95da534ea1c8a0d75004016083 SHA256 c973ef294f31c2937a55d5f683dc3ee2623877439b777093663e4f6367a791b1
 AUX jamvm-1.5.0.env 382 RMD160 e3a4953826ea66d17aed7b07795929949ebd6c6e SHA1 ab86a7bc601672b47afa7bb259edec0942248c10 SHA256 0b4930e4636771ec76ea053c64064b0fe1ab64d477ac365f88fcd70dc95ed7d7
+AUX jamvm-1.5.4-r1.env 353 RMD160 a9af0011b56fbb64ca9693c4a8b40fe03f851e6b SHA1 aa3300ba5d45cf0e95e943dca1069be0b85d60d1 SHA256 d4efccfae8d232ae923b41f5f8d547141751975e4b9506243f433fdde6fb8668
 AUX jamvm.env 331 RMD160 33e990fb7c22f310cc9c4ce678a67f3f8062ade1 SHA1 c60faaf90d26c45ceaaf1a84d2b476aed7adb048 SHA256 dca8067931277eb7e919c820d83e3dcfaa46d9c70103f2c023e83eb04b45bd92
 DIST jamvm-1.4.2.tar.gz 285593 RMD160 ca9d26f90dd04e5aaefb1c33dda59a4f41456e31 SHA1 cfda95e52261d58e535a0c8ec03878304e9560c7 SHA256 dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3
 DIST jamvm-1.5.0.tar.gz 594250 RMD160 cfe80de1e2895df177b054cc622df2ed8e51feb9 SHA1 35b29d09635ec95efdee4eaab815c4bbf4130147 SHA256 18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab
 DIST jamvm-1.5.4.tar.gz 656283 RMD160 7aa2a3d28c0d953c0d0048a3f8c48dc274ae10a0 SHA1 26863c78d5b0dfcc1a1492d24af58d192831b510 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124
 EBUILD jamvm-1.4.2.ebuild 1058 RMD160 059f12a824e6177b53d903a65f2cfa56edb047d7 SHA1 91f8cf3b8075ca5109f97e826e30b187c532fc66 SHA256 39b323f11ed4fba94e2ef84a9525d4b7427d08150fd24fd920d85b80b91223b2
 EBUILD jamvm-1.5.0-r3.ebuild 2409 RMD160 64a49cbf070dd40aa45e8204ab16d9c8339853b8 SHA1 bb2b5288332ee817192a60c97b52c635604ed71b SHA256 69b8e33d4472418ed5407bb5b71052bca019eae4f55cbe886765a84206d01ecc
+EBUILD jamvm-1.5.4-r1.ebuild 2732 RMD160 df9b9354fb42d99bb211f9d6d677a9e3a831c567 SHA1 99bd0648f0e133d9a50154cffd36389d761c3d87 SHA256 38f7e2bc6c4c1ad45ff72a8b629d714e7d7c6d2e85c8ebaa3316238aafa6a92d
 EBUILD jamvm-1.5.4.ebuild 2411 RMD160 3c584b43a46768cfd91395ab0e946d3ef5da3a28 SHA1 df68641bad907c6d7b713b65a01aa828beaa53f3 SHA256 588933a917246fdc835ecf673d562d12062071d9a98bf16e7c40a2a6c8f6aacb
-MISC ChangeLog 5793 RMD160 7f7d277e651965558cf4d23cabddc5606830cb0f SHA1 d16808458a091951253d8ed768de8957babfb22f SHA256 2b04f7fd9367a3568e6bb230b4a4348ffdeec2f32b0aee49c3dc6685b3944196
+MISC ChangeLog 6064 RMD160 2991dc523da6b68e1a351b7c40c65db212af3637 SHA1 a7ffc0049e61100eb2abf3b852a1715f78003170 SHA256 365f10adf6b2dc67d102ea05b7c10548e7cd753e6d1f51a7a97cd2fd9cc55ada
 MISC metadata.xml 250 RMD160 768ed9ef97f57c25c39ed3bd46a88b44e104526e SHA1 ec1919e99fc0395f90a0aff91ce77bf13c95d399 SHA256 380eb6d01f833fe0077b518b8f4b9230baf88fa61463de48ff6c672755edd442
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-r1.env b/dev-java/jamvm/files/jamvm-1.5.4-r1.env
new file mode 100644
index 000000000000..9419ab6b449d
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-1.5.4-r1.env
@@ -0,0 +1,12 @@
+VERSION="JamVM @PV@"
+JAVA_HOME="/usr/@LIBDIR@/@PN@"
+BOOTCLASSPATH="${JAVA_HOME}/classes.zip:${JAVA_HOME}/lib/rt.jar"
+JDK_HOME="${JAVA_HOME}"
+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"
+LDPATH="${JAVA_HOME}/lib"
diff --git a/dev-java/jamvm/jamvm-1.5.4-r1.ebuild b/dev-java/jamvm/jamvm-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..875cb40da361
--- /dev/null
+++ b/dev-java/jamvm/jamvm-1.5.4-r1.ebuild
@@ -0,0 +1,98 @@
+# 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-r1.ebuild,v 1.1 2010/03/27 22:32:16 caster Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic multilib java-vm-2 autotools
+
+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.98
+DEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT}
+	libffi? ( virtual/libffi )
+	amd64? ( virtual/libffi )"
+RDEPEND="${DEPEND}"
+PDEPEND="dev-java/gjdoc
+	dev-java/eclipse-ecj"
+
+src_prepare() {
+	# without this patch, classes.zip is not found at runtime
+	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="/usr/gnu-classpath-${CLASSPATH_SLOT}"
+
+src_configure() {
+	# Keep libjvm.so out of /usr
+	# http://bugs.gentoo.org/show_bug.cgi?id=181896
+	INSTALL_DIR="/usr/$(get_libdir)/${PN}"
+
+	filter-flags "-fomit-frame-pointer"
+
+	if use amd64 || use libffi; then
+		append-cflags "$(pkg-config --cflags-only-I libffi)"
+	fi
+
+	local fficonf="--enable-ffi"
+	use !amd64 && fficonf="$(use_enable libffi ffi)"
+
+	econf ${fficonf} \
+		--disable-dependency-tracking \
+		$(use_enable debug trace) \
+		--prefix=${INSTALL_DIR} \
+		--datadir=/usr/$(get_libdir) \
+		--bindir=/usr/bin \
+		--libdir=${INSTALL_DIR}/lib \
+		--with-classpath-install-dir=${CLASSPATH_DIR} \
+		|| die "configure failed."
+}
+
+create_launcher() {
+	local script="${D}/${INSTALL_DIR}/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.4-r1.env"
+
+	local bindir=${INSTALL_DIR}/bin
+	dodir ${bindir}
+	dosym /usr/bin/jamvm ${bindir}/java
+	dosym /usr/bin/ecj ${bindir}/javac
+	dosym /usr/bin/gjdoc ${bindir}/javadoc
+	dodir ${INSTALL_DIR}/jre/lib
+	dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip ${INSTALL_DIR}/jre/lib/rt.jar
+	dodir ${INSTALL_DIR}/lib
+	dosym ${CLASSPATH_DIR}/share/classpath/tools.zip ${INSTALL_DIR}/lib/tools.jar
+	for file in ${CLASSPATH_DIR}/bin/*; do
+		base=$(basename ${file})
+		create_launcher ${base#g}
+	done
+}