Version and EAPI 5 bump. Remove dev-java/servlet-api dependency. Fix bug 350224.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 155 insertions, 18 deletions

diff --git a/dev-scheme/kawa/ChangeLog b/dev-scheme/kawa/ChangeLog
index d8ee69e46b96..b73e5bff2ac3 100644
--- a/dev-scheme/kawa/ChangeLog
+++ b/dev-scheme/kawa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-scheme/kawa
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/ChangeLog,v 1.14 2014/02/24 02:27:12 phajdan.jr Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/ChangeLog,v 1.15 2015/04/27 20:26:48 monsieurp Exp $
+
+*kawa-1.14 (27 Apr 2015)
+
+  27 Apr 2015; Patrice Clement <monsieurp@gentoo.org> +files/kawa-1.14.patch,
+  +kawa-1.14.ebuild:
+  Version and EAPI 5 bump. Remove dev-java/servlet-api dependency. Fix bug
+  350224.
 
   24 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> kawa-1.10.ebuild:
   x86 stable wrt bug #354753
@@ -77,4 +84,3 @@
 
   Kawa is a Scheme environment, written in Java, and that compiles Scheme 
   code into Java byte-codes.
-
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index ede2f8cc7866..dc25e29f0f75 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -2,30 +2,28 @@
 Hash: SHA256
 
 AUX kawa-1.10.patch 1482 SHA256 e9b59585d9877807c6207d9c86862123f72b5062f441fd9fa63e0c4e8b954410 SHA512 796621da5483629953ed421e7643439702e088c74098af234b4023d50841dd98374a9b51d6549a3791a47bb8c6904aaebfd82cb668cd1e082f595d63c8bc3f92 WHIRLPOOL 71848e8ca8be6d311b9332272a822c96e715681ff8800f6303d0a86fec82591136f492b2f3ad2359305a90a8e31194126bc91f72a8dab13dd25946204a9dfcd5
+AUX kawa-1.14.patch 1482 SHA256 e9b59585d9877807c6207d9c86862123f72b5062f441fd9fa63e0c4e8b954410 SHA512 796621da5483629953ed421e7643439702e088c74098af234b4023d50841dd98374a9b51d6549a3791a47bb8c6904aaebfd82cb668cd1e082f595d63c8bc3f92 WHIRLPOOL 71848e8ca8be6d311b9332272a822c96e715681ff8800f6303d0a86fec82591136f492b2f3ad2359305a90a8e31194126bc91f72a8dab13dd25946204a9dfcd5
 AUX kawa-1.9.90.patch 949 SHA256 943dcf79cdeff184e026a41cb658ba270be721b5a1f64c7bfc5a2b94ea17553f SHA512 4088029fe2322d4cd02d9794cb005aa340a2ba58c5f397e35c2b5cf229bb5404a4130cde3377ea2e36a03c8da15217121fb14b70374d5007f4499734a8df5a53 WHIRLPOOL 0ea15fbb659032f539d22f12f4cc3474fa93c412043b54bd0e042c8f4ac0fe0d28f2cb21f0da8149bef354d6ebdc22011207f797158aea510ec5ed2671a6e1fd
 DIST XQTS_1_0_2.zip 19879467 SHA256 923361362d70a20818c6442eb52a6401fe9d2e53e4f52ee8b4d7fb1c841b4443
+DIST XQTS_1_0_3.zip 30956043 SHA256 1a6c9dd8761f021e78105efd4f46d5d35bb8b73b18e14bfde0512661e6be78ec SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd WHIRLPOOL 57ac5b2d5a38446d89df7bd7d06dbe09a592b6243ceb415fac4d2d0bf154a8cf51307194feab7eef14643bdd8f24e87f307b2cb521f5f81ef412814bf9fddc8b
 DIST kawa-1.10.tar.gz 2238130 SHA256 f697f5784b55b1945f0644954459f88a0eb9511bb60d695b1a9767b58eb7492e SHA512 4ab27331f7be6d6107272e75508179ed7d14c475e1fffaceeb7a16600e3ba4e54fc63506788ed89fca1f2d390477d2e3e685f29b015a28214fcb4f62016c943d WHIRLPOOL 2dc4c85ae4d8496b0425d6faf9c6077fe66906a107d0780b60d19fc91992b0a06f066857c4aa45fb81e29495ec4f9c7d9bac9d6f9a210874d2ffaf79dbf851eb
