Version bump for javadoc support using dev-java/gjdoc.

(Portage version: 2.0.53_rc4)

4 files changed, 143 insertions, 24 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 0c2be06cfbc6..7872ecd33cc2 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/kaffe
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.36 2005/09/28 22:22:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.37 2005/10/09 22:05:58 betelgeuse Exp $
+
+*kaffe-1.1.6-r1 (09 Oct 2005)
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> +kaffe-1.1.6-r1.ebuild:
+  Version bump for javadoc support using dev-java/gjdoc.
 
 *kaffe-1.1.6 (28 Sep 2005)
 
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index b6ccee81ad48..e0b2b9db7226 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5cd588f479e7388a3aee24d57df9b804 kaffe-1.1.5-r1.ebuild 2598
-MD5 ffe01c57cefea0e6bdc10e4bc158dbcc kaffe-1.1.6.ebuild 3143
-MD5 fbe6520260055eea60aa62c9e6c0525a kaffe-1.1.4-r1.ebuild 1428
-MD5 5537a1325fe5c1edf280f06e46a14a5d kaffe-1.1.5.ebuild 1431
-MD5 699ea69fb9771328b3142e6b74c5aad1 ChangeLog 5916
-MD5 0dbd2265323a31ffe6c44ccbf42e92e7 metadata.xml 344
-MD5 73eba47e4376b8ef0277917e9775d215 kaffe-1.1.4.ebuild 1384
-MD5 5705b7951b83fc326ce97b101de8cb49 files/kaffe-1.1.4 506
-MD5 db3c5b7c7434756580165a330667dde8 files/kaffe-1.1.5 464
-MD5 42825d131cd9a6c5f3ed65112e06f7a7 files/kaffe-1.1.6 464
-MD5 6b922132b47393ca82554800904339da files/kaffe-1.1.4-r1 467
+MD5 12031391b0ead62ffe627d02093fc8ca ChangeLog 6082
 MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4 64
-MD5 15d4e7be27bfaa5a835fd5acc810f3ba files/digest-kaffe-1.1.5 64
-MD5 c55ea6790f89725bffc5ab3fd2f42647 files/digest-kaffe-1.1.6 136
 MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4-r1 64
+MD5 15d4e7be27bfaa5a835fd5acc810f3ba files/digest-kaffe-1.1.5 64
 MD5 15d4e7be27bfaa5a835fd5acc810f3ba files/digest-kaffe-1.1.5-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD4DBQFDOxe6QiJ/wx066S4RApo1AJd0XA+c/BhzGthmFjq2vXv3K2t9AJ9utLz3
-lEiBzBy09nfa1S7zem6kkg==
-=1av/
------END PGP SIGNATURE-----
+MD5 c55ea6790f89725bffc5ab3fd2f42647 files/digest-kaffe-1.1.6 136
+MD5 dbb64d20594f8c4b123c1709e0b79818 files/digest-kaffe-1.1.6-r1 136
+MD5 5705b7951b83fc326ce97b101de8cb49 files/kaffe-1.1.4 506
+MD5 6b922132b47393ca82554800904339da files/kaffe-1.1.4-r1 467
+MD5 db3c5b7c7434756580165a330667dde8 files/kaffe-1.1.5 464
+MD5 42825d131cd9a6c5f3ed65112e06f7a7 files/kaffe-1.1.6 464
+MD5 fbe6520260055eea60aa62c9e6c0525a kaffe-1.1.4-r1.ebuild 1428
+MD5 73eba47e4376b8ef0277917e9775d215 kaffe-1.1.4.ebuild 1384
+MD5 5cd588f479e7388a3aee24d57df9b804 kaffe-1.1.5-r1.ebuild 2598
+MD5 5537a1325fe5c1edf280f06e46a14a5d kaffe-1.1.5.ebuild 1431
+MD5 3be6d021d691a9733ecd5b67082f6a39 kaffe-1.1.6-r1.ebuild 3202
+MD5 ffe01c57cefea0e6bdc10e4bc158dbcc kaffe-1.1.6.ebuild 3143
+MD5 0dbd2265323a31ffe6c44ccbf42e92e7 metadata.xml 344
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.6-r1 b/dev-java/kaffe/files/digest-kaffe-1.1.6-r1
new file mode 100644
index 000000000000..885885726b74
--- /dev/null
+++ b/dev-java/kaffe/files/digest-kaffe-1.1.6-r1
@@ -0,0 +1,2 @@
+MD5 95b211bb82bae6307952da968c688808 kaffe-1.1.6-kaffeh.patch.bz2 6758
+MD5 29d4b9ec58080715d13a764e9e4cfc06 kaffe-1.1.6.tar.gz 10779887
diff --git a/dev-java/kaffe/kaffe-1.1.6-r1.ebuild b/dev-java/kaffe/kaffe-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..7bf0a367fe89
--- /dev/null
+++ b/dev-java/kaffe/kaffe-1.1.6-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.6-r1.ebuild,v 1.1 2005/10/09 22:05:58 betelgeuse Exp $
+
+inherit base eutils java flag-o-matic
+
+DESCRIPTION="A cleanroom, open source Java VM and class libraries"
+SRC_URI="http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/${P/_/-}.tar.gz
+		 mirror://gentoo/${P}-kaffeh.patch.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
+	virtual/libc
+	>=dev-java/java-config-0.2.4
+	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="~x86 ~sparc ~amd64 -ppc"
+#X qt
+IUSE="alsa esd gmp gtk nls"
+
+PROVIDE="virtual/jdk
+	virtual/jre"
+
+PATCHES="${DISTDIR}/${P}-kaffeh.patch.bz2"
+
+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
+	strip-flags "-fomit-frame-pointer"
+
+	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"
+
+	# --with-rt-jar in 1.1.7 to use the system installed classpath
+	./configure \
+		--disable-dependency-tracking \
+		--prefix=/opt/${P} \
+		--host=${CHOST} \
+		$(use_with alsa)\
+		$(use_with esd) \
+		$(use_with gmp) \
+		$(use_enable nls) \
+		$(use_with gtk classpath-gtk-awt) \
+		${confargs} \
+		--with-jikes \
+		--disable-gjdoc || die "Failed to configure."
+
+	# --with-bcel
+	# --with-profiling
+	make || die "Failed to compile"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "Failed to install"
+	set_java_env ${FILESDIR}/${VMHANDLE} || die "Failed to install environment files"
+
+	local javadoc=${D}/opt/${P}/bin/javadoc
+	# xno append here to zero the kaffe installed one
+	echo '#!/bin/bash' > ${javadoc}
+	echo '/usr/bin/gjdoc ${@}' >> ${javadoc}
+}
+
+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!"
+}