gentoo resync : 13.11.2021

15 files changed, 112 insertions, 72 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index d8e010279578..e380b8ecf918 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/c-wrapper/Manifest b/dev-scheme/c-wrapper/Manifest
index c53e6d9182ac..23b0b49713b6 100644
--- a/dev-scheme/c-wrapper/Manifest
+++ b/dev-scheme/c-wrapper/Manifest
@@ -9,5 +9,5 @@ AUX c-wrapper-info.patch 1920 BLAKE2B 62c60a2dd8783fc0a56d386e02faa8f04bdd570c71
 AUX c-wrapper-local-typedef.patch 4576 BLAKE2B e128d6f1f5cc457b3968ed8b9c3cfe62ed94dc4c79a90d2b44226c525531daffb5fa2cfe5293ce0d1c7baaa947a0304a4c60c3046234ae957bf24162c4586de3 SHA512 bef1d6ab86473a440f6434aac257c41850f67443a0a5fbe83d139052509a855d594e18904a1e112989a9c8cbbc9d008e3f75a16a93e8c6d93cac370ffd5bf170
 AUX c-wrapper-texinfo-6.7.patch 1052 BLAKE2B 6c042ee1a386d611be9bd1155fe930995b026eac5722e2264d8b73dee29b2a0371916f7f087c8b8a2031e34e70a064c8396d1870e0f759898e39eaf97d55a068 SHA512 ca2f1697cb81ba7a0cdcccfdab8fde71e94dd8ef8be570bebf9b4cceda0723c178114fc0c713f3998eb102ad19c17889197a80e8f5410032da96e0788d1fc2c8
 DIST c-wrapper-0.6.1.tgz 843981 BLAKE2B af28cf60eebe0da32c90c030bfdae4457d20731c31220f7eaac33291ea1be104a7aab11fad0560fe6e3d36a5d3afafbd8795fddd633e0c26be226c29012afbc9 SHA512 a03a4d57d112d2c23dac3716bae081e3e6f02dcef261bd8dd518ed8519b43e28f9e61a36f7584b2bcb1762112c128d0b698cda422cc0c9d1190cbf7502ea04b0
-EBUILD c-wrapper-0.6.1-r2.ebuild 1085 BLAKE2B 21d4b6838d8f8cf1fcfcbcf96110490e03a7d5825dce5cfcfbf9b51c6291f8ad150e65343d6b121c33a134f84c4155eddf17297c952755d5510cc21dc52a67c5 SHA512 56001852e10b64306397812af3d41b8e46021dc0514dc624f5acc192eddcd9bb9981b3af232faedb8d9dbcb46bcd12a2312d6d52b037769e9048d119821cbfc8
+EBUILD c-wrapper-0.6.1-r2.ebuild 1085 BLAKE2B 095d7c6723de816748d4ec861dab5fe995529f17a42ab8d8cf29fff125bd0f91e8271c824fed156456bbc5e240ee634b86f3d3238f86bfc15c87b549f5b1a9b0 SHA512 0f68154463fd6a7597bca07cc6afd7a2397dcd2856c937f5801c2bc851bdae76a23e4dd9e46beca21bddb917888be6d7779f755393401b5e2bd7fb6c78770a8b
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild
index 3f8277774536..adbb32c8b4b9 100644
--- a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.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"
 
 inherit autotools
 
diff --git a/dev-scheme/escm/Manifest b/dev-scheme/escm/Manifest
index cd5f30e6ae8e..e975622f6772 100644
--- a/dev-scheme/escm/Manifest
+++ b/dev-scheme/escm/Manifest
@@ -1,3 +1,4 @@
+AUX escm-headers.patch 173 BLAKE2B d9f81e0ba55591d86dbbcd513e6e250a8097694ce025b38a5dfeffc1af1311923d3ee2756cd1727646a89df8fb5b1495f6cb1c9caf7a74482f66ceae10ece08c SHA512 643cdbbb45bf2c48b103b424888af80c6e56f057cd646439b052f779b95b5f7d6bf253f0760b4954a68c38e6abf0e9d0845b447b659d165f2a7005870b76dae3
 DIST escm-1.1.tar.gz 22344 BLAKE2B 4b1ee5a2e002cf0908c1cba58d39dc454cfcedcb11ff7f24344824947103d7670108263d210e020b7d0189f3745a002bb4345d8b50a9f334d89850baa30c9ae9 SHA512 7df97d8b9e7c4b46b412e3dd24a2b0b3f4028d45b1940d12b09f0801c93ab1868ef5c239d8f1bfb18d5c86f473aa543d9b735eb1f05b4bb3e4b17177d2ed9102
