Use system installed copies of fastjar and zlib. Fixes bug #188542.

(Portage version: 2.1.3)

3 files changed, 159 insertions, 1 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index c1c6590d2e64..1061d29d732a 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,11 @@
 # 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.71 2007/07/22 09:18:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.72 2007/08/12 09:18:41 betelgeuse Exp $
+
+*kaffe-1.1.7-r6 (12 Aug 2007)
+
+  12 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> +kaffe-1.1.7-r6.ebuild:
+  Use system installed copies of fastjar and zlib. Fixes bug #188542.
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> kaffe-1.1.7-r4.ebuild,
   kaffe-1.1.7-r5.ebuild:
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.7-r6 b/dev-java/kaffe/files/digest-kaffe-1.1.7-r6
new file mode 100644
index 000000000000..728f17b6760f
--- /dev/null
+++ b/dev-java/kaffe/files/digest-kaffe-1.1.7-r6
@@ -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-r6.ebuild b/dev-java/kaffe/kaffe-1.1.7-r6.ebuild
new file mode 100644
index 000000000000..78d74898ad6f
--- /dev/null
+++ b/dev-java/kaffe/kaffe-1.1.7-r6.ebuild
@@ -0,0 +1,150 @@
+# 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-r6.ebuild,v 1.1 2007/08/12 09:18:41 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 dependencies to be
+#determined
+#	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="~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."
+	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
+	java-vm-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	rm -v "${S}"/external/gcc/*/*.c || die
+}
+
+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!
+	[[ ${ARCH} = ppc || ${ARCH} = ppc64 ]] && 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 \
+		--disable-fastjar \
+		--with-system-zlib || 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
+
+	dosym /usr/bin/fastjar /opt/${P}/bin
+
+	# 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!"
+}