Version bump, from lisp overlay.

Package-Manager: portage-2.2_rc52/cvs/Linux i686

5 files changed, 164 insertions, 6 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/Manifest b/dev-scheme/kawa/Manifest
index 341b5e061a42..bb446429b3ec 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kawa-1.9.90.patch 949 RMD160 8e5e1649e55f0c16f03463aea4f780f621d5f15e SHA1 8a2fea2f5269f6f7bc357ee31cdf7ac83664e71c SHA256 943dcf79cdeff184e026a41cb658ba270be721b5a1f64c7bfc5a2b94ea17553f
+DIST XQTS_1_0_2.zip 19879467 RMD160 1dd6219b7c2d0c04deca41d2efa7966136fc5a14 SHA1 8e6d06b674f0acbbdacec2a8b4a0fb3d33419a6f SHA256 923361362d70a20818c6442eb52a6401fe9d2e53e4f52ee8b4d7fb1c841b4443
 DIST kawa-1.9.1.tar.gz 1973504 RMD160 db2f7f131132aa92c9fe782f93d5a2305b605108 SHA1 6b7d4c3011f4de550f6b0718e6321e0380c5903b SHA256 590da119e1a130c059cdb08dcf0a17a2d27f14020bd51b99a8318554b57a77d9
+DIST kawa-1.9.90.tar.gz 2079745 RMD160 4ad74f206078b3d259d3089e9b0d8f2b03feaf9b SHA1 5c262e586fc3ba1d005d024cc2bb17098709c7d5 SHA256 11152de647e93ea966883bc59f761033520ce1e3e4c9e3cc9f7b5ba1d0d5f4b7
 EBUILD kawa-1.9.1.ebuild 827 RMD160 89a955a70f3da286c275e8c8a01dfb2f96adf927 SHA1 4e1b7bed281e69039b77fc55525983a36fa2ae5e SHA256 df03b8dc38fdee5bff67b25744e7b17c6c569dd7a8a55b3053ae686de6ef8b85
-MISC ChangeLog 1903 RMD160 74296537c05eaf427d874942f32fdc48544a3cb2 SHA1 dc2d12b5aaa1a7bd5b4e0354f62f1920309ef6ff SHA256 c3b541dcac6f3441ebd7fc832a1e7cf898d46486e51fc7e54a8239808de4c722
-MISC metadata.xml 179 RMD160 96789594be5a8bb83078902f83cb044458873a35 SHA1 1d37b816717d1dfb76f98aaf034f513216b0cb15 SHA256 1ee01b0cb1f6531a987c56710469fc4b0b69b22c9c901388448984c999e243e9
+EBUILD kawa-1.9.90.ebuild 2965 RMD160 9c0e090158ae3686d73a680fa697c76fa7de4f7d SHA1 df27751c57526f0f47d2e9d732e54fc437020e8b SHA256 0de3215e04f4dc1e4691baa4edb2a696b4e66c6323e1888e6638e67d9c67ee28
+MISC ChangeLog 2116 RMD160 1c96d805befc776e8de75c4dc433e01be670ed21 SHA1 58d907fb90c4073e40da67da05b8e68cf5ef8037 SHA256 a2c9e2d0b5e6d936a3c75b4400f68fad7b28909d80cee347bf3f3d4926224e4d
+MISC metadata.xml 1281 RMD160 243ff2d208de06d8cf5512fea00a381d59e467c6 SHA1 366a6fda5b8c462eb951cb2396e4404163e7784c SHA256 39872500001989ac7d35446dfafc1d9e3e606b07ce2b3f590e34114ee389f173
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEARECAAYFAksUIucACgkQOeoy/oIi7uz9GQCdHRlPwtdt+0z8f8MHIMzX/YU3
+GwoAoIqfpffcoqrFfGoWvxDR89FAyyHR
+=hh6V
+-----END PGP SIGNATURE-----
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>