Version bump, from lisp overlay.

(Portage version: 2.2_rc52/cvs/Linux i686)

4 files changed, 148 insertions, 4 deletions

diff --git a/dev-scheme/kawa/ChangeLog b/dev-scheme/kawa/ChangeLog
index c8fad0bc36fb..a28bceb26ab7 100644
--- a/dev-scheme/kawa/ChangeLog
+++ b/dev-scheme/kawa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/kawa
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/ChangeLog,v 1.9 2008/10/06 16:58:28 pchrist Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/ChangeLog,v 1.10 2009/11/30 19:51:42 ulm Exp $
+
+*kawa-1.9.90 (30 Nov 2009)
+
+  30 Nov 2009; Ulrich Mueller <ulm@gentoo.org> +kawa-1.9.90.ebuild,
+  +files/kawa-1.9.90.patch, metadata.xml:
+  Version bump, from lisp overlay. Proxy commit for Tomás Touceda (chiiph).
 
   06 Oct 2008; Panagiotis Christopoulos <pchrist@gentoo.org>
   -kawa-1.6.97.ebuild, -kawa-1.7.ebuild, -kawa-1.8.ebuild:
diff --git a/dev-scheme/kawa/files/kawa-1.9.90.patch b/dev-scheme/kawa/files/kawa-1.9.90.patch
new file mode 100644
index 000000000000..9466f0637ee6
--- /dev/null
+++ b/dev-scheme/kawa/files/kawa-1.9.90.patch
@@ -0,0 +1,12 @@
+diff -Naur kawa-1.9.90.orig/bin/Makefile.in kawa-1.9.90/bin/Makefile.in
+--- kawa-1.9.90.orig/bin/Makefile.in	2009-08-08 12:20:49.000000000 -0300
++++ kawa-1.9.90/bin/Makefile.in	2009-09-21 20:15:06.000000000 -0300
+@@ -686,7 +686,7 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+-@ENABLE_KAWA_FRONTEND_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
++@ENABLE_KAWA_FRONTEND_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) ./kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
+ @WITH_GCJ_DBTOOL_FALSE@@WITH_GCJ_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa-bin$(EXEEXT) $(DESTDIR)$(bindir)/kawa-bin$(EXEEXT)
+ @ENABLE_SERVLET_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) cgi-servlet$(EXEEXT) $(DESTDIR)$(bindir)/cgi-servlet$(EXEEXT)
+ 
diff --git a/dev-scheme/kawa/kawa-1.9.90.ebuild b/dev-scheme/kawa/kawa-1.9.90.ebuild
new file mode 100644
index 000000000000..90b7782cf69d
--- /dev/null
+++ b/dev-scheme/kawa/kawa-1.9.90.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/kawa-1.9.90.ebuild,v 1.1 2009/11/30 19:51:42 ulm Exp $
+
+EAPI="1"
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
+HOMEPAGE="http://www.gnu.org/software/kawa/"
+XQTS_Ver="1_0_2"
+SRC_URI="mirror://gnu/kawa/${P}.tar.gz
+		 xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )"
+
+LICENSE="MIT public-domain
+		 jemacs? ( GPL-2 )
+		 krl? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests"
+
+COMMON_DEPEND="( >=virtual/jdk-1.5 )
+			   frontend? ( sys-libs/readline:0 )
+			   sax? ( dev-java/sax:0 )
+			   echo2? ( dev-java/echo2 )
+			   swt? ( dev-java/swt:3 )
+			   servlets? ( dev-java/servletapi:2.4 )"
+DEPEND="${COMMON_DEPEND}
+		xqtests? ( app-arch/unzip:0 )"
+RDEPEND="${COMMON_DEPEND}"
+
+xtestsuite="XQTS_${XQTS_Ver}"
+
+src_unpack () {
+	unpack kawa-${PV}.tar.gz || die
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
+
+	if use xqtests; then
+		mkdir "${WORKDIR}/${xtestsuite}" || die
+		cd "${WORKDIR}/${xtestsuite}" || die
+		unpack ${xtestsuite}.zip || die
+	fi
+}
+
+src_compile() {
+	# speeds up one-shot ebuilds.
+	myconf="--disable-dependency-tracking"
+	if use jemacs && ! use swing; then
+		echo
+		einfo "Although the swing USE flag is disabled you chose to enable jemacs,"
+		einfo "so swing is enabled anyway."
+		echo
+		myconf="${myconf} --with-swing"
+	else
+		myconf="${myconf} $(use_with swing)"
+	fi
+	if use xqtests; then
+		myconf="${myconf} $(use_with xqtests XQTS=${WORKDIR}/${xtestsuite})"
+	fi
+	if use servlets; then
+		myconf="${myconf} --with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
+	fi
+	if use swt; then
+		myconf="${myconf} --with-swt=$(java-pkg_getjar swt-3 swt.jar)"
+	fi
+
+	econf ${myconf} $(use_enable frontend kawa-frontend) \
+		  $(use_enable xml) \
+		  $(use_enable krl brl) \
+		  $(use_enable echo2) \
+		  $(use_enable jemacs) \
+		  $(use_with awt) \
+		  $(use_with sax sax2) \
+		  --with-java-source=$(java-pkg_get-source) || die "econf failed."
+
+	emake -j1 || die "emake failed."
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
+
+	java-pkg_newjar kawa-${PV}.jar || die
+
+	java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
+	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
+		"--xquery" || die "dolauncher qexo failed"
+	java-pkg_dolauncher "kawa-cgi-servlet" --main \
+		gnu.kawa.servlet.CGIServletWrapper || die
+	if use jemacs; then
+		java-pkg_dolauncher "jemacs" --main \
+			gnu.jemacs.lang.ELisp || die
+	fi
+
+	use source && java-pkg_dosrc kawa/* gnu/*
+
+	dodoc ChangeLog TODO README NEWS || die
+	doinfo doc/kawa.info* || die
+	cp doc/kawa.man doc/kawa.2 || die
+	cp doc/qexo.man doc/qexo.2 || die
+	doman doc/*.2 || die
+}
diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index 99b8861f5871..a427d8ea046c 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
-	<herd>java</herd>
+<herd>scheme</herd>
+<longdescription lang="en">
+  Kawa is a full Scheme implementation. It implements almost all of R5RS,
+  plus some extensions. By default, symbols are case sensitive. It is
+  completely written in Java. Scheme functions and files are automatically
+  compiled into Java byte-codes. Kawa does some optimizations, and the
+  compiled code runs at reasonable speed.
+</longdescription>
+<use>
+  <flag name='awt'>Assume AWT is available</flag>
+  <flag name='echo2'>Enable support for the Echo2 web toolkit with
+    <pkg>dev-java/echo2</pkg></flag>
+  <flag name='frontend'>Build "kawa" front-end program using
+    <pkg>sys-libs/readline</pkg></flag> 
+  <flag name='jemacs'>Build JEmacs</flag>
+  <flag name='krl'>Build BRL emulation and KRL</flag>
+  <flag name='sax'>Assume SAX2 is available with <pkg>dev-java/sax</pkg></flag>
+  <flag name='servlets'>Build support for generating servlets with
+    <pkg>dev-java/servletapi</pkg></flag>
+  <flag name='swing'>Assume Swing is available</flag>
+  <flag name='swt'>Assume SWT is available with <pkg>dev-java/swt</pkg></flag>
+  <flag name='xqtests'>Support XQuery Test Suite</flag>
+</use>
 </pkgmetadata>