gentoo resync : 12.05.2022

18 files changed, 333 insertions, 12 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 824edfaa7068..6cf5aed9cab4 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/bigloo/Manifest b/dev-scheme/bigloo/Manifest
index d07fc2144a09..881d9655dc21 100644
--- a/dev-scheme/bigloo/Manifest
+++ b/dev-scheme/bigloo/Manifest
@@ -1,4 +1,4 @@
 AUX 50bigloo-gentoo.el 110 BLAKE2B 520b6b4d89452d3c9479c92b3f2f31e46e7761bc2c03fd62236e277ff1f9613cd237ba799d7349cf8bc8311125d3548956dc1947bd8d79cb72349dee723a9190 SHA512 73fda359d7c09c291eb1c3d38d3352b57acab0e800e2d89ee815a1c58202e8a5603abe847409e58bd69ea0ed7245abbb4a60de4fa8285287523caff47f19d6e2
 DIST bigloo-4.4c-4.tar.gz 47714106 BLAKE2B f30775cfa3e29f781f31dc5ec80087712504ffab528a911e2a29746562b6179b03cbfc63a45ddf337b2424fbfa476005ffed67674a75b4629ab70459c47147a6 SHA512 b1a7f7f610303dbbd7339ac4f80679b07d1bf5304865fe61f28bd5af8205f1a5c2b5b3edb1c47a0409a6392a2242d2adde1f5129b026b6a7ee022b8f5faec157
-EBUILD bigloo-4.4c_p4-r1.ebuild 4650 BLAKE2B 92a91be2d325fc547eed8677e6b524a7cd10f1836f12c9f9fa1cb64aac24f2d120a20cc539ae5fd5d8ff47b9c87b14d7958196ef39b8d18e72859565641b4a32 SHA512 2517b82dab8392fc57734c8d64486592fbf488531a27eae1b7b49144b32ed0e7256d146b8b39979cd5804418f47b9e4a2dcd2098d50f6674e954e34f1a28615a
+EBUILD bigloo-4.4c_p4-r2.ebuild 4933 BLAKE2B ea2f5f4725f1b9cd721bbe6d0849d9b86df6b6880f940e5b6744fc7deb8ff7ab60c0755244eedc3b5ed190f3d655ee2e6f764560049eefad3c8468fa74a420eb SHA512 7bbedda6f6060ee06e3f6bc4dc4fda6739e84b83feeb5145a73b9907f609c5be6ea8a66d92ae337bdadbcb12124caaa7433863f96bb20bf673600b4541a0b0ef
 MISC metadata.xml 1113 BLAKE2B 20eec442cc5ba556fb5e30dc225bfeb45851be9ee1bbf111662ba3eec8573275754101d863145874cf778e27715792e1757189c2e4cec8ae6d320800e22dc0a6 SHA512 fb58869479a3310d1eac93ecd8127f2759fb93c45a73d1d2835802d201c6fb0a95592238521b7c385bea1d27d83da650000685978067dab272615f81e6ca5c4a
