Version bump. Now uses external gnu-classpath.

Package-Manager: portage-2.1_pre1

5 files changed, 66 insertions, 7 deletions

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index 84255e12571b..05d7b69917f6 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/cacao
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.4 2005/07/26 21:14:53 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.5 2005/12/21 11:30:27 betelgeuse Exp $
+
+*cacao-0.93 (21 Dec 2005)
+
+  21 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
+  +files/0.93-no-exec-stack.patch, +cacao-0.93.ebuild:
+  Version bump. Now uses external gnu-classpath.
 
   26 Jul 2005; Thomas Matthijs <axxo@gentoo.org> cacao-0.91.ebuild:
   removed inherit java-pkg, doesnt seem to use anything from it
diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest
index 10db0b57dcae..0500e9406753 100644
--- a/dev-java/cacao/Manifest
+++ b/dev-java/cacao/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1aed3998a2ae04404258025cf6111709 ChangeLog 677
-MD5 ebe9107b21e3ad6b7065a0a95a118869 metadata.xml 364
+MD5 a371d94414942eec3d336620e8b8d1f7 ChangeLog 868
 MD5 500a092baa3f5735bf31135042b865cc cacao-0.91.ebuild 1176
+MD5 7449efae6ed449d9237f7637b855d579 cacao-0.93.ebuild 1057
+MD5 77af59ed311f182690b4e5dcac85d064 files/0.93-no-exec-stack.patch 403
 MD5 1b8ece1ea129936e89b66052a7f28b0c files/digest-cacao-0.91 64
+MD5 d6095d9ed2b40cc02512dd70e9e90201 files/digest-cacao-0.93 63
+MD5 ebe9107b21e3ad6b7065a0a95a118869 metadata.xml 364
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC5qfv/rLF9B432nYRAgZyAKCaIcf3BzPIOVyXNSnkdjdn1qSZfwCgjWyB
-x8kDGBYsqQl5+nnEe39jmP4=
-=ySEI
+iD8DBQFDqTzjQiJ/wx066S4RAu4jAJ9958SfUXwMVLPIgm9I1xRUvDs0YwCfRLbr
+xvOlkGQOPC4EDEZDBZQ3uR0=
+=QRBn
 -----END PGP SIGNATURE-----
diff --git a/dev-java/cacao/cacao-0.93.ebuild b/dev-java/cacao/cacao-0.93.ebuild
new file mode 100644
index 000000000000..a030c77b112a
--- /dev/null
+++ b/dev-java/cacao/cacao-0.93.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/cacao-0.93.ebuild,v 1.1 2005/12/21 11:30:27 betelgeuse Exp $
+
+inherit base eutils
+
+DESCRIPTION="Cacao Java Virtual Machine"
+HOMEPAGE="http://www.cacaojvm.org/"
+SRC_URI="http://www.complang.tuwien.ac.at/cacaojvm/download/${P}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND=">=dev-java/gnu-classpath-0.19
+		dev-java/jikes"
+RDEPEND="${DEPEND}"
+
+PATCHES="${FILESDIR}/${PV}-no-exec-stack.patch"
+
+src_compile() {
+	# No way to force a compiler yet. Needs jikes atm.
+	# http://b2.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=13
+
+	econf --bindir=/opt/${PN}/bin \
+		--disable-dependency-tracking \
+		--with-classpath-install-dir=/usr/
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodir /usr/bin
+	dosym /opt/${PN}/bin/cacao /usr/bin/cacao
+	dodoc AUTHORS ChangeLog* NEWS README TODO || die "failed to install docs"
+}
diff --git a/dev-java/cacao/files/0.93-no-exec-stack.patch b/dev-java/cacao/files/0.93-no-exec-stack.patch
new file mode 100644
index 000000000000..cac6e71240ae
--- /dev/null
+++ b/dev-java/cacao/files/0.93-no-exec-stack.patch
@@ -0,0 +1,13 @@
+diff -ur cacao-0.93.old/src/vm/jit/i386/asmpart.S cacao-0.93/src/vm/jit/i386/asmpart.S
+--- cacao-0.93.old/src/vm/jit/i386/asmpart.S	2005-12-21 12:31:29.808539216 +0200
++++ cacao-0.93/src/vm/jit/i386/asmpart.S	2005-12-21 12:33:06.350862552 +0200
+@@ -40,6 +40,9 @@
+ 
+ #include "vm/jit/methodheader.h"
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+ 
+ /* define it like the risc way */
+ 
diff --git a/dev-java/cacao/files/digest-cacao-0.93 b/dev-java/cacao/files/digest-cacao-0.93
new file mode 100644
index 000000000000..ac2c85a03459
--- /dev/null
+++ b/dev-java/cacao/files/digest-cacao-0.93
@@ -0,0 +1 @@
+MD5 51bc6adf59f4ee5d6a647a45cf286c3b cacao-0.93.tar.gz 3381567