+DIST kawa-1.14.tar.gz 2691484 SHA256 2201cf3f4c57f49f15cf929d8634855cb8ef4ffe79158cecd66ebd5bd9b4b909 SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e WHIRLPOOL 6f7e32e38ecea68e4d7faffc2cb1df16d33b384010391d23507397714891ad1588a35aa7d0b4c1079322acc3250f25459c94ddb68f90a14f04a552f847542d6a
 DIST kawa-1.9.1.tar.gz 1973504 SHA256 590da119e1a130c059cdb08dcf0a17a2d27f14020bd51b99a8318554b57a77d9
 DIST kawa-1.9.90.tar.gz 2079745 SHA256 11152de647e93ea966883bc59f761033520ce1e3e4c9e3cc9f7b5ba1d0d5f4b7
 EBUILD kawa-1.10.ebuild 3029 SHA256 52e862133ce96b3c4d43df915e907c551b5bec1b3c2d24a8766706e8f897c779 SHA512 79f2e821f0fc71a45e1ac86155af164b00b7104f22ff924d54a0ceff6634b420556ca57fe5ea1d72290496bfc44d937067eb9482e1f78de1845ea8d0fac5c283 WHIRLPOOL 4e11e3868dccd28063c988f79706ca146e4aea6376eeb7d2f3876e9ffd6ddc43f91c4aeb190414a5fed2f9fe20e44726f29f9e3ed71c332e67db90a3e854d99e
+EBUILD kawa-1.14.ebuild 2989 SHA256 cb172b3fa69e35b7f1a1959d377a3723d7a5f5a3fab528d6306240ea4fadfd9f SHA512 5a814abc1a7c1507afa80960b71201d8e4d1e8a48742c4bc6c40fd38de4f6c2d3fa84a86027183a395382973c3b24de4c0de5adc38ac83b772ce9e956627c6cf WHIRLPOOL 08f111a3a54b5dcf1d286b5538706848fd6273d322bf2544a2f797999260dd23e9663df5813be98620ce0621be8370f5b8a1c8e0399df7d220df0c8eaa96603d
 EBUILD kawa-1.9.1.ebuild 827 SHA256 df03b8dc38fdee5bff67b25744e7b17c6c569dd7a8a55b3053ae686de6ef8b85 SHA512 3787ed32b6816fab1d15f7200143dba2131087e72ced6a220cd712fc3bb8424ec8c55df1fea5e9b66de7fb59dccfef7dde3e2fc0da58173ee0224bc9a9443ffc WHIRLPOOL 7faab11ba84c1c503a9d125df8314f724c5a97ba88f7179fe996834558b1a227dc9bf717658af16dc1a9a04c7983c5db458360b5984cbdad627fe8e14670967e
 EBUILD kawa-1.9.90-r1.ebuild 3031 SHA256 bf358d9748b0004ef305bad40801c5a9aa034ab97f4f703c4a39181d6552aa6d SHA512 199583f781091aa86f529c496a23a204b4d3b1320fd1015f9930dca968697b964351f624d0f1c7221477d89501e7b277ff6bf2121718b3fce32374d7e2f98e79 WHIRLPOOL b992c0fb60ea04d971de3ce7b419443861c5f9177660ee9c2c97160958e344d206856b839ad5c2f396c2783e07d154e2df8e2ae4de382a0bbe5bd63c0775edbb
-MISC ChangeLog 2693 SHA256 8a7c21e4664bd98d7aec79d68d5a81e9d05617e0919920417a8eafb07e0b10c5 SHA512 b259bbbce5fda76972c398b3ea94ddc0b616f765e2bebb4e62338c8a7fba813b8e7809716bd64c97f98f995f97f9ce351eac4e1da93c4b4bec297faa4648b6bd WHIRLPOOL 87933012f1692027a1c80ee8b40a063fa7a9cc411e16010e9329ddd82d45cd2a6f92e53af40ee8f237f7e5f5b036cd9a27c34b73c0e9a69552ef1c6e87b5c81b
+MISC ChangeLog 2902 SHA256 839df336fef3617e865e32d3f6275c7b91348ceb462d2a6f2ecd7a2513d697d4 SHA512 34ac07488e234e769e84a61da5f4dd179e6b088be4004d626ff0a8e6f881fb812cac60688436549e6488ea9e1357ba68c61a77f4f1e6529bafe5b8213089ab53 WHIRLPOOL 7439d6b9b648809b32d5896a6b169fa6ede440a4c0e2acc760c6e79f3ae9e5bcbd4c736f243b494ae41b06999b5c18e0c9258132c6456333857316a73426da2f
 MISC metadata.xml 1281 SHA256 39872500001989ac7d35446dfafc1d9e3e606b07ce2b3f590e34114ee389f173 SHA512 0dae2d8a7283952464ab85b663ac9c5b3b5113868c14c92acfeee819387665415690d62f15eed489954fd18cd1f6baf8032c0b323c7eb4534db65878467340b0 WHIRLPOOL 2d9cd4fb1a07a2a961fdfe0c06baea4fdc8080595e5f28f6188d318fec1c20017bbca43c3596bebecf64358ddf9c81531a13812abf6d06613f2a124be1791d0e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTCp/2AAoJEE8aJVXqcZkd5fYP/iDCLD1ZJuxCtL4eYaXWZymj