-EBUILD escm-1.1-r1.ebuild 645 BLAKE2B 545844fe9195db6ef4e55a5864b9631b3a05d0ba2faabcf047babd2c8f0f3c5e4a1da64b80363c7757470f1106f206295ceabb065f45dec19e4a5b218660963f SHA512 897f3e028752f2e573739211b7a9db42f54906baf606518d76db67da44883d333930a05b78774a2e4b3ce9891524a8c33763810e98a8a75dc05b6306e9abe64e
-MISC metadata.xml 222 BLAKE2B 425bba0db7c4bc483eddcb51bb4151324b62afc42496047413bf9d0480fd731ea78201a8b99c42d9adfa9b20614f9507e8e89a87e9afce32aa9db82f42f827ed SHA512 7ae4d3d64e85fb01194d31b41843c10e3bf6a782e9f308cbe3f0a75c0a07d6af2a88013549b5840b3cd5e766d5044f0da290c31a4800d1823f6eca4028b082da
+EBUILD escm-1.1-r1.ebuild 716 BLAKE2B 258789dd1558548fefb855f1676901e4dda2f21f46c5114f510ecb31cfc823471f430c79794679fcddf9bdd780e08b49ac1d4fe6b365c9643c4910efaff45b2b SHA512 1b22b49b21ea01480d674dcd4b4be42da5af4b7331d787b8a2ea660bc2631bf7a90f45a360371e51e145b3c60f071a33f7f9afd748e1c3ce4a6a7b508131ecd3
+MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/dev-scheme/escm/escm-1.1-r1.ebuild b/dev-scheme/escm/escm-1.1-r1.ebuild
index 2881ec1fb9fa..e9d61e33dd15 100644
--- a/dev-scheme/escm/escm-1.1-r1.ebuild
+++ b/dev-scheme/escm/escm-1.1-r1.ebuild
@@ -1,13 +1,13 @@
-# 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 toolchain-funcs
 
 DESCRIPTION="escm - Embedded Scheme Processor"
-HOMEPAGE="http://practical-scheme.net/vault/escm.html"
-SRC_URI="http://practical-scheme.net/vault/${P}.tar.gz"
+HOMEPAGE="https://practical-scheme.net/vault/escm.html"
+SRC_URI="https://practical-scheme.net/vault/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,12 +20,14 @@ RDEPEND="|| (
 	)"
 S="${WORKDIR}/${PN}"
 
+PATCHES=( "${FILESDIR}"/${PN}-headers.patch )
 HTML_DOCS=( ${PN}.html )
 
 src_prepare() {
-	sed -i -e "6s/scm, snow/scm gosh, gosh/" configure.in
+	sed -i "6s/scm, snow/scm gosh, gosh/" configure.in
 
 	default
+	mv configure.{in,ac} || die
 	eautoconf
 	tc-export CC
 }
diff --git a/dev-scheme/escm/files/escm-headers.patch b/dev-scheme/escm/files/escm-headers.patch
new file mode 100644
index 000000000000..bf23008f801f
--- /dev/null
+++ b/dev-scheme/escm/files/escm-headers.patch
@@ -0,0 +1,10 @@
+--- a/escm.c
++++ b/escm.c
+@@ -28,6 +28,7 @@
+ 
+ #include <sys/types.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <errno.h>
diff --git a/dev-scheme/escm/metadata.xml b/dev-scheme/escm/metadata.xml
index 9a97f3478d31..987ce1bc2ed6 100644
--- a/dev-scheme/escm/metadata.xml
+++ b/dev-scheme/escm/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index c9c37dae8dd3..5265f3f89d5a 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -6,5 +6,5 @@ AUX gauche-rfc.tls.patch 277 BLAKE2B 91e745207e64ba3c83a1252be6fa63c486a3ebf1481
 AUX gauche-xz-info.patch 1248 BLAKE2B 8c87339d3739da774da858f43345bb6063fe2fafdfda3e791a67aee7773be4c1312c11aa37f1532203a7e1d4805cf3fa0ec80ce28f52d05c43df8536efa199a2 SHA512 7cbbfc17ef28aaa29dffe03d2d8afa01cc92897f5c08c9ba1ddd7926d45207100a44ccb8efd745f2f98c8d9a83ca0ca20a6c611329c3a80dea5692002467c52b
 DIST Gauche-0.9.10.tgz 7701616 BLAKE2B ecffc8cbffdbbea53a52468bcc190c57eede51ade78ccafd323299458f333794cc613bbfa11090d261993908020ccf8d42c2142da5996e1e55188f28e03cc28b SHA512 f014ec00903fc91b90da8dbdaace04a64d12695c631e923d5cdca3574aaf6701374f5adbed20c395881b047bb5a448352614d4ce7f16b6e38f69382bf8e66ed0
 DIST gauche-0.9.10-sys-ctermid.patch.xz 10328 BLAKE2B f4cde73528624d07a8c7d820b8cf10a0b96e5f13394df3113b8d40ddb43996afc5e519a34fa1de72529e42e1fb6e1feec60213bbf5df97e7725f4c0cd2c621e3 SHA512 7d16a9e6097d458bcad9db68fbedd2f694afade681bf9b876e0a2f6c232be85fb58e3d7dca6b208117b300e2bf529027b736b381d8eca29c688628725c0466ed
