Merge remote-tracking branch 'upstream/master'

app-emacs/defmacro-gensym/defmacro-gensym-99999999.ebuild

@@ -14,7 +14,7 @@ EGIT_BRANCH="master"
 LICENSE="Unlicense"
 SLOT="0"
 KEYWORDS="~amd64"
-DOCS="README.org"
+DOCS="" # README.org is a relative symlink
 
 export ORG_IMMUTABLE_SOURCES_DIRECTORY="${SITEETC}/${PN}"
 

app-emacs/plz/files/50plz-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/plz/plz-9999.ebuild

@@ -18,6 +18,8 @@ KEYWORDS="~amd64"
 LICENSE="GPL-3"
 SLOT="0"
 
+SITEFILE="50${PN}-gentoo.el"
+
 RDEPEND="net-misc/curl"
 
 src_test() {

app-emacs/ts/files/50ts-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/ts/ts-9999.ebuild

@@ -17,6 +17,8 @@ KEYWORDS="~amd64"
 LICENSE="GPL-3"
 SLOT="0"
 
+SITEFILE="50${PN}-gentoo.el"
+
 BDEPEND="
 	>=app-emacs/dash-2.14.1
 	>=app-emacs/s-1.12.0

dev-python/matrix-nio/matrix-nio-0.18.2.ebuild

@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/aiohttp-socks-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/aiofiles-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/logbook-1.5.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unpaddedbase64-2.1.0[${PYTHON_USEDEP}]

dev-python/matrix-nio/matrix-nio-0.18.3.ebuild

@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/aiofiles-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/future-0.18.2[${PYTHON_USEDEP}]
 	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/logbook-1.5.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unpaddedbase64-2.1.0[${PYTHON_USEDEP}]

dev-python/matrix-nio/matrix-nio-0.18.5.ebuild

@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/aiofiles-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/future-0.18.2[${PYTHON_USEDEP}]
 	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/logbook-1.5.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unpaddedbase64-2.1.0[${PYTHON_USEDEP}]

dev-scheme/kawa/Manifest

@@ -0,0 +1 @@
+DIST Kawa-3.1.1.tar.gz 3216501 BLAKE2B abaea589c33ec01c49df9b376b43330a1246832428d64da2eded9899b06fb32ac5875112749f94e55b1d75ad628535b71dc41b8d7e0edf62ea7baabd20b8b182 SHA512 557fe8cc2eb7bea1e18dcbb0e4df6d82ed17e02724d55889591141b8db02245378bb0cd27acfc73e452cfbc0d6d1cbc50dd27b325fa437778eca5ce8db4211be

dev-scheme/kawa/kawa-3.1.1.ebuild

@@ -0,0 +1,90 @@
+# 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"
+
+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
+"
+
+QA_FLAGS_IGNORED="usr/bin/kawa"
+
+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
+}

dev-scheme/kawa/metadata.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@riseup.net</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <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">Enable AWT support</flag>
+    <flag name="frontend">Enable "front-end" 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">Enable SAX2 with <pkg>dev-java/sax</pkg></flag>
+    <flag name="servlets">Enable support for generating servlets</flag>
+    <flag name="swing">Enable Swing support</flag>
+  </use>
+</pkgmetadata>