gentoo resync : 06.04.2022

16 files changed, 257 insertions, 187 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index e4d5fd452e0f..4b1290067d9d 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/bigloo/Manifest b/dev-scheme/bigloo/Manifest
new file mode 100644
index 000000000000..d07fc2144a09
--- /dev/null
+++ b/dev-scheme/bigloo/Manifest
@@ -0,0 +1,4 @@
+AUX 50bigloo-gentoo.el 110 BLAKE2B 520b6b4d89452d3c9479c92b3f2f31e46e7761bc2c03fd62236e277ff1f9613cd237ba799d7349cf8bc8311125d3548956dc1947bd8d79cb72349dee723a9190 SHA512 73fda359d7c09c291eb1c3d38d3352b57acab0e800e2d89ee815a1c58202e8a5603abe847409e58bd69ea0ed7245abbb4a60de4fa8285287523caff47f19d6e2
+DIST bigloo-4.4c-4.tar.gz 47714106 BLAKE2B f30775cfa3e29f781f31dc5ec80087712504ffab528a911e2a29746562b6179b03cbfc63a45ddf337b2424fbfa476005ffed67674a75b4629ab70459c47147a6 SHA512 b1a7f7f610303dbbd7339ac4f80679b07d1bf5304865fe61f28bd5af8205f1a5c2b5b3edb1c47a0409a6392a2242d2adde1f5129b026b6a7ee022b8f5faec157
+EBUILD bigloo-4.4c_p4-r1.ebuild 4650 BLAKE2B 92a91be2d325fc547eed8677e6b524a7cd10f1836f12c9f9fa1cb64aac24f2d120a20cc539ae5fd5d8ff47b9c87b14d7958196ef39b8d18e72859565641b4a32 SHA512 2517b82dab8392fc57734c8d64486592fbf488531a27eae1b7b49144b32ed0e7256d146b8b39979cd5804418f47b9e4a2dcd2098d50f6674e954e34f1a28615a
+MISC metadata.xml 1113 BLAKE2B 20eec442cc5ba556fb5e30dc225bfeb45851be9ee1bbf111662ba3eec8573275754101d863145874cf778e27715792e1757189c2e4cec8ae6d320800e22dc0a6 SHA512 fb58869479a3310d1eac93ecd8127f2759fb93c45a73d1d2835802d201c6fb0a95592238521b7c385bea1d27d83da650000685978067dab272615f81e6ca5c4a
diff --git a/dev-scheme/bigloo/bigloo-4.4c_p4-r1.ebuild b/dev-scheme/bigloo/bigloo-4.4c_p4-r1.ebuild
new file mode 100644
index 000000000000..0d56b78e294e
--- /dev/null
+++ b/dev-scheme/bigloo/bigloo-4.4c_p4-r1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common toolchain-funcs
+
+MY_PV=${PV/_p/-}  # e.g.: 4.4c_p4 -> 4.4c-4
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Practical Scheme Compiler with many extensions"
+HOMEPAGE="http://www-sop.inria.fr/indes/fp/Bigloo/index.html"
+SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa avahi emacs flac +gmp gpg gstreamer java libuv mp3 pulseaudio +sqlite"
+REQUIRED_USE="flac? ( alsa ) mp3? ( alsa )"
+
+EMACS_DEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="
+	dev-libs/boehm-gc[threads]
+	dev-libs/libpcre2:=
+	dev-libs/libunistring:=
+	dev-libs/openssl:=
+	alsa? ( media-libs/alsa-lib )
+	avahi? ( net-dns/avahi )
+	flac? ( media-libs/flac )
+	gmp? ( dev-libs/gmp:= )
+	gpg? ( app-crypt/gnupg )
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0=
+		media-libs/gstreamer:1.0=
+	)
+	java? ( virtual/jdk:* )
+	libuv? ( dev-libs/libuv:= )
+	mp3? ( media-sound/mpg123 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sqlite? ( dev-db/sqlite:3= )
+"
+RDEPEND="
+	${DEPEND}
+	${EMACS_DEPEND}
+	sys-devel/binutils
+	sys-devel/gdb
+"
+BDEPEND="
+	${EMACS_DEPEND}
+	sys-apps/texinfo
+"
+
+DOCS=( ChangeLog README.md TODO.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	sed -e "/^ar=/s|=|=\"$(tc-getAR)\"|" \
+		-e "/^ranlib=/s|=|=\"$(tc-getRANLIB)\"|" \
+		-i ./configure || die
+
+	sed "s|^ar |$(tc-getAR) |" -i ./autoconf/ranlib || die
+}
+
+src_configure() {
+	tc-export AR AS CC CPP CXX LD
+	export CFLAGS
+	export LDFLAGS
+
+	local myconf=(
+		# Compilation
+		--as="$(tc-getAS)"
+		--cc="$(tc-getCC)"
+		--cflags="${CFLAGS}"
+		--cpicflags="-fPIC"
+		--cwarningflags=""
+		--ldflags="${LDFLAGS}"
+		# Installation directories
+		--prefix=/usr
+		--bindir=/usr/share/${PN}/bin
+		--docdir=/usr/share/doc/${PF}
+		--infodir=/usr/share/info
+		--libdir=/usr/"$(get_libdir)"
+		--mandir=/usr/share/man
+		# Custom internal components
+		--customgc=no
+		--customgmp=no
+		--customlibuv=no
+		--customunistring=no
+		--jvm=$(usex java)
+		--native=yes
+		--sharedbde=yes
+		--sharedcompiler=yes
+		--strip=no
+		# Libraries, Bigloo calls them APIs
+		--disable-phidget  # not important for now, only in ::ros-overlay ?
+		--enable-calendar  # iCalendar parser
+		--enable-crypto
+		--enable-csv   # parsing CSV files
+		--enable-mail  # IMAP protocol implementation
+		--enable-multimedia
+		--enable-packrat  # packrat parser
+		--enable-phone
+		--enable-pkgcomp
+		--enable-pthread
+		--enable-srfi1
+		--enable-srfi18
+		--enable-ssl
+		--enable-text  # BibTeX parser
+		--enable-upnp  # Upnp protocol implementation
+		--enable-web   # XML, CGI, and RSS parsers
+		$(use_enable alsa)
+		$(use_enable avahi)
+		$(use_enable flac wav)
+		$(use_enable flac)
+		$(use_enable gmp srfi27)
+		$(use_enable gmp)
+		$(use_enable gpg openpgp)
+		$(use_enable gstreamer)
+		$(use_enable libuv)
+		$(use_enable mp3 mpg123)
+		$(use_enable pulseaudio)
+		$(use_enable sqlite pkglib)
+		$(use_enable sqlite)
+		# GNU Emacs libraries
+		--bee=$(usex emacs full partial)
+		--emacs=$(usex emacs "${EMACS}" "no")
+		--lispdir=$(usex emacs "${SITELISP}/${PN}" "")
+	)
+	ebegin "Configuring Bigloo with the following options: ${myconf[@]}"
+	sh ./configure "${myconf[@]}"
+	eend $? || die "configure script failed"
+}
+
+src_compile() {
+	default
+
+	emake -C bdl
+	emake -C bdb
+	emake -C cigloo
+
+	use emacs && emake -C bmacs
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" LN_S="ln -rs" install
+	emake DESTDIR="${D}" -C bdl install
+	emake DESTDIR="${D}" -C bdb install
+	emake DESTDIR="${D}" -C cigloo install
+
+	# The ".sh" scripts set proper environment and library order for Bigloo,
+	# but programs (and the Bigloo Emacs library, "bee-mode") want "bigloo",
+	# not "bigloo.sh". To make programs work we install all executable files
+	# into "/usr/share/bigloo/bin", and then pick one by one for non-scripts:
+	# if a script with ".sh" extensions exists, then we link the script,
+	# not the picked executable to a binary name, otherwise link the binary.
+	mkdir -p "${D}"/usr/bin || die
+	pushd "${D}" >/dev/null || die
+	local bin bin_link
+	for bin in usr/share/${PN}/bin/* ; do
+		if [[ ${bin} != *.sh ]] ; then
+			bin_link=usr/bin/$(basename ${bin})
+			if [[ -f ${bin}.sh ]] ; then
+				ln -s ../../${bin}.sh ${bin_link} || die
+			else
+				ln -s ../../${bin} ${bin_link} || die
+			fi
+		fi
+	done
+	popd >/dev/null || die
+
+	if use emacs ; then
+		emake DESTDIR="${D}" install-bee
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-scheme/bigloo/files/50bigloo-gentoo.el b/dev-scheme/bigloo/files/50bigloo-gentoo.el
new file mode 100644
index 000000000000..9cac9f0f7d0f
--- /dev/null
+++ b/dev-scheme/bigloo/files/50bigloo-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'bee-mode "bee-mode" "Major mode for editing Bigloo code." t)
diff --git a/dev-scheme/bigloo/metadata.xml b/dev-scheme/bigloo/metadata.xml
new file mode 100644
index 000000000000..a179bb3d4094
--- /dev/null
+++ b/dev-scheme/bigloo/metadata.xml
@@ -0,0 +1,27 @@
+<?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>
+    Bigloo is a Scheme implementation devoted to one goal: enabling Scheme
+    based programming style where C(++) is usually required.
+    Bigloo attempts to make Scheme practical by offering features usually
+    presented by traditional programming languages but not offered by Scheme
+    and functional programming. Bigloo compiles Scheme modules. It delivers
+    small and fast stand alone binary executables. Bigloo enables full
+    connections between Scheme and C programs.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/manuel-serrano/bigloo/issues/</bugs-to>
+    <remote-id type="github">manuel-serrano/bigloo</remote-id>
+  </upstream>
+  <use>
+    <flag name="avahi">Enable Avahi support</flag>
+    <flag name="gpg">Enable GPG support</flag>
+    <flag name="libuv">Enable libuv support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
index c1d43cf688e1..b8e65496308c 100644
--- a/dev-scheme/chez/Manifest
+++ b/dev-scheme/chez/Manifest
@@ -1,3 +1,3 @@
 DIST chez-9.5.6.tar.gz 34565487 BLAKE2B 5d74cd3365b3039e6be1b774213da75da1080beffb1c9b5044466a8feff0171ce75d9999e69774754a5969d68825c571a88cb27d57af2718e98668e4fe936e3c SHA512 4affd73a5b2ea5cdec01fb200a32499387fc3769b7677ffe7d854f6a5567d50ba114f9f12951f99d8e0fd757c799e82e32c83079fae83e5fc138ee6e1a5f56c0
-EBUILD chez-9.5.6-r2.ebuild 1657 BLAKE2B ee63eef8ea26f35d6574fc316dbf0b9c5ab9fb35f810ebeb709a8548fa8eae38fc3ccc089e7442c891d917fa6fc45046e0c7297736c6048923487f67080c2324 SHA512 877124824e51e11a9c1fcf884ad8bea622ef604fa57a5b764e09c312f0775606d358e665bfae23715a6b5e445b5b55cfbcc057b3c900cb7afe2db5671689ef2f
+EBUILD chez-9.5.6-r2.ebuild 1648 BLAKE2B 3495e5605e2098f7c8c16638f6c6a6a5d97cf4bb4e2ac4f685e09779e0ae866e960a434e9fb9ed2afa0eefd80351bc79bd19e1421ee8c0c257a908abb0c3b851 SHA512 34d7cb87d6cceb4b24eea892ac517ef53cd27fe170050ba3cf18ca04643fa43ed0d63379d3d7be18e813a872a8ec4e97b7131fe8cbcc2c6506c928adc1946eb7
 MISC metadata.xml 1247 BLAKE2B 2fce457107f3e9a65f30ecc19c891c1b953049889bcd7bd9ccc7537c6ee8b9ae64937ee46c329f74266f095fd611ae53775e4229aacd4ebdf82b83135e13e50c SHA512 2a0bab06ce23b7e38f4651d33337b03691dbe09257ee325236ad5c585af4300e2b15f6b0d9614ee87ee4721adebfd71c0a2313ad3865a9e7f75e5e95b54cc5a3
diff --git a/dev-scheme/chez/chez-9.5.6-r2.ebuild b/dev-scheme/chez/chez-9.5.6-r2.ebuild
index 2d285842d04d..2d9538ba01d5 100644
--- a/dev-scheme/chez/chez-9.5.6-r2.ebuild
+++ b/dev-scheme/chez/chez-9.5.6-r2.ebuild
@@ -49,7 +49,6 @@ src_configure() {
 		--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
@@ -59,9 +58,12 @@ src_configure() {
 }
 
 src_install() {
-	default
+	# TempRoot == DESTDIR
+	emake TempRoot="${D}" install
 
 	if ! use examples; then
 		rm -r "${D}/usr/$(get_libdir)/${CSV}/examples" || die
 	fi
+
+	einstalldocs
 }
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index 79e3d083658d..3c7811defffa 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,5 +1,5 @@
 DIST chicken-4.13.0.tar.gz 4244358 BLAKE2B c40a28346fb6cd144e33605235ed022d48103edd1db1ae35e109e266989caaa0bf8fabf75e8b9cb740ac8bf4e3fba74218763573485127acacd001b8767cd088 SHA512 02c2035b4f81da6f4af2d246361ce8debdc9d9c663c3f43b7afb9abbf1ff591a2bb8fa144511b4d747a373dea4dcd9c10cac48466bf97032db76f3830c08709d
 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
+EBUILD chicken-5.3.0.ebuild 1781 BLAKE2B 4d55d7b4aa1590334598c8321591ffd386f37759b1899e702a1c5821e8f4e773b193ebf1bcf4d00dd84c9e4f2f1246ae11242145d4a87fe6d656693c93d12d57 SHA512 21447b45e5b16728e75de2d41ffa08c8fb4645c224398ac6e9f5460e86dc7c828ec77138e04081791141612d950cf238a979692d94c383bf3bc1e9f77a461325
 MISC metadata.xml 634 BLAKE2B b12c63caf7f06e32c23cf6ee7a02d245759f1e8d7da7e69457536e6a8a792eba43b86e170e04f67e6a4871ca4342c4db8db1661fe12626182ae3718dd1599f49 SHA512 9e7e23a443b91bd44870cc00206af7ff6dc536435d69ecfb370e423455b62df8aa4835265994f83c53240001727276005a3c30a4afac6c21f1b10c411d1b1ae7
diff --git a/dev-scheme/chicken/chicken-5.3.0.ebuild b/dev-scheme/chicken/chicken-5.3.0.ebuild
index 869ed7fcf99a..2b0584234cea 100644
--- a/dev-scheme/chicken/chicken-5.3.0.ebuild
+++ b/dev-scheme/chicken/chicken-5.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -11,7 +11,7 @@ SRC_URI="https://code.call-cc.org/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
index 067487b643b0..b22b315e12ac 100644
--- a/dev-scheme/gambit/Manifest
+++ b/dev-scheme/gambit/Manifest
@@ -4,5 +4,5 @@ DIST gambit-v4_8_8.tgz 13272335 BLAKE2B d15bf944c8da3050c1fee6854044d904712075f0
 DIST gambit-v4_9_3.tgz 13736448 BLAKE2B 664e90e3cc2419aa07264ac84abf0aacce43fd2339a72dc502745961a56097b6c161a89d12faa4b88a95841b8d45e37c199438d3fa8b9914db431406cc2d0e4b SHA512 0ee8eb5a2a0b63c0250f4d8d5bcf71d7c57b7444bf1a4c31c084fc9aef6f7932bf607a0a0b835987e7ada3a995cf732cc46593eb4b9dd79fc918358c57c4285f
 EBUILD gambit-4.8.8-r2.ebuild 1248 BLAKE2B 06aa2099a15e630acab87ae87be91e7c23cbb2c173d437444fc33e86564f47e6aa2695bb661c00808f12f6c29bce0e30eca98658c5121db3f21fe37e81728c45 SHA512 615493ea15f0496c6bf5054f926bed6d89b83bcfe5d839c1fee22da5e61ab7524db0d27c5aa140506b502c9aff90b8e59456684b9c19ad59ba16ff8f7033711c
 EBUILD gambit-4.9.3-r2.ebuild 1248 BLAKE2B 06aa2099a15e630acab87ae87be91e7c23cbb2c173d437444fc33e86564f47e6aa2695bb661c00808f12f6c29bce0e30eca98658c5121db3f21fe37e81728c45 SHA512 615493ea15f0496c6bf5054f926bed6d89b83bcfe5d839c1fee22da5e61ab7524db0d27c5aa140506b502c9aff90b8e59456684b9c19ad59ba16ff8f7033711c
-EBUILD gambit-4.9.4.ebuild 1347 BLAKE2B c96bef7713587f62d88057d3f8f0c570107f29120025072b1e837ab1d0e01227c8608b1bb4feea7c64d33903f0707c21f22b05b6c151bd474a305b653f5c86c8 SHA512 27eebb147816861cd42200ead403c164817323ab1e53bd57a50b496590ffc12ecff5916399bfd42593952966b3c7ccea9021914dd49d9cf958fd29fa6925ce7d
+EBUILD gambit-4.9.4.ebuild 1345 BLAKE2B f92de4e64ed6a3c9e8fd60f43f93f133f9c27bad31e1943147491240c326cf89dee78497b7e7afc5fdd2107a8937404617b106d3bf4c67b2c973483d73a79b47 SHA512 d3ef29c7a4c40e66f2f47f7e7656eb1ca65701bd3271e96c3ced0c277b28fd5d527e277b94bc363850818beae229349cf14343a26b2c2168dfc98f2e1f2fa1ed
 MISC metadata.xml 582 BLAKE2B 31f6ae847fca53c9b516584ca645e6d5d49b1bf3f3bb32effbd04e2b3c5a9c356dd3bec11b4f0f606cf1669a397e3e8473eac374cc4505383417d16173689783 SHA512 2662ddc6db6ab8dbae6db3d7f26da0c32def518e03d1ee375a5b5059e607cce588c14115c82908e0ab3a6f7c57b28eb7c9c10e439499179210a13da7e8333485
diff --git a/dev-scheme/gambit/gambit-4.9.4.ebuild b/dev-scheme/gambit/gambit-4.9.4.ebuild
index 2aca0c767e16..5419e7a1e236 100644
--- a/dev-scheme/gambit/gambit-4.9.4.ebuild
+++ b/dev-scheme/gambit/gambit-4.9.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-tags-v${PV}"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="emacs ssl static"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index d9626ab30de8..e2665a7e2e72 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -9,5 +9,5 @@ DIST racket-minimal-8.3-src-builtpkgs.tgz 21212037 BLAKE2B 76a742efe7ba2c44eb935
 DIST racket-minimal-8.4-src-builtpkgs.tgz 21279666 BLAKE2B 25d5eb405cedaa9cadfa776c4dd66b87f1641c86b638110f1a3a788465aaf573f5f8054e1e6913e6c0123840a1a2f64d5855db5f52acace3475b91d095272a76 SHA512 92433c08508cfb1bdb9093e5c7c726630826e9046de02fcb3d402f3dd76aa98fc2d9a5d09515d44e7a50eab0e38d963d2202f48a44741c3cf7fe8e47d9404e63
 EBUILD racket-8.2-r3.ebuild 5205 BLAKE2B 05b2762605383f5c48ef70cb87c5b791c04a5b721076ce9d52c51293573952898a16a535cc2b40be0c15c13e248cf52713c0617fd1471d4dd41a6f782e9c9250 SHA512 57cff4bd79dfb8ba5b800e6d1782d06968dd9e1ce59bd77c3691bba3b7d9c056e3bdc1bfeaa8377dc6cb0ba5d01f19cb18a67020c7a8b2b0375ea20b40ffbaf7
 EBUILD racket-8.3-r3.ebuild 4592 BLAKE2B df72e1388608938c636f9cf45827056b2e4c9d4102b7feeb99c8d33040c22a8efa62006aebfc2544f30b9f6dbca6c2bd22d17029d9c0c145759963c28cd17d25 SHA512 dafd2aec23a547333368908fa5fbc5a2c731581fc74025104c9dd2adaebe4de3a8aa622a7008bec8814cd91887657f52a1cc722760a53d6f3ab0203c2f2cbc99
-EBUILD racket-8.4-r1.ebuild 5386 BLAKE2B a028f3b6efc4bce5f0d25d4860903648fed822c36a7f12a7ebbed108c36590d12b540ad8044d10d97a18239da95f9ff3eb339115f47595a2ecf576e55b6de862 SHA512 20268d2e814500539b580dc26979fd0e5439255b0da4d16f34eb9abcdf95bb22222e79fb6903446ecceb00e41688f1ea4f3b709984a8ba34e1930021ac927555
+EBUILD racket-8.4-r1.ebuild 5384 BLAKE2B e0e8ccc64e93041202a599b50fcc08c857d593bea58caade1621c2b7c1929d9f249b0950f20a1b2ead7500d072526d482e3a6793e9caca2354a1bf381ad57289 SHA512 814ee06014870613888669be0dcc997e7919a45eb8c9a2be78438a8a95918e7f3c82e9644bcb5b44b812da1ea3368da0e8f2eb90dee7b3996577cca83d239566
 MISC metadata.xml 1878 BLAKE2B 9e9fb9e1e139c459b0e5d4b12034c09bb4fbf548c7868342bb207137779119d53ba1fae07a7be402b3a02d50ba5a7b6cf0d26d4329e971b9387685457956d564 SHA512 ab9639a08e8a2f1799c11964e900b58ba45ba044f1332a54dc476a20e143ffcb97ff97abfd28105a4a2b199dfa32ce48ac98622be1588c8fd8c5c24a627d4565
diff --git a/dev-scheme/racket/racket-8.4-r1.ebuild b/dev-scheme/racket/racket-8.4-r1.ebuild
index 1dae6d9cdb89..21f19f5a855e 100644
--- a/dev-scheme/racket/racket-8.4-r1.ebuild
+++ b/dev-scheme/racket/racket-8.4-r1.ebuild
@@ -24,7 +24,7 @@ LICENSE="
 # 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="+chez +doc +futures +jit minimal ncurses +places +threads"
 # See bug #809785 re chez/threads
 REQUIRED_USE="chez? ( futures places ) futures? ( jit threads ) places? ( threads )"
diff --git a/dev-scheme/scm/Manifest b/dev-scheme/scm/Manifest
index b9e3eb7e3606..b7d982c1d602 100644
--- a/dev-scheme/scm/Manifest
+++ b/dev-scheme/scm/Manifest
@@ -1,6 +1,5 @@
 AUX scm-5.5.6-multiplefixes.patch 3014 BLAKE2B 08891323ec487c703a04f72043b73edb0d8e697366f71910a4a728a8ad937c75db310cefdb96144a1af9334edd2da9fc5c720530c6cb0f741e310ee06277e6c1 SHA512 e746ebca91e26569354f09403cf1610c745281af3477d92587a8b52de704998a61d1aeac75bfadfed8aead84243aa01f626438399cfffe92c73bba9fa9564f22
 AUX scm-5.5.6-respect-ldflags.patch 395 BLAKE2B 1fec97642ad348678070df454bbc2c7e64e17907f986a95cf96a3ead621ebe6f22a2f5dbcccc4fe9f7a8b8b951d935bafc5a64ce5cc0b48a514d2cda6ecebfb3 SHA512 03f740acdde590dbdc67046795aa1bed609721cbf83e7c153f5d1d5524c4761e3025c808855bf5b56d44d917c4aefa7198b96d66729e565b277c1acac7c53356
 DIST scm-5e6.zip 912968 BLAKE2B c059b49364abd25bb2335ad11f82791b96ac95aa9529b914396d08592e46e5aa5cba178b791fc96e3ea3066670c48bdd728609463bea398300b81d979fb304cb SHA512 897370f043401a7961eb1c2e22c951e2144505a1670e328e2c3eab33d52da83f195b873fb7cf8486f412ae52316cfc437c9f2da1432ade70f82eb0da12c2f852
-EBUILD scm-5.5.6-r3.ebuild 3741 BLAKE2B 71e479b6df69b8a33ce6b4f826fc955d6c7361726fa4c50fe1bb3906b427d3cf97cdbeb5117d412249953bf8b185fe8e11a56a800cbf3d3cf97a9f2b29a61718 SHA512 ed4bd81f329cd9fffc6504dbce66e6017491448c9b9d32a75536231ca4c1a83f772cb5f428033c552ed85802b2fb0e23f6a9d9df035c135193cca63e312d1b0a
-EBUILD scm-5.5.6-r4.ebuild 3714 BLAKE2B 5c1aafbfe92f0185ad45cd4a5c8eb73eed2995dd975e45c5d5635b2242153c503f1fedfea7708385edcb6b4e282dac1143e4d5860729082057a48c48c15f8ec0 SHA512 b8400426ec602f874be94488b916fd6ed865d21d4808e3ef617a1b9d01d98dee382dc09fe56f130af9b7606ae7964934eba2a9f4af86d1d44d26d971598c5a9a
+EBUILD scm-5.5.6-r4.ebuild 3886 BLAKE2B 54647203a4dbc28d546cb496392976066bace65131e36600bff7e5c29715343c0aa296fda795cdc622f07d7f8a175ce5801d534dbd696962e13919fcd3347aab SHA512 b43a123cb307db0c11275be904fc033488ad10c15ae17beab9ce273fe8b9b91e54aef57803add43b85b5c353b40767b4c7c79c6168cb3c04b31a81ad9ace1e04
 MISC metadata.xml 1637 BLAKE2B fb3ba0a5330e95dabfbd0b8aae6b5bcf89a97f5c1f2ba98203a287098bdc5e8cc2795adbef31dc7eebd149ec8644162812770ce82dca060aae66480d3b72e75a SHA512 a96fa63997c9ee51578f9590c9ebf198a05b15be499f873bead38cb80985acccc47fdc9d8f67a683ebe3f97a2ed5b34aad037ce68148a12fa169f92dbe2b8c06
diff --git a/dev-scheme/scm/scm-5.5.6-r3.ebuild b/dev-scheme/scm/scm-5.5.6-r3.ebuild
deleted file mode 100644
index 7f9e5ca83411..000000000000
--- a/dev-scheme/scm/scm-5.5.6-r3.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator flag-o-matic
-
-#version magic thanks to masterdriverz and UberLord using bash array instead of tr
-trarr="0abcdefghi"
-MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
-
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${PN}
-DESCRIPTION="SCM is a Scheme implementation from the author of slib"
-SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip"
-HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix"
-
-#unzip for unpacking
-DEPEND="app-arch/unzip
-	>=dev-scheme/slib-3.1.5
-	dev-util/cproto
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/libtermcap-compat )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-multiplefixes.patch" )
-
-src_compile() {
-	# SLIB is required to build SCM.
-	local slibpath="${EPREFIX}/usr/share/slib/"
-	if [ -n "$SCHEME_LIBRARY_PATH" ]; then
-		einfo "using SLIB $SCHEME_LIBRARY_PATH"
-	elif [ -d ${slibpath} ]; then
-		export SCHEME_LIBRARY_PATH=${slibpath}
-	fi
-
-	einfo "Making scmlit"
-	emake -j1 scmlit clean
-
-	einfo "Building scm"
-	local features=""
-	use arrays && features+="arrays"
-	use bignums && features+=" bignums"
-	use cautious && features+=" cautious"
-	use engineering-notation && features+=" engineering-notation"
-	use inexact && features+=" inexact"
-	use macro && features+=" macro"
-
-	( use readline ||
-	  use ncurses ||
-	  use regex ||
-	  use posix ||
-	  use ioext ||
-	  use gsubr ||
-	  use sockets ||
-	  use unix ||
-	  use dynamic-linking ) && features+=" dynamic-linking"
-
-	./build \
-		--compiler-options="${CFLAGS}" \
-		--linker-options="${LDFLAGS} -L${EPREFIX}/$(get_libdir)" \
-		-s "${EPREFIX}"/usr/$(get_libdir)/scm \
-		-F ${features:="none"} \
-		-h system \
-		-o scm || die
-
-	einfo "Building DLLs"
-	if use readline; then
-		./build \
-			--compiler-options="${CFLAGS}" \
-			--linker-options="${LDFLAGS}" \
-			-h system \
-			-F edit-line \
-			-t dll || die
-	fi
-	if use ncurses ; then
-		./build \
-			--compiler-options="${CFLAGS}" \
-			--linker-options="${LDFLAGS}" \
-			-F curses \
-			-h system \
-			-t dll || die
-	fi
-	if use regex ; then
-		./build \
-			--compiler-options="${CFLAGS}" \
-			--linker-options="${LDFLAGS}" \
-			-c rgx.c \
-			-h system \
-			-t dll || die
-	fi
-	if use gsubr ; then
-		./build \
-			--compiler-options="${CFLAGS}" \
-			--linker-options="${LDFLAGS}" \
-			-c gsubr.c \
-			-h system \
-			-t dll || die
-	fi
-	if use ioext ; then
-		./build \
-			--compiler-options="${CFLAGS}" \
-			--linker-options="${LDFLAGS}" \
-			-c ioext.c \
-			-h system \
-			-t dll || die
-	fi
-	if use posix; then
-		./build \
-			--compiler-options="${CFLAGS}" \
-			--linker-options="${LDFLAGS}" \
-			-c posix.c \
-			-h system \
-			-t dll || die
-	fi
-	if use sockets ; then
-		./build \
-			--compiler-options="${CFLAGS}" \
-			--linker-options="${LDFLAGS}" \
-			-c socket.c \
-			-h system \
-			-t dll || die
-	fi
-	if use unix ; then
-		./build \
-			--compiler-options="${CFLAGS}" \
-			--linker-options="${LDFLAGS}" \
-			-c unix.c \
-			-h system \
-			-t dll || die
-	fi
-
-	if use libscm ; then
-		emake libscm.a
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" man1dir="${EPREFIX}"/usr/share/man/man1/ \
-		install
-
-	if use libscm; then
-		emake DESTDIR="${D}" libdir="${EPREFIX}"/usr/$(get_libdir)/ \
-			installlib
-	fi
-
-	doinfo scm.info
-	doinfo hobbit.info
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-}
-
-pkg_config() {
-	einfo "Regenerating catalog..."
-	scm -e "(require 'new-catalog)"
-}
diff --git a/dev-scheme/scm/scm-5.5.6-r4.ebuild b/dev-scheme/scm/scm-5.5.6-r4.ebuild
index 482f32675a52..0a286fe7cd04 100644
--- a/dev-scheme/scm/scm-5.5.6-r4.ebuild
+++ b/dev-scheme/scm/scm-5.5.6-r4.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-#version magic thanks to masterdriverz and UberLord using bash array instead of tr
+# Version magic thanks to masterdriverz and UberLord using bash array instead of tr
 trarr="0abcdefghi"
 MY_PV="$(ver_cut 1)${trarr:$(ver_cut 2):1}$(ver_cut 3)"
-
 MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${PN}
+
+inherit toolchain-funcs
+
 DESCRIPTION="SCM is a Scheme implementation from the author of slib"
-SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip"
 HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
+SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip"
+S=${WORKDIR}/${PN}
 
 SLOT="0"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix"
 
 BDEPEND="app-arch/unzip"
@@ -28,6 +30,15 @@ RDEPEND="${DEPEND}"
 PATCHES=( "${FILESDIR}/${P}-multiplefixes.patch"
 	"${FILESDIR}/${P}-respect-ldflags.patch" )
 
+src_prepare() {
+	default
+
+	sed \
+		-e "s|\"gcc\"|\"$(tc-getCC)\"|g" \
+		-e "s|\"ld\"|\"$(tc-getLD)\"|g" \
+		-i ./build.scm || die
+}
+
 src_compile() {
 	# SLIB is required to build SCM.
 	local slibpath="${EPREFIX}/usr/share/slib/"
@@ -38,7 +49,7 @@ src_compile() {
 	fi
 
 	einfo "Making scmlit"
-	emake -j1 scmlit clean
+	emake -j1 CC=$(tc-getCC) scmlit clean
 
 	einfo "Building scm"
 	local features=""