Version bump. Removed old snapshot ebuild.

Package-Manager: portage-2.0.52-r1

7 files changed, 142 insertions, 76 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 6504efd4da22..0c2be06cfbc6 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,13 @@
 # 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.35 2005/09/13 14:45:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.36 2005/09/28 22:22:13 betelgeuse Exp $
+
+*kaffe-1.1.6 (28 Sep 2005)
+
+  28 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
+  -files/kaffe-1.1.4_p20041220, +files/kaffe-1.1.6,
+  -kaffe-1.1.4_p20041220.ebuild, +kaffe-1.1.6.ebuild:
+  Version bump. Removed old snapshot ebuild.
 
   13 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> kaffe-1.1.5-r1.ebuild:
   Stable on sparc wrt #105505
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index c73d763408fa..b6ccee81ad48 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0bd99f73897c72ae2548c1335a73aff8 ChangeLog 5681
-MD5 73eba47e4376b8ef0277917e9775d215 kaffe-1.1.4.ebuild 1384
+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 0dbd2265323a31ffe6c44ccbf42e92e7 metadata.xml 344
-MD5 bedc2c8045f4427b9e5b5f7d4a0feb2d kaffe-1.1.4_p20041220.ebuild 1595
 MD5 5537a1325fe5c1edf280f06e46a14a5d kaffe-1.1.5.ebuild 1431
-MD5 5cd588f479e7388a3aee24d57df9b804 kaffe-1.1.5-r1.ebuild 2598
-MD5 db3c5b7c7434756580165a330667dde8 files/kaffe-1.1.5 464
-MD5 2e1f733100256452cb1fd7749144206c files/kaffe-1.1.4_p20041220 474
-MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4-r1 64
+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 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4 64
+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 89ab9ab78ed555baabd7d861d042b7c2 files/digest-kaffe-1.1.4_p20041220 75
-MD5 15d4e7be27bfaa5a835fd5acc810f3ba files/digest-kaffe-1.1.5-r1 64
+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-r1 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJuY6KRy60XGEcJIRAu1vAKCQbiKbmnMyhQa5nggogCqg0mWpqgCfSwP8
-pGabwaaj6cpYZ+eSUcWF2P8=
-=oU3i
+iD4DBQFDOxe6QiJ/wx066S4RApo1AJd0XA+c/BhzGthmFjq2vXv3K2t9AJ9utLz3
+lEiBzBy09nfa1S7zem6kkg==
+=1av/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.4_p20041220 b/dev-java/kaffe/files/digest-kaffe-1.1.4_p20041220
deleted file mode 100644
index b368666b9e7f..000000000000
--- a/dev-java/kaffe/files/digest-kaffe-1.1.4_p20041220
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa49ee1b292b854baec34bb80c83a927 kaffe-20041220-gentoo.tar.gz 10767200
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.6 b/dev-java/kaffe/files/digest-kaffe-1.1.6
new file mode 100644
index 000000000000..14dce8c41d63
--- /dev/null
+++ b/dev-java/kaffe/files/digest-kaffe-1.1.6
@@ -0,0 +1,2 @@
+MD5 29d4b9ec58080715d13a764e9e4cfc06 kaffe-1.1.6.tar.gz 10779887
+MD5 95b211bb82bae6307952da968c688808 kaffe-1.1.6-kaffeh.patch.bz2 6758
diff --git a/dev-java/kaffe/files/kaffe-1.1.4_p20041220 b/dev-java/kaffe/files/kaffe-1.1.6
index 0d52ceaec623..915891937483 100644
--- a/dev-java/kaffe/files/kaffe-1.1.4_p20041220
+++ b/dev-java/kaffe/files/kaffe-1.1.6
@@ -1,6 +1,6 @@
 # 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.4_p20041220,v 1.2 2005/09/10 16:48:52 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe-1.1.6,v 1.1 2005/09/28 22:22:13 betelgeuse Exp $
 
 VERSION="Kaffe @PV@"
 JAVA_HOME=/opt/@P@
diff --git a/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild b/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild
deleted file mode 100644
index 10995b6ecc00..000000000000
--- a/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.4_p20041220.ebuild,v 1.6 2005/09/10 16:48:52 betelgeuse Exp $
-
-inherit java flag-o-matic
-
-date=${PV/*_p/}
-DESCRIPTION="A cleanroom, open source Java VM and class libraries"
-SRC_URI="http://dev.gentoo.org/~karltk/projects/java/distfiles/kaffe-${date}-gentoo.tar.gz"
-HOMEPAGE="http://www.kaffe.org/"
-DEPEND=">=dev-libs/gmp-3.1
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.1
-	virtual/libc
-	virtual/x11
-	>=dev-java/java-config-0.2.4
-	dev-java/jikes
-	app-arch/zip
-	>=dev-java/java-config-0.2.4
-	alsa? ( >=media-libs/alsa-lib-1.0.1 )
-	esd?  ( >=media-sound/esound-0.2.1 )"
-RDEPEND=${DEPEND}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="alsa esd"
-
-PROVIDE="virtual/jdk
-	virtual/jre"
-S=${WORKDIR}/kaffe-${date}
-
-src_compile() {
-	# see #88330
-	strip-flags "-fomit-frame-pointer"
-
-	./configure \
-		--prefix=/opt/${P} \
-		--host=${CHOST} \
-		`use_enable alsa`\
-		`use_enable esd` \
-		--with-jikes || 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"
-}
-
-pkg_postinst() {
-	ewarn "By all means, 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!"
-}
diff --git a/dev-java/kaffe/kaffe-1.1.6.ebuild b/dev-java/kaffe/kaffe-1.1.6.ebuild
new file mode 100644
index 000000000000..8f0b156a685e
--- /dev/null
+++ b/dev-java/kaffe/kaffe-1.1.6.ebuild
@@ -0,0 +1,116 @@
+# 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.ebuild,v 1.1 2005/09/28 22:22:13 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
+#Add support after bug 107432 is fixed for all keyworded arches.
+#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"
+#	dosym /usr/bin/gjdoc /opt/${P}/bin/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!"
+}