diff --git a/dev-scheme/bigloo/bigloo-4.4c_p4-r1.ebuild b/dev-scheme/bigloo/bigloo-4.4c_p4-r2.ebuild
index 0d56b78e294e..32f3aac80a14 100644
--- a/dev-scheme/bigloo/bigloo-4.4c_p4-r1.ebuild
+++ b/dev-scheme/bigloo/bigloo-4.4c_p4-r2.ebuild
@@ -132,6 +132,13 @@ src_configure() {
 	ebegin "Configuring Bigloo with the following options: ${myconf[@]}"
 	sh ./configure "${myconf[@]}"
 	eend $? || die "configure script failed"
+
+	# When Emacs version is too high (e.g. 28) bigloo will skip compiling
+	# and installing the Emacs support files.
+	# The file "bmacs/Makefile" lists all officially supported Emacs versions.
+	if use emacs ; then
+		sed "/^EMACSBRAND=/s|generic|emacs23|" -i Makefile.config || die
+	fi
 }
 
 src_compile() {
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
index b8e65496308c..644fcfb3812a 100644
--- a/dev-scheme/chez/Manifest
+++ b/dev-scheme/chez/Manifest
@@ -1,3 +1,5 @@
 DIST chez-9.5.6.tar.gz 34565487 BLAKE2B 5d74cd3365b3039e6be1b774213da75da1080beffb1c9b5044466a8feff0171ce75d9999e69774754a5969d68825c571a88cb27d57af2718e98668e4fe936e3c SHA512 4affd73a5b2ea5cdec01fb200a32499387fc3769b7677ffe7d854f6a5567d50ba114f9f12951f99d8e0fd757c799e82e32c83079fae83e5fc138ee6e1a5f56c0
+DIST chez-9.5.8.tar.gz 35487100 BLAKE2B 6c5467f812788166aded14ce38ec2935bb890f2386f3ea7ec29a97c6a3d9aa37f26960e44aa6acd6b3954e45dfc4eaff4fc7db1dd77b231fb380a1dac7349be4 SHA512 80a4e9f61ddb254bef1a249af1d32f918df88390946fbe6eeb62c3510c760bf899285be1aba70eda9b54bcb0c6fef3fe7deace648993cd9cece2d08cf0ade9c0
 EBUILD chez-9.5.6-r2.ebuild 1648 BLAKE2B 3495e5605e2098f7c8c16638f6c6a6a5d97cf4bb4e2ac4f685e09779e0ae866e960a434e9fb9ed2afa0eefd80351bc79bd19e1421ee8c0c257a908abb0c3b851 SHA512 34d7cb87d6cceb4b24eea892ac517ef53cd27fe170050ba3cf18ca04643fa43ed0d63379d3d7be18e813a872a8ec4e97b7131fe8cbcc2c6506c928adc1946eb7
+EBUILD chez-9.5.8.ebuild 1649 BLAKE2B ab68e1d57b4f3b89b847985983cd25318decfb25370217add54d4a4ca08c84fb01dc7f7cfe772642fa513a781de4377821d20c8b2f6652c2c10303adf8c640a1 SHA512 fc22952807960e917821b165d93a8fe8ccfde2d8374639440b1933ebcee4752973cea2e6668ec61a06e39474747fe370867a64c6db37313cabbc8bfe9c6b1211
 MISC metadata.xml 1247 BLAKE2B 2fce457107f3e9a65f30ecc19c891c1b953049889bcd7bd9ccc7537c6ee8b9ae64937ee46c329f74266f095fd611ae53775e4229aacd4ebdf82b83135e13e50c SHA512 2a0bab06ce23b7e38f4651d33337b03691dbe09257ee325236ad5c585af4300e2b15f6b0d9614ee87ee4721adebfd71c0a2313ad3865a9e7f75e5e95b54cc5a3
diff --git a/dev-scheme/chez/chez-9.5.8.ebuild b/dev-scheme/chez/chez-9.5.8.ebuild
new file mode 100644
index 000000000000..9b650e16a29b
--- /dev/null
+++ b/dev-scheme/chez/chez-9.5.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CSV="csv${PV}"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A programming language based on R6RS"
+HOMEPAGE="https://cisco.github.io/ChezScheme/ https://github.com/cisco/ChezScheme"
+SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${CSV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${CSV}"
+
+# Chez Scheme itself is Apache 2.0, but it vendors LZ4 (BSD-2),
+# Nanopass (MIT), stex (MIT), and zlib (ZLIB).
+LICENSE="Apache-2.0 BSD-2 MIT ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="X examples ncurses threads"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	X? ( x11-libs/libX11 )
+	ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	tc-export AR CC CXX LD RANLIB
+
+	default
+
+	if use ncurses ; then
+		local nclibs="\"$($(tc-getPKG_CONFIG) --libs ncurses)\""
+		sed -i "s|ncursesLib=-lncurses|ncursesLib=${nclibs}|g" configure || die
+	fi
+
+	# Remove -Werror
+	sed -i "/^C = /s|-Werror||g" c/Mf-* || die
+}
+
+src_configure() {
+	local myconfargs=(
+		$(usex threads '--threads' '')
+		$(usex ncurses '' '--disable-curses')
+		$(usex X '' '--disable-x11')
+		--installprefix="/usr"
+		--installbin="/usr/bin"
+		--installlib="/usr/$(get_libdir)"
+		--installman="/usr/share/man"
+		--installschemename=chezscheme
+		--installpetitename=chezscheme-petite
+		--installscriptname=chezscheme-script
+		--nogzip-man-pages
+	)
+	sh ./configure "${myconfargs[@]}" || die
+}
+
+src_install() {
+	# TempRoot == DESTDIR
+	emake TempRoot="${D}" install
+
+	if ! use examples; then
+		rm -r "${D}/usr/$(get_libdir)/${CSV}/examples" || die
+	fi
+
+	einstalldocs
+}
diff --git a/dev-scheme/guile-json/Manifest b/dev-scheme/guile-json/Manifest
index 5df820a0fa18..3e5b9489a039 100644
--- a/dev-scheme/guile-json/Manifest
+++ b/dev-scheme/guile-json/Manifest
@@ -1,5 +1,7 @@
 DIST guile-json-4.5.2.tar.gz 159925 BLAKE2B 5324da707f8c2962d06b2375d7844de0d2eb2adb0db9b4f2c9103c1bc9f0258b0ac29e6828d03d725e964f92fb85c1a7358b002a9b054c040e0fa25e6b4faf25 SHA512 ed189d49b0529f36f76bf16ea371ca6b9651cd40dd86f755062cea9fd93f5a4d8ceb571cc62bf0f88c404a2ab86ea6f7ccb682e81cd5bcdb78f0bdf52a39502b
 DIST guile-json-4.7.0.tar.gz 164524 BLAKE2B 70edfa44622889d8cce85395e8b68aee4c696bee414d352866bae129ba803ed27a075d9b4273bc0cc9f6135a84062cc5f24ec1f08eb85f73e9475d5b19fd3e90 SHA512 5400fbd8a2c3bcdebec306808dad7c9e2e3401baea501dc9b50186f6f9dfcaf4f3fb8ee0c3662f08aff7dda7ba355a8cdb90cfd3457e0a575fff9884a8345b09
-EBUILD guile-json-4.5.2.ebuild 683 BLAKE2B 9518805e7984196516c112ec87bc3360092df9e330c4614762b6fa61c49a3892942b5d280e756a38324f26a874e7b805c7b6cbf6f79eaa7f8504e290ecb6e77b SHA512 c956427490e4040844374389ef237ac72cb9a4e86c1ab76e800381a7e85793ce835584583bddb7271e43ca8c629dc413da73222462270dca13f3d22a8879a98a
-EBUILD guile-json-4.7.0.ebuild 675 BLAKE2B 4f706b4542a4ea2f28e5187e54935f93a1fba78e94cb6619c2723b9db1584b7e5cee74b2661fa83b2a70107f983d48f812f024daf45e5014b542a8923c38354a SHA512 204191da8eab65162fbc7fe366aa79b696b6803d9b0883d8e60949a49e4bb4114683403baee9375c795ef7c9c622304e4c1f4ce0ba63d5251232447e860adc09
+DIST guile-json-4.7.1.tar.gz 162507 BLAKE2B ea2fe55fb9ddb8783c6260ecb80f882c811fd313781d57b2ebe73f553c666996778d91bf7cd00725165540069763922317e4595b6c97fa7ac2f5c793c11d2a23 SHA512 f96ca819ffebf8e736cb4e28ee8c6e80c5a7f6f2a064897a4dd7094e3e4b879ba7cd5780778c4dce0db4a938b7603d3352f4a30aab9cd35f47d7ff1c1e3208ac
+EBUILD guile-json-4.5.2.ebuild 684 BLAKE2B 5041aaf1542531b9f547ecd095c29e813c6dda2798b977be0ca85adc13f690af9e7f8fbb21a7ad3a484dc51322e3fa0c5b67792f0ee16af9ddabdedf7a9daec7 SHA512 67416e59bd8a3d36e990cb80ad0530f93b45e6d23a4325dab585ffd9dad14acc661d0ae7ce14a4bb81f70be0cf7766faa4c0395f4430494a0fac632528c8c5b0
+EBUILD guile-json-4.7.0.ebuild 676 BLAKE2B bbc1431ec0ac575d8b7047d3ba6635ab61f015ebf8e828ff49b93cca06f4989a65c423c94210d73c58b4ea3d0e92db8eb765040a3d7a791193460c203429dce0 SHA512 a79f542359121e507fea32ebc201af02efe52dff44c97bea3d2c390293efaad75fe389683f8edad7c0eefccf40be570231bc2b9c81c8b85e523ad626e7e7eeea
+EBUILD guile-json-4.7.1.ebuild 676 BLAKE2B bbc1431ec0ac575d8b7047d3ba6635ab61f015ebf8e828ff49b93cca06f4989a65c423c94210d73c58b4ea3d0e92db8eb765040a3d7a791193460c203429dce0 SHA512 a79f542359121e507fea32ebc201af02efe52dff44c97bea3d2c390293efaad75fe389683f8edad7c0eefccf40be570231bc2b9c81c8b85e523ad626e7e7eeea
 MISC metadata.xml 252 BLAKE2B 4680544207c9b29a195f9784832d934535f9626ed11fba23b8a84848b28db674789a8e9f919915919e6d38b144a4636699ba4b07a7160a634b794baf1b619b22 SHA512 758f7ad6a8a1ce8ae164517d615b08bb069e3cf680296159d323d7d34457b990b4657bb14fa9803d9fc77d69f6818b0d06636bcf442ad1bfa22aa2528ec97635
diff --git a/dev-scheme/guile-json/guile-json-4.5.2.ebuild b/dev-scheme/guile-json/guile-json-4.5.2.ebuild
index 3c0f10b4a19a..4e926c52001c 100644
--- a/dev-scheme/guile-json/guile-json-4.5.2.ebuild
+++ b/dev-scheme/guile-json/guile-json-4.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ DESCRIPTION="JSON module for Guile"
 HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
 SRC_URI="http://download.savannah.nongnu.org/releases/guile-json/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/dev-scheme/guile-json/guile-json-4.7.0.ebuild b/dev-scheme/guile-json/guile-json-4.7.0.ebuild
index d13edb375266..d2e78a2618c3 100644
--- a/dev-scheme/guile-json/guile-json-4.7.0.ebuild
+++ b/dev-scheme/guile-json/guile-json-4.7.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="JSON module for Guile"
 HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
 SRC_URI="http://download.savannah.nongnu.org/releases/guile-json/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="strip"
diff --git a/dev-scheme/guile-json/guile-json-4.7.1.ebuild b/dev-scheme/guile-json/guile-json-4.7.1.ebuild
new file mode 100644
index 000000000000..d2e78a2618c3
--- /dev/null
+++ b/dev-scheme/guile-json/guile-json-4.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="JSON module for Guile"
+HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
+SRC_URI="http://download.savannah.nongnu.org/releases/guile-json/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND=">=dev-scheme/guile-2.0.0:="
+DEPEND="${RDEPEND}"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
diff --git a/dev-scheme/guile-ncurses/Manifest b/dev-scheme/guile-ncurses/Manifest
index 324c1e79fef7..c2968c26a4b7 100644
--- a/dev-scheme/guile-ncurses/Manifest
+++ b/dev-scheme/guile-ncurses/Manifest
@@ -1,3 +1,4 @@
+AUX guile-ncurses-3.0-slibtool.patch 1593 BLAKE2B ffabe52966b527e6d27da9a7d5518d48db875b5cf1dbbb1c435d990ced5011c41a2d81e9c0a8dc1dc7e2cb042643989777262e9c856c02aaaa8887494859b4c1 SHA512 9c7b1419c21525c6abc91d5b9c9b00ad3ae64a97fd6f1f1bc05dd80f77603706f702def71af5f0bbc85cd5eb4beed4c35b14cadbb289c726d14aedb4e2bda897
 DIST guile-ncurses-3.0.tar.gz 910030 BLAKE2B e7bfa1e7c7ff8fd4e8b653a5bcada99f8f047142322e4abb946cd42b27bd1d2014f904b5a73d5356ad95bec1c394d0b76ad06204a7d117ab4c2e9a3181633fa2 SHA512 6f36ec57b1835dc90f6691243e3b627e067522c78ea620fc109bf270016034842a933c2d9e09c1a3998a740ae17cb1b7ae291d3e4c578c54128eae4c88a450ac
-EBUILD guile-ncurses-3.0.ebuild 1343 BLAKE2B de7758bbda1c477256526d8ab703be4220d7946288feccdc75cff94460c52f69f1cbb866e3fa72482739220aeebcef32aa09356be214fa27da9de0270422624b SHA512 ceaa6f395e383b9167546021fab431e6bc413449548014f7b9d46a06614f004eb98bbd5e727dc115c0e35369d65c67c45338bf5181f9e443ac8459284be165e5
+EBUILD guile-ncurses-3.0-r1.ebuild 1443 BLAKE2B 7ff53ea2f3fdd2c478e61743a0df2d32923ec5feb12af02a8ca88706e4ad0297022fe24c17118bc1b4cc8687158669ec31655378b96a144083000efbeaef68d4 SHA512 2d56e28182ca0f3540f935bf03e686ff85feb2571c7708fa6c926d52f3ba63ba4e15f1fd84c3804842aa26a38f83ea8c7ceb181ff81ddd888d9dd79a862c0741
 MISC metadata.xml 547 BLAKE2B 6607b13dbae6f4aa4364cb8227c49bc96ab5bccd739af9c8c6731974132be80f9ef891c642c58cb0591678fdca5902df765f35a56df33faefd9833e695d950cf SHA512 a1fed1ceed50336ecdca1b6f8e17ea85bf81808fc2230215e52e654a3a7c8f10890978f057972f501d72d798b1e75b114fac4c6f53621120c205fdea1bf39057
diff --git a/dev-scheme/guile-ncurses/files/guile-ncurses-3.0-slibtool.patch b/dev-scheme/guile-ncurses/files/guile-ncurses-3.0-slibtool.patch
new file mode 100644
index 000000000000..5c102fca6011
--- /dev/null
+++ b/dev-scheme/guile-ncurses/files/guile-ncurses-3.0-slibtool.patch
@@ -0,0 +1,38 @@
+commit 8c8327c8518508380bd68f52db19432b776833e5
+Author: orbea <orbea@riseup.net>
+Date:   Mon May 9 09:06:04 2022 -0700
+
+    build: Link with -ltinfow/-ltinfow to fix undefined references
+
+diff --git a/configure.ac b/configure.ac
+index f194166..954d9b2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -200,6 +200,13 @@ AS_IF([test "$with_ncursesw" = check],
+                        with_ncursesw=yes],
+                       [AC_MSG_FAILURE([--with-ncursesw was given, but, test for ncursesw failed])])])
+ 
++AS_IF([test "$with_ncursesw" = yes],
++      [AC_SEARCH_LIBS([LINES], [tinfow],
++                      [AC_DEFINE([HAVE_TINFOW],
++                                 [1],
++                                 [Define if you have libtinfow])],
++                      [AC_MSG_FAILURE([--with-ncursesw was given, but, test for tinfow failed])])])
++
+ AS_IF([test "$with_ncursesw" = no],
+       [AC_SEARCH_LIBS([initscr], [ncurses],
+                       [AC_DEFINE([HAVE_NCURSES],
+@@ -207,6 +214,13 @@ AS_IF([test "$with_ncursesw" = no],
+                                  [Define if you have libncurses])],
+                       [AC_MSG_FAILURE([the ncurses library was not found])])])
+ 
++AS_IF([test "$with_ncursesw" = no],
++      [AC_SEARCH_LIBS([LINES], [tinfo],
++                      [AC_DEFINE([HAVE_TINFO],
++                                 [1],
++                                 [Define if you have libntinfo])],
++                      [AC_MSG_FAILURE([the tinfo library was not found])])])
++
+ AM_CONDITIONAL([WIDE], [test "$with_ncursesw" = yes])
+ 
+ AC_MSG_NOTICE([checking for term.h])
diff --git a/dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild b/dev-scheme/guile-ncurses/guile-ncurses-3.0-r1.ebuild
index 361ce458158d..19c1e87ccc47 100644
--- a/dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild
+++ b/dev-scheme/guile-ncurses/guile-ncurses-3.0-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Guile FFI to ncurses library for text-based console UI"
 HOMEPAGE="https://www.gnu.org/software/guile-ncurses/"
 SRC_URI="mirror://gnu/guile-ncurses/${P}.tar.gz"
@@ -23,6 +25,10 @@ BDEPEND="sys-apps/texinfo"
 # It's a portage's false positive. bug #677600
 QA_PREBUILT='*[.]go'
 
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch" # 843416
+)
+
 src_prepare() {
 	default
 
@@ -52,6 +58,8 @@ src_prepare() {
 	for bad_test in "${bad_tests[@]}" ; do
 		echo "#t" > test/${bad_test}.scm || die
 	done
+
+	eautoreconf  # 843560
 }
 
 src_test() {
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index cef634c4625e..acbbd962d3bd 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -24,7 +24,7 @@ DIST guile-3.0.8.tar.xz 6200072 BLAKE2B 6ab6bfd18889d0d263e5e06ff1284ec025437e53
 EBUILD guile-1.8.8-r4.ebuild 3108 BLAKE2B 6cdae9c84f0696c792b2c8a13856853e700ffc5d4ebf123d2ea50d8a03a42d8ee671da91c21e652da878dd404a95a7b6e0904622717369696724f1afc1029375 SHA512 42a2b19d45dd284877b4f88f487eaaf45997c6df9d0a007d2832215b9d25a34ffda9f51c3ad72d2d8df10cd6085179845ef18e04712e32ecb098d3153fc9525b
 EBUILD guile-2.0.14-r4.ebuild 2369 BLAKE2B c4ff72e68e661d60acb144445bcd7eb5a1d6bf44be42134e1d882e72d47ec91e521f6b9a711256a22f1aa725220d7c7fbbe8bd1eec143894b2ece4769526e733 SHA512 ccf99867f719607702e5d24bffc1c21af1ddfca0c3d662e8ed3f97f31c13392cde84fa882efb81c3ede24533059e40e0acba81f322a96a330a814e08c4ebbe02
 EBUILD guile-2.2.6.ebuild 2256 BLAKE2B cc76cd57484e689fe9f2fddf5672698b5d11794b974ae8cfcf963f5f5c2341bccf92ad3aded25d5127bb7b46232eb5f94d5358ce98aaad3ed62c3689d5511fe3 SHA512 45515f0a378ed521302b5f1565f769d253ca82890e38da70d5fc8e5f95edc0836024265db00a46b723dd5e054d7dadd2fb5a87c3153afbd598c42ab34fbbd6fe
-EBUILD guile-2.2.7-r1.ebuild 2146 BLAKE2B 0f529596c4c4f1ef69154bbb2434db5000153e97dd3e0a0f5f5193262d80388404fe2ee7e242abee65731625f43ce4aa6e9851ea5663c7731b571bf9059ce85e SHA512 ff76cee71c8a1cb49b1cdc10595b6640aa90a7e59280fb2cbb125a2f72572634dabb3db5cfa72877100913e7d356a393aa7f4485806664b381be7d2a3ea79da5
+EBUILD guile-2.2.7-r1.ebuild 2153 BLAKE2B c89758d4351f7259ec7d711de043741687ef6f7ebe32e64676d2d259226816daa941d23b438eb4e43b2cf02472b67a1514e08f81385f128a82281c8dab64a6b0 SHA512 9d076d43e33ef88c28855e86e6a170fb32ed177252f402602dbc3a97f28276bb4c378ffd0e4db59f3b480edde7dfbf5cf1d92dd8e69cf6245c4a392305f09a77
 EBUILD guile-3.0.7-r1.ebuild 2353 BLAKE2B 1fc8f5aba2b9fefc9be56ace97ef6999d2925ed1b3bd0a3a77eeb9062a0a7793fbac123ab0ec5f71bc7ff052920c0d45c1e8376fc4f6db42722312f6e9406e50 SHA512 cb863c4d5f58e4f091cda7fdbdf162cee9d9df0a42af2147ef91162b6f70a69313a25eaad1a1656fc3035b3b93f0f14dff1bd890a368892136c5bfb107076e45
 EBUILD guile-3.0.8.ebuild 2109 BLAKE2B fb5bed8658610a7abbcffa6325a0e97b8575521719b9b70cee031fea89abf49e60cb19e99734dc6d2460ff72c0d8cd6177f58b976bec740df02388d5c0161dbe SHA512 5ded209512cd8c7624e04a08bd5d6c134080395449e52ba4bbf057f5298e17efbb8d91802f5b0ba3677cfa2c15a4554c8d2fbbe66555ce90e6e34de3e00e4e09
 MISC metadata.xml 1041 BLAKE2B d01e2b55f3618fa4056f46d0a3cd2e2c5e006374a8c9fbc28adca37f4b4e5978e65c968762e5675e0f98ba2ce686e09f2997481c1365eb0787e979d9bfd012fb SHA512 ace5d0cea917c980c1958c174b869692d7a407132be9e9b223ac970ef3d9323c76a23e009e45990583993de0bb3c423243931cfeb9de7c3383d6b4b5efda4b3a
diff --git a/dev-scheme/guile/guile-2.2.7-r1.ebuild b/dev-scheme/guile/guile-2.2.7-r1.ebuild
index 0c99ed481dea..eeac2976a708 100644
--- a/dev-scheme/guile/guile-2.2.7-r1.ebuild
+++ b/dev-scheme/guile/guile-2.2.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 1cfed6376ce3..b913df94efd8 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -4,5 +4,5 @@ DIST Kawa-3.1.1.tar.gz 3216501 BLAKE2B abaea589c33ec01c49df9b376b43330a124683242
 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-r1.ebuild 2066 BLAKE2B 370bcdb330111adfa54f4c1764c58c0b79847c4a4da5033ad4a566e080b0351b4d05f9e6531b5a10c81c85b6e014d93eb94ebfaecbace090fd23726c50d314d9 SHA512 40e39e624588bbfe2732fa5d9ec41b03d7bee27f94e0aa17cb57a11520ac5da4035c208a59da11c0d54d9f99b7237e71d93b0a0a6f9f24026fbd7e764d27b64b
+EBUILD kawa-3.1.1-r1.ebuild 2065 BLAKE2B 8ba887bed9392346cf00abd001d4fc1a1eebecbdb7d3b97d49539eb83b5fc54b3fee35eee13e3a1cc6af42fb5bbfa41636bf6260d48b35825796113bb7cd86af SHA512 d393ffad45851cd1bcd76c99b41a2c185b6b79faf45d5b2c20e374a687e504a8f8e6015aebb358bec5407c82d31eefe6db06cfb80d60e8aef53362cf12a61089
 MISC metadata.xml 1178 BLAKE2B 5a7b5ef1369023679f8227368b53f9a5f18307ff19bd2d34c50e42ec5529c53cc74d462ecdcf0ad117ee0d6f7b2d8651e184e154b3cb40ed9eea91ddd4966e57 SHA512 137a0aa387493f4977a4b5ae7855360a858d0c33417f3b6473cc9354745bff5386c7c15598cafa874021c3027588d66e50c1c50aa2d5c1937b0a14e1875faecf
diff --git a/dev-scheme/kawa/kawa-3.1.1-r1.ebuild b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
index bbe8642c2a1c..f14edc1a471d 100644
--- a/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="source"
 
 inherit autotools java-pkg-2
 
-DESCRIPTION=" Java-based Scheme system & Language Framework"
+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}"
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index e2665a7e2e72..c66d3a300796 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -4,10 +4,13 @@ AUX racket-8.4-ncurses.patch 4768 BLAKE2B 5d2a76efe004446624aac6ac23460a4daf9997
 DIST racket-8.2-src-builtpkgs.tgz 150467561 BLAKE2B 5005aa852b089becd9d6da136a55a035ac5fd86bd1ad186ec30cdcf411927d444e1814797d63dbde3eb7b52bba7756e0464edf1d854d2ee7f5851caaae18ba55 SHA512 9e4c0cabfcbdb8c8742e8170548bee58021697e8b0842f575f94193db31adc04a7b9023ed8fd70dae197e5ec6f1aee7985d849be3ce5b4279f216e900ee143c7
 DIST racket-8.3-src-builtpkgs.tgz 150608486 BLAKE2B f002934c07afab4152ad8395c4ab5c6c87ef810f5cf79cf5ae0b41f4caa4508e0044f4246812513def14130d507af57aa61efaff8106eaeac0b86918bd775902 SHA512 7c340f65d221343beb2b4205cdc58648bd65dceabdb16f40cda425474faa905f4dd441193dc6cd4856f7863fb83834721394d6888027db356f830eceb127dbae
 DIST racket-8.4-src-builtpkgs.tgz 151809822 BLAKE2B c42f7943975a6f91a03ef0f668d218571dfc4159eac5a5722b9513b978413a9617b4e1bf3ccabef051014311ecf51fdc80d7563942e9e645c442ddfc4995a308 SHA512 afd9f357673a28ac5e4529ea0879a4edc3dbffc5b8627aa3553f1caf867be3296b94620dc2d86b8bb3f0c7ec7743d0057ce897c5caa705e02f2cc469ce4c7116
+DIST racket-8.5-src-builtpkgs.tgz 152548446 BLAKE2B ef914d742b3b949ecd7a1f817900add3ede874d7bd4dbe195c2ab69826d938c3ac81b883bc57d938908bc1f9e96faeaa25cb4dedf85288c580b7a89d62ec970a SHA512 4714599cbe10247cad119cc4073d80329d77c845d92b3741d35a9c88cc6395dc3d6f08ace8f606c3e39840f7071789ea953e3b6548da04fd7dfaa72a4368a7ae
 DIST racket-minimal-8.2-src-builtpkgs.tgz 21187959 BLAKE2B 0f62a900e71ee101fa3acf0985b0a72215ac657285c5ce9e4f5f49189180b82dcca94ded9778b7ba92a42919f17b1dc24eec07e13c64c77e47fc958614d7dc0a SHA512 04950703fa73cdbbb10c234d57c89e70db6076b42d4a74ddb8cace9e0438b9a1431f7317baf31d667368ad75ae19e4eecec39667ba0c5b08a3580f8cc81f4f5e
 DIST racket-minimal-8.3-src-builtpkgs.tgz 21212037 BLAKE2B 76a742efe7ba2c44eb935d4852c20be355ccff9b935b39226ef1935184b0a9179ef6ca2ac0a64f3c7a6ae4a0082117a12c668d7804a0b73b9f1a391eaba61994 SHA512 3cab4a24cab5c1ac107c8aead2ada6fa3ec7d7aa122716c78af584f055dadf89497168e95b36d99115ecd1a1905dc1ec51774dd2c8099198ec7d6aa9d380039d
 DIST racket-minimal-8.4-src-builtpkgs.tgz 21279666 BLAKE2B 25d5eb405cedaa9cadfa776c4dd66b87f1641c86b638110f1a3a788465aaf573f5f8054e1e6913e6c0123840a1a2f64d5855db5f52acace3475b91d095272a76 SHA512 92433c08508cfb1bdb9093e5c7c726630826e9046de02fcb3d402f3dd76aa98fc2d9a5d09515d44e7a50eab0e38d963d2202f48a44741c3cf7fe8e47d9404e63
+DIST racket-minimal-8.5-src-builtpkgs.tgz 21390850 BLAKE2B 7bcd8c409203f71b3a49cd7e4a34159ef62fcc61b8fb66e976bfc0938ac54b7bc475e6aff59796b9c01ee324eb0d88bd68340c787f728a3739a57e879e731bfb SHA512 e0dec1038f33dbe3dfbbeba05cb24829e4b0c4223c5326cd26f920c736171e3b47b457236a06c9c57b6ebc82d17b022fba6558e3c94315b75469a2130b6fd375
 EBUILD racket-8.2-r3.ebuild 5205 BLAKE2B 05b2762605383f5c48ef70cb87c5b791c04a5b721076ce9d52c51293573952898a16a535cc2b40be0c15c13e248cf52713c0617fd1471d4dd41a6f782e9c9250 SHA512 57cff4bd79dfb8ba5b800e6d1782d06968dd9e1ce59bd77c3691bba3b7d9c056e3bdc1bfeaa8377dc6cb0ba5d01f19cb18a67020c7a8b2b0375ea20b40ffbaf7
 EBUILD racket-8.3-r3.ebuild 4592 BLAKE2B df72e1388608938c636f9cf45827056b2e4c9d4102b7feeb99c8d33040c22a8efa62006aebfc2544f30b9f6dbca6c2bd22d17029d9c0c145759963c28cd17d25 SHA512 dafd2aec23a547333368908fa5fbc5a2c731581fc74025104c9dd2adaebe4de3a8aa622a7008bec8814cd91887657f52a1cc722760a53d6f3ab0203c2f2cbc99
 EBUILD racket-8.4-r1.ebuild 5384 BLAKE2B e0e8ccc64e93041202a599b50fcc08c857d593bea58caade1621c2b7c1929d9f249b0950f20a1b2ead7500d072526d482e3a6793e9caca2354a1bf381ad57289 SHA512 814ee06014870613888669be0dcc997e7919a45eb8c9a2be78438a8a95918e7f3c82e9644bcb5b44b812da1ea3368da0e8f2eb90dee7b3996577cca83d239566
+EBUILD racket-8.5.ebuild 5157 BLAKE2B 40f52ea097769371a6d1347ff65c56287d71cc26fab2cb51b47a3b155e74853268d36c47d821f0fd6639e063cc82711945cfbb92af9a5a4d4ea7960aa4a68f5e SHA512 00af0e3ae20fd3a6b4800ba14783399352523c7cd4b3a3187b546d9d53c9881f8bd346c7dc748f49310c3dc4505b77bd46360e708676efccf3112925361f22b8
 MISC metadata.xml 1878 BLAKE2B 9e9fb9e1e139c459b0e5d4b12034c09bb4fbf548c7868342bb207137779119d53ba1fae07a7be402b3a02d50ba5a7b6cf0d26d4329e971b9387685457956d564 SHA512 ab9639a08e8a2f1799c11964e900b58ba45ba044f1332a54dc476a20e143ffcb97ff97abfd28105a4a2b199dfa32ce48ac98622be1588c8fd8c5c24a627d4565
diff --git a/dev-scheme/racket/racket-8.5.ebuild b/dev-scheme/racket/racket-8.5.ebuild
new file mode 100644
index 000000000000..f501621d6d0e
--- /dev/null
+++ b/dev-scheme/racket/racket-8.5.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature readme.gentoo-r1
+
+DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
+HOMEPAGE="https://racket-lang.org/"
+SRC_URI="
+	minimal? ( https://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz )
+	!minimal? ( https://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )
+"
+S="${WORKDIR}/${P}/src"
+
+# See https://blog.racket-lang.org/2019/11/completing-racket-s-relicensing-effort.html
+LICENSE="
+	|| ( MIT Apache-2.0 )
+	chez? ( Apache-2.0 )
+	!chez? ( LGPL-3 )
+"
+# Bytecode generated by Racket is not compatible between versions.
+# The bytecode version should be denoted by SLOT, in most cases
+# PV == SLOT but this has to be checked carefully and in cases
+# where we use _p, _pre, etc it will have to be set manually.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+chez +doc +futures +jit minimal ncurses +places +threads"
+# See bug #809785 re chez/threads
+REQUIRED_USE="chez? ( futures places ) futures? ( jit threads ) places? ( threads )"
+
+DEPEND="
+	!dev-tex/slatex
+	dev-db/sqlite:3
+	dev-libs/libffi:=
+	ncurses? ( sys-libs/ncurses:= )
+"
+RDEPEND="${DEPEND}"
+
+# "mred" and "mzscheme" are binaries generated by Racket, not CC
+QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
+
+DOC_CONTENTS="
+If you wish to use sys-libs/readline instead of dev-libs/libedit
+for readline-like features in the Racket's REPL you can install
+the package 'readline-gpl' using raco, Racket's package manager
+https://pkgs.racket-lang.org/package/readline-gpl
+"
+
+# Package database files (for pkg_preinst & pkg_config)
+PKGDB=(
+	/usr/share/racket/info-cache.rktd
+	/usr/share/racket/links.rktd
+	/usr/share/racket/pkgs/pkgs.rktd
+)
+
+src_prepare() {
+	# Prepare the environment
+	unset PLTADDONDIR PLTCOLLECTS PLTCONFIGDIR PLTUSERHOME
+
+	default
+
+	# Remove bundled libffi
+	rm -r ./bc/foreign/libffi || die "failed to remove bundled libffi"
+}
+
+src_configure() {
+	# Libtool:
+	#   According to vapier, we should use the bundled libtool
+	#   such that we don't preclude cross-compile.
+	#   Thus don't use --enable-lt=/usr/bin/libtool
+	# Backend:
+	#   --enable-bc builds Racket w/o chez backend
+	# C Libraries:
+	#   --enable-libs & --disable-shared is the way to build
+	#   .a files that are needed to embed Racket into programs
+	#   https://docs.racket-lang.org/inside/cs-embedding.html
+	local myconf=(
+		--disable-shared
+		--disable-strip
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-libs
+		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
+		$(use_enable doc docs)
+		$(use_enable ncurses curses)
+	)
+	# Some options are togglable only for the BC version (are forced in CS)
+	! use chez && myconf+=(
+			--enable-float
+			--enable-foreign
+			--enable-gracket
+			--enable-libffi
+			$(use_enable futures)
+			$(use_enable jit)
+			$(use_enable places)
+			$(use_enable threads pthread)
+		)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install Racket boot files
+	use chez && emake -C "${S}"/cs/c DESTDIR="${ED}" unix-install-boot-files
+
+	# raco needs decompressed files for packages doc installation bug 662424
+	use doc && docompress -x /usr/share/doc/${PF}
+
+	# Create missing desktop files and icon
+	if ! use minimal ; then
+		newicon "${ED}/usr/share/racket/drracket-exe-icon.png" "racket.png"
+		make_desktop_entry "gracket" "GRacket" "racket" "Development;Education;"
+		make_desktop_entry "plt-games" "PLT Games" "racket" "Education;Game;"
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# If we are merging the same SLOT check if package
+	# database files exist and do not overwrite them
+	if has_version "${CATEGORY}/${PN}:${SLOT}" ; then
+		echo "We are installing the same SLOT: ${SLOT}"
+		local rktd
+		for rktd in "${PKGDB[@]}" ; do
+			if [[ -f "${EROOT}"/${rktd} ]] && [[ -f "${ED}"/${rktd} ]] ; then
+				einfo "Keeping old file: ${rktd}"
+				mv "${ED}"/${rktd} "${ED}"/${rktd}.bak ||
+					die "failed to create a backup of ${rktd}"
+				cp "${EROOT}"/${rktd} "${ED}"/${rktd} ||
+					die "failed to create a copy of ${rktd}"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	# If we have any pkgs not included in Racket main distribution (outsiders),
+	# then we have to re-setup them or during installation other pkgs will want
+	# to recompile parts of "outsider" pkgs they depend upon (and fail).
+	local outsiders=( $(raco pkg show -i | grep 'link' | sed 's|link.*||g') )
+	if [[ -n "${outsiders[@]}" ]] ; then
+		ebegin "Running \"raco setup\" for outsider packages"
+		echo "Outsiders: ${outsiders[@]}"
+		raco setup --all-users --force --no-docs --no-user --pkgs "${outsiders[@]}"
+		eend 0  # do not fail
+	fi
+
+	optfeature "readline editing features in REPL" dev-libs/libedit
+	optfeature "generating PDF files using Scribble" dev-texlive/texlive-fontsextra
+
+	readme.gentoo_print_elog
+}
+
+pkg_config() {
+	einfo "Swapping package database backup files"
+
+	for rktd in "${PKGDB[@]}" ; do
+		mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config
+		mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd}
+		mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak
+	done
+}