Use fastjar instead of the jar wrapper to make it possible to install kaffe without a jdk installed. Fixes bug #163801.

Package-Manager: portage-2.1.2-r12

4 files changed, 164 insertions, 8 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 30a2233a0f56..6d971ab03524 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/kaffe
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.66 2007/02/14 19:27:55 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.67 2007/02/28 12:16:21 betelgeuse Exp $
+
+*kaffe-1.1.7-r5 (28 Feb 2007)
+
+  28 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> +kaffe-1.1.7-r5.ebuild:
+  Use fastjar instead of the jar wrapper to make it possible to install kaffe
+  without a jdk installed. Fixes bug #163801.
 
   14 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> kaffe-1.1.7-r4.ebuild:
   Use jikes-bin directly instead of the wrapper so that it's possible to
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index 2dfdc0181664..e0b3734c42af 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -14,10 +14,14 @@ EBUILD kaffe-1.1.7-r4.ebuild 3718 RMD160 251cdd1df7eca5301fd0768ab430a1cfce07822
 MD5 71e9d5e473114f6b768aae08443f47c4 kaffe-1.1.7-r4.ebuild 3718
 RMD160 251cdd1df7eca5301fd0768ab430a1cfce078226 kaffe-1.1.7-r4.ebuild 3718
 SHA256 be071cd14960c7b76b1b90142b339335ab701bfafefd180f554f344e8123cf4d kaffe-1.1.7-r4.ebuild 3718
-MISC ChangeLog 10721 RMD160 848f0c0872226d6810a55de677762db080ce1c26 SHA1 d1d2018c0809091ba2b14de612ea0be25b37e67a SHA256 870cdac54a6139b90c8deb2c224471406f8fa70d33c98cc1872c7aef6c100e5a
-MD5 5ba52539208efd67c01a4f498d9ee7e0 ChangeLog 10721
-RMD160 848f0c0872226d6810a55de677762db080ce1c26 ChangeLog 10721
-SHA256 870cdac54a6139b90c8deb2c224471406f8fa70d33c98cc1872c7aef6c100e5a ChangeLog 10721
+EBUILD kaffe-1.1.7-r5.ebuild 3917 RMD160 e28c89bcbf89dcd2a782aaa4115b251a0a1cd3d0 SHA1 e12a595071ca75239a907c510ff7b310a5d5a3d4 SHA256 1e1e040c077191a0ebd682c84a5eadf69535fb719164ba9916242f9ae471588c
+MD5 9cb677104a63ecf651b0d65f57506e8b kaffe-1.1.7-r5.ebuild 3917
+RMD160 e28c89bcbf89dcd2a782aaa4115b251a0a1cd3d0 kaffe-1.1.7-r5.ebuild 3917
+SHA256 1e1e040c077191a0ebd682c84a5eadf69535fb719164ba9916242f9ae471588c kaffe-1.1.7-r5.ebuild 3917
+MISC ChangeLog 10954 RMD160 d53fdf54f7aafde03adb090d0ec71b1d6c409079 SHA1 2a5f97162afc62b7910aa3aa76a0b453793b47a9 SHA256 a5ed88515af151654c3e35640ce6e0676bca36f096fc2d86d14d719c6c708700
+MD5 fc586bb99f15fc6b9987cbab94b88e17 ChangeLog 10954
+RMD160 d53fdf54f7aafde03adb090d0ec71b1d6c409079 ChangeLog 10954
+SHA256 a5ed88515af151654c3e35640ce6e0676bca36f096fc2d86d14d719c6c708700 ChangeLog 10954
 MISC metadata.xml 539 RMD160 ebed312bca45b48f276fef682112676a7db60291 SHA1 7ea3b80e47be90dbc1ee37581186a5b59483a3d8 SHA256 df08b5714a84814335206b660a04b3bba211d3d8fd3b7e9d9afba1be375754b6
 MD5 6e04f926f281bd16bb09b7ae372fbaff metadata.xml 539
 RMD160 ebed312bca45b48f276fef682112676a7db60291 metadata.xml 539
@@ -25,10 +29,13 @@ SHA256 df08b5714a84814335206b660a04b3bba211d3d8fd3b7e9d9afba1be375754b6 metadata
 MD5 e336d26d231eefe5244cf5ed40f0a316 files/digest-kaffe-1.1.7-r4 244
 RMD160 d22fe2ab8898f1e7f76b92e40825db8d3903c771 files/digest-kaffe-1.1.7-r4 244
 SHA256 105a9ee7995a77eeaabc82a9ca3264f9f7e61395c42e9dc76f9545ba44a35789 files/digest-kaffe-1.1.7-r4 244
+MD5 e336d26d231eefe5244cf5ed40f0a316 files/digest-kaffe-1.1.7-r5 244
+RMD160 d22fe2ab8898f1e7f76b92e40825db8d3903c771 files/digest-kaffe-1.1.7-r5 244
+SHA256 105a9ee7995a77eeaabc82a9ca3264f9f7e61395c42e9dc76f9545ba44a35789 files/digest-kaffe-1.1.7-r5 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF02LEcxLzpIGCsLQRAqCVAJ4iesfmI7JgrXqPbjB1b22NkGVqZQCbB/Eq
-omOn4i3Ls7sfOSPRFZ8BFI0=
-=4ox8
+iD8DBQFF5W6ccxLzpIGCsLQRAsQ9AJ9WJ0qJiXppdjSe9fZ+4T4EkDSIXACeMsGT
+c9p3jxxPoCI09KGGU+2pQXU=
+=JZLN
 -----END PGP SIGNATURE-----
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.7-r5 b/dev-java/kaffe/files/digest-kaffe-1.1.7-r5
new file mode 100644
index 000000000000..728f17b6760f
--- /dev/null
+++ b/dev-java/kaffe/files/digest-kaffe-1.1.7-r5
@@ -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/kaffe-1.1.7-r5.ebuild b/dev-java/kaffe/kaffe-1.1.7-r5.ebuild
new file mode 100644
index 000000000000..1cf7a63195a6
--- /dev/null
+++ b/dev-java/kaffe/kaffe-1.1.7-r5.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2007 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-r5.ebuild,v 1.1 2007/02/28 12:16:21 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* )
+
+COMMON_DEP="
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	app-arch/zip
+	>=dev-java/jikes-1.22-r13
+	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 )"
+
+# kaffe builds it's own copy of fastjar so we don't need fastjar at
+# runtime. Hopefully next upstream release uses the system one.
+DEPEND="${COMMON_DEP}
+	app-arch/fastjar"
+
+RDEPEND="${COMMON_DEP}"
+
+# We need to build this after kaffe because it is implemented in java
+PDEPEND="dev-java/gjdoc"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~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."
+	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."
+	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 fastjar or kaffe tries to use the jar tool which does
+	# not work before kaffe is installed if kaffe is the first jdk
+	# merged
+	# bug #141477 and bug #163801
+
+	# --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=/usr/bin/jikes-bin \
+		--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!"
+}