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

Package-Manager: portage-2.1.4.4

5 files changed, 137 insertions, 3 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/Manifest b/dev-java/jamvm/Manifest
index d9aad28e4336..8ca09bbbb2db 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX classes-location.patch 1184 RMD160 7ab849c181808d61bba64ed1a98a575ac14da4fd SHA1 632e5a2785435e95da534ea1c8a0d75004016083 SHA256 c973ef294f31c2937a55d5f683dc3ee2623877439b777093663e4f6367a791b1
+AUX jamvm-1.5.0.env 333 RMD160 d48ac63bcdde14d1933d2317f95c799f6fb563b4 SHA1 6827af89236556a6dfc9697a3f6343bfeb48ed7c SHA256 9ad52f179f09b55e375562e1c63e1b2fe1e5e081458adb6501dc86f2c91d6d84
 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.4.4.tar.gz 530157 RMD160 765149cf26314ab6355fcbec37b833b4e4e5fc88 SHA1 1a371a744da6faad3f5edd97966ec6b7fcc10432 SHA256 991a6f4e452e8d05750f33d5bac96b842e9093072c5152255bc75cfcf0b173e5
 DIST jamvm-1.4.5.tar.gz 547407 RMD160 63221c64e285349494f9a3166dce7e2a58381a55 SHA1 ad22e8eedf375230eae2917660c09c9063ffafd8 SHA256 f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5
+DIST jamvm-1.5.0.tar.gz 594250 RMD160 cfe80de1e2895df177b054cc622df2ed8e51feb9 SHA1 35b29d09635ec95efdee4eaab815c4bbf4130147 SHA256 18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab
 EBUILD jamvm-1.4.2.ebuild 1058 RMD160 059f12a824e6177b53d903a65f2cfa56edb047d7 SHA1 91f8cf3b8075ca5109f97e826e30b187c532fc66 SHA256 39b323f11ed4fba94e2ef84a9525d4b7427d08150fd24fd920d85b80b91223b2
 EBUILD jamvm-1.4.4-r1.ebuild 1338 RMD160 022bd907d133dbec8b56a4cb7aa3dad91d7d594f SHA1 0f50290b970e875b2ebab813e737489a61fd7e5f SHA256 9cd3c7a0c7093a2546f2b83a6fa67eed66ab180134261b7214cf52330302a70f
 EBUILD jamvm-1.4.5.ebuild 1704 RMD160 dc069285bf6ac9f9b702112e1162da0dc737f4b2 SHA1 9d714a7aae8ff885bafaf8346dd87b772591151e SHA256 2eb8989fd573cdf5cb17d85354176a25b77ef42c58cd3de61572e970d5923d66
-MISC ChangeLog 3888 RMD160 9ff6d3426efd0fb5099fb1e1fa1f80434601fa6d SHA1 c4a885c1c871a6ba4429e3acc8daa03e285d6fe9 SHA256 265b18e4216e626c7fb33e0942d1efb0c2e468c1355b10c4a3127759b8db583e
+EBUILD jamvm-1.5.0.ebuild 2092 RMD160 87e7fee86647838117c27be5abe0117be6244a74 SHA1 424f2df5958757c2154700804153c685167fe866 SHA256 4af564e50170d41f1508da1890b4353404eb723162ead18ac3470dcc6ed79d4f
+MISC ChangeLog 4114 RMD160 dd8a0aaaf97b1a7aea596b824597ced2069cfe89 SHA1 98be5ef38008e488b5ea2cd23434db283b0c8151 SHA256 98ced901517d26554cda591735604837507b591c3749be1afb165660319c8360
 MISC metadata.xml 159 RMD160 8da0afd0f687b8985b7f0432fec737950271e354 SHA1 1d089c3afbfafd09e371d7806cc0c72a5c76e5a1 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHzDUfcxLzpIGCsLQRAt5GAJ0cX+QazC/unW/GP3R6lhRJNtb6KgCgleYn
+7claFgLcM+iU5X8LOkwofew=
+=xfcI
+-----END PGP SIGNATURE-----
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
+}