Version bump.

(Portage version: 2.1_pre3-r1)

5 files changed, 146 insertions, 11 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 64e0580b2394..794e2824399b 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.42 2006/01/20 05:32:03 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.43 2006/01/22 15:39:24 nichoj Exp $
+
+*kaffe-1.1.7_rc1 (22 Jan 2006)
+
+  22 Jan 2006; Joshua Nichols <nichoj@gentoo.org> +files/kaffe-1.1.7_rc1,
+  +kaffe-1.1.7_rc1.ebuild:
+  Version bump.
 
   20 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
   +files/kaffe-1.1.6-alsa.patch, kaffe-1.1.6-r2.ebuild:
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index 400ef49f6089..201b2ae115fb 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c45f8fc620bb1f7c35273491d91b8204 ChangeLog 6908
 MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4 64
 MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4-r1 64
@@ -8,22 +5,18 @@ MD5 15d4e7be27bfaa5a835fd5acc810f3ba files/digest-kaffe-1.1.5 64
 MD5 15d4e7be27bfaa5a835fd5acc810f3ba files/digest-kaffe-1.1.5-r1 64
 MD5 dbb64d20594f8c4b123c1709e0b79818 files/digest-kaffe-1.1.6 136
 MD5 dbb64d20594f8c4b123c1709e0b79818 files/digest-kaffe-1.1.6-r2 136
+MD5 1370487c7be7aad6fd7f42554022d8d7 files/digest-kaffe-1.1.7_rc1 69
 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 eddf093a0ea65d4d6f9bc7799250660c files/kaffe-1.1.6-alsa.patch 1132
+MD5 4df82a63ce7e304b03ba307b35e7bfa2 files/kaffe-1.1.7_rc1 479
 MD5 23e8c44e1f004349a3db5ca1bf2f5c47 kaffe-1.1.4-r1.ebuild 1393
 MD5 ee5a07dfacef040bc21d45a6a3d66aac kaffe-1.1.4.ebuild 1349
 MD5 2dcca85c1a74583e9deff9f8b5386edc kaffe-1.1.5-r1.ebuild 2565
 MD5 f1d64d96296bdad2ade674b87f24c17b kaffe-1.1.5.ebuild 1397
 MD5 101c1f0e92cfa21705b6f1fc6f732c31 kaffe-1.1.6-r2.ebuild 3291
 MD5 8e843f11037571fd8c1f031874443033 kaffe-1.1.6.ebuild 3109
+MD5 118db15336d83e6df5f7a77802980b95 kaffe-1.1.7_rc1.ebuild 3332
 MD5 d63ca386275c4844b0c8211d76e01d6f metadata.xml 542
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0HNandWRXhKOboURAksrAKDIh380X7BgxL03MTzMWjsswMuYAwCeN0vd
-PteoaIV55vBUPuyJmzmE04M=
-=zXVA
------END PGP SIGNATURE-----
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.7_rc1 b/dev-java/kaffe/files/digest-kaffe-1.1.7_rc1
new file mode 100644
index 000000000000..60c49b554652
--- /dev/null
+++ b/dev-java/kaffe/files/digest-kaffe-1.1.7_rc1
@@ -0,0 +1 @@
+MD5 167d80aa86a8090923537bd4d6378461 kaffe-1.1.7-rc1.tar.gz 14199477
diff --git a/dev-java/kaffe/files/kaffe-1.1.7_rc1 b/dev-java/kaffe/files/kaffe-1.1.7_rc1
new file mode 100644
index 000000000000..ca2ab05b246e
--- /dev/null
+++ b/dev-java/kaffe/files/kaffe-1.1.7_rc1
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe-1.1.7_rc1,v 1.1 2006/01/22 15:39:24 nichoj Exp $
+
+VERSION="Kaffe @PV@"
+JAVA_HOME=/opt/@PN@
+JDK_HOME="${JAVA_HOME}"
+JAVAC=${JAVA_HOME}/bin/javac
+MANPATH=${JAVA_HOME}/man
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="${JAVA_HOME}/jre/lib/i386/"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/kaffe/kaffe-1.1.7_rc1.ebuild b/dev-java/kaffe/kaffe-1.1.7_rc1.ebuild
new file mode 100644
index 000000000000..8ed44ae450c8
--- /dev/null
+++ b/dev-java/kaffe/kaffe-1.1.7_rc1.ebuild
@@ -0,0 +1,123 @@
+# 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_rc1.ebuild,v 1.1 2006/01/22 15:39:24 nichoj Exp $
+
+inherit base eutils java flag-o-matic
+
+MY_P=${P/_/-}
+DESCRIPTION="A cleanroom, open source Java VM and class libraries"
+#SRC_URI="http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/${MY_P}.tar.gz"
+SRC_URI="http://www.kaffe.org/~robilad/${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
+	virtual/libc
+	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}
+S="${WORKDIR}/${MY_P}"
+
+# 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"
+
+PROVIDE="virtual/jdk
+	virtual/jre"
+
+# 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"
+
+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/${PN} \
+		--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 'exec /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!"
+}