diff options
author | Vlastimil Babka <caster@gentoo.org> | 2010-07-06 19:22:55 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2010-07-06 19:22:55 +0000 |
commit | 2f4d164953ca5aa1eac87aeb2876dcfabe01bbe9 (patch) | |
tree | 494bac69a3ee033676cf117117d5c8af63b77521 /dev-java | |
parent | Use PYTHON_DEPEND instead of NEED_PYTHON. (diff) | |
download | gentoo-2-2f4d164953ca5aa1eac87aeb2876dcfabe01bbe9.tar.gz gentoo-2-2f4d164953ca5aa1eac87aeb2876dcfabe01bbe9.tar.bz2 gentoo-2-2f4d164953ca5aa1eac87aeb2876dcfabe01bbe9.zip |
Cleanup.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/jamvm/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/jamvm/files/classes-location.patch | 27 | ||||
-rw-r--r-- | dev-java/jamvm/files/jamvm-1.5.0.env | 13 | ||||
-rw-r--r-- | dev-java/jamvm/files/jamvm.env | 11 | ||||
-rw-r--r-- | dev-java/jamvm/jamvm-1.4.2.ebuild | 36 | ||||
-rw-r--r-- | dev-java/jamvm/jamvm-1.5.0-r3.ebuild | 96 | ||||
-rw-r--r-- | dev-java/jamvm/jamvm-1.5.4.ebuild | 96 |
7 files changed, 6 insertions, 280 deletions
diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog index 024cd229d6b1..edd2ad2d2417 100644 --- a/dev-java/jamvm/ChangeLog +++ b/dev-java/jamvm/ChangeLog @@ -1,6 +1,11 @@ # 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.44 2010/07/05 17:22:22 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.45 2010/07/06 19:22:55 caster Exp $ + + 06 Jul 2010; Vlastimil Babka <caster@gentoo.org> -jamvm-1.4.2.ebuild, + -jamvm-1.5.0-r3.ebuild, -files/jamvm-1.5.0.env, -jamvm-1.5.4.ebuild, + -files/classes-location.patch, -files/jamvm.env: + Cleanup. 05 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> jamvm-1.4.2.ebuild: Drop ppc64 wrt #168736, Comment #17 diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/classes-location.patch deleted file mode 100644 index 57d046a81882..000000000000 --- a/dev-java/jamvm/files/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.0.env b/dev-java/jamvm/files/jamvm-1.5.0.env deleted file mode 100644 index a0d7fb769ea3..000000000000 --- a/dev-java/jamvm/files/jamvm-1.5.0.env +++ /dev/null @@ -1,13 +0,0 @@ -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" -GENTOO_COMPILER="ecj-3.3" -LDPATH="/opt/@PN@/lib" diff --git a/dev-java/jamvm/files/jamvm.env b/dev-java/jamvm/files/jamvm.env deleted file mode 100644 index 19120fbbea21..000000000000 --- a/dev-java/jamvm/files/jamvm.env +++ /dev/null @@ -1,11 +0,0 @@ -VERSION="JamVM @PV@" -JAVA_HOME=/opt/@P@ -BOOTCLASSPATH="/usr/share/classpath/glibj.zip" -JDK_HOME=/opt/@P@ -JAVAC=${JAVA_HOME}/bin/javac -PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.4" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH" diff --git a/dev-java/jamvm/jamvm-1.4.2.ebuild b/dev-java/jamvm/jamvm-1.4.2.ebuild deleted file mode 100644 index 2b391060e55b..000000000000 --- a/dev-java/jamvm/jamvm-1.4.2.ebuild +++ /dev/null @@ -1,36 +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.4.2.ebuild,v 1.5 2010/07/05 17:22:22 ssuominen Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="An extremely small and specification-compliant virtual machine." -HOMEPAGE="http://jamvm.sourceforge.net/" -SRC_URI="mirror://sourceforge/jamvm/jamvm-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~ppc x86" -IUSE="debug" - -DEPEND=">=dev-java/gnu-classpath-0.19" -RDEPEND="${DEPEND}" - -src_compile() { - filter-flags "-fomit-frame-pointer" - - # configure adds "/share/classpath" itself - # includedir puts jni.h in a package dependent folder - local myc="--with-classpath-install-dir=/usr - --includedir=/usr/include/${PN}" - use debug && myc="${myc} --enable-trace" - econf ${myc} || die "configure failed." - emake || die "make failed." -} - -src_install() { - make install DESTDIR="${D}" || die "installation failed." - - dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README \ - || die "dodoc failed" -} diff --git a/dev-java/jamvm/jamvm-1.5.0-r3.ebuild b/dev-java/jamvm/jamvm-1.5.0-r3.ebuild deleted file mode 100644 index bcd3f0bd50c4..000000000000 --- a/dev-java/jamvm/jamvm-1.5.0-r3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2009 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-r3.ebuild,v 1.7 2009/07/19 13:45:51 nixnut Exp $ - -EAPI=2 - -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} - libffi? ( virtual/libffi ) - amd64? ( virtual/libffi )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" -PDEPEND="dev-java/ant-eclipse-ecj:3.3 - dev-java/gjdoc" - -src_prepare() { - 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=/opt/gnu-classpath-${CLASSPATH_SLOT} - -src_configure() { - local myconf - - filter-flags "-fomit-frame-pointer" - - if use libffi; then - append-cflags "$(pkg-config --cflags-only-I libffi)" - fi - - if use amd64; then - append-cflags "$(pkg-config --cflags-only-I libffi)" - myconf="--enable-ffi" - fi - - # Keep libjvm.so out of /usr - # http://bugs.gentoo.org/show_bug.cgi?id=181896 - econf \ - $(use_enable debug trace) \ - --prefix=/opt/${PN} \ - --bindir=/usr/bin \ - --datadir=/opt \ - $(use_enable libffi ffi) \ - --disable-dependency-tracking \ - --with-classpath-install-dir=${CLASSPATH_DIR} \ - ${myconf} -} - -create_launcher() { - local script="${D}/opt/${PN}/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.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 - for file in ${CLASSPATH_DIR}/bin/*; do - base=$(basename ${file}) - create_launcher ${base#g} - done -} diff --git a/dev-java/jamvm/jamvm-1.5.4.ebuild b/dev-java/jamvm/jamvm-1.5.4.ebuild deleted file mode 100644 index c4fa580222d7..000000000000 --- a/dev-java/jamvm/jamvm-1.5.4.ebuild +++ /dev/null @@ -1,96 +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.ebuild,v 1.1 2010/03/27 17:55:53 ali_bush Exp $ - -EAPI=2 - -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} - libffi? ( virtual/libffi ) - amd64? ( virtual/libffi )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" -PDEPEND="dev-java/ant-eclipse-ecj:3.3 - dev-java/gjdoc" - -src_prepare() { - 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=/opt/gnu-classpath-${CLASSPATH_SLOT} - -src_configure() { - local myconf - - filter-flags "-fomit-frame-pointer" - - if use libffi; then - append-cflags "$(pkg-config --cflags-only-I libffi)" - fi - - if use amd64; then - append-cflags "$(pkg-config --cflags-only-I libffi)" - myconf="--enable-ffi" - fi - - # Keep libjvm.so out of /usr - # http://bugs.gentoo.org/show_bug.cgi?id=181896 - econf \ - $(use_enable debug trace) \ - --prefix=/opt/${PN} \ - --bindir=/usr/bin \ - --datadir=/opt \ - $(use_enable libffi ffi) \ - --disable-dependency-tracking \ - --with-classpath-install-dir=${CLASSPATH_DIR} \ - ${myconf} -} - -create_launcher() { - local script="${D}/opt/${PN}/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.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 - for file in ${CLASSPATH_DIR}/bin/*; do - base=$(basename ${file}) - create_launcher ${base#g} - done -} |