Made javadoc executable, bug #144635. Fixed jar problem with java-config, bug #141477. Fixed a collision with gnu-classpath.

Package-Manager: portage-2.1.1_pre5-r3

4 files changed, 151 insertions, 5 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 6c69eb8865ce..eb48a5b6d0ef 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.54 2006/08/19 14:38:19 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.55 2006/08/25 02:58:07 nichoj Exp $
+
+*kaffe-1.1.7-r1 (25 Aug 2006)
+
+  25 Aug 2006; Joshua Nichols <nichoj@gentoo.org> +kaffe-1.1.7-r1.ebuild:
+  Made javadoc executable, bug #144635. Fixed jar problem with java-config,
+  bug #141477. Fixed a collision with gnu-classpath.
 
   19 Aug 2006; Thomas Cort <tcort@gentoo.org> kaffe-1.1.6-r2.ebuild:
   Stable on amd64 wrt Bug #137827.
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index eb71e47fe20b..4082cf205812 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -48,6 +48,10 @@ EBUILD kaffe-1.1.6-r2.ebuild 3237 RMD160 6feab98590c7d3ede4182e952b35e262d7924e0
 MD5 8ca5c6f423c7ed1355b96f7751868aa1 kaffe-1.1.6-r2.ebuild 3237
 RMD160 6feab98590c7d3ede4182e952b35e262d7924e07 kaffe-1.1.6-r2.ebuild 3237
 SHA256 bfdb7d18ac9ad9daef69cdce98167429f174e296fc7e7ff235d76c7802716a0f kaffe-1.1.6-r2.ebuild 3237
+EBUILD kaffe-1.1.7-r1.ebuild 3571 RMD160 572c3ef753bbc347e197b44cc4f567db33f00770 SHA1 f2608625b4250f41589175f4738d43a6e82f17cf SHA256 7368544ee7e5f8afec7db214d2cfffe350b76838aaaecac0349535878bfc94fc
+MD5 49861f0e56268579501358530aea8304 kaffe-1.1.7-r1.ebuild 3571
+RMD160 572c3ef753bbc347e197b44cc4f567db33f00770 kaffe-1.1.7-r1.ebuild 3571
+SHA256 7368544ee7e5f8afec7db214d2cfffe350b76838aaaecac0349535878bfc94fc kaffe-1.1.7-r1.ebuild 3571
 EBUILD kaffe-1.1.7.ebuild 3144 RMD160 02c16bc03adb8504e5ef33490a4d88e6dfb80233 SHA1 023e8a0a7c92d6653e2a10830af6824e9a56d370 SHA256 8622ebfde16a61b13de28479a41da720b458ccbe730d4ff410d55b021cfcbc23
 MD5 b3718b2063ced6be7a4d000e178ad757 kaffe-1.1.7.ebuild 3144
 RMD160 02c16bc03adb8504e5ef33490a4d88e6dfb80233 kaffe-1.1.7.ebuild 3144
@@ -56,10 +60,10 @@ EBUILD kaffe-1.1.7_rc1.ebuild 3284 RMD160 9a4e7ebd5908d9cd895daaf4b34aff2bd21041
 MD5 3fafc45971f992ed8857d4e9ac20c63d kaffe-1.1.7_rc1.ebuild 3284
 RMD160 9a4e7ebd5908d9cd895daaf4b34aff2bd21041be kaffe-1.1.7_rc1.ebuild 3284
 SHA256 e38ec2142944c025f7e54df499874dfa1dc326f950f0f6782c29d11a7c3f90ff kaffe-1.1.7_rc1.ebuild 3284