-uO5DnegEleJD/fPEqUUWiZFc2UzUlPNzFRej50OXq+3qeN7eBUQ4tV/ngqXzFbDy
-b2WK6KvN+aBiQZfjeHwKV0H4pmLqXhwc9033VfItYqu3wo9kJ7+vIxOfuBtl/PHV
-t1Cs/L5KQE+SW1M/NT8CruBio+dPYJgvSSZmkvGkWrvLXipBW8pXLygxa+hftUsj
-kVhfaz9e+d+MCqWWKYZNDaWAf5GppnIcWmYt6r2pNCMpb3DFK4L5pC0fZzmE0xLB
-L3Le4d0EgV53J+EAHHh0xsClK0ORpHx5cEkucR2wIJNlKL8bv1OLejTe5NWM3e+X
-/sTxf+onldUjypa9siK5y23ZxFTVsxzGNL86gVAE2dA9n1dDK+6sBITB1+pmVYES
-1wvJGUI//PGGXOE9YCjFxSOmnzzEXsYZNSxtmMGNinGwTr2t4W1+y0CzSLfPk8Wl
-8TsOpUgdqoakMm6VgUTEc3pjcU+/sslXGMoRHVYzVvsxjA6ZTOvE1Q9zROXYQDT8
-/bcVybT6RY44YB9tpIeXdJhFgl9SY/1ig9LRL5mNvpsq/CyPb1oWVh22/evl+qOe
-PzJwaXMsNvI+dFr+wgm6LglhU7BJS2qBLiIBFz5IkSOyQ/lNMM4Z7gg7eM0/W+Vf
-TjHSL6fsL584lg1pfRy8
-=E42L
+iQEcBAEBCAAGBQJVPpuLAAoJEJGRpfGTSRu41RMIAI7YUHGDhS2qJQ9CfdEzkhQD
+ysE6U9BDPQ4gfBldRPNciA4nfhgcKTeQnfHjFiVVkl23F29P/i20XSTNBo+sQOTN
+W51gs5RUUzYZIj4GriE8F6ORi1EzsKb6/KwM24R586v50LNucrwrVXBm7XoRjqhs
+wdtrnKgJ2psxzHz1M/safwRQ4W5nQeR2SY3eiV6BTkppwvbyuQrAETLe+IJNnva8
+YBetajrOaiw79vcswA6LcdzCGYcIM87EIFA8z5ROvhyJKNWOOx4a+FyYLx2429Hx
+Kv77FoI49HLDia7gshhJCXjCgMLYCHGEn8Ad4ym9T8hrqoIrFQ1yjRlC8jEB+5k=
+=Z1+P
 -----END PGP SIGNATURE-----
diff --git a/dev-scheme/kawa/files/kawa-1.14.patch b/dev-scheme/kawa/files/kawa-1.14.patch
new file mode 100644
index 000000000000..8acc5e442f69
--- /dev/null
+++ b/dev-scheme/kawa/files/kawa-1.14.patch
@@ -0,0 +1,24 @@
+diff -Naur kawa-1.10.orig/Makefile.in kawa-1.10/Makefile.in
+--- kawa-1.10.orig/Makefile.in		2010-09-19 01:38:24.000000000 +0200
++++ kawa-1.10/Makefile.in	2010-09-19 01:38:59.000000000 +0200
+@@ -908,7 +908,7 @@
+     | sed -e 's|./||' | sort > $@
+ 
+ gnu/kawa/util/PreProcess.class: $(srcdir)/gnu/kawa/util/PreProcess.java
+-	$(JAVAC) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
++	$(JAVAC) $(JAVACFLAGS) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
+ 
+ # JDK 1.1
+ select-java1: $(srcdir)/patch-source-list gnu/kawa/util/PreProcess.class
+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.14.ebuild b/dev-scheme/kawa/kawa-1.14.ebuild
new file mode 100644
index 000000000000..fdbd48e215bf
--- /dev/null
+++ b/dev-scheme/kawa/kawa-1.14.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/kawa-1.14.ebuild,v 1.1 2015/04/27 20:26:48 monsieurp Exp $
+EAPI=5
+
+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_3"
+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"
+
+CDEPEND="( >=virtual/jdk-1.6 )
+	frontend? ( sys-libs/readline:0 )
+	sax? ( dev-java/sax:0 )
+	echo2? ( dev-java/echo2 )
+	swt? ( dev-java/swt:3.5 )
+	servlets? ( java-virtuals/servlet-api:3.0 )"
+DEPEND="${CDEPEND}
+		xqtests? ( app-arch/unzip:0 )"
+RDEPEND="${CDEPEND}"
+
+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
+}