Only provide JRE. #371461

Package-Manager: portage-2.1.10.58/cvs/Linux x86_64

4 files changed, 118 insertions, 11 deletions

diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
index 8c028e53b676..0bb73887c3fb 100644
--- a/dev-java/jamvm/ChangeLog
+++ b/dev-java/jamvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jamvm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.47 2011/09/28 10:53:39 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.48 2012/05/14 19:17:32 sera Exp $
+
+*jamvm-1.5.4-r2 (14 May 2012)
+
+  14 May 2012; Ralph Sennhauser <sera@gentoo.org> +jamvm-1.5.4-r2.ebuild,
+  +files/jamvm-1.5.4-r2.env:
+  Only provide JRE. #371461
 
   28 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   USE="libffi" is now global USE flag.
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index c35a146faecd..a928a678282f 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -3,18 +3,20 @@ Hash: SHA1
 
 AUX classes-location.patch 1184 RMD160 7ab849c181808d61bba64ed1a98a575ac14da4fd SHA1 632e5a2785435e95da534ea1c8a0d75004016083 SHA256 c973ef294f31c2937a55d5f683dc3ee2623877439b777093663e4f6367a791b1
 AUX jamvm-1.5.4-r1.env 353 RMD160 a9af0011b56fbb64ca9693c4a8b40fe03f851e6b SHA1 aa3300ba5d45cf0e95e943dca1069be0b85d60d1 SHA256 d4efccfae8d232ae923b41f5f8d547141751975e4b9506243f433fdde6fb8668
+AUX jamvm-1.5.4-r2.env 320 RMD160 b4379cfa19de525f064c8a283e6e642e64521163 SHA1 a71fc8025112a5a1a8f3ee626890b8e7fca2ec13 SHA256 0bdb8b07a21509ff5650629546a0bfd1a0fe40e5c7b8e9a8d2a1c3797bfa9f04
 DIST jamvm-1.5.4.tar.gz 656283 RMD160 7aa2a3d28c0d953c0d0048a3f8c48dc274ae10a0 SHA1 26863c78d5b0dfcc1a1492d24af58d192831b510 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124
 EBUILD jamvm-1.5.4-r1.ebuild 2728 RMD160 f1ed2ced1bb0f989376220fb0b717fb8de658135 SHA1 71837be968863b47399753b0f0f3a3122b35d101 SHA256 3ac5c49552213cb434a5c6b12038e35e63076291543e44b19bef3c3350146d4b
-MISC ChangeLog 6938 RMD160 31826574bcfb3a97b6122373957a8d3876aafe0e SHA1 a8e126c30de3cc2ec6d86af419f22b6c3df3bad8 SHA256 b609cc3f48c05590914830f93c7eb10db884f3fc698eed056698ac281e61bb0f
+EBUILD jamvm-1.5.4-r2.ebuild 2432 RMD160 4403034fa768307e175bfef5b642155249fc2421 SHA1 f39f794888d1250bb68e9fcb2edcc3cae8debd63 SHA256 d73cbb573af292ff3369e42f889e52d75dfb2b4233a08b25e5499c7f1e144779
+MISC ChangeLog 7096 RMD160 af51a0ebdda8fad07fb07a70a0c1b4978c801b25 SHA1 510c15abc71f4aae40771278b56374353ca8a7b5 SHA256 d7b0461c357569dbe34a46cbea98cee6b931d80305e098a3a108a9087bb50804
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOgvzcAAoJEEdUh39IaPFNVSYH/i2RlRCa0nS62NqknEu8Xtev
-NS0+BZvEYYTb626eAduLa3TfXSDjbbAsEGQSB/kZy7qqhb2/9Juy/Le0YTELrB+f
-qVfA4dHeiijgvjoEd6YAsfJKO5F/jZonyx9di1vdh141rAjmZCWyxm6oQugseoTx
-Yp1Dju9LrjVStNBYXE0+UpQSgx2Bq8kSoufoazrrZf3Xbshd5zf5TDyTuBwScrvu
-cBSXsBuHliADJ71S3WZFRI9iD/wkYb7eAG+w8AvvM3leV8ykPTTeFn+q+VXq5c4z
-gN760Jt6xS5fptD98z7s5kINYCwnQ+Elv3ySPR1gU1dQB6G9eX8DJiXApBQ1+/Q=
-=9ulA
+iQEcBAEBAgAGBQJPsVpiAAoJEIUJ+svaV163/R4H/A3XIOYM4aURkwwWqIMjVcwA
+ttUVXQ3WH+QlSBBkFmSyagb2p5EzeHX59onrkMjjc1Oc/IbUSKmxZUuPPwzVaXq5
+/7V2uDO7RrinqTD5+jIaIeHzIroweZ1OVyxAhb88N/CL3IEtjf2VVeWAlz4aPDm3
+I9hFLUcsAJHsjDZ3W96xWK3stSXnZbUsgSUc+U3SSy0merffdLzpLJBGhzgdi3s2
+MjN+v8cgKTwYpxTJMVHphtsrjesZJWd4VPSmHtKhqWfifyqufL2syOloGpVB1VpR
+ju6x+sd/NhtrZOLC5QlkhfKyGeLbYrCzcb9ugOUfKdAocvE8NlDfB2AyQ2ASipg=
+=nkaJ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-r2.env b/dev-java/jamvm/files/jamvm-1.5.4-r2.env
new file mode 100644
index 000000000000..85c551eb63d3
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-1.5.4-r2.env
@@ -0,0 +1,11 @@
+VERSION="JamVM JRE @PV@"
+JAVA_HOME="/usr/@LIBDIR@/@PN@"
+BOOTCLASSPATH="${JAVA_HOME}/classes.zip:${JAVA_HOME}/lib/rt.jar"
+JAVAC="${JAVA_HOME}/bin/javac"
+PATH="${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.5"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JAVAC PATH"
+LDPATH="${JAVA_HOME}/lib"
diff --git a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..bd6d632b0b55
--- /dev/null
+++ b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/05/14 19:17:32 sera Exp $
+
+EAPI=4
+
+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}"
+
+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}
+}
+
+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
+
+	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
+
+	set_java_env "${FILESDIR}/${PN}-1.5.4-r2.env"
+
+	dosym /usr/bin/jamvm ${INSTALL_DIR}/bin/java
+	dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip ${INSTALL_DIR}/jre/lib/rt.jar
+	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
+}