[gentoo-commits] repo/gentoo:master commit in: dev-java/jamvm/files/, dev-java/jamvm/

[Patrice Clement]

commit:     a9c8796f3650d5ab6ef10fed311fc7f3d535fdda
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 21:23:52 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 23:41:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c8796f

dev-java/jamvm: Clean up old.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jamvm/Manifest                            |  1 -
 .../jamvm/files/jamvm-1.5.4-classes-location.patch | 27 -------
 dev-java/jamvm/files/jamvm-1.5.4-env.file          | 11 ---
 dev-java/jamvm/jamvm-1.5.4-r2.ebuild               | 92 ----------------------
 4 files changed, 131 deletions(-)

diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 144c16d..7aa2e6b 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,2 +1 @@
-DIST jamvm-1.5.4.tar.gz 656283 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124 SHA512 a4a7a2917881262fee19b6aedd9dc50a78463c5e4b02bda4b8184aef49797e3476f8ec8671047a01ba246af7d84cbe58f57ee84bb198817738c79d9f62c1ddbc WHIRLPOOL 615d94ab3a8359c8d6d0a2347d836c0a6adceaeda03a72d105b094f4ffb3161a5f3abbd4c12aa75703823da203d1cee91591e829a796813f82fcfbf2703068f2
 DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443

diff --git a/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
deleted file mode 100644
index 57d046a..0000000
--- a/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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.4-env.file b/dev-java/jamvm/files/jamvm-1.5.4-env.file
deleted file mode 100644
index 85c551e..0000000
--- a/dev-java/jamvm/files/jamvm-1.5.4-env.file
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 03dccea..0000000
--- a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}-classes-location.patch"
-)
-
-src_prepare() {
-	# without this patch, classes.zip is not found at runtime
-	epatch "${PATCHES[@]}"
-	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
-	# https://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}/${P}-env.file"
-
-	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
-}