6 files changed, 3 insertions, 147 deletions
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index a5c9d44b1393..6ac742bdb5b4 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 5b074bcc678d..205f32f65a20 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,8 +1,4 @@
-AUX kawa-1.14.patch 1482 BLAKE2B 76f1ab83fee8ece2d30138b4fed314a056dc32b4c3a07eccbc75307a36779c0a5c3bd519e7bfa5d03c1108714ea9c2f13cd1e5852c2622a9b701387f6e9fe0b0 SHA512 796621da5483629953ed421e7643439702e088c74098af234b4023d50841dd98374a9b51d6549a3791a47bb8c6904aaebfd82cb668cd1e082f595d63c8bc3f92
 AUX kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch 396 BLAKE2B f63432756e5a8ce724fc67168e0b802f01aedeba6c3768b77ae76af4e4f071097a4dd001784d6d6965c4628610d60efd045147c1ea373da6392cdad1ca15b8f1 SHA512 f30e6f30d95d0afcaa0e50a1d5725dc166217513a03baa4cc67b4adb9dcab8f31b69449d74c3be09a22b75ce3f2dbaa4ee2af3a6bcf1ee287435e8d37a2a84b0
 DIST Kawa-3.1.1.tar.gz 3216501 BLAKE2B abaea589c33ec01c49df9b376b43330a1246832428d64da2eded9899b06fb32ac5875112749f94e55b1d75ad628535b71dc41b8d7e0edf62ea7baabd20b8b182 SHA512 557fe8cc2eb7bea1e18dcbb0e4df6d82ed17e02724d55889591141b8db02245378bb0cd27acfc73e452cfbc0d6d1cbc50dd27b325fa437778eca5ce8db4211be
-DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
-DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
-EBUILD kawa-1.14-r2.ebuild 2534 BLAKE2B fa3cc1865cf3dd81cb12fa3c8b779e0b1639d3d4a36b18348c61089fb13eaf523a9cee28027770d6a8314bb60ac1b2de1794a061d8546265cd78ef4f5e06c6d5 SHA512 7bf8197e38e2548d64005be55b3321c7518306dc43bc816b5a5df8057bc7767025b4615d0bb9367c9c7810ebf0873110997819d0fa296f76184d48db0c553f4d
-EBUILD kawa-3.1.1-r3.ebuild 2135 BLAKE2B 63160053db6f3cf8d8615c37ca5b1a9f52e42aacee2becbfa149bb77c9b735ced36f959544ed5c010723e5c9a367fe9f24a5fcf529453152cf5424077612c5b4 SHA512 b8123c135120357045033661d9b92f37af0716ce1867ccac55b88f771c95f1abf71341aa3ea860716181edf409af53795e4950ace36c7478e5340bda2ec5e7d5
-MISC metadata.xml 1338 BLAKE2B 509eb703c605b702ddf3e9f17bab7ae0e4e88cb7fdc6ea87c40a2a62f120da72963c106b0c388519df063786f311ac2b5c7563e4dfb2233f0b4d87aed4470f55 SHA512 188b5ad17f428ccdd9db736631dc481247339db1b1cf25153c04e8fb571b9ff9447114c33473eb28dfe081ecd2120c8839c0b146a77eb993bdc81f1f4e4c112b
+EBUILD kawa-3.1.1-r3.ebuild 2133 BLAKE2B 137cad20d011e1da33a9dc382c630e5f447e51446fd4d5591a52bb4b03b9103dd33e5f56df6b0076c6a492a8e1fe45d63b8c0e06441d483c45c5f02bf926ec10 SHA512 1c096ff9b773bd1aea4a1ec1c568c1b72ea1ab767e4840b9fe3ae953b198ed79cc96915f10d0ee3c5b5746d68eb187da3e58f2e87c096027f483799cbcd065f6
+MISC metadata.xml 1280 BLAKE2B 40923933a285822dcd2c6e07c083a8f5b55dc51d6f8fe78c7ace268cf99b9d0df9c3805d24dce4a810e759271003493092bd88d2cec2897a785f3a8e1c9ece1a SHA512 8581735644c967ac1c1273519670da17ce44e33457a887f50dba261d53ef47cbad97087d9581bfc90082ee6ac397c1eddff4479d2f9b5b6a8f227d36c8cbb04a
diff --git a/dev-scheme/kawa/files/kawa-1.14.patch b/dev-scheme/kawa/files/kawa-1.14.patch
deleted file mode 100644
index 8acc5e442f69..000000000000
--- a/dev-scheme/kawa/files/kawa-1.14.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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-r2.ebuild b/dev-scheme/kawa/kawa-1.14-r2.ebuild
deleted file mode 100644
index 46c2161cc790..000000000000
--- a/dev-scheme/kawa/kawa-1.14-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
-HOMEPAGE="https://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 +frontend jemacs krl +sax servlets +swing +xml xqtests"
-
-CDEPEND="
-	frontend? ( sys-libs/readline:0 )
-	sax? ( dev-java/sax:0 )
-	servlets? ( java-virtuals/servlet-api:3.0 )"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	xqtests? ( app-arch/unzip:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-xtestsuite="XQTS_${XQTS_Ver}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}.patch
-)
-
-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() {
-	default
-
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	# speeds up one-shot ebuilds.
-	local myconf=""
-	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
-
-	econf ${myconf} $(use_enable frontend kawa-frontend) \
-		$(use_enable xml) \
-		$(use_enable krl brl) \
-		$(use_enable jemacs) \
-		$(use_with awt) \
-		$(use_with sax sax2) \
-		--with-java-source=$(java-pkg_get-source)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
-
-	java-pkg_newjar kawa-${PV}.jar
-
-	java-pkg_dolauncher "kawa" --main kawa.repl
-	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \ "--xquery"
-	if use servlets; then
-		java-pkg_dolauncher "kawa-cgi-servlet" --main \
-			gnu.kawa.servlet.CGIServletWrapper
-	fi
-	if use jemacs; then
-		java-pkg_dolauncher "jemacs" --main \
-			gnu.jemacs.lang.ELisp
-	fi
-
-	use source && java-pkg_dosrc kawa/* gnu/*
-
-	dodoc ChangeLog TODO README NEWS
-	doinfo doc/kawa.info*
-	doman doc/*.2
-
-	cp doc/kawa.man doc/kawa.2 || die
-	cp doc/qexo.man doc/qexo.2 || die
-}
diff --git a/dev-scheme/kawa/kawa-3.1.1-r3.ebuild b/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
index 6c57ed41bb73..c8b02f8f59c4 100644
--- a/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN^}-${PV}
 
 LICENSE="MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml"
 RESTRICT="test"  # fails
 
diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index 2822ab30387c..32770bd52d12 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -22,7 +22,6 @@
     <flag name="servlets">Build support for generating servlets with
     Java servletapi</flag>
     <flag name="swing">Assume Swing is available</flag>
-    <flag name="xqtests">Support XQuery Test Suite</flag>
   </use>
   <upstream>
     <remote-id type="gitlab">kashell/Kawa</remote-id>