NM: Cleanup superseeded ebuilds.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 6 insertions, 112 deletions

diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
index 5da3bc115aa5..4beb0c334a32 100644
--- a/dev-java/jamvm/ChangeLog
+++ b/dev-java/jamvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jamvm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.51 2012/12/07 21:40:57 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.52 2014/06/17 10:53:06 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -files/jamvm-1.5.4-r1.env,
+  -jamvm-1.5.4-r1.ebuild:
+  NM: Cleanup superseeded ebuilds.
 
   07 Dec 2012; Agostino Sarubbo <ago@gentoo.org> jamvm-1.5.4-r2.ebuild:
   Stable for ppc, wrt bug #425624
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-r1.env b/dev-java/jamvm/files/jamvm-1.5.4-r1.env
deleted file mode 100644
index 9419ab6b449d..000000000000
--- a/dev-java/jamvm/files/jamvm-1.5.4-r1.env
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 6b2fd54232f1..000000000000
--- a/dev-java/jamvm/jamvm-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.4 2010/05/24 18:50:27 pacho 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
-}