-EBUILD gauche-0.9.10-r1.ebuild 1457 BLAKE2B d1e08267cb94f5b45041af19a97ef6132d4aed73e2c07ad90d8a42817bef0aca0ebcc3aabcdce978efa2c0d86bb11bf02cfadb7c9bc240ba602307d56f9acdff SHA512 ddbea54c152b3d02473fb804000cc01f8e569e158a662555b89e8b4da6e82049dba8e7a532153e15a88dc668af4ea64004322df6fbf1a87cc23bc2d40790cb10
+EBUILD gauche-0.9.10-r1.ebuild 1457 BLAKE2B 7a48d9785d98db2a516235e463311a5f620345f2ddb1530dc62fae75acec14dcf1053158dd69d5ddf6323abf48e326deb13b41d2d6825706430f8ea8ce0ad842 SHA512 a4c370a394b7e2346cc384f0a0face23ae4cb8101b1bb52bfd75cbf80f9a53ccf20adc3f7ebf55313be89ab958174c10ef6b44fcb28395042cfd4bef4d265d18
 MISC metadata.xml 910 BLAKE2B e521ff4a434554441bb94b2c2246a02f5f1d976b77cde7fd8f8364108cb6c000c794f8413d636b8b13bbb89ec03b3042d3ccb0599a25c6894aef4e5282544c50 SHA512 6a3d126f858bd4b8eb9cf2475fb5d25f9f23c5caf62406941ef3646a5b36c7c8143f83d8dfabb6aa36abd2cce31e65a11a5451ec2f33964c3d51662e09bd37a0
diff --git a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild b/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
index 06bbf39e6e53..561857d35c8f 100644
--- a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.10-r1.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"
 
 inherit autotools
 
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index c68059d63963..09b8e2126a4b 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -19,6 +19,6 @@ EBUILD racket-7.1-r1.ebuild 2466 BLAKE2B 907c211cf8634e226e13bc8ec6d57fdfa5deabf
 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.ebuild 4412 BLAKE2B bd530aba49c44162b5bb94792b74ae858d43843a692f2d5fbed1224ded76d202fe298c7524c35db5c966fe11c15de7e5a049c3ecf2a0da76f4435fdebd5bbb1c SHA512 2ab601d06f1d195b63443d8bd232aeb492ebf51ebb822c4c845c89b653ce1020cde0123bb09f90076f32daee3c90ed7e20b521597444033cf43c9e91b005a1fe
