gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /dev-scheme
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
85 files changed, 1632 insertions, 845 deletions
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index e380b8ecf918..92e828c0126b 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/akku/Manifest b/dev-scheme/akku/Manifest
new file mode 100644
index 000000000000..b22be523592d
--- /dev/null
+++ b/dev-scheme/akku/Manifest
@@ -0,0 +1,3 @@
+DIST akku-v1.1.0.tar.gz 492996 BLAKE2B 7e3d549ed7f7fc0b6e84a41ff03d66398d2a464d6aa65dc92780a2b657d4476fef592543fba0fefe0da8ee429d97d4dcc0cf13ecd53c7be425b3f292b7b1c93d SHA512 e728bd80aaa21ca896e054e71a17ee519608b7c436f9613c688dba666f0120562174b7dca3156299528c1063a74e8faa8b8a77d1b7166d7506dec6b51d555825
+EBUILD akku-1.1.0.ebuild 949 BLAKE2B ad18d5354ef453f5fd6496ec30e9347b7071ee8aa94c6eb06faa726973638ba3ce8e8d22fa8b21487fe4b882d9424e52cdd0bee84459978297c8bd3fa5cb4c70 SHA512 1b0f1ae8cdeb070d447a31841fb9e79355de6aa96b3be7b9bce2cb630b15262c0dbfbc4763e5868df7d41392f5c34baa22669f5d9d1e3a5c9eea01e35ddb2411
+MISC metadata.xml 914 BLAKE2B f87257e7a1c6adee74c4d946ff6f788c2655ca83de90a967e94b56a4057057a731e582a9b6f870ee66ba01c75fac76857b793645a9e1fc9a3000dbcfc86064cd SHA512 5f9ae8349bcfadc22b6d7deec22c1a4e4fca285a6054b46329ab5cddf3e3c6658590716c3c17ad2af48f04471f67d881c7181721fdf74995e3d3573aa8f09ba9
diff --git a/dev-scheme/akku/akku-1.1.0.ebuild b/dev-scheme/akku/akku-1.1.0.ebuild
new file mode 100644
index 000000000000..76a3f57a10e5
--- /dev/null
+++ b/dev-scheme/akku/akku-1.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Language package manager for Scheme"
+HOMEPAGE="https://akkuscm.org/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/akkuscm/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/akkuscm/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+# tests require network access
+RESTRICT="strip test"
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.11:=
+	net-misc/curl[ssl]
+"
+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
+
+	eautoreconf
+}
+
+src_compile() {
+	touch bootstrap.db || die
+
+	emake
+}
diff --git a/dev-scheme/akku/metadata.xml b/dev-scheme/akku/metadata.xml
new file mode 100644
index 000000000000..4d0973104ed3
--- /dev/null
+++ b/dev-scheme/akku/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Akku.scm is a language package manager for Scheme.
+    It grabs hold of code and vigorously shakes it until it behaves properly.
+    - No complicated setup to point out where libraries are; Akku finds them!
+    - Separately declare dependencies and locked versions for your project.
+    - Convert R7RS libraries for use with Chez Scheme and other R6RS Scheme implementations.
+    - Numerous R6RS packages, as well as R7RS libraries mirrored from Snow.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://gitlab.com/akkuscm/akku/-/issues</bugs-to>
+    <remote-id type="gitlab">akkuscm/akku</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-scheme/bytestructures/Manifest b/dev-scheme/bytestructures/Manifest
index 0b1f9ec1fc2e..f7180a67df74 100644
--- a/dev-scheme/bytestructures/Manifest
+++ b/dev-scheme/bytestructures/Manifest
@@ -1,3 +1,3 @@
 DIST bytestructures-1.0.10.tar.gz 103312 BLAKE2B 85f688242523efdad2eb2b54c07c83edd424ce0f41e9b060dd4a265d0344d2eb44376658580de8e8a7a15967a0412851c4bc2fd988dda0a877300a6fc42512ee SHA512 721f5eab256b28f7354b6051aaea87ad6baa062e89af13443907038df1621bc600c781c73f541dc1000f6d472168fa954f9075721646e8493cf2b7d9f46a08f0
-EBUILD bytestructures-1.0.10.ebuild 1057 BLAKE2B f0147eb2a634f720d8a9d2081781c9103c7611c23b1b017512ae22306fc5e9ce448e70a5c230d428c0ff62ec0fefa624e647b4c19fb5d53791749fe01f9c4ec8 SHA512 7790ba3ddf9e483b4e58e576a55e9c046cdfbb6c79a4349cfdc39104e420bb4773666a938900e847156ba2a54d37e07551be48c70129d263fb6442955fb8d4c1
-MISC metadata.xml 576 BLAKE2B 49e1181406777dbbe85b869d1f65474beaae14dfb630864b3e07519365386e9c8d37368c1b378c55827783166c35efa4fa0dd4ff61785530bc55175b65bc07bc SHA512 e39fe7dcb849ed69b4b8675ea5116987d8d597c4e11f10ee6ab8c470388a9881ad99680bf4821a4b504744601ab435736ccdf4270c2080f4b8394b9d1180e5dd
+EBUILD bytestructures-1.0.10.ebuild 1068 BLAKE2B 59e13a856446b40cc9201d6ad0395fc3cd7578b75ccd78e8af25229b2dc2903e71870a26583f0318e758647450a3279a49b1d99bde3d966cc0e4fe653585d39f SHA512 b767c1fb31a861cb689c820d298201dcae52c9cd420e74ed4ae8068e82af51747db993a93d55f4325a7ec7248284568fbaf3b6389b474323dae2c9c1eeb65f37
+MISC metadata.xml 435 BLAKE2B c6e604778c6a8132143debf8de3e65e4c4f2bdf810b0472de75dfa66743c9fa085273a676d9f1dc7e56caa07d84dc524b44dd75bca089a1b251c678d5618beeb SHA512 5dc6a528584006e6802f626d0e525a1740b82b84e1e2bb613de80baea1d65e115ba63cfe04ed0bac61f1a7650915adf749274458bb2c9b209ac82e0c179f4ab8
diff --git a/dev-scheme/bytestructures/bytestructures-1.0.10.ebuild b/dev-scheme/bytestructures/bytestructures-1.0.10.ebuild
index 7d756f149fdd..4842f26f1ed7 100644
--- a/dev-scheme/bytestructures/bytestructures-1.0.10.ebuild
+++ b/dev-scheme/bytestructures/bytestructures-1.0.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Structured access to bytevector contents"
 HOMEPAGE="https://github.com/TaylanUB/scheme-bytestructures/"
@@ -11,13 +11,14 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+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_FLAGS_IGNORED='.*[.]go'
+QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
diff --git a/dev-scheme/bytestructures/metadata.xml b/dev-scheme/bytestructures/metadata.xml
index 722cc318f6fb..0cf45ce6c0e6 100644
--- a/dev-scheme/bytestructures/metadata.xml
+++ b/dev-scheme/bytestructures/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>xgqt@riseup.net</email>
-    <name>Maciej Barć</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
   </maintainer>
   <upstream>
     <bugs-to>https://github.com/TaylanUB/scheme-bytestructures</bugs-to>
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
new file mode 100644
index 000000000000..311fe964a007
--- /dev/null
+++ b/dev-scheme/chez/Manifest
@@ -0,0 +1,3 @@
+DIST chez-9.5.6.tar.gz 34565487 BLAKE2B 5d74cd3365b3039e6be1b774213da75da1080beffb1c9b5044466a8feff0171ce75d9999e69774754a5969d68825c571a88cb27d57af2718e98668e4fe936e3c SHA512 4affd73a5b2ea5cdec01fb200a32499387fc3769b7677ffe7d854f6a5567d50ba114f9f12951f99d8e0fd757c799e82e32c83079fae83e5fc138ee6e1a5f56c0
+EBUILD chez-9.5.6-r1.ebuild 1584 BLAKE2B aa3f84f8a33f1b02df94c22dd2df71ff5f267e08185521ddc4d624c07f1fdf04bb6193fbbf5286b77481f7cd60a55506dfe2a424d6da627afd57b1a4df748bbc SHA512 17166bbcd775f477d5117deec8227f09652363bbe8ccccebabc888478c4f2600d231fee112d2c110862e219cbc954054c99d736b4514bae43b97fb6c058202d8
+MISC metadata.xml 1266 BLAKE2B 85c7701d3c2b5e6cea3975f59c262fda6a6f38f0acd7093544ef62c647bc6fcbde06c5013d84f62ced3ea58efc5882ab1c6eb45fbb4b63f3366e19b1aea78c52 SHA512 27753e59489405becb7e70169447a24eea12ea3c273fd90a1cd7fd416fbab9b8ba6041977a9d57b24a9e9a55bcd2833ee83e31bcc6db2d6ba4b39c5281f535e9
diff --git a/dev-scheme/chez/chez-9.5.6-r1.ebuild b/dev-scheme/chez/chez-9.5.6-r1.ebuild
new file mode 100644
index 000000000000..6ec1f6d5145f
--- /dev/null
+++ b/dev-scheme/chez/chez-9.5.6-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021 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"
+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
+
+	if use ncurses ; then
+		local nclibs="\"$($(tc-getPKG_CONFIG) --libs ncurses)\""
+		sed -i "s|ncursesLib=-lncurses|ncursesLib=${nclibs}|g" configure || die
+	fi
+
+	default
+}
+
+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"
+		--temproot="${D}"  # required in order for DESTDIR to be respected
+		--installschemename=chezscheme
+		--installpetitename=chezscheme-petite
+		--installscriptname=chezscheme-script
+		--nogzip-man-pages
+	)
+	sh ./configure "${myconfargs[@]}" || die
+}
+
+src_install() {
+	default
+
+	if ! use examples; then
+		rm -r "${D}/usr/$(get_libdir)/${CSV}/examples" || die
+	fi
+}
diff --git a/dev-scheme/chez/metadata.xml b/dev-scheme/chez/metadata.xml
new file mode 100644
index 000000000000..7c0daa5cbed0
--- /dev/null
+++ b/dev-scheme/chez/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>matt@offtopica.uk</email>
+    <name>Matt Smith</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Chez Scheme is both a programming language and an implementation
+    of that language, with supporting tools and documentation.
+
+    As a superset of the language described in the Revised6 Report on
+    the Algorithmic Language Scheme (R6RS), Chez Scheme supports all
+    standard features of Scheme, including first-class procedures,
+    proper treatment of tail calls, continuations, user-defined
+    records, libraries, exceptions, and hygienic macro expansion.
+
+    Chez Scheme also includes extensive support for interfacing with C
+    and other languages, support for multiple threads possibly running
+    on multiple cores, non-blocking I/O, and many other features.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/cisco/ChezScheme/issues</bugs-to>
+    <remote-id type="github">cisco/ChezScheme</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-scheme/chibi/Manifest b/dev-scheme/chibi/Manifest
new file mode 100644
index 000000000000..f067681951ba
--- /dev/null
+++ b/dev-scheme/chibi/Manifest
@@ -0,0 +1,4 @@
+DIST chibi-0.10.tar.gz 1148573 BLAKE2B 1435d5734bfc44b6d6ddafdb339eea659345eea0db0e9b227830d7a6b6b14d3655af10906e43b6f8abd7eb2b90596fcb5dcc024abd2cba123a184f66ffcd0961 SHA512 348c20468e3b3b084ed25d38860f1afdecfb06ad9ff9ceb178c36930c14aa66a78f48b881a8eda28a30498662e7c722938212ea77b1cea89834d1a4377f0f648
+EBUILD chibi-0.10.ebuild 868 BLAKE2B 6101a3349563aaa2a20ac2343ad49ea7e1dbd27280cc22a1acfdf1944d36195d372d201f8b2107d498dacbe0f7df28be2d22b8412edfabe6afd2863255d0fcfc SHA512 9ca2b03ad437ac7dcae1b30640abcbce12e3a2b5012c8b8534c2a8e8ddc1c6ed887f3ae8e9e88a80e24be0d1c0ae576c13302c9ab7b215df9d2efb9dbb32bbd7
+EBUILD chibi-9999.ebuild 868 BLAKE2B 6101a3349563aaa2a20ac2343ad49ea7e1dbd27280cc22a1acfdf1944d36195d372d201f8b2107d498dacbe0f7df28be2d22b8412edfabe6afd2863255d0fcfc SHA512 9ca2b03ad437ac7dcae1b30640abcbce12e3a2b5012c8b8534c2a8e8ddc1c6ed887f3ae8e9e88a80e24be0d1c0ae576c13302c9ab7b215df9d2efb9dbb32bbd7
+MISC metadata.xml 1354 BLAKE2B f42d034ab15ba6df9f4cea3be5d6e5c66a61b55dbd6ada20cff02fbc79d2683e7eb5d8e95ce1b62b6cca54a521018e0abff7e15251dd5af8dfe1cd9ad1c56c3d SHA512 52c10ed2024fc27179e0a043cc00840ad81c9c5d31365ce27787691ca846a1a1ab065af4376655fff97a88638003c9ef4c1831a3b13a216f7f200b075a16fb09
diff --git a/dev-scheme/chibi/chibi-0.10.ebuild b/dev-scheme/chibi/chibi-0.10.ebuild
new file mode 100644
index 000000000000..189f61eb059f
--- /dev/null
+++ b/dev-scheme/chibi/chibi-0.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Minimal Scheme implementation for use as an extension language"
+HOMEPAGE="http://synthcode.com/scheme/chibi/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ashinn/${PN}-scheme.git"
+else
+	SRC_URI="https://github.com/ashinn/${PN}-scheme/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-scheme-${PV}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+src_configure() {
+	tc-export CC
+
+	export PREFIX="${EPREFIX}/usr"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export SOLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+	# if ldconfig (stored in LDCONFIG variable) exists it is ran
+	export LDCONFIG="0"
+}
+
+src_install() {
+	default
+
+	dosym chibi-scheme /usr/bin/chibi
+}
diff --git a/dev-scheme/chibi/chibi-9999.ebuild b/dev-scheme/chibi/chibi-9999.ebuild
new file mode 100644
index 000000000000..189f61eb059f
--- /dev/null
+++ b/dev-scheme/chibi/chibi-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Minimal Scheme implementation for use as an extension language"
+HOMEPAGE="http://synthcode.com/scheme/chibi/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ashinn/${PN}-scheme.git"
+else
+	SRC_URI="https://github.com/ashinn/${PN}-scheme/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-scheme-${PV}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+src_configure() {
+	tc-export CC
+
+	export PREFIX="${EPREFIX}/usr"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export SOLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+	# if ldconfig (stored in LDCONFIG variable) exists it is ran
+	export LDCONFIG="0"
+}
+
+src_install() {
+	default
+
+	dosym chibi-scheme /usr/bin/chibi
+}
diff --git a/dev-scheme/chibi/metadata.xml b/dev-scheme/chibi/metadata.xml
new file mode 100644
index 000000000000..6a31c51ea163
--- /dev/null
+++ b/dev-scheme/chibi/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Chibi-Scheme is a very small library intended for use as an extension
+    and scripting language in C programs. In addition to support for
+    lightweight VM-based threads, each VM itself runs in an isolated heap
+    allowing multiple VMs to run simultaneously in different OS threads.
+    Despite the small size, Chibi-Scheme attempts to do The Right Thing.
+    The default settings include:
+    - a full numeric tower, with rational and complex numbers
+    - full and seamless Unicode support
+    - low-level and high-level hygienic macros
+    - an extensible module system
+    Specifically, the default repl language contains all bindings from R7RS
+    small, available explicitly as the (scheme small) library. The language
+    is built in layers, however - see the manual for instructions on
+    compiling with fewer features or requesting a smaller language
+    on startup.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/ashinn/chibi-scheme/issues</bugs-to>
+    <remote-id type="github">ashinn/chibi-scheme</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index c8550237f395..79e3d083658d 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,3 +1,5 @@
 DIST chicken-4.13.0.tar.gz 4244358 BLAKE2B c40a28346fb6cd144e33605235ed022d48103edd1db1ae35e109e266989caaa0bf8fabf75e8b9cb740ac8bf4e3fba74218763573485127acacd001b8767cd088 SHA512 02c2035b4f81da6f4af2d246361ce8debdc9d9c663c3f43b7afb9abbf1ff591a2bb8fa144511b4d747a373dea4dcd9c10cac48466bf97032db76f3830c08709d
