gentoo resync : 05.12.2021

3 files changed, 111 insertions, 0 deletions

diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 838d6da3fba1..426b0e08d420 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,5 +1,8 @@
 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 2532 BLAKE2B 3c05839e512ca81a47c3c59cc7b2f7ccd02421a12630b0924bf9679b382cb8f4876b834699d9c782a97ba40f1047404cc322f136c254f48f9771f4a04650f0d7 SHA512 6af4070642ba6e617fe8d8117b2d355a4e53e4283fffeb292be804d03bb82c5ed725dc48cbfe1a6aaade16ee73902e1642768194b4a03fbacc0113393c711e1e
+EBUILD kawa-3.1.1.ebuild 2065 BLAKE2B 41c36f19a8bbbc0187f3b50b66db897d99ad8c1f159b9a92a8615ef14709e56508c70bf96a9bfa918221830b67433d5aa5e687de3262d79cc694b29596cf2680 SHA512 18a11d9fd32ca0921c835d93b6922d42a4c2d3ce1b74f812aacddd75d2939950862156f71f306b8206bc72c294eca804d3a58df2212fee3d4efdd97a58067579
 MISC metadata.xml 1178 BLAKE2B 5a7b5ef1369023679f8227368b53f9a5f18307ff19bd2d34c50e42ec5529c53cc74d462ecdcf0ad117ee0d6f7b2d8651e184e154b3cb40ed9eea91ddd4966e57 SHA512 137a0aa387493f4977a4b5ae7855360a858d0c33417f3b6473cc9354745bff5386c7c15598cafa874021c3027588d66e50c1c50aa2d5c1937b0a14e1875faecf
diff --git a/dev-scheme/kawa/files/kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch b/dev-scheme/kawa/files/kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch
new file mode 100644
index 000000000000..d7ecb85434f1
--- /dev/null
+++ b/dev-scheme/kawa/files/kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch
@@ -0,0 +1,17 @@
+Repeated calls to AM_INIT_AUTOMAKE made fatal in 1.16.5:
+https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f4a3a70f69e1dbccb6578f39ef47835098a04624.
+
+https://bugs.gentoo.org/818094
+https://bugs.gentoo.org/827973
+
+--- a/bin/configure.ac
++++ b/bin/configure.ac
+@@ -4,8 +4,6 @@ AM_INIT_AUTOMAKE([foreign])
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST
+ 
+-AM_INIT_AUTOMAKE
+-
+ AC_EXEEXT
+ AC_OBJEXT
+ 
diff --git a/dev-scheme/kawa/kawa-3.1.1.ebuild b/dev-scheme/kawa/kawa-3.1.1.ebuild
new file mode 100644
index 000000000000..3efe3ba8f69b
--- /dev/null
+++ b/dev-scheme/kawa/kawa-3.1.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit autotools java-pkg-2
+
+DESCRIPTION=" Java-based Scheme system & Language Framework"
+HOMEPAGE="https://www.gnu.org/software/kawa/"
+SRC_URI="https://gitlab.com/kashell/${PN^}/-/archive/${PV}/${PN^}-${PV}.tar.gz"
+S="${WORKDIR}/${PN^}-${PV}"
+
+LICENSE="MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml"
+RESTRICT="test"  # fails
+
+COMMON_DEPEND="
+	frontend? ( sys-libs/readline:0 )
+	sax? ( dev-java/sax:0 )
+	servlets? ( java-virtuals/servlet-api:3.0 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jdk-1.8
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jre-1.8
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-${PV}-configure.ac-single_AM_INIT_AUTOMAKE.patch )
+
+src_prepare() {
+	default
+
+	java-pkg-2_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable frontend kawa-frontend)
+		$(use_enable jemacs)
+		$(use_enable krl brl)
+		$(use_enable xml)
+		$(use_with awt)
+		$(use_with sax sax2)
+		--with-java-source="$(java-pkg_get-source)"
+	)
+
+	if use jemacs && ! use swing; then
+		einfo "Although the swing USE flag is disabled you chose to enable jemacs,"
+		einfo "so swing is enabled anyway."
+		myconf+=( "--with-swing" )
+	else
+		myconf+=( "$(use_with swing)" )
+	fi
+	if use servlets; then
+		myconf+=(
+			"--with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	use source && java-pkg_dosrc ./kawa/* ./gnu/*
+	java-pkg_newjar ./lib/kawa.jar
+
+	java-pkg_dolauncher "kawa" --main kawa.repl
+	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \ "--xquery"
+	use servlets &&
+		java-pkg_dolauncher "kawa-cgi-servlet" --main gnu.kawa.servlet.CGIServletWrapper
+	use jemacs &&
+		java-pkg_dolauncher "jemacs" --main gnu.jemacs.lang.ELisp
+
+	einstalldocs
+	doinfo doc/kawa.info*
+	cp doc/kawa.man doc/kawa.1 || die
+	cp doc/qexo.man doc/qexo.1 || die
+	doman doc/*.1
+}