-EBUILD racket-8.2.ebuild 4412 BLAKE2B bd530aba49c44162b5bb94792b74ae858d43843a692f2d5fbed1224ded76d202fe298c7524c35db5c966fe11c15de7e5a049c3ecf2a0da76f4435fdebd5bbb1c SHA512 2ab601d06f1d195b63443d8bd232aeb492ebf51ebb822c4c845c89b653ce1020cde0123bb09f90076f32daee3c90ed7e20b521597444033cf43c9e91b005a1fe
+EBUILD racket-8.1-r1.ebuild 4669 BLAKE2B a4ac2ad98c75fa22499c3c2426b6b804ede9bfcfbef6a74b36b7615edaf11b3d59faa32199975a227e6bb7608193f01d6a2bb85a04d8bb7865fdb3e8a8e4e89d SHA512 a988c01b07176b63eadb50dc62898a2d24613c22178016a581164e227608f9c63e28e146914ce097956685d7c6b9968f4393814d83286afa5a86d52a5377bf2d
+EBUILD racket-8.2-r1.ebuild 4719 BLAKE2B 347edfd00d2f4af9ba4a1f96de37af00e3e8bc13dd9eb8b8422d1217021e64fe7278b0b168c4c4f461e8249219fc78f2067cda5c9a821529119f68fd19aa5534 SHA512 da546f1216f40fd55e319bf582ca4daefea7c50fc17282bcdffb02f300b795fe496578b4d39aff8f306d16edabc868adf63a01585471479fb0ab75cb3195e1e8
 MISC metadata.xml 1650 BLAKE2B af7d1bb5e4a6a4fa170f4f88fa20faca5463330047a7dcdf48e24f0e9967233235ac810f5901397ab909fbbf008c4aa8c4a89a1ea540bed40a3d2da1886613de SHA512 e2b5c5af4e5e6561cf206c1cfd3b1a1e031d722482f85ac09ce808713acc856e691adf43d62d3df46644d1abcd1f01f8cf07f1453556e7d27ae9bc425f61e63b
