From 683c059d1aed1da22ab5ed969d52deb79738d826 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Fri, 1 Dec 2006 18:44:57 +0000 Subject: [PATCH] Changed PROVIDES_TYPE from "JDK" to "JDK JRE" Package-Manager: portage-2.1.2_rc2-r3 --- dev-java/kaffe/ChangeLog | 8 +- dev-java/kaffe/files/digest-kaffe-1.1.7-r4 | 3 + dev-java/kaffe/files/kaffe.env | 4 +- dev-java/kaffe/kaffe-1.1.7-r4.ebuild | 134 +++++++++++++++++++++ 4 files changed, 146 insertions(+), 3 deletions(-) create mode 100644 dev-java/kaffe/files/digest-kaffe-1.1.7-r4 create mode 100644 dev-java/kaffe/kaffe-1.1.7-r4.ebuild diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog index 942fcdf3b02c..3504b0b92183 100644 --- a/dev-java/kaffe/ChangeLog +++ b/dev-java/kaffe/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/kaffe # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.64 2006/12/01 18:42:41 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.65 2006/12/01 18:44:57 betelgeuse Exp $ + +*kaffe-1.1.7-r4 (01 Dec 2006) + + 01 Dec 2006; Petteri Räty files/kaffe.env, + -kaffe-1.1.7-r3.ebuild, +kaffe-1.1.7-r4.ebuild: + Changed PROVIDES_TYPE from "JDK" to "JDK JRE" 01 Dec 2006; Petteri Räty -files/kaffe-1.1.4, -files/kaffe-1.1.4-r1, -files/kaffe-1.1.5, -files/kaffe-1.1.6, diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.7-r4 b/dev-java/kaffe/files/digest-kaffe-1.1.7-r4 new file mode 100644 index 000000000000..728f17b6760f --- /dev/null +++ b/dev-java/kaffe/files/digest-kaffe-1.1.7-r4 @@ -0,0 +1,3 @@ +MD5 6ba7a8ef815ddafcb1ec75f268f58897 kaffe-1.1.7.tar.bz2 10976055 +RMD160 8f58ee1b9389f5a562f152dabeeeeb6072eb1d57 kaffe-1.1.7.tar.bz2 10976055 +SHA256 827f861c2d404a0fefed286f3691da61928b0d84e7d13eda8620d4fe47fa244c kaffe-1.1.7.tar.bz2 10976055 diff --git a/dev-java/kaffe/files/kaffe.env b/dev-java/kaffe/files/kaffe.env index ed76695e28fb..1a5a024f1f98 100644 --- a/dev-java/kaffe/files/kaffe.env +++ b/dev-java/kaffe/files/kaffe.env @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe.env,v 1.1 2006/06/25 19:49:23 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe.env,v 1.2 2006/12/01 18:44:57 betelgeuse Exp $ VERSION="Kaffe @PV@" JAVA_HOME=/opt/@P@ @@ -11,7 +11,7 @@ MANPATH=/opt/@P@/man PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" LDPATH="/opt/@P@/jre/lib/i386/" -PROVIDES_TYPE="JDK" +PROVIDES_TYPE="JDK JRE" PROVIDES_VERSION="1.4" GENERATION="2" ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH" diff --git a/dev-java/kaffe/kaffe-1.1.7-r4.ebuild b/dev-java/kaffe/kaffe-1.1.7-r4.ebuild new file mode 100644 index 000000000000..f21e5adb8313 --- /dev/null +++ b/dev-java/kaffe/kaffe-1.1.7-r4.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r4.ebuild,v 1.1 2006/12/01 18:44:57 betelgeuse Exp $ + +JAVA_SUPPORTS_GENERATION_1="true" +inherit base eutils java-vm-2 flag-o-matic + +DESCRIPTION="A cleanroom, open source Java VM and class libraries" +SRC_URI="ftp://ftp.kaffe.org/pub/${PN}/v1.1.x-development/${P}.tar.bz2" +HOMEPAGE="http://www.kaffe.org/" + +#robilad recommended in bug 103978 that we leave the X and QT +#awt backends disabled for now. Please check the status of these +#backends with new upstream versions. +# X?( virtual/x11 ) +# qt?( =x11-libs/qt-3.3* ) + +DEPEND=" + >=media-libs/jpeg-6b + >=media-libs/libpng-1.2.1 + app-arch/zip + dev-java/jikes + dev-libs/libxml2 + sys-libs/zlib + gtk? ( + >=dev-libs/glib-2.0 + >=x11-libs/gtk+-2.0 + >=media-libs/libart_lgpl-2.0 ) + esd? ( >=media-sound/esound-0.2.1 ) + alsa? ( >=media-libs/alsa-lib-1.0.1 ) + gmp? ( >=dev-libs/gmp-3.1 )" +RDEPEND=${DEPEND} + +# We need to build this after kaffe because it is implemented in java +PDEPEND="dev-java/gjdoc" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +#X qt +IUSE="alsa esd gmp gtk nls" + +# kaffe-1.1.6-alsa.patch is needed to prevent compile errors with newer alsas +# (see bug #119272) +#PATCHES="${FILESDIR}/${PN}-1.1.6-alsa.patch" + +# ignore execstack for now. needs to be fixed upstream +# http://kaffe.org/cgi-bin/bugzilla/show_bug.cgi?id=59 +QA_EXECSTACK_x86="opt/${P}/jre/lib/i386/libkaffevm-1.1.7.so" + +pkg_setup() { + if ! use gmp; then + ewarn "You have don't have the gmp use flag set." + ewarn "Using gmp is the default upstream setting." + epause 3 + fi + + if ! use gtk; then + ewarn "" + ewarn "The gtk use flag is needed for a awt implementation." + ewarn "Don't file bugs for awt not working when you have" + ewarn "gtk use flag turned off." + epause 3 + fi +} + +src_compile() { + local confargs="" + + # see #88330 + filter-flags "-fomit-frame-pointer" + append-flags "-fno-strict-aliasing" + + if ! use alsa && ! use esd; then + confargs="${confargs} --disable-sound" + fi + + ! use gmp && confargs="${confargs} --enable-pure-java-math" + +# $(use_with X x) \ +# $(use_with X kaffe-x-awt) \ +# $(use_with qt kaffe-qt-awt ) \ + + # according to dalibor, this is needed on ppc because jit is + # not complete + # TODO needs testing! + use ppc && confargs="${confargs} --with-engine=intrp" + + # Use bundled fastjar until we have a separate fastjar package + # bug #141477 + FASTJAR="$S/external/gcc/fastjar/fastjar" + # --with-rt-jar in 1.1.7 to use the system installed classpath + econf \ + --disable-dependency-tracking \ + --prefix=/opt/${P} \ + --host=${CHOST} \ + $(use_with alsa)\ + $(use_with esd) \ + $(use_with gmp) \ + $(use_enable nls) \ + $(use_enable gtk gtk-peer) \ + ${confargs} \ + --with-jikes \ + --disable-gjdoc || die "Failed to configure." + + # --with-bcel + # --with-profiling + emake || die "Failed to compile" +} + +src_install() { + emake DESTDIR="${D}" install || die "Failed to install" + set_java_env + + # use doexe to ensure executable bit (bug #144635) + echo '#!/bin/bash' > javadoc + echo 'exec /usr/bin/gjdoc "${@}"' >> javadoc + exeinto "/opt/${P}/bin/" + doexe javadoc + + # Remove some files that collide with classpath + rm ${D}/usr/share/info/vmintegration.info \ + ${D}/usr/share/info/hacking.info + + # Add symlink to glibj.zip, for bug #148607 + cd ${D}/opt/${P}/jre/lib + ln -s glibj.zip rt.jar +} + +pkg_postinst() { + ewarn "Please, do not use Kaffe as your default JDK/JRE!" + ewarn "Kaffe is currently meant for testing... it should be" + ewarn "only be used by developers or bug-hunters willing to deal" + ewarn "with oddities that are bound to come up while using Kaffe!" +} -- 2.26.2