Version bump to 1.10

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

4 files changed, 133 insertions, 2 deletions

diff --git a/dev-scheme/kawa/ChangeLog b/dev-scheme/kawa/ChangeLog
index 009d393b38ba..da97b0497912 100644
--- a/dev-scheme/kawa/ChangeLog
+++ b/dev-scheme/kawa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/kawa
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/ChangeLog,v 1.11 2010/06/28 23:30:54 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/ChangeLog,v 1.12 2010/09/16 15:14:21 chiiph Exp $
+
+*kawa-1.10 (16 Sep 2010)
+
+  16 Sep 2010; Tomas Touceda <chiiph@gentoo.org> +kawa-1.10.ebuild,
+  +files/kawa-1.10.patch:
+  Version bump to 1.10
 
 *kawa-1.9.90-r1 (29 Jun 2010)
 
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 716dff817349..7350f12bf34d 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,8 +1,11 @@
+AUX kawa-1.10.patch 949 RMD160 8e5e1649e55f0c16f03463aea4f780f621d5f15e SHA1 8a2fea2f5269f6f7bc357ee31cdf7ac83664e71c SHA256 943dcf79cdeff184e026a41cb658ba270be721b5a1f64c7bfc5a2b94ea17553f
 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.10.tar.gz 2238130 RMD160 ebe59edc951dba4644d8ee6d304e4b0b2d11dd46 SHA1 68375de0c9927e921601293f2d48df1627ed81c2 SHA256 f697f5784b55b1945f0644954459f88a0eb9511bb60d695b1a9767b58eb7492e
 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.10.ebuild 3026 RMD160 c9200adcdfc223f775fcbda685ceb4717b48c2fc SHA1 cdc7df765b160abca0783425c336dacbff32332e SHA256 c03b9637e0428fba1931a1818638baf48bdae86014c948a8ec50ccac1a60519d
 EBUILD kawa-1.9.1.ebuild 827 RMD160 89a955a70f3da286c275e8c8a01dfb2f96adf927 SHA1 4e1b7bed281e69039b77fc55525983a36fa2ae5e SHA256 df03b8dc38fdee5bff67b25744e7b17c6c569dd7a8a55b3053ae686de6ef8b85
 EBUILD kawa-1.9.90-r1.ebuild 3031 RMD160 b02f6ea16ec08445bace52a13c3133b19b407b47 SHA1 e80fa74f8b98c8780673c5cc499db639138bc306 SHA256 bf358d9748b0004ef305bad40801c5a9aa034ab97f4f703c4a39181d6552aa6d
-MISC ChangeLog 2307 RMD160 f3c7d40ad164bc6b76d29bdc0e5d1e03e623b4a0 SHA1 1bc014574b8bf583346a1af8cee9b5bf5efd6f99 SHA256 46472a49a03246c9ec5495b442cfda62756f554b6a6cc1460d3294fc1b5aec54
+MISC ChangeLog 2451 RMD160 4ae1998c2ac3c61285b31bb0b9aa0c3e59d8e4d8 SHA1 e2b1bf2b696bb14b3fed7384d78af11a957be6ae SHA256 f14a155783461566facd831b998b858acf4749230e84d42ba1d0312ebfb727fe
 MISC metadata.xml 1281 RMD160 243ff2d208de06d8cf5512fea00a381d59e467c6 SHA1 366a6fda5b8c462eb951cb2396e4404163e7784c SHA256 39872500001989ac7d35446dfafc1d9e3e606b07ce2b3f590e34114ee389f173
diff --git a/dev-scheme/kawa/files/kawa-1.10.patch b/dev-scheme/kawa/files/kawa-1.10.patch
new file mode 100644
index 000000000000..9466f0637ee6
--- /dev/null
+++ b/dev-scheme/kawa/files/kawa-1.10.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.10.ebuild b/dev-scheme/kawa/kawa-1.10.ebuild
new file mode 100644
index 000000000000..d4f39e634252
--- /dev/null
+++ b/dev-scheme/kawa/kawa-1.10.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/kawa-1.10.ebuild,v 1.1 2010/09/16 15:14:21 chiiph Exp $
+
+EAPI="3"
+
+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.5 )
+			   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
+	if use xqtests; then
+		mkdir "${WORKDIR}/${xtestsuite}" || die
+		cd "${WORKDIR}/${xtestsuite}" || die
+		unpack ${xtestsuite}.zip || die
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+src_configure() {
+	# 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.5 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."
+}
+
+src_compile() {
+	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"
+	if use servlets; then
+		java-pkg_dolauncher "kawa-cgi-servlet" --main \
+			gnu.kawa.servlet.CGIServletWrapper || die
+	fi
+	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
+}