diff --git a/dev-scheme/racket/racket-8.1.ebuild b/dev-scheme/racket/racket-8.1-r1.ebuild
index b9c6c2601961..652449041953 100644
--- a/dev-scheme/racket/racket-8.1.ebuild
+++ b/dev-scheme/racket/racket-8.1-r1.ebuild
@@ -81,18 +81,24 @@ src_prepare() {
 }
 
 src_configure() {
-	# According to vapier, we should use the bundled libtool
+	# Libtool:
+	#   According to vapier, we should use the bundled libtool
 	#   such that we don't preclude cross-compile.
 	#   Thus don't use --enable-lt=/usr/bin/libtool
-	# --enable-bc builds Racket w/o chez backend
+	# Backend:
+	#   --enable-bc builds Racket w/o chez backend
+	# C Libraries:
+	#   --enable-libs & --disable-shared is the way to build
+	#   .a files that are needed to embed Racket into programs
+	#   https://docs.racket-lang.org/inside/cs-embedding.html
 	local myconf=(
-		--disable-libs
+		--disable-shared
 		--disable-strip
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--enable-float
 		--enable-foreign
 		--enable-libffi
-		--enable-shared
+		--enable-libs
 		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
 		$(use_enable X gracket)
 		$(use_enable doc docs)
@@ -107,14 +113,18 @@ src_configure() {
 src_install() {
 	default
 
+	# Install Racket boot files
+	if use chez; then
+		pushd "${S}"/cs/c || die
+		emake DESTDIR="${ED}" unix-install-boot-files
+		popd || die
+	fi
+
 	# raco needs decompressed files for packages doc installation bug 662424
 	if use doc; then
 		docompress -x /usr/share/doc/${PF}
 	fi
 
-	# Remove unneeded "*.a" and "*.la" files
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
 	# Create missing desktop files and icon
 	if use X && ! use minimal; then
 		newicon "${ED}/usr/share/racket/drracket-exe-icon.png" "racket.png"
diff --git a/dev-scheme/racket/racket-8.2.ebuild b/dev-scheme/racket/racket-8.2-r1.ebuild
index b9c6c2601961..3437a73c8c5f 100644
--- a/dev-scheme/racket/racket-8.2.ebuild
+++ b/dev-scheme/racket/racket-8.2-r1.ebuild
@@ -21,9 +21,10 @@ LICENSE="
 "
 # Bytecode generated by Racket is not compatible between versions
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="X +chez +doc +futures +jit minimal +places +readline +threads"
-REQUIRED_USE="futures? ( jit )"
+# See bug #809785 re chez/threads
+REQUIRED_USE="futures? ( jit ) chez? ( threads )"
 
 DEPEND="
 	!dev-tex/slatex
@@ -81,18 +82,24 @@ src_prepare() {
 }
 
 src_configure() {
-	# According to vapier, we should use the bundled libtool
+	# Libtool:
+	#   According to vapier, we should use the bundled libtool
 	#   such that we don't preclude cross-compile.
 	#   Thus don't use --enable-lt=/usr/bin/libtool
-	# --enable-bc builds Racket w/o chez backend
+	# Backend:
+	#   --enable-bc builds Racket w/o chez backend
+	# C Libraries:
+	#   --enable-libs & --disable-shared is the way to build
+	#   .a files that are needed to embed Racket into programs
+	#   https://docs.racket-lang.org/inside/cs-embedding.html
 	local myconf=(
-		--disable-libs
+		--disable-shared
 		--disable-strip
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--enable-float
 		--enable-foreign
 		--enable-libffi
-		--enable-shared
+		--enable-libs
 		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
 		$(use_enable X gracket)
 		$(use_enable doc docs)
@@ -107,14 +114,18 @@ src_configure() {
 src_install() {
 	default
 
+	# Install Racket boot files
+	if use chez; then
+		pushd "${S}"/cs/c || die
+		emake DESTDIR="${ED}" unix-install-boot-files
+		popd || die
+	fi
+
 	# raco needs decompressed files for packages doc installation bug 662424
 	if use doc; then
 		docompress -x /usr/share/doc/${PF}
 	fi
 
-	# Remove unneeded "*.a" and "*.la" files
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
 	# Create missing desktop files and icon
 	if use X && ! use minimal; then
 		newicon "${ED}/usr/share/racket/drracket-exe-icon.png" "racket.png"
diff --git a/dev-scheme/scheme48/Manifest b/dev-scheme/scheme48/Manifest
index 860b941b3cce..f45bc1e8e570 100644
--- a/dev-scheme/scheme48/Manifest
+++ b/dev-scheme/scheme48/Manifest
@@ -1,5 +1,5 @@
 AUX 50scheme48-gentoo.el 198 BLAKE2B 48b8efe86b0392d03a5456680f05b7dcc810757a80bab44a6af5adc43d97179b41880a2f4910bed5c408e5162c9498cc3b3a9fd865629cc230032aade98eb4b7 SHA512 874355b78d5ddcc55add22d7171ae92e4115c8e84883a89e76848ad362c070c00d8ec12e1841eabd1bc0d2a786d789e36f3f109b0d3e5dd879a9faca1fb8e4b7
 AUX CVE-2014-4150.patch 407 BLAKE2B 7f71707166eaaf668c28b5af41cfd50c73790962cc70630ddc4ac6a615943f399eaecc9a1719d72f4679eefdde035c1bde6e5c57b1680f45b871a89008adb4c2 SHA512 b15b5c9ccc1cf2fba1c15244a4ec0a08d49188fc3476ee1abea74d4415cbd59e94d1a5ad7be39b73fd82a393e29a13569a8178017b6ca82320646a1ac9260eb7
 DIST scheme48-1.9.2.tgz 3951356 BLAKE2B 5a021c80d9986d51e9a9be9a469aa21f4e782e6464e5ccd51d3fdc3e7bd58f5151cafe5f81ec5f48ceeabfc235de6e8412dc18462a417932eb98db9e82d26045 SHA512 a854e3c6f5b02c585fa125899dee276500b91e21cc773202fd4cb84f2e0566a0e19cc34b5f96a3265fab6bf06422e869a2e48433eb2d8fac83a1179fda62e2d1
-EBUILD scheme48-1.9.2-r1.ebuild 1451 BLAKE2B b00533095c20e65cf4f49121ddf2f1abe12069f8b677cf9ef6cbf6908e7f1384bffbe1bcb36bfed09a8fee6a892c4f1415a7a93e60d2336e9b611c22d232316b SHA512 a21b45e2bad4d6913f728d51ad8f4bdd0bc31db430ee050ed5b755b9a3f2c94e14e6b07c124c94af0639e13fea76dc80dc6b79d2086e12a5b91f11a63ad951dd
-MISC metadata.xml 536 BLAKE2B 5f1bfcd15449b0c92dc1a90d0701ba9e5a1d59113ee05fc98377eba6f897cb7e7b64051d0a36457d37facffc103b6bb6005cde24015fa5ed7817825fa57b4304 SHA512 20948dc24f25bceb2baa30381f8aa4d466d5df6e134cc8324ffb5a1794bf9c25703b17fe0f492273b68fe60d920c7eaf5b6091510de7f78ae4cdad9773098f62
+EBUILD scheme48-1.9.2-r2.ebuild 1445 BLAKE2B e45c30c04c25e4bad65d0a22d396d0e5d63e6dceb20b27d4b1e0173c410b3be1bb80b2b7dd93a7cb52c98c5a6e34228b3fb73432b1874e65d443ab4feced6288 SHA512 a8fd46738acdb29e1cc1ac179e3c03c054603b3ea51f472300bbe836a1cc9131c12d6b78711dcaec3dc7004a68cde291258a86c1aaaa074e956ffe98d15c1801
+MISC metadata.xml 550 BLAKE2B e568bc7acb3481317aa5b19dce8ab41272eec5ffaa7dbf8657c8b050ab3ae39e9fced2ba41f6e98be93f3daab3ee84f62fc0e25efa395b35e51125968b35d83a SHA512 598c84b6594c45d50431658f69028ca824645d5fd007d7e4b98b07678f59048e9967e5c68b234e947710e6e25246bdd43fec25593a5bec353b9cbc1bdd716134
diff --git a/dev-scheme/scheme48/metadata.xml b/dev-scheme/scheme48/metadata.xml
index c3094c04edfa..6a5fffa960e3 100644
--- a/dev-scheme/scheme48/metadata.xml
+++ b/dev-scheme/scheme48/metadata.xml
@@ -1,13 +1,14 @@
 <?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 lang="en">
-Scheme 48 is an implementation of Scheme written by Richard Kelsey and Jonathan
-Rees. It is based on a byte-code interpreter and is designed to be used as a
-testbed for experiments in implementation techniques and as an expository tool.
-</longdescription>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Scheme 48 is an implementation of Scheme written by Richard Kelsey and
+		Jonathan Rees. It is based on a byte-code interpreter and is designed
+		to be used as a testbed for experiments in implementation techniques
+		and as an expository tool.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild b/dev-scheme/scheme48/scheme48-1.9.2-r2.ebuild
index ab6fbfde0f60..16a051638906 100644
--- a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r2.ebuild
@@ -1,37 +1,49 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="8"
 
-inherit elisp-common epatch flag-o-matic
+inherit elisp-common flag-o-matic toolchain-funcs
 
 DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language"
-HOMEPAGE="http://www.s48.org/"
-SRC_URI="http://www.s48.org/${PV}/${P}.tgz"
+HOMEPAGE="https://www.s48.org/"
+SRC_URI="https://www.s48.org/${PV}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs"
 
-DEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-RDEPEND="${DEPEND}"
+RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="${RDEPEND}"
 
-SITEFILE=50scheme48-gentoo.el
+PATCHES=( "${FILESDIR}"/CVE-2014-4150.patch )
+
+SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
-	epatch "${FILESDIR}"/CVE-2014-4150.patch
+	default
+
+	append-cflags -fno-strict-aliasing
+
+	sed -i \
+		-e "/# Cygwin/,/fi/d" \
+		-e "s/\tar /\t$(tc-getAR) /" \
+		-e "s/\tranlib/\t$(tc-getRANLIB) /" \
+		-e "/\/COPYING/d" \
+		-e "/for .*html/,/done/d" \
+		Makefile.in
 }
 
 src_configure() {
-	append-cflags -fno-strict-aliasing
 	econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {
-	emake
+	default
+
 	if use emacs; then
-		elisp-compile "${S}"/emacs/cmuscheme48.el
+		elisp-compile emacs/*.el
 	fi
 }
 
@@ -39,28 +51,20 @@ src_install() {
 	# weird parallel failures!
 	emake -j1 DESTDIR="${D}" install
 
-	if use emacs; then
-		elisp-install ${PN} emacs/cmuscheme48.el emacs/*.elc
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	dodoc README
 	if use doc; then
-		dodoc doc/*.txt
-		docinto src
-		dodoc doc/src/*
-		pushd "${ED}/usr/share/doc/${P}" > /dev/null
-		install -dm755 html
-		mv *.html *.css *.gif html/
-		popd > /dev/null
+		DOCS=( README doc/*.txt )
+		HTML_DOCS=( doc/html/. )
 	else
-		pushd "${ED}/usr/share/doc/${P}" > /dev/null
-		rm -f *.html *.css *.gif
-		rm -f manu*
-		popd > /dev/null
+		rm -f "${ED}"/usr/share/doc/${PF}/man*
+	fi
+	einstalldocs
+
+	if use emacs; then
+		elisp-install ${PN} emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
-	#this symlink clashes with gambit
+	# this symlink clashes with gambit
 	rm "${ED}"/usr/bin/scheme-r5rs || die
 }