-EBUILD chicken-4.13.0-r1.ebuild 1703 BLAKE2B 38a6881c50185aacf0810d8d006afe11a56c07067d0ec965b537d73a323e374699f531d6a2daaa5a5ce69899e95b43f4ab3197d403c8799a0dd53888198d6919 SHA512 559251a99faa453ae3ce69044209d30d1cb5551663a99e7f485ffc6b63d3e6182b27e4f0d12d21151b0965262975c3d7ea68a3e702e5545b693cddf1c91405b0
-MISC metadata.xml 618 BLAKE2B e3f4914b2b8036d5fe7979dfb4dedabee6b8ea83df3906d55fd774cb89145fa0f0ea405cbca4b0bef3c37a55a098b9ac922d7ec7b03d043375e3e6f310f48ab1 SHA512 3b6cc9f00a7ba2fbdd7c4933e352394872b62cdb993fd85d85db96e68304d1d5c65abfa6bc6a58c00a9963a14342ca45aebd0e8c15de0e876548b24c8e5eddd9
+DIST chicken-5.3.0.tar.gz 4069549 BLAKE2B 7e1fb8c844542927eec53df751014f718b8c96fb6cf390d6464d7d55467c7320346be9ed05202b9c5c96548f274243ae52fead488981d7c207bec2c001db7cd7 SHA512 8fcc08a1ba44cde42c95820695a11858a3b7ff39a4b577bc5afb894c53513661aab2dc5b8e608e1d9d26648e314551052041626c4c8e519fcb9f8af324386e02
+EBUILD chicken-4.13.0-r2.ebuild 1623 BLAKE2B b5a16a9171e08517f4b014ad9a98d9450c16ef5ef61a7ac9dbd14ed07b497a663c0e329e3f49dc76f3a92d9eb3d4e59564882ba6cc55afad73a8ecc34a7f808d SHA512 188733b4f1c747fbf50fc66330d67a9b8553e82d65c697b56177202f62045b0db08bd5470db5172adeb456467b2b83b799b732ac0dfbd5701131afa617d621f4
+EBUILD chicken-5.3.0.ebuild 1785 BLAKE2B ce54b97bc1efa0ca896250d4ed939d08f9acaf6c0ab0e9c934a7eab5f6cabd964c2d4133a3392f479edd4d7f027dc88b2fd5d7dc0dec8f2c0fea06fd8f2f3f68 SHA512 f6c5a181d15227204ca62d5eb179b09ec19d6c97fb82e8c6de6a3356b43665de0d915580d91744c5f4cb2b722397c6f48850b2b7146dfb6cd62187e7b7851d95
+MISC metadata.xml 634 BLAKE2B b12c63caf7f06e32c23cf6ee7a02d245759f1e8d7da7e69457536e6a8a792eba43b86e170e04f67e6a4871ca4342c4db8db1661fe12626182ae3718dd1599f49 SHA512 9e7e23a443b91bd44870cc00206af7ff6dc536435d69ecfb370e423455b62df8aa4835265994f83c53240001727276005a3c30a4afac6c21f1b10c411d1b1ae7
diff --git a/dev-scheme/chicken/chicken-4.13.0-r1.ebuild b/dev-scheme/chicken/chicken-4.13.0-r1.ebuild
deleted file mode 100644
index 9f70d69dc3f6..000000000000
--- a/dev-scheme/chicken/chicken-4.13.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_PV=$(get_version_component_range 1-3)
-DESCRIPTION="Scheme interpreter and native Scheme to C compiler"
-HOMEPAGE="http://www.call-cc.org/"
-SRC_URI="http://code.call-cc.org/releases/${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	default
-
-	#Because chicken's Upstream is in the habit of using variables that
-	#portage also uses :( eg. $ARCH and $A
-	sed "s,A\(\s?=\|)\),chicken&," \
-		-i Makefile.cross-linux-mingw defaults.make rules.make || die
-	sed "s,ARCH,zARCH," \
-		-i Makefile.* defaults.make rules.make || die
-	sed -e "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," \
-		-e "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${PF}," \
-		-i defaults.make || die
-
-	if ! use doc; then
-		rm -rf manual || die
-		# Without this Makefile tries to re-bootstrap the compiler
-		touch build-version.c
-	fi
-}
-
-src_compile() {
-	emake -j1 PLATFORM=linux PREFIX=/usr C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
-		LINKER_OPTIONS="${LDFLAGS}" \
-		HOSTSYSTEM="${CBUILD}"
-}
-
-src_test() {
-	cd tests
-	./runtests.sh || die
-}
-
-src_install() {
-	# still can't run make in parallel for the install target
-	emake -j1 PLATFORM=linux PREFIX=/usr DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" \
-		LINKER_OPTIONS="${LDFLAGS}" install
-
-	rm "${D}"/usr/share/doc/${PF}/LICENSE || die
-
-	# README is installed by Makefile
-	dodoc NEWS
-
-	# Let portage track this file (created later)
-	touch "${D}"/usr/$(get_libdir)/chicken/8/modules.db || die
-}
-
-pkg_postinst() {
-	# Create modules.db file in ${ROOT}
-	chicken-install -update-db || die
-}
diff --git a/dev-scheme/chicken/chicken-4.13.0-r2.ebuild b/dev-scheme/chicken/chicken-4.13.0-r2.ebuild
new file mode 100644
index 000000000000..2c55fdc89af2
--- /dev/null
+++ b/dev-scheme/chicken/chicken-4.13.0-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Scheme interpreter and native Scheme to C compiler"
+HOMEPAGE="https://www.call-cc.org/"
+SRC_URI="https://code.call-cc.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	default
+
+	# because chicken's upstream is in the habit of using variables that
+	# portage also uses :( eg. $ARCH and $A
+	sed -i \
+		-e "s/A\([[:space:]]*?=\|)\)/z&/" \
+		-e "s/ARCH/z&/" \
+		-e "/LICENSE /d" \
+		Makefile.* {defaults,rules}.make || die
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		-e "s|\$(DATADIR)/doc|\$(SHAREDIR)/doc/${PF}|" \
+		defaults.make || die
+
+	use doc || sed -i "/\$(SEP)manual/d" rules.make || die
+}
+
+src_compile() {
+	emake -j1 \
+		PLATFORM="linux" \
+		PREFIX="${EPREFIX}/usr" \
+		C_COMPILER="$(tc-getCC)" \
+		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		CXX_COMPILER="$(tc-getCXX)" \
+		HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}"
+}
+
+src_test() {
+	cd tests && ./runtests.sh || die
+}
+
+src_install() {
+	emake -j1 \
+		PLATFORM="linux" \
+		PREFIX="${EPREFIX}/usr" \
+		C_COMPILER="$(tc-getCC)" \
+		CXX_COMPILER="$(tc-getCXX)" \
+		HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}" \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+	find "${ED}" -name '*.a' -delete || die
+
+	# let portage track this file (created later)
+	touch "${ED}"/usr/$(get_libdir)/${PN}/8/modules.db || die
+}
+
+pkg_postinst() {
+	# create modules.db file in ${ROOT}
+	chicken-install -update-db || die
+}
diff --git a/dev-scheme/chicken/chicken-5.3.0.ebuild b/dev-scheme/chicken/chicken-5.3.0.ebuild
new file mode 100644
index 000000000000..869ed7fcf99a
--- /dev/null
+++ b/dev-scheme/chicken/chicken-5.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Scheme interpreter and native Scheme to C compiler"
+HOMEPAGE="https://www.call-cc.org/"
+SRC_URI="https://code.call-cc.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	default
+
+	# because chicken's upstream is in the habit of using variables that
+	# portage also uses :( eg. $ARCH and $A
+	sed -i \
+		-e "s/A\([[:space:]]*?=\|)\)/z&/" \
+		-e "s/ARCH/z&/" \
+		-e "/LICENSE /d" \
+		Makefile.* {defaults,rules}.make || die
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		-e "s|\$(DATADIR)/doc|\$(SHAREDIR)/doc/${PF}|" \
+		defaults.make || die
+	sed -i \
+		-e "/\$(CHICKEN_DO_PROGRAM)\$(EXE):/,/^$/s/\(\$<\)/\$(LINKER_OPTIONS) \1/" \
+		rules.make || die
+
+	use doc || sed -i "/\$(SEP)manual/d" rules.make || die
+}
+
+src_compile() {
+	emake -j1 \
+		PLATFORM="linux" \
+		PREFIX="${EPREFIX}/usr" \
+		C_COMPILER="$(tc-getCC)" \
+		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		CXX_COMPILER="$(tc-getCXX)" \
+		HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}"
+}
+
+src_test() {
+	cd tests && ./runtests.sh || die
+}
+
+src_install() {
+	emake -j1 \
+		PLATFORM="linux" \
+		PREFIX="${EPREFIX}/usr" \
+		C_COMPILER="$(tc-getCC)" \
+		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		CXX_COMPILER="$(tc-getCXX)" \
+		HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}" \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+	find "${ED}" -name '*.a' -delete || die
+
+	# let portage track this file (created later)
+	touch "${ED}"/usr/$(get_libdir)/${PN}/11/modules.db || die
+}
+
+pkg_postinst() {
+	# create modules.db file in ${ROOT}
+	chicken-install -update-db || die
+}
diff --git a/dev-scheme/chicken/metadata.xml b/dev-scheme/chicken/metadata.xml
index 39f7cc709ea6..be95a48c267f 100644
--- a/dev-scheme/chicken/metadata.xml
+++ b/dev-scheme/chicken/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>scheme@gentoo.org</email>
-	<name>Gentoo Scheme Project</name>
-</maintainer>
-<longdescription>
-CHICKEN is a compiler for the Scheme programming language. CHICKEN produces
-portable, efficient C, supports almost all of the current Scheme language
-standard, the Revised5 Report on the Algorithmic Language Scheme (R5RS ), and
-includes many enhancements and extensions. CHICKEN runs on MacOS X, Windows, and
-many Unix flavours.
-</longdescription>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription>
+		CHICKEN is a compiler for the Scheme programming language. CHICKEN
+		produces portable, efficient C, supports almost all of the current
+		Scheme language standard, the Revised^5 Report on the Algorithmic
+		Language Scheme (R5RS), and includes many enhancements and extensions.
+		CHICKEN runs on MacOS X, Windows, and many Unix flavours.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-scheme/cyclone/Manifest b/dev-scheme/cyclone/Manifest
new file mode 100644
index 000000000000..cf538f24f96c
--- /dev/null
+++ b/dev-scheme/cyclone/Manifest
@@ -0,0 +1,4 @@
+DIST cyclone-0.33.0.tar.gz 3946573 BLAKE2B 7eba62995ef3d327e14d6fbcf433d40e73c244508f8858d636a3a3fd05660e2921055932dedbe50ce8b384e9a9b44a09112aca6f851af6cd38b9b372769b2adc SHA512 96ffd3d04636b27f36c98920359a9f880c4b2a15e9820e5d91c82f821dc93357b665537e7688b00510d6a4fd113666edbd5ec109ff491f4f18d547129527b763
+EBUILD cyclone-0.33.0.ebuild 1158 BLAKE2B 47fa760d10dc84bd13fe82b970cd693c4ba5eb03f5356c3ee28bff36abb1603e91691d1aa7077ede2b612e09c39bf575003448169dffe4cd16a835ab658f8711 SHA512 59a1d7d1b3f900e6b9aadd7177328a3af20a42fe09e1177075124a089f9f58d315f6eaf0c023d6f63f0463a265e8ee024c43dea773cd61bec1ba50fbfcd87103
+EBUILD cyclone-9999.ebuild 1164 BLAKE2B b00e6cfba08aabf30efd64d9905696e8c46d9f31c811736cd21fac09e5f0dd7bc41f8811d44d062324c213bd3c0d3d4dbfa6ee17ec308577f06ef83cf71d94b8 SHA512 a24b4cf4f5454a1b41800c6b06c138d716dfd198e4ec7cfa8927a36df20aafe72e132d094e72c69c428f6ba729182fe21b3c04a5fc3bc9f39873499aab78832d
+MISC metadata.xml 1180 BLAKE2B 2d15145f5940e17f775a55dfa507d8f6bbeaa955be48dfb9d026d2bf7f4f1fb0b3422aa990d2d2149ec9e86449f0fb6a0c94e1809b39ed2b2d51acdfeda52eee SHA512 a35f542ac1c1ac6605241a5ba556975394255595a4c177c13277399c8ba03a8bf99703812b1b7e2200ec555294a85c1fea2f8d22fcaab6da8ee2217555b299ab
diff --git a/dev-scheme/cyclone/cyclone-0.33.0.ebuild b/dev-scheme/cyclone/cyclone-0.33.0.ebuild
new file mode 100644
index 000000000000..2a50206ddfee
--- /dev/null
+++ b/dev-scheme/cyclone/cyclone-0.33.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Cyclone is a self-hosting Scheme to C compiler
+# cyclone-bootstrap is the Cyclone SOURCE transpiled by it to C
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="R7RS Scheme to C compiler"
+HOMEPAGE="http://justinethier.github.io/cyclone/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/justinethier/${PN}-bootstrap.git"
+else
+	SRC_URI="https://github.com/justinethier/${PN}-bootstrap/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-bootstrap-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="dev-libs/concurrencykit"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	export CYC_GCC_OPT_FLAGS="${CFLAGS}"
+	append-cflags -fPIC -Iinclude
+	append-ldflags -L.
+	tc-export AR CC RANLIB
+}
+
+src_compile() {
+	local myopts=(
+		PREFIX="/usr"
+		CYC_GCC_OPT_FLAGS="${CYC_GCC_OPT_FLAGS}"
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		RANLIB="$(tc-getRANLIB)"
+	)
+	emake "${myopts[@]}"
+}
+
+src_test() {
+	emake LDFLAGS="" test
+}
+
+src_install() {
+	einstalldocs
+
+	emake PREFIX="/usr" DESTDIR="${D}" install
+}
diff --git a/dev-scheme/cyclone/cyclone-9999.ebuild b/dev-scheme/cyclone/cyclone-9999.ebuild
new file mode 100644
index 000000000000..12a81a63780a
--- /dev/null
+++ b/dev-scheme/cyclone/cyclone-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Cyclone is a self-hosting Scheme to C compiler
+# cyclone-bootstrap is the Cyclone SOURCE transpiled by it to C
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="R7RS Scheme to C compiler"
+HOMEPAGE="http://justinethier.github.io/cyclone/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/justinethier/${PN}-bootstrap.git"
+else
+	SRC_URI="https://github.com/justinethier/${PN}-bootstrap/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-bootstrap-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-libs/concurrencykit"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	export CYC_GCC_OPT_FLAGS="${CFLAGS}"
+	append-cflags -fPIC -Iinclude
+	append-ldflags -L.
+	tc-export AR CC RANLIB
+}
+
+src_compile() {
+	local myopts=(
+		PREFIX="/usr"
+		CYC_GCC_OPT_FLAGS="${CYC_GCC_OPT_FLAGS}"
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		RANLIB="$(tc-getRANLIB)"
+	)
+	emake "${myopts[@]}"
+}
+
+src_test() {
+	emake LDFLAGS="" test
+}
+
+src_install() {
+	einstalldocs
+
+	emake PREFIX="/usr" DESTDIR="${D}" install
+}
diff --git a/dev-scheme/cyclone/metadata.xml b/dev-scheme/cyclone/metadata.xml
new file mode 100644
index 000000000000..8e37f78fc1e8
--- /dev/null
+++ b/dev-scheme/cyclone/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Cyclone Scheme is a brand-new compiler that allows real-world
+    application development using the R7RS Scheme Language standard.
+    We provide modern features and a stable system capable of generating
+    fast native binaries.
+    Cheney on the MTA is used by Cyclone's runtime to implement full tail
+    recursion, continuations, and generational garbage collection.
+    In addition, the Cheney on the MTA concept has been extended to allow
+    execution of multiple native threads. An on-the-fly garbage collector
+    is used to manage the second-generation heap and perform major
+    collections without "stopping the world".
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/justinethier/cyclone/issues</bugs-to>
+    <remote-id type="github">justinethier/cyclone-bootstrap</remote-id>
+    <remote-id type="github">justinethier/cyclone</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-scheme/gauche-cdb/Manifest b/dev-scheme/gauche-cdb/Manifest
index b3c162c1314c..4bf1bf3c831b 100644
--- a/dev-scheme/gauche-cdb/Manifest
+++ b/dev-scheme/gauche-cdb/Manifest
@@ -1,5 +1,5 @@
 AUX gauche-cdb-gauche-package.patch 3764 BLAKE2B fd87c6521c10fd3fdc65951643f2b6b6b714d99ebd9d6de3aaf2d94dcd0d43818d1440153f89081dcb8751bcfa1eee48165f18bb77da4f117b7da65db909ada0 SHA512 6c746b96b9f54334e8592ab76721b71521eb6f09c9b5a99d2b43423ccea1c9603656505d4e3d35d0c03ceea1914a3bafff3a3ed527fee9512c96f495de9a658a
 AUX gauche-cdb-undefined-reference.patch 639 BLAKE2B cbf4d33e4b0b6a280bf7c5c8c5edd794fd3834b51be2c3e8f97ea42246c57b5d9bc29ec928ab267a91c58e102a0f415320f5ac1079d84d79b23d1a8e0a49a5ab SHA512 e316917e2915b3d0cecc002bb2be5714f86602810508f6b0fef283ba9ae0ac68952b3f93cf3e16bbb331c3544ee81bf37a9d84d1122f46789a5b17b1b2cb347c
 DIST Gauche-cdb-0.3.1.tar.gz 72048 BLAKE2B f4363ec9893e3f365c34965414620b46c08edcfdf5ed95a5934aeedd3af6e58f1cdedb7c4df90e95fa5a93ce3f95aeeb08fca0f3a440990d3383cd72bef8aa87 SHA512 c02629de9e96c561da0a928e2817056da27951a5ad988b7d105cc24aedd6d103001bf9dd4ae28c1729d701850d937a3134361c2ad83a4e1e51d565a95e8f1a68
-EBUILD gauche-cdb-0.3.1-r1.ebuild 591 BLAKE2B a9bfb97c3a9327a8e536e592559638f3175fbae702268ca11831ae006b18dbf409e5f508de7135a83a1e7dc84a1d755e190150de33e146e69d3fe3d692c9e97e SHA512 cc7189ac072b72a663f94caf2f123ef9662d4e705210984f7cc8ee0d22e8561edb788ff23ce6932fc951d1a90c57e3c402e5b09a3091785a390f23f1f8da670b
+EBUILD gauche-cdb-0.3.1-r1.ebuild 585 BLAKE2B 6b5d0ba9634d8f379d9b50bd4b341d8fe7c069338404bba7bce29f89e7c17e8c8dc9e17884cf3722b8bcaefa7ed803b483d9495dfabe6a3545d2f85521a309d9 SHA512 e69b04f9f3b1354f61fb297a820e409b5198c438195b50cfd78341301865664757f8eb6e49a71dc237f79b602b9a01e76ee2ab855c200cf19c30b79b3b47435a
 MISC metadata.xml 328 BLAKE2B 8e6a23ff8db0b0cfa884c0c70f2439c44662447d13300f753dc626ce433b85589f8585d256d9f2882ae04f0681e279f2a87b07fdb1b92f4680080da5fdcf0f05 SHA512 7160a11388f8bc62d5b07424adb997975992dec33f29abd78f65c88d6c60608be30a7d04d92d88202c8e398e690488fe985c52f2f4ae3bd1fb0891898493b8fa
diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
index 941d4acb9d24..8d7b13b2471a 100644
--- a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
+++ b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
 inherit autotools
 
 MY_P="${P^g}"
 
 DESCRIPTION="CDB binding for Gauche"
-HOMEPAGE="http://sourceforge.jp/projects/gauche/"
+HOMEPAGE="https://osdn.jp/projects/gauche/"
 SRC_URI="mirror://sourceforge.jp/${PN%-*}/8407/${MY_P}.tar.gz"
 
 LICENSE="BSD"
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 x86"
 IUSE=""
 
-RDEPEND="dev-scheme/gauche:=
-	dev-db/tinycdb"
+RDEPEND="dev-db/tinycdb
+	dev-scheme/gauche:="
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-scheme/gauche-gl/Manifest b/dev-scheme/gauche-gl/Manifest
index b14a1466cdf3..2f8693970cd1 100644
--- a/dev-scheme/gauche-gl/Manifest
+++ b/dev-scheme/gauche-gl/Manifest
@@ -3,5 +3,5 @@ AUX gauche-gl-0.6-cg.patch 1168 BLAKE2B 27a0e4957e9148b97e95994fa037cb28bb5eacca
 AUX gauche-gl-0.6-info.patch 1954 BLAKE2B ed038d5214d8705901e4902848156084138c5ccfa75a40d12b8f473e2c77222271b954c0cb64ed0d973b0750b72dbd65a295dc3eb5e52985b67206273ecf6fb0 SHA512 de74c7bd0abf861c8b24b9166037543b6389d2ddf2118829e028aed8f511e23f90427e129e95b46145a2c4449d21d18ce060fd75f8d76df1244e6eac16ff5b3b
 AUX gauche-gl-0.6-simple.viewer.patch 806 BLAKE2B a2e3e35f704a108ec6bf7a809558db14daddb972487aa11dbbca01d894ba5752822ea4f2f869722a96043543fd3c794c2b92bcc2091184a957059b4c2f90afc4 SHA512 ed9d08b02e7035b5415cefb501b323a86e434389149f49ec3612e00a282c5b709da2f900768749577387537189f68e2ac32320ecae118dd32ec4fed5ea40407f
 DIST Gauche-gl-0.6.tgz 1369790 BLAKE2B b077eeee7a2d64908b36e1d279a1131eef40e98104a983e581856320529207682d17e2c9577ff892c873492f4b78631d86a4c642b1e4f8ecd364acb4ee41482e SHA512 60f763ba832048f9932cabd2e8ce8595ba2a1f0b86f1212b1f6919d6b9b8ba33ed1076f119e53059ceac7f6e46a6ead3ba0e23cce81af3097355cd97b3b4b673
-EBUILD gauche-gl-0.6.ebuild 1163 BLAKE2B 9b042c5657a152ffc589115c3068136b7e8ba45bdabb28361002f27d9ce3fac9db72de943236c8397c6e0a907bc31d9aa28119df8e9e2ecdd5ee28b61532ffce SHA512 572ca8b0293d53b2ba9e1b3488b92e8fb77ccffd9ff3f346ac5aa2691013328062f8369089c57954f3e69fd307b37ad7e16f06f0ef0cb50196eca6f913bddc65
+EBUILD gauche-gl-0.6-r1.ebuild 1158 BLAKE2B 459d70bb24d8ab56741fc5be91e8cbf29243574de455bdbb64677abbad61f01d5fe5c671213e79c65a5080e653c107099d3fa0d7436dd09413d08c1c4f2207e5 SHA512 392bf97437d4d2cea3bc3f69fd7afe103be5ed1252742f0e33e1e087f4cbb76e15d400118f8c0c37995494b2df415612bcab0d9c90345e01dd2cb6e0c0dc1798
 MISC metadata.xml 446 BLAKE2B 42e47b27a9698630c02789c6efcf119ff88e96da02f71733fc2c5b03d81c49d44452aaceaf9e593a1017ab3cbd4fb3d4de379c4131b96590bf4082bc977a6975 SHA512 ee955f6fb7eeca1e69f6fc70029f0cc06b3529015d03a67fba3614c4ed5308e3d9721a20eb2c4e421e2045031a56635cfaa3741e736b694393b7ea2a3f7d83e7
diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.6-r1.ebuild
index 840d7c958120..cf7d9f5aac7b 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit autotools
 
 MY_P="${P^g}"
 
 DESCRIPTION="OpenGL binding for Gauche"
-HOMEPAGE="http://practical-scheme.net/gauche/"
+HOMEPAGE="https://practical-scheme.net/gauche/"
 SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tgz"
 
 LICENSE="BSD"
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="cg examples"
 
-RDEPEND=">=dev-scheme/gauche-0.9.4
+RDEPEND="dev-scheme/gauche:=
 	media-libs/freeglut
 	virtual/opengl
 	x11-libs/libXmu
diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest
index 432039b2168c..ff4bacace837 100644
--- a/dev-scheme/gauche-gtk/Manifest
+++ b/dev-scheme/gauche-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST Gauche-gtk2-0.6_pre1.tar.gz 205003 BLAKE2B ecc444c246aa20f67a0030d7d87528596d6c2d69beb7ffaef1b53f80963d2fcc1294a04cacf958df6c3331789b6b0260f911126941d6e672a6c57e3aa4807d81 SHA512 5379dafbfabd536e335c30af18f8ddd13e00238e6d99494bbc8e78ee9cf1db872c08b5deee42ac50898dedde39c441d837312d2d6f559a0d2ac2568c31926f70
-EBUILD gauche-gtk-0.6_pre1-r1.ebuild 900 BLAKE2B 268f31e5319100d037dff54bad6dc996571abea14d9f712a14a954db7a2197dfccc669b23fb1c7cd2373c38421a0e3015920a846bc635e0c6a153604ec65d736 SHA512 15e0a1835e8ca73edd8067cbbd381c8fa9fedcc5a7698f017b451e3da6578b2ba51f0eeca88be8a8491e09563bf31c1d90ab7c69f4b9f810b9fcbffc83594e99
+DIST Gauche-gtk2-0.6_pre20210518.tar.gz 205003 BLAKE2B ecc444c246aa20f67a0030d7d87528596d6c2d69beb7ffaef1b53f80963d2fcc1294a04cacf958df6c3331789b6b0260f911126941d6e672a6c57e3aa4807d81 SHA512 5379dafbfabd536e335c30af18f8ddd13e00238e6d99494bbc8e78ee9cf1db872c08b5deee42ac50898dedde39c441d837312d2d6f559a0d2ac2568c31926f70
+EBUILD gauche-gtk-0.6_pre1-r2.ebuild 916 BLAKE2B f569ad5ad06908891b17a01521882f5e93aa1d3e2ea86f283d4325e0dae5a3a63f936d7d9ab7d0d3a58ca068424ce5b5496e4017f4e46fd37f15a7de142c8067 SHA512 85677e0efa1763942b39b1907a032bbd9b98e44dad1de1e572befa6fc48c4764e7084f6d8d61e74da2527bfa62ee99b8683d0d4664d758190a6f356457f25af5
+EBUILD gauche-gtk-0.6_pre20210518.ebuild 918 BLAKE2B 87f249524095cfd65ba455747eaa1db064cce9c383b2077d5a7b5effd061b1cfb90f0c2fffd1672aad1eb54f403e077d7697527b4baa30853f0222573fcf38a7 SHA512 503b3e8ae28c06abd8eb19e019e9e983a4da2448c902ed1bd0684ee901831fb2a84ff9df10144d680cce097fd13d0afbd856222cce748c6d1253cd1f53bf96ae
 MISC metadata.xml 332 BLAKE2B bfb94c256a66b7b190e052f373e4fea4ec5d79f1ebca1f41cfa04151fce72d5a2724593bf234ac73e9f4708fbfd367d6921a01017a4706368fcba4bfe26852fb SHA512 280107527381e07494f651ac1bbc5bb9f0737878196672dafd222c4f6b7021cd7586942c1522f9195bbb9bb56c6e6a49a6ba957d6a4a65b5f0ca6c1237f55ac2
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r2.ebuild
index 9497ba267f79..a7439de412d8 100644
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools vcs-snapshot
 
 MY_P="${PN^g}2-${PV}"
-PV_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
+EGIT_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
 
 DESCRIPTION="GTK2 binding for Gauche"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="https://github.com/shirok/${PN^g}2/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+HOMEPAGE="https://practical-scheme.net/gauche/"
+SRC_URI="https://github.com/shirok/${PN^g}2/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,10 +18,10 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="examples"
 RESTRICT="test"
 