-MISC ChangeLog 8550 RMD160 0da948529f7e6c2a2c1e6be7a3795c18e08d5324 SHA1 1ad88be97e3a6a94100bf3b28ec565eb7f4957ba SHA256 2833e3b40903275e66bcc94cd2e96c945ee9d4256b92eee51732fc6f14862aa2
-MD5 72d16be489f8f9c2c8ac765300e5d584 ChangeLog 8550
-RMD160 0da948529f7e6c2a2c1e6be7a3795c18e08d5324 ChangeLog 8550
-SHA256 2833e3b40903275e66bcc94cd2e96c945ee9d4256b92eee51732fc6f14862aa2 ChangeLog 8550
+MISC ChangeLog 8786 RMD160 299f6ba8eae59baa70df4aa60ec412d9017c1c37 SHA1 109229e59962774ae968c3591de7bc3859c8544e SHA256 7594bdc4f8c784e66b6475cdd6d58c1609b19cd6a859ae5b41e2fe1a1f3408cd
+MD5 64bce5770c8c7367f5406a22789d72fe ChangeLog 8786
+RMD160 299f6ba8eae59baa70df4aa60ec412d9017c1c37 ChangeLog 8786
+SHA256 7594bdc4f8c784e66b6475cdd6d58c1609b19cd6a859ae5b41e2fe1a1f3408cd ChangeLog 8786
 MISC metadata.xml 542 RMD160 e1d04c9d6f9200a9e9acbc277517f03949257f9f SHA1 7e30cc0755fdb517c7109cd5f19b9f4ff0f806be SHA256 00e7b8299c6cff8042960a5a7cb0f9fbd1a37bf943ceeab4778c18da7e9b0106
 MD5 d63ca386275c4844b0c8211d76e01d6f metadata.xml 542
 RMD160 e1d04c9d6f9200a9e9acbc277517f03949257f9f metadata.xml 542
@@ -79,6 +83,9 @@ SHA256 477661cf70c4202440aa8319b18803605a770af2686ccaae3dfdbbddac12fabd files/di
 MD5 0801d866830b5de24bf7cf8e2410389d files/digest-kaffe-1.1.7 241
 RMD160 27d7bb38c6d94a080249369320505e56d65057d1 files/digest-kaffe-1.1.7 241
 SHA256 5ee42d9a1756e7d00fbe5da2e4938883c7b26341f2ea022d688f7701265ef92b files/digest-kaffe-1.1.7 241
+MD5 0801d866830b5de24bf7cf8e2410389d files/digest-kaffe-1.1.7-r1 241
+RMD160 27d7bb38c6d94a080249369320505e56d65057d1 files/digest-kaffe-1.1.7-r1 241
+SHA256 5ee42d9a1756e7d00fbe5da2e4938883c7b26341f2ea022d688f7701265ef92b files/digest-kaffe-1.1.7-r1 241
 MD5 4b7c35bf7ef493e294ce1407fb75fedd files/digest-kaffe-1.1.7_rc1 253
 RMD160 dd53c8db778427ab57da52ce5f399c03f4db68ab files/digest-kaffe-1.1.7_rc1 253
 SHA256 b9c1efb040eb36a5c951acabaafa155b17676cec7b648450b68948eabd1de5d8 files/digest-kaffe-1.1.7_rc1 253
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.7-r1 b/dev-java/kaffe/files/digest-kaffe-1.1.7-r1
new file mode 100644
index 000000000000..2db7c00c6d29
--- /dev/null
+++ b/dev-java/kaffe/files/digest-kaffe-1.1.7-r1
@@ -0,0 +1,3 @@
+MD5 375c3dc44656f3f253455ea219f768b1 kaffe-1.1.7.tar.gz 14494274
+RMD160 7523a3470cd06cf60dbade8ea2f464dc9d85277b kaffe-1.1.7.tar.gz 14494274
+SHA256 7e46e8659e2b7f8b44e53438553df15f1d90c7f498be465391513157a03ff919 kaffe-1.1.7.tar.gz 14494274
diff --git a/dev-java/kaffe/kaffe-1.1.7-r1.ebuild b/dev-java/kaffe/kaffe-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..df8394ea4d9d
--- /dev/null
+++ b/dev-java/kaffe/kaffe-1.1.7-r1.ebuild
@@ -0,0 +1,130 @@
+# 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-r1.ebuild,v 1.1 2006/08/25 02:58:07 nichoj Exp $
+
+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.gz"
+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 ~sparc ~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/kaffe-1.1.7/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
+
+}
+
+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!"
+}