-RDEPEND="x11-libs/gtk+:2
-	dev-scheme/gauche"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="dev-scheme/gauche:=
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre20210518.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre20210518.ebuild
new file mode 100644
index 000000000000..d585ddc55762
--- /dev/null
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre20210518.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools vcs-snapshot
+
+MY_P="${PN^g}2-${PV}"
+EGIT_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
+
+DESCRIPTION="GTK2 binding for Gauche"
+HOMEPAGE="https://practical-scheme.net/gauche/"
+SRC_URI="https://github.com/shirok/${PN^g}2/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+RESTRICT="test"
+
+RDEPEND="dev-scheme/gauche:=
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_compile() {
+	emake stubs
+	emake
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc examples/*.scm
+		# install gtk-tutorial
+		docinto examples/gtk-tutorial
+		dodoc examples/gtk-tutorial/*
+	fi
+}
diff --git a/dev-scheme/gauche-kakasi/Manifest b/dev-scheme/gauche-kakasi/Manifest
index 01857a698933..a880d776c2c8 100644
--- a/dev-scheme/gauche-kakasi/Manifest
+++ b/dev-scheme/gauche-kakasi/Manifest
@@ -1,4 +1,4 @@
 AUX gauche-kakasi-gauche-package.patch 4790 BLAKE2B ce0df43e310bfb2cd110f27e651faa307a4f64631fd9e494db9b0e0cf2ee70a1744973a26fd61aaebdbca6d284d4722d68837f46c1b9779eea5b3bb0840ba93e SHA512 5eccf08bcbab4644bf9f89da37dd81ffd64b486c4ea9f30206d5fbe53cb0e5b2e5a4131a8b84b0cd19a7b6bb7f0e28618af0e1fddc60028773cb40d671cd2eec
 DIST Gauche-kakasi-0.1.tgz 56568 BLAKE2B 965c59918da2005b14c127ea23bf1b7e001809889a1caa9cde5af97b22ea23952dcc269e8860f37354e98264c659f222826cc6e3f7f9db49701c33c3e898246a SHA512 761fb704482f4e6705ca80b894b245391efee92d409e9438e59afae56d0b7d9907ed40ab3a5bcc3ec9f2a8115bdbc622c48eaec3b0ed38c99677bf1f9f0f7bed
-EBUILD gauche-kakasi-0.1.ebuild 571 BLAKE2B d5285162234a87b39957d5e9f61deabac775a7923507ab3d7fa697deaa88fecc3f4a962dbf1fe258a28a021700bb2450df65c19ecf6b461f8c6a4770c390a7ef SHA512 a658281a9fd4cfb33b8df67d470afbf9de5e28529cafed979ba8ea04a5fc4ac434612600cd2b1a513f7fdcdb50fae10b9254c2266276d17335adcc3ae7f6b4e2
+EBUILD gauche-kakasi-0.1-r1.ebuild 571 BLAKE2B ea782e330e60d483fc8a29ace4ba6276a0944e83a7670db3695767b215d60e5ddb5bb17a8a1e77fbc61f2fde2dc83092ca4c02ed5abc134a4e3be3efb6b80bae SHA512 46c6941bdb456cd053902ea81e57c4734915c980dd29b55506b04f416e62bc2ae6826afb40ee58b097118084fa0922b3e9c47689d4b385c4303ad2990bd287e8
 MISC metadata.xml 325 BLAKE2B 92de1a9b470fb0cb3963dd04cb8ad2bfb16b6ca7c0ce327ab0b35110e1a8e6dc7c369fbb0c30a1dbf5c2f47ffcbd82b8576f14d5012360e04d8f6d43bb6693ab SHA512 476565d73fb93088b368e6a08f8be5e026f431549aadc4ec869575f632d182c0168abb13735abfa10719bc4e9add08c1eb51c27b99d0139dbd41b6cb09df9b42
diff --git a/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild b/dev-scheme/gauche-kakasi/gauche-kakasi-0.1-r1.ebuild
index 10ac8a46a9a9..ce93266467be 100644
--- a/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild
+++ b/dev-scheme/gauche-kakasi/gauche-kakasi-0.1-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
 inherit autotools
 
 MY_P="${P^g}"
 
 DESCRIPTION="Kakasi binding for Gauche"
-HOMEPAGE="http://sourceforge.jp/projects/gauche/"
+HOMEPAGE="https://osdn.jp/projects/gauche/"
 SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE=""
 
-RDEPEND="dev-scheme/gauche
-	>=app-i18n/kakasi-2.3.4"
+RDEPEND=">=app-i18n/kakasi-2.3.4
+	dev-scheme/gauche:="
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
@@ -26,6 +26,6 @@ PATCHES=( "${FILESDIR}"/${PN}-gauche-package.patch )
 src_prepare() {
 	default
 
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/dev-scheme/gauche-mecab/Manifest b/dev-scheme/gauche-mecab/Manifest
index 4175e3c52d27..dd6f78f8984b 100644
--- a/dev-scheme/gauche-mecab/Manifest
+++ b/dev-scheme/gauche-mecab/Manifest
@@ -1,3 +1,3 @@
 DIST Gauche-mecab-1.0.2.tar.gz 12724 BLAKE2B 7e18910f5e45750b6fe3a916a0350071be97f0c860bdf27733639599ec2e302305887ae04b7239c9da90e0913bc2ba03626f105a0004bd3c7f087016b66cef63 SHA512 2d000a0c0f795af93e2728249e7ab339c19d388546d3a300d5960079b9bf360a23c7758867edaca4abb871329689372b645e27eb20bed139aeb997e4d7583c43
-EBUILD gauche-mecab-1.0.2.ebuild 457 BLAKE2B eab6b25ba349e1e1949abe7a39639960e7bd8cd7d57c2c76f7b653cc665bbc79db9f0442d4bcc4d4f5066be8e90a5fb25b2b405808f121e2f05a8e6d335d0e80 SHA512 7127b97844fa51b7205927a5500b41f4cb873f9d62c763873672fcfa772b57c7aae2248877a4de3a71b017d40a5265ae4d8e1edb3b10fc0fe572a9ed6b6bba4b
+EBUILD gauche-mecab-1.0.2-r1.ebuild 446 BLAKE2B abb89812c5613dedd153cb06248fb2a7300afd1483f8cc79638e5feb2538cadba3456b63d1367200676452758c3a6e52ed0693a2cd6884b0d62e7c9f8a1ef9ca SHA512 000b526c25bad5a55b413b521fabc045ee5ede397bf062b6dba1090550153516a8ab2cd7f058bd859b0c4c287faad0192f374590d2868ad5a471d63b54910407
 MISC metadata.xml 333 BLAKE2B 9e22889bd37ec8c50d6c832a1efa3733ef446d49a8b5c50b0e4413519e718a53bda6b01eb0d9aa779ea44b6bbc9a25586725b4d777c6b9dc57ee4ae609088b1d SHA512 8410a5d37fda71da701a401bb4e23317647f5dac258690e10a49b1216370d9daaf0088ee0184acdfdaba7f2b058b46f774a8e16c07e289d75af538610b7049e9
diff --git a/dev-scheme/gauche-mecab/gauche-mecab-1.0.2.ebuild b/dev-scheme/gauche-mecab/gauche-mecab-1.0.2-r1.ebuild
index 1f7af5b4816a..064d573170a1 100644
--- a/dev-scheme/gauche-mecab/gauche-mecab-1.0.2.ebuild
+++ b/dev-scheme/gauche-mecab/gauche-mecab-1.0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
 MY_P="${P^g}"
 
@@ -11,10 +11,10 @@ SRC_URI="https://github.com/shirok/${PN^g}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-text/mecab
-	>=dev-scheme/gauche-0.9.5"
+	dev-scheme/gauche:="
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-scheme/gauche-qdbm/Manifest b/dev-scheme/gauche-qdbm/Manifest
index 2eedb4815500..f818aacf0556 100644
--- a/dev-scheme/gauche-qdbm/Manifest
+++ b/dev-scheme/gauche-qdbm/Manifest
@@ -2,5 +2,5 @@ AUX gauche-qdbm-gauche-package.patch 4106 BLAKE2B 94e7dcf114aad23bd974efd6e8dca7
 AUX gauche-qdbm-test.patch 509 BLAKE2B d25e07515e8e8a5fd8428b3438f77ee250ab4828280cd84cbb6d8be27847e6109204cd2adfd8dee69f571cfed2a54367dd9c3b32665310ffcf2da8e2fd803946 SHA512 b6903f20440aeddc8f1977d66aa54458d241f53a195ac1ba9d2c60ddef0167c4053aa662e8da0595f5427f502a20e948763e7648d13d452cb37ad1abd33cf54f
 AUX gauche-qdbm-undefined-reference.patch 389 BLAKE2B 8730afd098e3b12365470d3544bcfd8cf03b2058af0cf4c63107f66c364aec50a7516d699a2e292ef1f40eacb0ec76458730509db576b3e53bdea57ff634f5cd SHA512 67aaf78272973c283da3c128e7479688ec4207395da5b0af0e33b9c209d8f1dac547dca57787db218bc954ac3af34b25f2b6862acfe5362c439bb244878be282
 DIST Gauche-qdbm-0.2.tar.gz 73311 BLAKE2B d8937147368416ef17ca5e953d91a6e906f16e65b73c87d01515346c0be5e5bb3646e7b26a8847d4b29bcf7abd4e7114fdbfd74a122f5fd1cc6205768e1789eb SHA512 9286d22f1ad32f213c34670ca0a3fef4d43da8d7e0bed019cd5891400eb7337cd3adfb7cc788350e1f1ab535b87af0fa0a6096d33fa73da6049888ce0006e821
-EBUILD gauche-qdbm-0.2-r1.ebuild 628 BLAKE2B 409db0ddf5ee230579fc36b38745afbd684fe7989c85bf6f6f383818558e19b01aed26cef07022883a2d0cea500265d34c89f91255c1e76c0db46be6a8d25884 SHA512 6ce0e4cd09ff579a4ddaf55b8b3e56c91ad0d679754ead17b9534586064a37df8d441e1ac13fe35d15666ac0ff1c2963db9e2e1cdecae5c63a4359073d94dd07
+EBUILD gauche-qdbm-0.2-r1.ebuild 622 BLAKE2B 6d765ab1ce726212e8bb2230f44ec8288a00275612d273a784b08beffe8111b524f005b17b18c28166e7ee79b6b57e78bba4d82737d5d46d9d6ba0d6c9e0cbec SHA512 56b5be131dd8474e8099754d59cfee2dc544a126f78d6f96cac142f7470c79eff8347e1bd7fd9ef91b45add6016f70f34b68a2ac008250b09ee0a159a35d028c
 MISC metadata.xml 328 BLAKE2B 8e6a23ff8db0b0cfa884c0c70f2439c44662447d13300f753dc626ce433b85589f8585d256d9f2882ae04f0681e279f2a87b07fdb1b92f4680080da5fdcf0f05 SHA512 7160a11388f8bc62d5b07424adb997975992dec33f29abd78f65c88d6c60608be30a7d04d92d88202c8e398e690488fe985c52f2f4ae3bd1fb0891898493b8fa
diff --git a/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
index 0983fc334522..ed21f214a6a7 100644
--- a/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
+++ b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
 inherit autotools
 
 MY_P="${P^g}"
 
 DESCRIPTION="QDBM binding for Gauche"
-HOMEPAGE="http://sourceforge.jp/projects/gauche/"
+HOMEPAGE="https://osdn.jp/projects/gauche/"
 SRC_URI="mirror://sourceforge.jp/${PN%-*}/6988/${MY_P}.tar.gz"
 
 LICENSE="BSD"
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ~sparc x86"
 IUSE=""
 
-RDEPEND="dev-scheme/gauche:=
-	dev-db/qdbm"
+RDEPEND="dev-db/qdbm
+	dev-scheme/gauche:="
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-scheme/guile-colorized/Manifest b/dev-scheme/guile-colorized/Manifest
new file mode 100644
index 000000000000..1dd79fd22ac1
--- /dev/null
+++ b/dev-scheme/guile-colorized/Manifest
@@ -0,0 +1,4 @@
+DIST guile-colorized-0.1_p20191205.tar.bz2 15496 BLAKE2B a85fc44c3b6b8433362197a4f1da216ea99793673ee4592e6ea32178d2952d0f43f5a4e79304185d0c67b6dee668bf52d53970df97954a37650cd8b7770e7abd SHA512 4cd9833c70debf0086ba69252e1fb8b9fc33707ec1f3bb6dfb144d5a35db6f38e3af585cbc889936c8ebb38dea0f8808f483bd51ed1722c9b9df857d31a7cec7
+EBUILD guile-colorized-0.1_p20191205.ebuild 997 BLAKE2B ded12f4d420da627e6e558571e0225d76d99d105d2efa5523578be92db4d0137efc7c64381b7f6e8ddc2380897c8fa5fcccdf908500a5b73701e57e8528d4428 SHA512 53e82ae6be1cbe27e627b48f5e9232cf75a21488660e44b99f0920181375a4c14e21df41a645735b7b6e6e8b5cfcf0a1451f4a02be08a46233c340d95aa499e1
+EBUILD guile-colorized-9999.ebuild 997 BLAKE2B ded12f4d420da627e6e558571e0225d76d99d105d2efa5523578be92db4d0137efc7c64381b7f6e8ddc2380897c8fa5fcccdf908500a5b73701e57e8528d4428 SHA512 53e82ae6be1cbe27e627b48f5e9232cf75a21488660e44b99f0920181375a4c14e21df41a645735b7b6e6e8b5cfcf0a1451f4a02be08a46233c340d95aa499e1
+MISC metadata.xml 435 BLAKE2B 4ec60047cd79724e2cccaaee8c32bb8cfc7b3c4bb559b50f474d258689e5a0684346100f51f4ebb4b7f8b8ae37f631b7c376a227d8d2f0e5393eccf230522ce8 SHA512 0e0219b207ba1adb3dbed202e783d2b89440bec331654fabcff61739f9afa28a843621476503848a60f022351548f730c0dad28dac3fcff2ae51f41897d54aa0
diff --git a/dev-scheme/guile-colorized/guile-colorized-0.1_p20191205.ebuild b/dev-scheme/guile-colorized/guile-colorized-0.1_p20191205.ebuild
new file mode 100644
index 000000000000..79eef16351ba
--- /dev/null
+++ b/dev-scheme/guile-colorized/guile-colorized-0.1_p20191205.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Colorized REPL for GNU Guile"
+HOMEPAGE="https://gitlab.com/NalaGinrut/guile-colorized/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NalaGinrut/${PN}.git"
+else
+	# Latest release (before this commit from 2019) was in 2015
+	COMMIT_SHA="1625a79f0e31849ebd537e2a58793fb45678c58f"
+	SRC_URI="https://gitlab.com/NalaGinrut/${PN}/-/archive/${COMMIT_SHA}.tar.bz2 -> ${P}.tar.bz2"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${COMMIT_SHA}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-scheme/guile-2.0.9:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_install() {
+	einstalldocs
+
+	local loadpath=$(guile -c '(display (string-append (car %load-path) "/ice-9"))')
+	mkdir -p "${D}${loadpath}"
+	emake TARGET="${D}${loadpath}" install
+}
diff --git a/dev-scheme/guile-colorized/guile-colorized-9999.ebuild b/dev-scheme/guile-colorized/guile-colorized-9999.ebuild
new file mode 100644
index 000000000000..79eef16351ba
--- /dev/null
+++ b/dev-scheme/guile-colorized/guile-colorized-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Colorized REPL for GNU Guile"
+HOMEPAGE="https://gitlab.com/NalaGinrut/guile-colorized/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NalaGinrut/${PN}.git"
+else
+	# Latest release (before this commit from 2019) was in 2015
+	COMMIT_SHA="1625a79f0e31849ebd537e2a58793fb45678c58f"
+	SRC_URI="https://gitlab.com/NalaGinrut/${PN}/-/archive/${COMMIT_SHA}.tar.bz2 -> ${P}.tar.bz2"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${COMMIT_SHA}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-scheme/guile-2.0.9:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_install() {
+	einstalldocs
+
+	local loadpath=$(guile -c '(display (string-append (car %load-path) "/ice-9"))')
+	mkdir -p "${D}${loadpath}"
+	emake TARGET="${D}${loadpath}" install
+}
diff --git a/dev-scheme/guile-colorized/metadata.xml b/dev-scheme/guile-colorized/metadata.xml
new file mode 100644
index 000000000000..c1ef4deb0fd4
--- /dev/null
+++ b/dev-scheme/guile-colorized/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://gitlab.com/NalaGinrut/guile-colorized/-/issues</bugs-to>
+    <remote-id type="gitlab">NalaGinrut/guile-colorized</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-scheme/guile-gcrypt/Manifest b/dev-scheme/guile-gcrypt/Manifest
index 973afad4ac36..2d53d73b37f5 100644
--- a/dev-scheme/guile-gcrypt/Manifest
+++ b/dev-scheme/guile-gcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST guile-gcrypt-0.3.0.tar.gz 55022 BLAKE2B 20d0948df250637c38a9e583ed9b8e0f4fd6d6142a60b4cceddab9a6a5c3062ffc7a0c8bc61187a1e942a137186ccc6e3cbc44b86d3c64f8cea91c67ae46cb08 SHA512 036017bbf10247bf474f41bb23fa0e824ed17241f169d0b36da5b20753502050bf6b14fa3a584076521e8f076732b75fe3f5e0ec9fb9ffeaf142319a98d36ae9
-EBUILD guile-gcrypt-0.3.0.ebuild 826 BLAKE2B faf02b92b9ebf46ee622b6a5fe4d185c9c3b79ee57a4f00dc8d6ed37ada01bca3e6b0758384fee21eda4b65abfec8a0b1f8f6186d6de1950cc3462846bf0efce SHA512 4c73edce849e9d891992cddd24171854a645bd56c314481a7431ebd34a09fec2d660fd114403ba109a82fdd332bd4dbdd4536847bca307134c32053e947a06ca
-MISC metadata.xml 495 BLAKE2B 3fbd4fad8703a166aa531aa2ed867ee7a07d7fc0417d18262d0e7c910258f555da80948ab1ac7d9627f722d1c57550f6ed18d6fe51bf172fc626f79893696a22 SHA512 904efb785bb9d74c7c9c20cbfc83ce1fb7fb4e75500b69f3be2d39e1f891a025f634a30e7a52155581c2a598047bf21aee309713437f1ddea7f1087649b7962a
+EBUILD guile-gcrypt-0.3.0.ebuild 838 BLAKE2B a332d61c6925c55aa64b0b3b68ebef2d0afe329584790fe6d3ed415c4d1490b3b708829b8d58e350357e524029dff19f0fa907e29afef0773c67ea52a54d14d4 SHA512 b631bba26efe511cb388ca877fb04ce01b570cab5f80d7ea29c62351889291045904f078e6a918de448bd1252c1e45c7df706c8bf63097485560c85f423d06b1
+MISC metadata.xml 354 BLAKE2B bfe98c34fd1d916fab0de0b611ffe99c1c12acbd27549ec4fbe2dda90ef1e66b970e4df253c3c1ae878472c20fff522f23771eb2bfbd115e51130b1b4e9a8c14 SHA512 a1f5eccd97377c4e1c44f435322d786335c9eadb1d8e2cd7fe39bb695aa62b40879634c9dc0e3968cf51eeec50f596472f882fdc5daf81eb9a4715f8a7ca24da
diff --git a/dev-scheme/guile-gcrypt/guile-gcrypt-0.3.0.ebuild b/dev-scheme/guile-gcrypt/guile-gcrypt-0.3.0.ebuild
index 3eb4f555d7c2..d0b486243328 100644
--- a/dev-scheme/guile-gcrypt/guile-gcrypt-0.3.0.ebuild
+++ b/dev-scheme/guile-gcrypt/guile-gcrypt-0.3.0.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Guile bindings of libgcrypt"
 HOMEPAGE="https://notabug.org/cwebber/guile-gcrypt"
 SRC_URI="https://notabug.org/cwebber/guile-gcrypt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="strip"
 
 RDEPEND="
 	>=dev-scheme/guile-2.0.11:=
@@ -20,11 +22,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
-QA_FLAGS_IGNORED='.*[.]go'
+QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
diff --git a/dev-scheme/guile-gcrypt/metadata.xml b/dev-scheme/guile-gcrypt/metadata.xml
index d8fa1e7ed60d..ad23cad35e47 100644
--- a/dev-scheme/guile-gcrypt/metadata.xml
+++ b/dev-scheme/guile-gcrypt/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>xgqt@riseup.net</email>
-    <name>Maciej Barć</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
   </maintainer>
   <upstream>
     <bugs-to>https://notabug.org/cwebber/guile-gcrypt</bugs-to>
diff --git a/dev-scheme/guile-gi/Manifest b/dev-scheme/guile-gi/Manifest
new file mode 100644
index 000000000000..2a439ffbc1c9
--- /dev/null
+++ b/dev-scheme/guile-gi/Manifest
@@ -0,0 +1,4 @@
+DIST guile-gi-0.3.1.tar.gz 345440 BLAKE2B 17c4ecda48951244d427098767072621278750614919f13d1b03b7ecda5f06b2274c7db50c4288b4bfe581cd852e80cd1d4137b5ccc0e18d0e23866e1eba323a SHA512 b866df95946069cad606bc8f7e7c988665029482bcb986109d652728023151a5e60ee39e86635b9f0b9f0d4d3a9cd72f39b65ee983438f71dff186994e3af197
+EBUILD guile-gi-0.3.1.ebuild 1111 BLAKE2B c0e6ee4d8f9526d42cb1d1fbeb1735978802ce77e46019e2811db26f2f793360ec2ad0652f1286b5b523cf627a80773bb5f3b43d81659094341f9fa69269e8ee SHA512 5b205b6387c468afc7c063c79b8485496d466154cbd486f3b09d340ce9e00958951547137a1407ea7bf1a95bc39a6f24fa0a5f691c8bd9648471fd234d502c47
+EBUILD guile-gi-9999.ebuild 1111 BLAKE2B c0e6ee4d8f9526d42cb1d1fbeb1735978802ce77e46019e2811db26f2f793360ec2ad0652f1286b5b523cf627a80773bb5f3b43d81659094341f9fa69269e8ee SHA512 5b205b6387c468afc7c063c79b8485496d466154cbd486f3b09d340ce9e00958951547137a1407ea7bf1a95bc39a6f24fa0a5f691c8bd9648471fd234d502c47
+MISC metadata.xml 929 BLAKE2B efe3b5d7302ac0b8d39cddfc579952d7e2bfa6f56f9f69e6dc2b9315812069839c149e9b6638f4a3a6cb92c0a68fa0c27648d26c9e706fca8a2da04c26356844 SHA512 c68a55f58cc905451110fad27ca02c987d11c942efab0eb4befaa1a94a37b2a83f92488d1be2d043f0354bfe55bbf352aa08c4f22d1c2893b7e8731d901bd4fe
diff --git a/dev-scheme/guile-gi/guile-gi-0.3.1.ebuild b/dev-scheme/guile-gi/guile-gi-0.3.1.ebuild
new file mode 100644
index 000000000000..0fd9d6ec4efe
--- /dev/null
+++ b/dev-scheme/guile-gi/guile-gi-0.3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Bindings for GObject Introspection and libgirepository for Guile"
+HOMEPAGE="https://spk121.github.io/guile-gi/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/spk121/${PN}.git"
+else
+	SRC_URI="https://github.com/spk121/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# Tests fail
+RESTRICT="strip test"
+LICENSE="GPL-3"
+SLOT="0"
+
+BDEPEND="
+	sys-apps/texinfo
+"
+DEPEND="
+	>=dev-scheme/guile-2.0.9:=
+	dev-libs/gobject-introspection
+	x11-libs/gtk+:3[introspection]
+"
+RDEPEND="${DEPEND}"
+
+# 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
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-introspection="yes"
+}
+
+src_install() {
+	default
+
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
+}
diff --git a/dev-scheme/guile-gi/guile-gi-9999.ebuild b/dev-scheme/guile-gi/guile-gi-9999.ebuild
new file mode 100644
index 000000000000..0fd9d6ec4efe
--- /dev/null
+++ b/dev-scheme/guile-gi/guile-gi-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Bindings for GObject Introspection and libgirepository for Guile"
+HOMEPAGE="https://spk121.github.io/guile-gi/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/spk121/${PN}.git"
+else
+	SRC_URI="https://github.com/spk121/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# Tests fail
+RESTRICT="strip test"
+LICENSE="GPL-3"
+SLOT="0"
+
+BDEPEND="
+	sys-apps/texinfo
+"
+DEPEND="
+	>=dev-scheme/guile-2.0.9:=
+	dev-libs/gobject-introspection
+	x11-libs/gtk+:3[introspection]
+"
+RDEPEND="${DEPEND}"
+
+# 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
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-introspection="yes"
+}
+
+src_install() {
+	default
+
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
+}
diff --git a/dev-scheme/guile-gi/metadata.xml b/dev-scheme/guile-gi/metadata.xml
new file mode 100644
index 000000000000..1817ffcfd32d
--- /dev/null
+++ b/dev-scheme/guile-gi/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a library for GNU Guile to create language bindings via GObject
+    Introspection.
+    Guile GI has two primary components:
+    - The gi scheme modules: guile modules that provide functionality to
+    dynamically generate Scheme API from GObject typelib files.
+    - libguile-gi.so or libguile-gi.dll: a compiled module that contains glue
+    code to interface with GObject.
+    To create bindings, use the use-typelibs syntax found in the (gi) library.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/spk121/guile-gi/issues/</bugs-to>
+    <remote-id type="github">spk121/guile-gi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
index 007e9f538862..444b02a36205 100644
--- a/dev-scheme/guile-git/Manifest
+++ b/dev-scheme/guile-git/Manifest
@@ -1,5 +1,5 @@
 DIST guile-git-0.5.1.tar.gz 305077 BLAKE2B f1dd4dade424045f992f9df9fb6c0c6e010deab26d77b32c6a7febda20e03192c91a5ec024bfdf05ea9585c7be307610c1eea6d569a5a97b90d5eedf715e5c59 SHA512 b5a07fc3e2a6c8d6277b3a2d6c2d47461e76441573dcf02c046e272853e3d46266adb2025e15f203d590b751def21c026eb55ed66a6f81795c1409ae5d6aa3c2
 DIST guile-git-0.5.2.tar.gz 305493 BLAKE2B 03fa85e1943fadc5e7e2da4bed2b6476e5a275856ed087a1730815defc17586f43eb2006bc3970d6f97d42822bcf83ef3d57a74c9a7ddb2fb877f5f0f8237a49 SHA512 4ac55c04c555f1a343f842bbda80d54314697d5bbc28bc3967edfdfacb8afa07c673ef7fd651388a6c55b6977b041174732cde14359a0127f0b931364a7eeda9
-EBUILD guile-git-0.5.1.ebuild 1326 BLAKE2B c846b257e729e7c41fb7f59281373ede6d96321612d7a2b1582a1751ead68e8a5d671d4a70e28e0f4c71f08d29acb7a0b940992478d9138cfeebb09ed7ec2798 SHA512 642614d2c1aed98a302e9ee0283863724cc77af3554b2db387364ebc12fa619f8f4503eb97436e62238828fcc1369abc25327d4288da27e74429ecbaa8892b30
-EBUILD guile-git-0.5.2.ebuild 1592 BLAKE2B acade8b6015e3b7613a717feb2d83a8023c918853c938b4cc1446cc2b735d41d0500e3a47bf654db33554295c7d43b2de76269ec161b9626ac266b635de057da SHA512 b802a99d469cd7e7f53ba537877fd3e1d4434ce420625ccbd048220ffa45da27efda7e24da3436905d0be24048a72980b3bb0f916495fd76aaf20ef16b77864f
-MISC metadata.xml 554 BLAKE2B 9abb131861fd4ecc8cf857b7ffe72dc216b7300be4146eb847446f925c7e2685091a0e1c08db876f0daf2b87fe9b66efeaf7ccf2b1bcc87c1905226a8e8baed5 SHA512 4142c9864efe3344a3b68080b92e5ef9400da170391afb43a670b51be62dc66f08381bdfb1bce42e5f446c946f7ec6ef50b10a153f0d0d909eb74440bc1ea0f3
+EBUILD guile-git-0.5.1.ebuild 1328 BLAKE2B 3659bc31312b252ff7edecb32052720cca9ec4fbf1ca23589917762154180001ab71c6148c77a5f68064dcbebca04cc4f5910912d958da0e70d2e47884de1ab5 SHA512 e1d985a081dfe153763eaf65e6eec31d210789603f3f0441e4cb03966c34c210261cee2a64fac081966be33429395a693530a13028b95ee89f450cd96f337853
+EBUILD guile-git-0.5.2.ebuild 1594 BLAKE2B 6983edb915163dcdb607cc52dc206968bb34879ef2658caa4707b8a70826ccdb8a10d68efe52b5d268a8944fefae5fd0d0ec1b1fc873accde087a098d609b457 SHA512 23e4a85c1dd901bf7ac0e14037e88c83c7a196b023476c618e5d44b46d41d4ff8c2e917b05ad1509b94e3505ee9c8c9c7411271c7914d860e0c55509033d3419
+MISC metadata.xml 413 BLAKE2B c7d3ae8db8c3905597982f1fead9c98736c237dceca107585e6ee9c7055feaab9d365725de7d8350b1da181aa84fc75d8691fdfca8656fbe78c50d618a48ddab SHA512 1dcf94683f43b26168cf7acd3e49c0d257c5398d89676a361ec1347fd51970dd4b6c1e25d49454e4eef086dea134cb2facf5036322131ec3e6ab32c19a790e86
diff --git a/dev-scheme/guile-git/guile-git-0.5.1.ebuild b/dev-scheme/guile-git/guile-git-0.5.1.ebuild
index de7b4a6e6e1a..6dc5a53034a8 100644
--- a/dev-scheme/guile-git/guile-git-0.5.1.ebuild
+++ b/dev-scheme/guile-git/guile-git-0.5.1.ebuild
@@ -21,11 +21,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-RESTRICT=test # Tets suite needs a fix: https://gitlab.com/guile-git/guile-git/issues/18
+# Tets suite needs a fix: https://gitlab.com/guile-git/guile-git/issues/18
+RESTRICT="strip test"
 
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
-QA_FLAGS_IGNORED='.*[.]go'
+QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
diff --git a/dev-scheme/guile-git/guile-git-0.5.2.ebuild b/dev-scheme/guile-git/guile-git-0.5.2.ebuild
index bd0165fade55..e1f491fe31d8 100644
--- a/dev-scheme/guile-git/guile-git-0.5.2.ebuild
+++ b/dev-scheme/guile-git/guile-git-0.5.2.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # Works without sandbox. But under sandbox sshd claims to break the protocol.
-RESTRICT=test
+RESTRICT="strip test"
 
 # older libgit seems to be incompatible with guile-git bindings
 # https://github.com/trofi/nix-guix-gentoo/issues/7
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}"
 
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
-QA_FLAGS_IGNORED='.*[.]go'
+QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
diff --git a/dev-scheme/guile-git/metadata.xml b/dev-scheme/guile-git/metadata.xml
index 4df5b27601d7..d48f281c6f54 100644
--- a/dev-scheme/guile-git/metadata.xml
+++ b/dev-scheme/guile-git/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>xgqt@riseup.net</email>
-    <name>Maciej Barć</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
   </maintainer>
   <upstream>
     <bugs-to>https://gitlab.com/guile-git/guile-git</bugs-to>
diff --git a/dev-scheme/guile-json/Manifest b/dev-scheme/guile-json/Manifest
index 2fcc305e1395..a29b89dcee61 100644
--- a/dev-scheme/guile-json/Manifest
+++ b/dev-scheme/guile-json/Manifest
@@ -1,3 +1,3 @@
 DIST guile-json-4.5.2.tar.gz 159925 BLAKE2B 5324da707f8c2962d06b2375d7844de0d2eb2adb0db9b4f2c9103c1bc9f0258b0ac29e6828d03d725e964f92fb85c1a7358b002a9b054c040e0fa25e6b4faf25 SHA512 ed189d49b0529f36f76bf16ea371ca6b9651cd40dd86f755062cea9fd93f5a4d8ceb571cc62bf0f88c404a2ab86ea6f7ccb682e81cd5bcdb78f0bdf52a39502b
-EBUILD guile-json-4.5.2.ebuild 672 BLAKE2B 498596ba5856057193b098e2020b6607e55ca1fa1476a5cfbffc039e3a578856bc29f0edb1cf61fd80c65ae96e4b8e69a87b2ba23b1ae0b7da87b4fee5242a70 SHA512 f0ea956f66206f6fb26223bf5fca8733535c70762b2db7bf98c341dcbac002a873cbda87f1c2be0f9f40a0531e850ef417ceb4517782bddf1241f5cc01865f03
+EBUILD guile-json-4.5.2.ebuild 683 BLAKE2B 9518805e7984196516c112ec87bc3360092df9e330c4614762b6fa61c49a3892942b5d280e756a38324f26a874e7b805c7b6cbf6f79eaa7f8504e290ecb6e77b SHA512 c956427490e4040844374389ef237ac72cb9a4e86c1ab76e800381a7e85793ce835584583bddb7271e43ca8c629dc413da73222462270dca13f3d22a8879a98a
 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 ec4094737898..3c0f10b4a19a 100644
--- a/dev-scheme/guile-json/guile-json-4.5.2.ebuild
+++ b/dev-scheme/guile-json/guile-json-4.5.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="JSON module for Guile"
 HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
@@ -11,13 +11,14 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+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_FLAGS_IGNORED='.*[.]go'
+QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
diff --git a/dev-scheme/guile-sqlite3/Manifest b/dev-scheme/guile-sqlite3/Manifest
index 53163be68943..9aa7dc86a362 100644
--- a/dev-scheme/guile-sqlite3/Manifest
+++ b/dev-scheme/guile-sqlite3/Manifest
@@ -1,3 +1,3 @@
 DIST guile-sqlite3-0.1.3.tar.gz 25017 BLAKE2B 74d78592a7d87a66fe74bab49a5fbbabe66bc1f7967ef1323992a04cb4996f78759d2aa05827cad24298a9349fe0a24c94a0cfea54a9f09aeaef01c7dcc19d61 SHA512 1abc6646c775b4bf61d7f9f8a75d8ba4da2e67c9d85cd6a29c432acdb0ed68fcb6e7073693d06787d83c3ceb84bd512e71f53d18afeb0063e1cfc296b6873f79
-EBUILD guile-sqlite3-0.1.3.ebuild 735 BLAKE2B 74730782b62dfac397377107a01c9a1ddf045810427db15ddecb12834a009929cf2b0e502d9de5a62144ad37799904f503e3c054c58402d40262babd53a91bc2 SHA512 137b82b58fef900e6c6aaf86d0cfc1828812fd81f848208516c8f21997e7ac4b76023def2bcfc7449647106fd01103736d4d35bbee6b3a0c7ec9325e26fe4595
-MISC metadata.xml 502 BLAKE2B 4ee0eb2d717eda8ce026772bcf7f2d4fb07c23f26696b3ae5aac4121227250f1e545e51988abe4905e8ee8c13fd767be3d245652640c4ffe86a4f2ab122d27aa SHA512 8dd2cf89156304d595f4e188620f5dd1f11aefbad79fc3529f356638d2f1a414e6b176ebb996d8809f0abd6eda237f1737cfa5702961c0df95a74439007d834d
+EBUILD guile-sqlite3-0.1.3.ebuild 747 BLAKE2B c1c249f0817bb6dfa94db48a6c4daf9ce010b77a3c128c270e135cfdb572a8188557563dff4294e758f4d6c87c2c446169b4e4a39ef4cea67695cfb8141e76ed SHA512 f165a4124d4d4dbb81a0471f165691b38884f1a358f0ecbfb2bf614eb82b0580512b5e4908d88a8e69974372c99088b551dc8378eb5b03a5e1ca1fd16cb1f010
+MISC metadata.xml 361 BLAKE2B 3cc6086cee9f95bb0daf6abe9644e1305ef225378373937ba4889f00395871be238c2072d85607be5eaa153c49fe9a213f6e4b6523368b63106fac8586dedbd6 SHA512 b871ca3f48216b8a6e9957f16c5c2789729aa4d4bc7707897fbb50d1b14d234232d6d8606466ac6cf4534fe36042947e4678364d9372ac8fbd2c3854b6e34be2
diff --git a/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.3.ebuild b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.3.ebuild
index 470b4e281dd1..e2ccd5955c75 100644
--- a/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.3.ebuild
+++ b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.3.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Guile bindings of sqlite3"
 HOMEPAGE="https://notabug.org/guile-sqlite3/guile-sqlite3"
 SRC_URI="https://notabug.org/guile-sqlite3/guile-sqlite3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="LGPL-3+ GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="strip"
 
 RDEPEND="
 	>=dev-scheme/guile-2.0.11:=
@@ -22,9 +24,7 @@ DEPEND="${RDEPEND}"
 
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
-QA_FLAGS_IGNORED='.*[.]go'
-
-S=${WORKDIR}/${PN}
+QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
diff --git a/dev-scheme/guile-sqlite3/metadata.xml b/dev-scheme/guile-sqlite3/metadata.xml
index 3ca96a6afc1b..f1731075833a 100644
--- a/dev-scheme/guile-sqlite3/metadata.xml
+++ b/dev-scheme/guile-sqlite3/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>xgqt@riseup.net</email>
-    <name>Maciej Barć</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
   </maintainer>
   <upstream>
     <bugs-to>https://notabug.org/guile-sqlite3/guile-sqlite3</bugs-to>
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 21feb6a83378..f4d34c8c5f74 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -18,10 +18,12 @@ DIST guile-1.8.8.tar.gz 3956654 BLAKE2B 4820d635ac2c57526c0c03f3e0e6e4ac4276533e
 DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
 DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381dff44ca3ad176ad64adf9b0d200c0b8d34a41e34b15ecf24fa28ddccaa9b033cead25583ff9984b5b7c09ced5 SHA512 6a9264c2e10def5e69a0e755fb28a5f09b98bc202660d742b0ee144d4f486b049dcbce8bcece79c3af9421d43df6eca36adf82798520f75b09303f5e8c2092af
 DIST guile-2.2.7.tar.gz 18129833 BLAKE2B 03c88d753f83e5a797f12808b7b053c9cf6c51f87fb8f3c3db89e54528aafb0e54de2eb951cc622e98fada82a558932bb074a8e739f4175144d4b06ba42f7d60 SHA512 ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773
+DIST guile-3.0.7-gnulib-glibc-2.34.patch.bz2 60359 BLAKE2B b21adb981d4242c62b3038f14cf2048fdd5fd1aa00aae937cab6e9b6dfa1331adff1291484bb7f39ddf8e93159fd0c424dc6e4d83fce0083daa6eb661b651cfe SHA512 be2985b41cd567a549ba96dedda2a24355be40a5aad408a7f0593b6e6c02c9719ead27463a786736501ed26c01c65f9a403160b2bd1660d60d6fd4932c92f095
 DIST guile-3.0.7.tar.gz 21878396 BLAKE2B 4fae35e21e7f7b47ae9b4cdbafd3b2f660ec4844f838c7eef023b307963b8e92bc30698bd85954523f8fb67edee8de44d19004eb288d3d6656c962e5cb57dc8b SHA512 d7b159e109fd4a08231ef9b961376e71c2872f08d47d82896d96ccac250f5677b35be9a8ce3b9a758bd2ed78d6451e4fdd844408a1baf684256d9bfa09999f3f
 EBUILD guile-1.8.8-r3.ebuild 3131 BLAKE2B 0da1627c6e5e8d3106911e19e1777b2fb2be2a5c684dbc71cb8cd9b4e8992b00ca2a101e933b226f0ae847a1e81453e91a5e0b87a4c4036af5fd554475b83b08 SHA512 5e3d788486e7be9d637dfdc669b4599f2c3a605b28802dceb82b4d8a414d4631a538775085b696725b03f3929fc646c0168f357b2cf76cde94da3a96d77b2410
 EBUILD guile-2.0.14-r4.ebuild 2222 BLAKE2B 78995d180b00fde3caa157ef93310964281dce34044f3b09f01fe4c2cdebbdbc5d648cdfc02ec5b4a0ff026ea422f7b8831bb935ffa6c2d353f33304bd5ed1b6 SHA512 73b9e384f5338325631aaef90f320ddd4ae1031ad41df15b570110bde955e34d27f9d6b5dd7af17599818c8800aa6686b37bac2d7598ef5e2756e1680f27aa58
 EBUILD guile-2.2.6.ebuild 1953 BLAKE2B 99ae78d4ed8c6a0a05b709df1237ca9b6bbca61df809c1f4cadd06147207e1abb90f0ef82ccf16c8e6aad4e653f0778f2c54eb965525d543139ba668341ce01b SHA512 ee2877ec48fb3e4f9e81859add46d4e0817627532b183faeb5f81cfd9b0a891084d5ee8e2c21256425c60f5c8166b64b910dceda0506e2fc14e8328f25ba01e6
 EBUILD guile-2.2.7-r1.ebuild 2016 BLAKE2B e8ac5c088e46c582c21014e7f3b1b290cdcd1e8d740ab91485d0231eeec426b28265efdf43f713ae4ff0ce43d95be432fc88ec03b08d7513e1d3f9dea9ebb99f SHA512 9376a9f2e2d0bcb718368d65ee6783067c5c4cc3658059e231321c17fa2a6d1a0f62c16af692ad9fd5aa0d36f332106c739ccd1453a2e90aeff8d84da9977059
+EBUILD guile-3.0.7-r1.ebuild 2223 BLAKE2B 8672f3a181f2ac1c698227dfb99870cdcd03e68e95eec47618e2aa485c84bd90e4f41cac6472c0df1b114ae776a3baa75781391275a1d7cfcb31de1628a154b1 SHA512 541ae15a4401aba1e3b235e493f899d0baedc41e4876f58bb71e2dd9ee3d548a3e36aaa172c0e57bb33c92181276d05d4fffbf7bfef5c3c2ed69fc109dbbafd1
 EBUILD guile-3.0.7.ebuild 1958 BLAKE2B 65898252823811c21d592d7adac205b8056e41658379a01e38dc39c1d9ee4c3d9862295db4e2c752bd53bba17b7f97f37fe92aa3867c51134e42fda3a4b60fd9 SHA512 b5f968df80cf50b92f3b18bf8ae5d28adfc646230d80f585752137836f7d17252b2180095d1e451e5decf36da1f96367970718806766c473cb04836161c9e119
 MISC metadata.xml 1041 BLAKE2B d01e2b55f3618fa4056f46d0a3cd2e2c5e006374a8c9fbc28adca37f4b4e5978e65c968762e5675e0f98ba2ce686e09f2997481c1365eb0787e979d9bfd012fb SHA512 ace5d0cea917c980c1958c174b869692d7a407132be9e9b223ac970ef3d9323c76a23e009e45990583993de0bb3c423243931cfeb9de7c3383d6b4b5efda4b3a
diff --git a/dev-scheme/guile/guile-3.0.7-r1.ebuild b/dev-scheme/guile/guile-3.0.7-r1.ebuild
new file mode 100644
index 000000000000..2bd3be08275a
--- /dev/null
+++ b/dev-scheme/guile/guile-3.0.7-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MAJOR="3.0"
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gnulib-glibc-2.34.patch.bz2"
+
+LICENSE="LGPL-3+"
+SLOT="12/3.0-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"
+IUSE="debug debug-malloc +deprecated +jit +networking +nls +regex +threads" # upstream recommended +networking +nls
+REQUIRED_USE="regex" # workaround for bug 596322
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-libs/boehm-gc-7.0:=[threads?]
+	dev-libs/gmp:=
+	dev-libs/libffi:=
+	dev-libs/libunistring:0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/libtool
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
+	"${WORKDIR}/${P}-gnulib-glibc-2.34.patch"
+)
+
+DOCS=( GUILE-VERSION HACKING README )
+
+src_prepare() {
+	default
+
+	# Needed for the glibc-2.34 gnulib patch, can drop later
+	eautoreconf
+}
+
+src_configure() {
+	# see bug #676468
+	mv prebuilt/32-bit-big-endian{,.broken} || die
+
+	econf \
+		--disable-error-on-warning \
+		--disable-rpath \
+		--disable-static \
+		--enable-posix \
+		--without-libgmp-prefix \
+		--without-libiconv-prefix \
+		--without-libintl-prefix \
+		--without-libreadline-prefix \
+		--without-libunistring-prefix \
+		$(use_enable debug guile-debug) \
+		$(use_enable debug-malloc) \
+		$(use_enable deprecated) \
+		$(use_enable jit) \
+		$(use_enable networking) \
+		$(use_enable nls) \
+		$(use_enable regex) \
+		$(use_with threads)
+}
+
+src_install() {
+	default
+
+	# From Novell
+	# https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+	dodir /usr/share/gdb/auto-load/$(get_libdir)
+	mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
+
+	# necessary for registering slib, see bug 206896
+	keepdir /usr/share/guile/site
+
+	find "${D}" -name '*.la' -delete || die
+}
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
+}
diff --git a/dev-scheme/owl-lisp/Manifest b/dev-scheme/owl-lisp/Manifest
new file mode 100644
index 000000000000..7e6ec29d396a
--- /dev/null
+++ b/dev-scheme/owl-lisp/Manifest
@@ -0,0 +1,4 @@
+DIST owl-v0.2.tar.gz 515574 BLAKE2B 054a06d33554cc31f5e1c756bf3ff5ea4fb5cec220048fb939aa9dcd19c586cef54ae8ddc80e1ee8befedfa2e42fc1bf9ea4bcfe37e6743154ff678346444e87 SHA512 f0dc4badc84be1ebd1ad8f6a84c8fc292449b0f66a9416f202f9010e89aa2971c6470599173db67bf3db3e4b6a61d777ee369eda76fa7c42114748e8fe48b7b2
+EBUILD owl-lisp-0.2.ebuild 828 BLAKE2B 768195c6399bdf8442205696eb198f0efdbbaf5f2be174ccd679f09909b9dde905d779121a2ffef64cba2a58a416053e73b920b4b6e939711a1590a80c98013b SHA512 b560e6b8600d8cae5c7a4f3a328f1def7bffb618651cef8ba1c271912498cc9410d6a23a4b5c69edea6f9dfce5a2e284db6ec184446c89ad65a1f4bfd686a208
+EBUILD owl-lisp-9999.ebuild 740 BLAKE2B f1947c80c4bde952f1ef8186bd97285acea0dea3ac65c40eccdf3d64534cb88479a6e58fb3394cd90d7c2464f08d861e68cbc1e311cca0817728b14c8617506c SHA512 58e71b363cb90524661649ab466d4c2767713b2f91eedf7964c427e7af6a8e420ee4f750bc89970f0945019eff318504bf65fac226276e5c5a7d5f6ceaa28467
+MISC metadata.xml 792 BLAKE2B 86d345f529357a07597c295f93140136ac23a50a3e052f2f08726329ee62dc6a3e487c7215d2c0a2e32a44b9897933527f34d4857332758a24a7c5d8dfa36eab SHA512 f4b53a54b3c678b143abbe1a6b1e10ff0dc043cb4a3ef25838815179bc8916166f4bace591dd3ca89e4225f6164ce4a34e21053a7fb7ed4d321c37eaac14d623
diff --git a/dev-scheme/owl-lisp/metadata.xml b/dev-scheme/owl-lisp/metadata.xml
new file mode 100644
index 000000000000..904d4e58388f
--- /dev/null
+++ b/dev-scheme/owl-lisp/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Owl Lisp is a simple programming language. The main motivation for
+    writing it was to get a portable system for writing standalone
+    programs in a subjectively pleasant dialect of LISP, which in this
+    case means a minimal core language and runtime, purely functional
+    operation and support for asynchronous evaluation.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://gitlab.com/owl-lisp/owl/-/issues</bugs-to>
+    <remote-id type="gitlab">owl-lisp/owl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild b/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
new file mode 100644
index 000000000000..95d2e9242438
--- /dev/null
+++ b/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTICE: Because it is "purely functional" it is not scheme-compatible ootb
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Purely functional dialect of Scheme"
+HOMEPAGE="https://haltp.org/posts/owl.html"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/owl-lisp/owl.git"
+else
+	SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v0.2/owl-v${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/owl-v${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	sed -i 's|make bin/vm|$(MAKE) bin/vm|g' ./Makefile || die
+}
+
+src_compile(){
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" owl
+}
+
+src_install() {
+	einstalldocs
+
+	dobin ./bin/ol
+	newbin ./bin/vm ovm
+
+	doman ./doc/*.1
+}
diff --git a/dev-scheme/owl-lisp/owl-lisp-9999.ebuild b/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
new file mode 100644
index 000000000000..c88a667b978e
--- /dev/null
+++ b/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTICE: Because it is "purely functional" it is not scheme-compatible ootb
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Purely functional dialect of Scheme"
+HOMEPAGE="https://haltp.org/posts/owl.html"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/owl-lisp/owl.git"
+else
+	SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v0.2/owl-v${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/owl-v${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_compile(){
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" owl
+}
+
+src_install() {
+	einstalldocs
+
+	dobin ./bin/ol
+	newbin ./bin/vm ovm
+
+	doman ./doc/*.1
+}
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 09b8e2126a4b..29665e323ab5 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,24 +1,9 @@
 AUX Makefile-nostrip.patch 635 BLAKE2B 6b8c6e573d64e284a4a6842fe8346b382f4f656a98bae59fff5c0b84c71557e74a9c91065f15d82910c3ecaeed720d38d42ba9366beaaeb9b5d1ffaa6baff954 SHA512 08221300c19fd115fe713a6e3f20e83f791d20807af33c27882f7f05e1dc20436dd1459f6b9e011118720c55d26c91f6d4650afa5977e6d2341898fbc7b54971
 AUX Makefile-starter.patch 1346 BLAKE2B 4f33f059ce0c9a02a27250d4893d00423854281ae6343443b7ffc7ddb7eed75951a31cbf11a9f89cf23d3c86513b54f6c42d9e66a006072f032c14957bbb9151 SHA512 a3dd1c1ed1cbb6ca596d32739ac56b1a4db188035572ff9015035061f69f0ef173c0b2dfae4a820b540c30e06d763c65e9d3192d16aaa6c6c25f6f74369f91f8
-DIST racket-7.0-src-builtpkgs.tgz 122544008 BLAKE2B fa6eddab17fbdec1db1dac2debb2da72fbab064f10fe0f49eda5b0ccfc635b2f86cef2eb103675988d281459f4fdb19841e27f154b803b38631ee21a2312799f SHA512 e872bb935146027bdc78dd7d22ea07cbbf78a23c761d584770d9ded3ece71b74954a317b799de16b0ba762219a46f0e66f41ceeb4d6741d0b1998bc6abf6b20a
-DIST racket-7.1-src-builtpkgs.tgz 126596138 BLAKE2B 734595105630352977d7f51de233c320de590744810f2f469d4259d84f19a69a84394d4f62ade130897babd21d46180659689a0c2dda7bc9559586f5c3c37be6 SHA512 9d6fb0912c7c612dfb32b4955e192d69f00b67e73c08196ef3caa7b3123909627496a6dfb36f7910ea5f9af526e99b56fe936359cbea261db26a5687ed49c38f
-DIST racket-7.2-src-builtpkgs.tgz 127050541 BLAKE2B f6235c9f5a646a6d2a8ab0ce63ded384ed707dc704927b63281c159e2daa503ffc4bad99cd33511aca05c0fa7aa55adde1e9c79032faa17dcd99f1bbd15324a8 SHA512 748e1ee63b6c32bafc58401e943e7dd31a47cfd2eb8dad6e4a40a8966d4df2fb7e4bb573841c210a567ba0f02b518d41fa69df03736f49ae9761446e71a4ab9b
-DIST racket-7.3-src-builtpkgs.tgz 127136703 BLAKE2B 3449f62d8301cf5cc527cd46e074279d34c6064631a584488407d4c7af3b10aa01bb074d0dbc59034e8e036b1f24f9921ccdc070fb7bb3ff548f18b37cd8d12d SHA512 2cba16d6513984721b82d21e279a0017e3d96f3e2a53ca773deb45e10be2b74a61d4496679eb5aa4aff9276f323a16a1506e9471a873c28ee014f7d4e49bfea8
-DIST racket-8.0-src-builtpkgs.tgz 153847792 BLAKE2B dba1b39e770954e5971689f6d2b413f1aadc6176822e4400b40b41ebf7eab00cc34b5e5158f38d1a1d8caa98fa260ef10864794dc0d4768e2ea5b2ad869d0102 SHA512 df3e14ccdba00eb4de113693a6eee22e640958b074f3ad4946e5900333fbf558c4c2653f65a89f638f6ef173d32c9f97b19349360a9d4afca82365aceb43c911
-DIST racket-8.1-src-builtpkgs.tgz 154340467 BLAKE2B 1a12ca71a3af0c506238e2abad44596c54b5102fbe81d99c713356dc52abcdba8f0a0cf969702cff1f7738a0383d55894a546f682f3d854b504ceab34cef600e SHA512 afc8c737087a98172dbf699d24cee73966da699aebbdefb8b7785a6521dc4de61b8d7f2ed3a3f1d2be7a1dfe6675db7a33d39492da9dfe0aad8d9074cd03cf9f
 DIST racket-8.2-src-builtpkgs.tgz 150467561 BLAKE2B 5005aa852b089becd9d6da136a55a035ac5fd86bd1ad186ec30cdcf411927d444e1814797d63dbde3eb7b52bba7756e0464edf1d854d2ee7f5851caaae18ba55 SHA512 9e4c0cabfcbdb8c8742e8170548bee58021697e8b0842f575f94193db31adc04a7b9023ed8fd70dae197e5ec6f1aee7985d849be3ce5b4279f216e900ee143c7
-DIST racket-minimal-7.0-src-builtpkgs.tgz 12215529 BLAKE2B 4e9d2b137edf6b188c71dd32771753a16589ab49884aba1641fac5a5f82b9016843fec3257de7d59a9b00971a7dd455e99897782794800e14a656bcb22a17080 SHA512 976fd0ab96f4bf99eb7c63f7f213af91f91de4dd2498c4f8f1440743f7571194090abf0c4037e436970235f737d0add116f5689bf495688b3667a91ef95e8270
-DIST racket-minimal-7.1-src-builtpkgs.tgz 15304920 BLAKE2B be851eb58655d5f7eb36235eeb37f3d24c94c4a6b20724a4772acccf109df6e6a9d8e0f9797530c7c3f6540e99325417ef982244017719fced75e1afda71847a SHA512 e1e839867fd4540fe15234f149162c88ad1f73ca26ba22644d58b3d8ab2809851d8b176f9f448dfd7acd3b7733a20d388c71cdd76e8a5dc6c50662e6113df6df
-DIST racket-minimal-7.2-src-builtpkgs.tgz 15481415 BLAKE2B 145823cfe8538e5f569e33303bae585cb2eebf013da27551a606a005ab84e70b0e58710eadbaecbaae4fc5c9b62b22e26ba1ab2f3158500600c0bc9d7a52e17c SHA512 0fb17ef0e7d8c03c847827118dec48486fd499777fbbf98588124f9e4725dd815e0f6df2e95f4d8700b8d8dbe3b7d678d2ffb8966ce0add6742bff554ef9415c
-DIST racket-minimal-7.3-src-builtpkgs.tgz 15549791 BLAKE2B ab03252c48b8a07ae6caeb3af67d823d8eeddd22242d2146812c7b12ade09caa86ad026fb1a7b3dfeb981e304b78c697d1f93fb9d94c6e7dbc8c3ecb09fdfea0 SHA512 e542898dab04e781b0b8a613f250a35db8beed9db33406f20d4f028b7f3629904409aadf653c68998d36948bdd46e51134d3cebe1e014b46e3dba82472c3563b
-DIST racket-minimal-8.0-src-builtpkgs.tgz 24065953 BLAKE2B 2af056758660d30f7d232dabe03d544e5e77478df71389df883b8af956fe224332048eac3a351fdb905051e3ef99b08bd0e0f1704e04919a4a2e68f8005922b8 SHA512 1e43b390f6a4c1405df0872c71c27638ec35a8cdd8508390db13bd59a43f5a4728f0660fe1afb5785f625d31fd25cdc1a6ecb9972daf99bcb538f7204956dabc
-DIST racket-minimal-8.1-src-builtpkgs.tgz 24172851 BLAKE2B ab3e898e257d610874b31ac5ea3034b5c213f1d181f105c206c45129c35efb53250986163ea8c2399c02084d0d7ec55d0c79c8c8499578067f1bbef4c02568c5 SHA512 eb786882383c33fc77a697a66b06d797b0dbb2de8435daa41db4211cfa893dbbc213910ada4ea087f848dae1abb4d5ff9df162af5cf8eae689f1ef69b410d6c5
+DIST racket-8.3-src-builtpkgs.tgz 150608486 BLAKE2B f002934c07afab4152ad8395c4ab5c6c87ef810f5cf79cf5ae0b41f4caa4508e0044f4246812513def14130d507af57aa61efaff8106eaeac0b86918bd775902 SHA512 7c340f65d221343beb2b4205cdc58648bd65dceabdb16f40cda425474faa905f4dd441193dc6cd4856f7863fb83834721394d6888027db356f830eceb127dbae
 DIST racket-minimal-8.2-src-builtpkgs.tgz 21187959 BLAKE2B 0f62a900e71ee101fa3acf0985b0a72215ac657285c5ce9e4f5f49189180b82dcca94ded9778b7ba92a42919f17b1dc24eec07e13c64c77e47fc958614d7dc0a SHA512 04950703fa73cdbbb10c234d57c89e70db6076b42d4a74ddb8cace9e0438b9a1431f7317baf31d667368ad75ae19e4eecec39667ba0c5b08a3580f8cc81f4f5e
-EBUILD racket-7.0-r1.ebuild 2464 BLAKE2B 3e1c81765a0ff1c98a2268d6938dc1156cb88dde0efcd3b5c178a48e3ca9ef5b5df0a8b2d96425c7a6df34ba3c2fba9c0c6fa9db98bf4417cfb669c8fa968f10 SHA512 0af128dc40abcca88043016c6ae3e03db7f655515c91c3ff9330c451b7e94dabdc51d309e485d67e6e03e388563b1b4b30e622803670d53b271594ce57a18302
-EBUILD racket-7.1-r1.ebuild 2466 BLAKE2B 907c211cf8634e226e13bc8ec6d57fdfa5deabf3a32ac2b13800b76861445d689912a0379dd51e64994ef87994be5f919dfb09de162623feb89fd79b6a7e8f49 SHA512 4bb2c9dc8f00aba30a8157721c28679581d66127141539df564dfc703d37f1f9ae18fd5343cc152d7ac828cf536c644168b4cde93dc4dae4bd19bbdc3cc10971
-EBUILD racket-7.2-r1.ebuild 2529 BLAKE2B fdfd7f60f5c609bd2835b6b07344e0bda04a128328efd49e925bd9bf20832df0cb3259b497465f106693c9b8b48154619efbd128c290b2e8725907f78956870e SHA512 346fc9a11710e2a4bfd83f65f79a27408ed5be0574d1b38f48a998ee944ace97af7af64c1bd8399c33bc5d09b83b12486f32d2df71f41fe5ca2cafaeefab1f48
-EBUILD racket-7.3-r1.ebuild 2529 BLAKE2B fdfd7f60f5c609bd2835b6b07344e0bda04a128328efd49e925bd9bf20832df0cb3259b497465f106693c9b8b48154619efbd128c290b2e8725907f78956870e SHA512 346fc9a11710e2a4bfd83f65f79a27408ed5be0574d1b38f48a998ee944ace97af7af64c1bd8399c33bc5d09b83b12486f32d2df71f41fe5ca2cafaeefab1f48
-EBUILD racket-8.0-r1.ebuild 2947 BLAKE2B 466e3cd12f6a192ab3c980a07556aaae1af4537bd96fba2b646adcda36f63ebeb93df05f191e1546be0186f2bfb4662e63d4a806d12c44ad0ba9f39e9299bf5b SHA512 993fd309782646a33944ff634ba1c25ef03e2c6d0c22230a2a7aa0406b527af4a9ac0b9b04b6d2fba52e01ef5b02dae008da2c9b80027cdb04e7f9614ef3136e
-EBUILD racket-8.1-r1.ebuild 4669 BLAKE2B a4ac2ad98c75fa22499c3c2426b6b804ede9bfcfbef6a74b36b7615edaf11b3d59faa32199975a227e6bb7608193f01d6a2bb85a04d8bb7865fdb3e8a8e4e89d SHA512 a988c01b07176b63eadb50dc62898a2d24613c22178016a581164e227608f9c63e28e146914ce097956685d7c6b9968f4393814d83286afa5a86d52a5377bf2d
-EBUILD racket-8.2-r1.ebuild 4719 BLAKE2B 347edfd00d2f4af9ba4a1f96de37af00e3e8bc13dd9eb8b8422d1217021e64fe7278b0b168c4c4f461e8249219fc78f2067cda5c9a821529119f68fd19aa5534 SHA512 da546f1216f40fd55e319bf582ca4daefea7c50fc17282bcdffb02f300b795fe496578b4d39aff8f306d16edabc868adf63a01585471479fb0ab75cb3195e1e8
+DIST racket-minimal-8.3-src-builtpkgs.tgz 21212037 BLAKE2B 76a742efe7ba2c44eb935d4852c20be355ccff9b935b39226ef1935184b0a9179ef6ca2ac0a64f3c7a6ae4a0082117a12c668d7804a0b73b9f1a391eaba61994 SHA512 3cab4a24cab5c1ac107c8aead2ada6fa3ec7d7aa122716c78af584f055dadf89497168e95b36d99115ecd1a1905dc1ec51774dd2c8099198ec7d6aa9d380039d
+EBUILD racket-8.2-r1.ebuild 4884 BLAKE2B 202c3b418652e2a3b8a67c7915e2219b4b27c8e6032f31c84af21a8f86af0f69821f1f2faae522409536213601fef9b5d89bf21978386a86cc6b4bfac7873b2d SHA512 d99c3600f68d1e6d527ca41207af5fadc1c32105bbadfb1ed33042a3091f495673bdfc83a9c607c0f2213bd779b4fc5289994a39dc9514f1431b708a11d99027
+EBUILD racket-8.3.ebuild 4500 BLAKE2B 1e7035d5af3885a8d142c683227bd1449e0be6a5f748824a49cf69d928eaacaec9747f063356c4be06005cecfafeeea3db8c311e0896c263878f22c55567ec5a SHA512 d7be5f51979992d879425585e65e1c30dbe253f609c6799ae01c11e01ad0764d2056398c8a3d43460ed4ad420c9dc2f91475147bb015cce279e66c95cfbc204c
 MISC metadata.xml 1650 BLAKE2B af7d1bb5e4a6a4fa170f4f88fa20faca5463330047a7dcdf48e24f0e9967233235ac810f5901397ab909fbbf008c4aa8c4a89a1ea540bed40a3d2da1886613de SHA512 e2b5c5af4e5e6561cf206c1cfd3b1a1e031d722482f85ac09ce808713acc856e691adf43d62d3df46644d1abcd1f01f8cf07f1453556e7d27ae9bc425f61e63b
diff --git a/dev-scheme/racket/racket-7.0-r1.ebuild b/dev-scheme/racket/racket-7.0-r1.ebuild
deleted file mode 100644
index dbd4ca5333f2..000000000000
--- a/dev-scheme/racket/racket-7.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-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 )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/libpng:0
-	x11-libs/cairo[X?]
-	x11-libs/pango[X?]
-	dev-libs/libffi:=
-	virtual/jpeg:0
-	readline? ( dev-libs/libedit )
-	X? ( x11-libs/gtk+[X?] )"
-RDEPEND="${RDEPEND} !dev-tex/slatex"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-src_configure() {
-	# 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
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	fi
-	# raco needs decompressed files for packages doc installation bug 662424
-	if use doc; then
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-scheme/racket/racket-7.1-r1.ebuild b/dev-scheme/racket/racket-7.1-r1.ebuild
deleted file mode 100644
index 19e1da2a90c7..000000000000
--- a/dev-scheme/racket/racket-7.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-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 )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/libpng:0
-	x11-libs/cairo[X?]
-	x11-libs/pango[X?]
-	dev-libs/libffi:=
-	virtual/jpeg:0
-	readline? ( dev-libs/libedit )
-	X? ( x11-libs/gtk+[X?] )"
-RDEPEND="${RDEPEND} !dev-tex/slatex"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-src_configure() {
-	# 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
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	fi
-	# raco needs decompressed files for packages doc installation bug 662424
-	if use doc; then
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-scheme/racket/racket-7.2-r1.ebuild b/dev-scheme/racket/racket-7.2-r1.ebuild
deleted file mode 100644
index 367977769dc9..000000000000
--- a/dev-scheme/racket/racket-7.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-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 )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/libpng:0
-	x11-libs/cairo[X?]
-	x11-libs/pango[X?]
-	dev-libs/libffi:=
-	virtual/jpeg:0
-	readline? ( dev-libs/libedit )
-	X? ( x11-libs/gtk+[X?] )"
-RDEPEND="${RDEPEND} !dev-tex/slatex"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-src_configure() {
-	# 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
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	fi
-	# raco needs decompressed files for packages doc installation bug 662424
-	if use doc; then
-		docompress -x /usr/share/doc/${PF}
-	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-scheme/racket/racket-7.3-r1.ebuild b/dev-scheme/racket/racket-7.3-r1.ebuild
deleted file mode 100644
index 367977769dc9..000000000000
--- a/dev-scheme/racket/racket-7.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-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 )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/libpng:0
-	x11-libs/cairo[X?]
-	x11-libs/pango[X?]
-	dev-libs/libffi:=
-	virtual/jpeg:0
-	readline? ( dev-libs/libedit )
-	X? ( x11-libs/gtk+[X?] )"
-RDEPEND="${RDEPEND} !dev-tex/slatex"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-src_configure() {
-	# 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
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	fi
-	# raco needs decompressed files for packages doc installation bug 662424
-	if use doc; then
-		docompress -x /usr/share/doc/${PF}
-	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-scheme/racket/racket-8.0-r1.ebuild b/dev-scheme/racket/racket-8.0-r1.ebuild
deleted file mode 100644
index bedf4056abbf..000000000000
--- a/dev-scheme/racket/racket-8.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-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 )"
-SRC_URI+=" !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 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +chez +futures +jit minimal +places +readline +threads +X"
-
-REQUIRED_USE="futures? ( jit )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	media-libs/libpng:0
-	x11-libs/cairo[X?]
-	x11-libs/pango[X?]
-	dev-libs/libffi:=
-	virtual/jpeg:0
-	readline? ( dev-libs/libedit )
-	X? ( x11-libs/gtk+:3[X?] )
-	!dev-tex/slatex
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	rm -r bc/foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-src_configure() {
-	# 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
-	# docdir doesn't get passed automatically
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--docdir="/usr/share/doc/${PF}" \
-		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly") \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		if ! use chez; then
-			pushd bc || die
-			emake cgc-core
-			pax-mark m .libs/racketcgc
-
-			pushd gc2 || die
-			emake all
-			popd || die
-
-			pax-mark m .libs/racket3m
-			popd || die
-		fi
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-
-		pax-mark m "${D}/usr/$(get_libdir)/racket/starter"
-	fi
-
-	# raco needs decompressed files for packages doc installation bug 662424
-	if use doc; then
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-scheme/racket/racket-8.2-r1.ebuild b/dev-scheme/racket/racket-8.2-r1.ebuild
index 3437a73c8c5f..ebb87fe339c6 100644
--- a/dev-scheme/racket/racket-8.2-r1.ebuild
+++ b/dev-scheme/racket/racket-8.2-r1.ebuild
@@ -19,12 +19,15 @@ LICENSE="
 	chez? ( Apache-2.0 )
 	!chez? ( LGPL-3 )
 "
-# Bytecode generated by Racket is not compatible between versions
+# 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="X +chez +doc +futures +jit minimal +places +readline +threads"
+IUSE="X +chez +doc +futures +jit minimal +places +threads"
 # See bug #809785 re chez/threads
-REQUIRED_USE="futures? ( jit ) chez? ( threads )"
+REQUIRED_USE="futures? ( jit threads ) chez? ( threads ) places? ( threads )"
 
 DEPEND="
 	!dev-tex/slatex
@@ -39,7 +42,6 @@ DEPEND="
 		x11-libs/pango[X]
 		x11-misc/shared-mime-info
 	)
-	readline? ( dev-libs/libedit )
 "
 RDEPEND="${DEPEND}"
 
@@ -135,30 +137,27 @@ src_install() {
 }
 
 pkg_preinst() {
-	# If we are merging the same version (NOT revision!)
-	# check if pkg database files exist and do not overwrite them
-	local pvr rel
-	for pvr in ${REPLACING_VERSIONS}; do
-		rel="${pvr%-r*}"
-		if [[ "${rel}" == "${PV}" ]]; then
-			echo "We are installing the same version: ${rel}"
-			local rktd
-			for rktd in "${PKGDB[@]}"; do
-				if [[ -f "${EROOT}/${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
-	done
+	# 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}" ]]; 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() {
 	post_X_update
 
+	optfeature "readline editing features in REPL" dev-libs/libedit sys-libs/readline
 	optfeature "generating PDF files using Scribble" dev-texlive/texlive-fontsextra
 }
 
diff --git a/dev-scheme/racket/racket-8.1-r1.ebuild b/dev-scheme/racket/racket-8.3.ebuild
index 652449041953..c767ef23e92c 100644
--- a/dev-scheme/racket/racket-8.1-r1.ebuild
+++ b/dev-scheme/racket/racket-8.3.ebuild
@@ -19,11 +19,15 @@ LICENSE="
 	chez? ( Apache-2.0 )
 	!chez? ( LGPL-3 )
 "
-# Bytecode generated by Racket is not compatible between versions
+# 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="X +chez +doc +futures +jit minimal +places +readline +threads"
-REQUIRED_USE="futures? ( jit )"
+IUSE="X +chez +doc +futures +jit minimal +places +threads"
+# See bug #809785 re chez/threads
+REQUIRED_USE="futures? ( jit threads ) chez? ( threads ) places? ( threads )"
 
 DEPEND="
 	!dev-tex/slatex
@@ -38,23 +42,12 @@ DEPEND="
 		x11-libs/pango[X]
 		x11-misc/shared-mime-info
 	)
-	readline? ( dev-libs/libedit )
 "
 RDEPEND="${DEPEND}"
 
 # "mred" and "mzscheme" are binaries generated by Racket, not CC
 QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
 
-# Backports that will be probably available in 8.3 release
-PATCHES=(
-	# Prevent "libracket3m" from being stripped
-	# https://github.com/racket/racket/commit/92d202060201f569fafc348c4f64a2965b55287f
-	"${FILESDIR}/Makefile-nostrip.patch"
-	# Fix "starter" LDFLAGS
-	# https://github.com/racket/racket/commit/4f0e1703979d704c4f91b009945c324450acec7a
-	"${FILESDIR}/Makefile-starter.patch"
-)
-
 # Package database files
 PKGDB=(
 	/usr/share/racket/info-cache.rktd
@@ -134,30 +127,27 @@ src_install() {
 }
 
 pkg_preinst() {
-	# If we are merging the same version (NOT revision!)
-	# check if pkg database files exist and do not overwrite them
-	local pvr rel
-	for pvr in ${REPLACING_VERSIONS}; do
-		rel="${pvr%-r*}"
-		if [[ "${rel}" == "${PV}" ]]; then
-			echo "We are installing the same version: ${rel}"
-			local rktd
-			for rktd in "${PKGDB[@]}"; do
-				if [[ -f "${EROOT}/${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
-	done
+	# 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}" ]]; 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() {
 	post_X_update
 
+	optfeature "readline editing features in REPL" dev-libs/libedit sys-libs/readline
 	optfeature "generating PDF files using Scribble" dev-texlive/texlive-fontsextra
 }
 
diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest
index 9c71f2779f75..510f3f8acb44 100644
--- a/dev-scheme/stklos/Manifest
+++ b/dev-scheme/stklos/Manifest
@@ -1,3 +1,7 @@
+AUX stklos-1.10-gentoo.patch 1090 BLAKE2B aed70b104b1f28e59feafd9b04ae687244e96dff3656b4aa893e46a3af398189d4b0721ff59ffc4aedf9f81d5271899b5488544f4b13e41bd6ad6797c9de6560 SHA512 cddb0f5be61cf4bc3a55c79a576aedf99583ebe0f7a6cfc883bc8991d4e1c78678b853f9a4f65dcceb53477fabe0d9c53acb60e0957f35f45be16dc6c32bc642
+AUX stklos-1.70-gentoo.patch 1937 BLAKE2B 42c534b6d84bc1c3a541bcb8e68ba0abf097f4ad0a1012df1a153ebed918bf2ea37e0c505c33cbdf07ab9dc57372df37a3fdefb3864201497f1cca6bfe888b64 SHA512 05f9c3263e46902c149cd4131c32092b24e4d2499596faa9c6d0d448a1e92a06eac466458e3cca5e688fa4a07e5e870ff81ca4d5a4171c50217b942ebf4850df
 DIST stklos-1.10.tar.gz 6097807 BLAKE2B bfb957c54626d29cc1ecba553a0b982022b1ed0b89f333d763937e8c5f84b5c6b80ebc1e6531d968f4b33d72427a4f9957c010932308672907e105d37828ee50 SHA512 64877dec82b4c19bcaea95f6c60a4b9dff19c11bf11792fa5204d0ca3bb6f6962cc9250b35dcd5f01015e430b9a027add4f40c6a7169858893cab3e8c8df0bbb
-EBUILD stklos-1.10-r1.ebuild 896 BLAKE2B 2604c10c02bb8cd69850284df5d053ba53ec141cef4d148b94118d20e5ce705bb5a7ef3861040edc72c6495a70caa93a596d5a570344e06ba0ac65dc49e51d17 SHA512 9d236d7502971bcf416597d4c0f0dbebc0c66737f9add28a48949b9f599364d4bab3af19512812580637e204af6b9b48e2312989fadef9bf189ce7d3da6c9503
+DIST stklos-1.70.tar.gz 8767615 BLAKE2B 7cae5b5d0c9b2d9dcccc47e78e70a562f2d1751de068668777441d29ee15be7f3c5c285b8297e367311cd8c9695c9a2d083ad7ea1d9c21c838cf1d819f7cb82c SHA512 64da09171b191688f750f10c29f10cd7393f326555d4324344faeac63547a2548407490e44a50f0afa348487bd9cc5106f3c344cab6935f3a3516b3c064a596f
+EBUILD stklos-1.10-r2.ebuild 937 BLAKE2B 0754fe68a803e9e821bc4918f67631eb86510fd233b7918fc12ace0d4c5ebebd5e7f131b5e5080f459f664e567d436664321ccf4b5b325676ef0907c737e448b SHA512 4d27df2b8cc80f31caf554aa0de568dd28d143a9353ae8ca9e8fb8181aaac22e312acfec75d7d83286d3a5f1b51b56dc911a65f7dfa5b3ee912a256783cc76db
+EBUILD stklos-1.70.ebuild 1012 BLAKE2B 2424a767067de671080bd94175d44297e3e3956e0b9f0a3d3a925a0b08c1961ab27f220518b4c82a141d8ef49125c3c608781140f00cfea6378d8ae772000841 SHA512 42859e74c39709de5e7ef00fbac67c3c4e1a7a4afc6ba55dbb6758a1e1b0a8acf883f8f9a64e9691679e974dacb7190b30debaea3ee6c2ca92e9243547f268d0
 MISC metadata.xml 603 BLAKE2B 631cd06bdc3a5b14371ffd07f6cde777eb99506a4383720a11395e4633f1fdb74d271b1a0e561e1b5bf64e55328186c2ca25870381e0283b46a5868550d5c925 SHA512 89db69dcb36c87b58587aef86590de1391e215213b444e135aa144fd78bf9b9ddbd366a07562e5de2f000e6b66f387ec24e0a56698ce076b8304288868a25859
diff --git a/dev-scheme/stklos/files/stklos-1.10-gentoo.patch b/dev-scheme/stklos/files/stklos-1.10-gentoo.patch
new file mode 100644
index 000000000000..56f5440cf1dc
--- /dev/null
+++ b/dev-scheme/stklos/files/stklos-1.10-gentoo.patch
@@ -0,0 +1,40 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -4,7 +4,6 @@
+ #    Creation date: 11-Apr-2000 10:30 (eg)
+ # Last file update: 23-Oct-2010 11:52 (eg)
+ 
+-mandir	      = $(prefix)/share/man
+ man_MANS      = stklos.1 stklos-config.1 stklos-compile.1 stklos-genlex.1 \
+ 	        stklos-pkg.1
+ EXTRA_DIST    = $(man_MANS)
+@@ -16,15 +16,13 @@
+ schemedir   = $(prefix)/share/@PACKAGE@/@VERSION@
+ scheme_DATA = DOCDB
+ 
+-doclocation = $(prefix)/share/doc/@PACKAGE@-@VERSION@
+-
+-docpdfdir   = $(doclocation)/pdf
++docpdfdir   = $(pdfdir)
+ docpdf_DATA = pdf/stklos-ref.pdf
+ 
+-dochtmldir  = $(doclocation)/html
++dochtmldir  = $(htmldir)
+ dochtml_DATA= $(wildcard html/stklos-ref*.html) $(wildcard html/*.css)
+ 
+-docimgdir   = $(doclocation)/html/images
++docimgdir   = $(htmldir)/images
+ docimg_DATA = $(wildcard html/images/*)
+ 
+ 
+--- a/pkgman/Makefile.am
++++ b/pkgman/Makefile.am
+@@ -4,7 +4,7 @@
+ # Last file update:  4-Dec-2011 16:48 (eg)
+ 
+ 
+-makefiledir=  $(prefix)/etc/stklos
++makefiledir=  $(prefix)/share/@PACKAGE@/@VERSION@/etc
+ makefile_DATA= etc/Makefile-scmpkg.tmpl
+ 
+ bin_SCRIPTS = stklos-pkg
diff --git a/dev-scheme/stklos/files/stklos-1.70-gentoo.patch b/dev-scheme/stklos/files/stklos-1.70-gentoo.patch
new file mode 100644
index 000000000000..c9baba3bf268
--- /dev/null
+++ b/dev-scheme/stklos/files/stklos-1.70-gentoo.patch
@@ -0,0 +1,66 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -21,7 +21,6 @@
+ #    Creation date: 11-Apr-2000 10:30 (eg)
+ # Last file update:  1-Jun-2021 19:13 (eg)
+ 
+-mandir	      = $(prefix)/share/man
+ man_MANS      = stklos.1 stklos-config.1 stklos-compile.1 stklos-genlex.1 \
+ 	        stklos-pkg.1 stklos-script.1
+ EXTRA_DIST    = $(man_MANS)
+@@ -33,12 +32,10 @@
+ schemedir   = $(prefix)/share/@PACKAGE@/@VERSION@
+ scheme_DATA = DOCDB
+ 
+-doclocation = $(prefix)/share/doc/@PACKAGE@-@VERSION@
+-
+-docpdfdir   = $(doclocation)/pdf
++docpdfdir   = $(pdfdir)
+ docpdf_DATA = pdf/stklos-ref.pdf
+ 
+-dochtmldir  = $(doclocation)/html
++dochtmldir  = $(htmldir)
+ dochtml_DATA= html/index.html		\
+ 	      html/stklos-ref.html	\
+ 	      html/stklos-ref-1.html	\
+@@ -59,7 +56,7 @@
+ 	      html/stklos-ref-16.html	\
+ 	      html/doc-style.css
+ 
+-docimgdir   = $(doclocation)/html/images
++docimgdir   = $(htmldir)/images
+ docimg_DATA = html/images/hierarchy.jpg
+ 
+ 
+--- a/lib/Lalr.d/Makefile.am
++++ b/lib/Lalr.d/Makefile.am
+@@ -34,7 +34,7 @@
+ all: lalr.ostk calc
+ 
+ install-sources: install
+-	mkdir -p $(schemedir)
++	mkdir -p $(DESTDIR)/$(schemedir)
+ 	cp lalr.stk $(DESTDIR)/$(schemedir)
+ 
+ uninstall-hook:
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -123,8 +123,6 @@
+ 
+ 
+ install-exec-hook:
+-	@echo "STRIP command: $$STRIP"
+-	if test "X$$STRIP" != "Xno" ;then $(STRIP) $(DESTDIR)/$(bindir)/stklos; fi;
+ 	mv $(DESTDIR)/$(bindir)/stklos $(DESTDIR)/$(bindir)/stklos-@VERSION@
+ 	ln -s stklos-@VERSION@ $(DESTDIR)/$(bindir)/stklos
+ 
+--- a/utils/shlib-options
++++ b/utils/shlib-options
+@@ -173,6 +173,6 @@
+ 
+ echo "os=\"$os\"; version=\"$version\"; machine=\"$machine\"; OS=\"$OS\"; \
+ OS_FLAVOUR=\"$OS_FLAVOUR\";SH_COMP_FLAGS=\"$SH_COMP_FLAGS\"; \
+-SH_LOAD_FLAGS=\"$SH_LOAD_FLAGS\"; \
++SH_LOAD_FLAGS=\"$LDFLAGS $SH_LOAD_FLAGS\"; \
+ SH_LOADER=\"$SH_LOADER\"; SH_SUFFIX=\"$SH_SUFFIX\"; \
+ SH_LIB_SUFFIX=\"$SH_LIB_SUFFIX\"; SH_MAIN_LOAD_FLAGS=\"$SH_MAIN_LOAD_FLAGS\""
diff --git a/dev-scheme/stklos/stklos-1.10-r1.ebuild b/dev-scheme/stklos/stklos-1.10-r1.ebuild
deleted file mode 100644
index 9a71d6c6b8bf..000000000000
--- a/dev-scheme/stklos/stklos-1.10-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="fast and light Scheme implementation"
-HOMEPAGE="http://www.stklos.net"
-SRC_URI="http://www.stklos.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="threads"
-DEPEND="dev-libs/gmp:= dev-libs/libpcre dev-libs/libffi dev-libs/boehm-gc[threads?]"
-RDEPEND="${DEPEND}"
-
-#parallel build failure reported upstream
-MAKEOPTS=-j1
-
-src_prepare() {
-	# kill bundled libs
-	rm -rf "${S}"/{ffi,gc,gmp,pcre} || die
-	default
-}
-
-src_configure() {
-	econf --enable-threads=$(if use threads; then echo pthreads; else echo none; fi) \
-		--without-gmp-light --without-provided-gc \
-		--without-provided-regexp --without-provided-ffi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS
-}
diff --git a/dev-scheme/stklos/stklos-1.10-r2.ebuild b/dev-scheme/stklos/stklos-1.10-r2.ebuild
new file mode 100644
index 000000000000..72aa6c496083
--- /dev/null
+++ b/dev-scheme/stklos/stklos-1.10-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="fast and light Scheme implementation"
+HOMEPAGE="https://www.stklos.net/"
+SRC_URI="https://www.${PN}.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="threads"
+
+RDEPEND="dev-libs/boehm-gc[threads?]
+	dev-libs/gmp:=
+	dev-libs/libffi:=
+	dev-libs/libpcre"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+DOCS=( AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS )
+
+src_prepare() {
+	rm -rf {ffi,gc,gmp,pcre}
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-threads=$(usex threads pthreads none) \
+		--without-gmp-light \
+		--without-provided-ffi \
+		--without-provided-gc \
+		--without-provided-regexp
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+	einstalldocs
+}
diff --git a/dev-scheme/stklos/stklos-1.70.ebuild b/dev-scheme/stklos/stklos-1.70.ebuild
new file mode 100644
index 000000000000..74b2eb58dcf5
--- /dev/null
+++ b/dev-scheme/stklos/stklos-1.70.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="fast and light Scheme implementation"
+HOMEPAGE="https://www.stklos.net/"
+SRC_URI="https://www.${PN}.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="threads"
+
+RDEPEND="dev-libs/boehm-gc[threads?]
+	dev-libs/gmp:=
+	dev-libs/libffi:=
+	dev-libs/libpcre"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+DOCS=( AUTHORS ChangeLog {HACKING,NEWS}.md PACKAGES-USED {PORTING-NOTES,README}.md SUPPORTED-SRFIS )
+
+src_prepare() {
+	use threads || rm -f tests/srfis/216.stk
+
+	default
+	eautoreconf
+	export LD="$(tc-getCC)"
+}
+
+src_configure() {
+	econf \
+		--enable-threads=$(usex threads pthreads none) \
+		--without-gmp-light \
+		--without-provided-ffi \
+		--without-provided-gc \
+		--without-provided-regexp
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+	einstalldocs
+}
diff --git a/dev-scheme/tinyscheme/Manifest b/dev-scheme/tinyscheme/Manifest
index a148ca517f8d..24f7fc0270d6 100644
--- a/dev-scheme/tinyscheme/Manifest
+++ b/dev-scheme/tinyscheme/Manifest
@@ -1,4 +1,6 @@
-AUX tinyscheme-1.41-makefile.patch 1152 BLAKE2B 7d75c4a04912e46606d27bc8bab66a868a05547577b4b80962da3d86f169fc64fed7f591c99fc6308f03a8957c99191ec2ebba30d76d2d186a0781c95d0fab9a SHA512 e7ff9a2cc45f1f7f07df3619bf48b2d14c4adf39c452786e4aa0ebb134264f0111f001296e617b6511cd8f28ee3dbdc9f90b5922540aafd91becc358c5de98da
+AUX tinyscheme-makefile.patch 1049 BLAKE2B ddfd6371d76d52231319a9df7ad3bc1538eb334ed8e3210666ac83e997893aaa6fc9e2b76632b940921c64e83b98bb026079844e249e1d26cde070fa06f8cacf SHA512 dfd1ba72d4e32ed2d07ff20f88edebc203329a1ead3931c871fd22da1dd883ca48e5d5cb75c0689d4c8b0edc6d9e533a8716f2e2034444f303dc81f48b82ac92
 DIST tinyscheme-1.41.tar.gz 61761 BLAKE2B b657376561eee0ceae02d102ae7da7ce777dcbc78c98b54b0c00c578fb06ccdd3fba8aca5ce150ca188917b8e5f1e9acb63c9c5dc2e050aafa78b0705a20d47c SHA512 a9c1c9cd7a11bf31e0f8ac813ebd6e731cb56b9526fd14d343d7f8c479a8e1b561b744b3f522512adc023cacd1acbf52aa18bf5d8db68f767971660305b79b0f
-EBUILD tinyscheme-1.41.ebuild 1381 BLAKE2B b47d21dcbdd986aad1e226a208fca93cf6a91a748f5abfe0b3ab32d7896130cdc1422905b77ba05c4f9949d1ab3cd6b795195cfbae705314b561d5bd357b9d57 SHA512 80873bdd026112320db089720fc934b915b6ab2895465342b3920d85079fc20e702f8e092dc17855d908bdb9704febb7556d50ad72eca8ead058a9ba68044c04
-MISC metadata.xml 868 BLAKE2B c9a3a33cf5109399006fc9b74c212eaec42b10fc394eb3cf912678936e5a42088ec48843dd9e4cd0b0a36cb6c0465b5588665942f3952ecb259e10d40935f3cd SHA512 ee52e8400bd6d863db57f01b4aacc1217bdc02701f4a7a86e16b777fdeb2c8dc795c1a6447adde2507c84b278729fd175d844d21412ee82158b6bf8c8917b9ad
+DIST tinyscheme-1.42.tar.gz 62156 BLAKE2B 9ebda4e0d90c37bb5e9b8275e67912daebe3786163bdb0b5ad06ad48bdd98934f9ce8679c0d259276fd4a8595522cb06d384498fe283314b782e29bf723af522 SHA512 54841dddd151042a976343409d5fcd778390bfddad50986d2a19120ec1eede54e2a3150100f5331abcacc222d8d547abde2b65a427c0353c2534b5f52918606c
+EBUILD tinyscheme-1.41-r1.ebuild 1069 BLAKE2B 8f1939c1df05446449cabe3f71f6a91e20339e3c73f2b5e507f5c2b12097ba6f456cf256aaa9d14313386ff8eebbdb9678eb165f16c68d1d5433557c6ef83658 SHA512 18bf1f2f575ddd6ff5963d8701cf6efa3fe6ecc74bb645afe9ea760e3785a8b4667fb2370764d01a84ab7026d67bd3c29b3f6cd42d22dfa2693a565482119586
+EBUILD tinyscheme-1.42.ebuild 1072 BLAKE2B 397a79ee70f53376510f40cd2032a20b195fabbec1c67aeaf29ea1f4961d4a2128417b66a34f8916ffdb3f51eff68db3533785caece1f0e5bdd2a8935be6884e SHA512 85b083d2d561b6f5d49370a542cf5c53ab5b570ef554200bb0ed0ef8d5d6d592860bb828aa5d1e63d6d503852db041a1195d3299a0d81b15b82260b0a79b8d3a
+MISC metadata.xml 884 BLAKE2B 2c4e7346a43676652eae5b4cff9776430c7ebd7643106d487b410117fc488eb1741b8f5f454bd289b705e15be870af50c9b6ac16930983696439caf4438603cd SHA512 bbae3c7ecd0746d1e5796ab8444a74f4943e6774294bd5e8e375e7d85ac92f53920c714e6b86656e903430837aaf76e26b5b90519d158a18da507ab1155d7eeb
diff --git a/dev-scheme/tinyscheme/files/tinyscheme-1.41-makefile.patch b/dev-scheme/tinyscheme/files/tinyscheme-makefile.patch
index 69fccb5e537a..b11afccacaa0 100644
--- a/dev-scheme/tinyscheme/files/tinyscheme-1.41-makefile.patch
+++ b/dev-scheme/tinyscheme/files/tinyscheme-makefile.patch
@@ -1,6 +1,5 @@
-diff -ru a/makefile b/makefile
---- a/makefile	2013-04-14 20:08:33.000000000 +0000
-+++ b/makefile	2013-12-11 11:59:58.688782748 +0000
+--- a/makefile
++++ b/makefile
 @@ -18,8 +18,7 @@
  #AR= echo
  
diff --git a/dev-scheme/tinyscheme/metadata.xml b/dev-scheme/tinyscheme/metadata.xml
index ac49f95d58ff..71fee92b23b1 100644
--- a/dev-scheme/tinyscheme/metadata.xml
+++ b/dev-scheme/tinyscheme/metadata.xml
@@ -6,7 +6,14 @@
 		<name>Gentoo Scheme Project</name>
 	</maintainer>
 	<longdescription lang="en">
-TinyScheme is a lightweight Scheme interpreter that implements as large a subset of R5RS as was possible without getting very large and complicated. It is meant to be used as an embedded scripting interpreter for other programs. As such, it does not offer IDEs or extensive toolkits although it does sport a small top-level loop, included conditionally. A lot of functionality in TinyScheme is included conditionally, to allow developers freedom in balancing features and footprint.
+		TinyScheme is a lightweight Scheme interpreter that implements as large
+		a subset of R5RS as was possible without getting very large and
+		complicated. It is meant to be used as an embedded scripting
+		interpreter for other programs. As such, it does not offer IDEs or
+		extensive toolkits although it does sport a small top-level loop,
+		included conditionally. A lot of functionality in TinyScheme is
+		included conditionally, to allow developers freedom in balancing
+		features and footprint.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">tinyscheme</remote-id>
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.41-r1.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.41-r1.ebuild
new file mode 100644
index 000000000000..65386c50ba9e
--- /dev/null
+++ b/dev-scheme/tinyscheme/tinyscheme-1.41-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Lightweight scheme interpreter"
+HOMEPAGE="https://tinyscheme.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
+DOCS=( CHANGES {Manual,MiniSCHEMETribute,hack}.txt )
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		CC=$(tc-getCC) \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local tslib=lib${PN}$(get_libname)
+	local tslibx=lib${PN}$(get_libname ${PV})
+
+	newbin scheme ${PN}
+
+	newlib.so ${tslib} ${tslibx}
+	dosym ${tslibx} /usr/$(get_libdir)/${tslib}
+	use static-libs && dolib.a lib${PN}.a
+	einstalldocs
+
+	# bug #328967
+	insinto /usr/include
+	newins scheme.h ${PN}.h
+
+	local INIT_DIR=/usr/share/${PN}
+	insinto ${INIT_DIR}
+	doins init.scm
+	dodir /etc/env.d
+	echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}/init.scm\"" >"${ED}"/etc/env.d/50${PN}
+}
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
deleted file mode 100644
index c911e4ebae6a..000000000000
--- a/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Lightweight scheme interpreter"
-HOMEPAGE="http://tinyscheme.sourceforge.net"
-SRC_URI="mirror://sourceforge/tinyscheme/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		append-flags -DOSX
-		sed -i \
-			-e 's/SOsuf=so/SOsuf=dylib/' \
-			-e "s|-Wl,-soname=|-Wl,-install_name=${EPREFIX}/usr/lib/|" \
-			makefile || die
-	fi
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"\
-		AR=$(tc-getAR) CC=$(tc-getCC)
-}
-
-src_install() {
-
-	local tslib=libtinyscheme$(get_libname)
-	local tslibx=libtinyscheme$(get_libname ${PV})
-
-	newbin scheme ${PN}
-
-	newlib.so ${tslib} ${tslibx}
-	dosym ${tslibx} /usr/$(get_libdir)/${tslib}
-	dodoc Manual.txt
-
-	if use static-libs; then
-		dolib.a libtinyscheme.a
-	fi
-
-	# Bug 328967: dev-scheme/tinyscheme-1.39-r1 doesn't install header file
-	insinto /usr/include/
-	newins scheme.h tinyscheme.h
-
-	local INIT_DIR=/usr/share/${PN}/
-	insinto ${INIT_DIR}
-	doins init.scm
-	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}init.scm\"" > "${ED}"/etc/env.d/50tinyscheme
-}
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.42.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.42.ebuild
new file mode 100644
index 000000000000..91c204a5cfb1
--- /dev/null
+++ b/dev-scheme/tinyscheme/tinyscheme-1.42.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Lightweight scheme interpreter"
+HOMEPAGE="https://tinyscheme.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
+DOCS=( CHANGES {Manual,MiniSCHEMETribute,hack}.txt )
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		CC=$(tc-getCC) \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local tslib=lib${PN}$(get_libname)
+	local tslibx=lib${PN}$(get_libname ${PV})
+
+	newbin scheme ${PN}
+
+	newlib.so ${tslib} ${tslibx}
+	dosym ${tslibx} /usr/$(get_libdir)/${tslib}
+	use static-libs && dolib.a lib${PN}.a
+	einstalldocs
+
+	# bug #328967
+	insinto /usr/include
+	newins scheme.h ${PN}.h
+
+	local INIT_DIR=/usr/share/${PN}
+	insinto ${INIT_DIR}
+	doins init.scm
+	dodir /etc/env.d
+	echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}/init.scm\"" >"${ED}"/etc/env.d/50${PN}
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /dev-scheme
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)