gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-scheme
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
56 files changed, 1130 insertions, 205 deletions
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 65fdfd992570..59a48131973a 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/bytestructures/Manifest b/dev-scheme/bytestructures/Manifest
index f7180a67df74..b4f8ffbf2787 100644
--- a/dev-scheme/bytestructures/Manifest
+++ b/dev-scheme/bytestructures/Manifest
@@ -1,3 +1,5 @@
 DIST bytestructures-1.0.10.tar.gz 103312 BLAKE2B 85f688242523efdad2eb2b54c07c83edd424ce0f41e9b060dd4a265d0344d2eb44376658580de8e8a7a15967a0412851c4bc2fd988dda0a877300a6fc42512ee SHA512 721f5eab256b28f7354b6051aaea87ad6baa062e89af13443907038df1621bc600c781c73f541dc1000f6d472168fa954f9075721646e8493cf2b7d9f46a08f0
+DIST bytestructures-2.0.1.tar.gz 61474 BLAKE2B 647222d26de824645fc2b6d209076a0c156728ff9e35b93b548b89e6b4c904d8dedcc1253c39b882687604a3c357d8c4a224917b9f0fc1bc0ac8ba481f2a5888 SHA512 fae28908e8efaa3c675a2e47bcaff05c6449a42537ebf0f5f630c80b0c370af41dea09e2f7d8f4b1aec8edca388a817ac80dcd223bcbfbca4c12828ce0149eb8
 EBUILD bytestructures-1.0.10.ebuild 1068 BLAKE2B 59e13a856446b40cc9201d6ad0395fc3cd7578b75ccd78e8af25229b2dc2903e71870a26583f0318e758647450a3279a49b1d99bde3d966cc0e4fe653585d39f SHA512 b767c1fb31a861cb689c820d298201dcae52c9cd420e74ed4ae8068e82af51747db993a93d55f4325a7ec7248284568fbaf3b6389b474323dae2c9c1eeb65f37
+EBUILD bytestructures-2.0.1.ebuild 774 BLAKE2B c169290af9cac6644f39f965c6069221376389a4480ca2cace8d0fb3402f6cf75e9616592aa2deadc46781658d399e51a9b4e3b5ae381a67b9675d6bba8ad705 SHA512 a3cd760098d70b4600a9e55d3ec0edef8bd0f62a3b279622fa0c7cb59da96a95e536ee6f819f8e64f30c3de80f7cb71ded8372201f8d943a99ad82d4854c4ba1
 MISC metadata.xml 435 BLAKE2B c6e604778c6a8132143debf8de3e65e4c4f2bdf810b0472de75dfa66743c9fa085273a676d9f1dc7e56caa07d84dc524b44dd75bca089a1b251c678d5618beeb SHA512 5dc6a528584006e6802f626d0e525a1740b82b84e1e2bb613de80baea1d65e115ba63cfe04ed0bac61f1a7650915adf749274458bb2c9b209ac82e0c179f4ab8
diff --git a/dev-scheme/bytestructures/bytestructures-2.0.1.ebuild b/dev-scheme/bytestructures/bytestructures-2.0.1.ebuild
new file mode 100644
index 000000000000..165c1a44eda8
--- /dev/null
+++ b/dev-scheme/bytestructures/bytestructures-2.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Structured access to bytevector contents"
+HOMEPAGE="https://github.com/TaylanUB/scheme-bytestructures/"
+SRC_URI="https://github.com/TaylanUB/scheme-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/scheme-${PN}-${PV}"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND=">=dev-scheme/guile-2.0.0:="
+DEPEND="${RDEPEND}"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
diff --git a/dev-scheme/c-wrapper/Manifest b/dev-scheme/c-wrapper/Manifest
index 23b0b49713b6..266678f1f645 100644
--- a/dev-scheme/c-wrapper/Manifest
+++ b/dev-scheme/c-wrapper/Manifest
@@ -2,6 +2,7 @@ AUX c-wrapper-clang.patch 3196 BLAKE2B f960f9008bb8114804ecc20cedbb0e8b46d144231
 AUX c-wrapper-closure.patch 205 BLAKE2B b633bbf97b3d76ab58b9a332ddc56f976b54f9eb3df0b235e7784e27141dda051e5d637839bf3be49c580845ad6898d9d526169abb14e6329642105dd5416c11 SHA512 284f08b6a8164d129dfe5e26500ca4946c037d0661614dfcab7caf4d5ce189ee299dbb70fa6a4d0f2ec5b0fdf9f1926891d07ce019fade329a0909c10586c790
 AUX c-wrapper-extend-parser.patch 4899 BLAKE2B f0ba1b3e6866e48b8546535c63ca71b9e3f219348ecda3cc9281bef1801a5e1731767b4456d4071b62e5b9da94b7280ab3fa33bc396089cb6e0dee529b853d88 SHA512 a7c3d1ce4ab53478ccb6621c94ce12e3dcd8a967ea1589b210e2dfc91b2a1a6e4fb9b00c0e8ac6a054a0d9d905e662c178682ad43971b46153c825efff9a7319
 AUX c-wrapper-float128.patch 2198 BLAKE2B 5a17b735f99cd2af99b161421102e2d8eb4f081b85b83645b9d3bd209f30706a9441d4222a3d8c863304f4c028ab0a53677a1c25e5f16221e1b24d7293eefa8f SHA512 29386dd077dcd2a88dcd2fe13064863a9a36a59d0a59f34be04adb06bb923d548bc1aff3df9a208f25285d91cf0c1470ece08b188f74ae6526f918c72447456a
+AUX c-wrapper-gauche-abi-0.98.patch 912 BLAKE2B 265b37e9f4ea70e236a8c5e2060beb2ca1f2cc7188ba2576d7c76ef23a7987f3967815f0f8e54a419360989979a4f501147294fb9910527f8ed40775880f0b6f SHA512 585f5a8ef41402da098d2cd106ca9f721841349ff337b9234c15d3616188440d6311b94dd19a3a1422daf94b66e833ab2cbd9b863877149c70ca560041ce0e7e
 AUX c-wrapper-gcc-5.patch 1704 BLAKE2B 2f91221e5fad3c9871307c8da2f6650e02a6d645a56538359afad8cb817f02ec6eba407a76b852e854085d89650a6ff05ccd8e525e8be7b3ad57af87c4ac7a97 SHA512 96effd453715ca3725ff3288ceb237c9078499d43cb5be36dc2e15b9a4d274ff42d25bf212f47f2bfae2b79d9713addc12c0663f6fd8cc7c3229df8121f4b903
 AUX c-wrapper-gentoo.patch 2015 BLAKE2B fedf622537151079df07aaa1091fe377b1e1ee8ebf95a4c8b290ca983376211e6897ddb14c8d3c8f38fc1a23073d5282c447b8e8d66578235b17bb3cddce76f1 SHA512 4184d3a4953478ff19374ff230bd7376eb8a8d7d90e1e91b1903b30af49f124d18b816639024a9b54a7099965ea2c5c8244ca64a7ce4db8f3fde32cbc13578d3
 AUX c-wrapper-glibc-2.25.patch 727 BLAKE2B 0c0dce0bfb78a92ff4c2cf6176a7b7de129e143737be897a074f06f88b6923915ec36a9e3ddb5410010c662e8e11bb17b89742349c2a01a3066c1c49c08cc57a SHA512 769c92156395f121d8ba3776904c279c5b97f791f7606b74c682264430ed71f1af31ce8655286cae7dfebb75ea8addc2fb304a87eb5972314c5ab082700921ee
@@ -9,5 +10,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 095d7c6723de816748d4ec861dab5fe995529f17a42ab8d8cf29fff125bd0f91e8271c824fed156456bbc5e240ee634b86f3d3238f86bfc15c87b549f5b1a9b0 SHA512 0f68154463fd6a7597bca07cc6afd7a2397dcd2856c937f5801c2bc851bdae76a23e4dd9e46beca21bddb917888be6d7779f755393401b5e2bd7fb6c78770a8b
+EBUILD c-wrapper-0.6.1-r2.ebuild 1128 BLAKE2B a14d6bfaadf755ecc5b883abe85ccb522422c820d7e52e6e2ab6ff074392975614e465e424346c3564d77e139d1095f0d82dd121d660850f440a52ca276dd583 SHA512 53627ee7e05b7f0050b6d69633d46ae8e75f507c79b887eb4839a8ca33231491492e1a5f1853af10af074b49abf73f7edc3606d4ea12a6dbf0ccdbdf24fed7cb
 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 adbb32c8b4b9..f0e379406c0c 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,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"
@@ -21,6 +21,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-closure.patch
+	"${FILESDIR}"/${PN}-gauche-abi-0.98.patch
 	"${FILESDIR}"/${PN}-gcc-5.patch
 	"${FILESDIR}"/${PN}-gentoo.patch
 	"${FILESDIR}"/${PN}-glibc-2.25.patch
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
new file mode 100644
index 000000000000..15e8b6990cc7
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
@@ -0,0 +1,28 @@
+--- a/src/c-ffi.c
++++ b/src/c-ffi.c
+@@ -347,7 +347,11 @@
+     }
+     sa = SCM_SLOT_ACCESSOR(SCM_CDR(p));
+     if (0 <= sa->slotNumber) {
++#if !defined(GAUCHE_API_VERSION) || GAUCHE_API_VERSION < 98
+         return SCM_FFI_TYPE_DATA(Scm_InstanceSlotRef(ctype, sa->slotNumber));
++#else
++        return SCM_FFI_TYPE_DATA(Scm_InstanceSlotRef(ctype, sa->slotNumber, SCM_UNBOUND));
++#endif
+     } else {
+         Scm_Error("wrong slot number: %d", sa->slotNumber);
+     }
+--- a/src/c-lexlib.stub
++++ b/src/c-lexlib.stub
+@@ -40,7 +40,11 @@
+         "if (nptr == endptr) {"
+         "    SCM_RETURN(SCM_FALSE);"
+         "} else {"
++        "#if !defined(GAUCHE_API_VERSION) || GAUCHE_API_VERSION < 98"
+         "    SCM_RETURN(Scm_MakeInteger64((ScmInt64) v));"
++        "#else"
++        "    SCM_RETURN(Scm_MakeInteger64((int64_t) v));"
++        "#endif"
+         "}"))
+ 
+ (define-cproc strtod (nptr::<const-cstring>)
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
index 9c92637fa2b5..c1d43cf688e1 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 1589 BLAKE2B e4123f496a04680d0433e839d280fbe1cd533ad7ee5f6029d5c179304d9466a7dc77b28756ce9a9e1c4a39755ded51563134a21993c4ee864595cf2c18c241fa SHA512 747d8e0610dceb08befc03aa6db6bf1fa45e6b63f090ad40b51dfed6e9695dc33cd5ad8ef560fbad54b6afcfb029f6e314fa5ceb3c55a35511c8fb5a1132dd05
-MISC metadata.xml 1267 BLAKE2B d234e2e88925fb2591463185f1b07dcc8629efbc3eec59bc81473cc25a919185e683db294202f62b8a759885e9958bab8f526ee2062293984b939c5ab7099896 SHA512 14d6f5ccb3c31686806364ea83ab417d9575c35fd17cef5178afc6f7a4ae368811e72a71d3dc06a0604bf42a24a3ac4dea17083604a55b23b9781fdb72ef7ef3
+EBUILD chez-9.5.6-r2.ebuild 1657 BLAKE2B ee63eef8ea26f35d6574fc316dbf0b9c5ab9fb35f810ebeb709a8548fa8eae38fc3ccc089e7442c891d917fa6fc45046e0c7297736c6048923487f67080c2324 SHA512 877124824e51e11a9c1fcf884ad8bea622ef604fa57a5b764e09c312f0775606d358e665bfae23715a6b5e445b5b55cfbcc057b3c900cb7afe2db5671689ef2f
+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 f9af30466ac7..2d285842d04d 100644
--- a/dev-scheme/chez/chez-9.5.6-r2.ebuild
+++ b/dev-scheme/chez/chez-9.5.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,12 +29,15 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	tc-export AR CC CXX LD RANLIB
 
+	default
+
 	if use ncurses ; then
 		local nclibs="\"$($(tc-getPKG_CONFIG) --libs ncurses)\""
 		sed -i "s|ncursesLib=-lncurses|ncursesLib=${nclibs}|g" configure || die
 	fi
 
-	default
+	# Remove -Werror
+	sed -i "/^C = /s|-Werror||g" c/Mf-* || die
 }
 
 src_configure() {
diff --git a/dev-scheme/chez/metadata.xml b/dev-scheme/chez/metadata.xml
index e539d1309d73..8ab998490b7e 100644
--- a/dev-scheme/chez/metadata.xml
+++ b/dev-scheme/chez/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>matt@offtopica.uk</email>
-    <name>Matt Smith</name>
+  <maintainer type="person">
+    <email>matthew@gentoo.org</email>
+    <name>Matthew Smith</name>
   </maintainer>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
     <name>Gentoo Scheme Project</name>
   </maintainer>
-  <longdescription lang="en">
+  <longdescription>
     Chez Scheme is both a programming language and an implementation
     of that language, with supporting tools and documentation.
 
diff --git a/dev-scheme/cyclone/Manifest b/dev-scheme/cyclone/Manifest
index fe8d7ce042a7..f3320a6637d1 100644
--- a/dev-scheme/cyclone/Manifest
+++ b/dev-scheme/cyclone/Manifest
@@ -1,6 +1,6 @@
 DIST cyclone-0.33.0.tar.gz 3946573 BLAKE2B 7eba62995ef3d327e14d6fbcf433d40e73c244508f8858d636a3a3fd05660e2921055932dedbe50ce8b384e9a9b44a09112aca6f851af6cd38b9b372769b2adc SHA512 96ffd3d04636b27f36c98920359a9f880c4b2a15e9820e5d91c82f821dc93357b665537e7688b00510d6a4fd113666edbd5ec109ff491f4f18d547129527b763
 DIST cyclone-0.34.0.tar.gz 3947685 BLAKE2B db86669bda00c89cee0d6b9224e7cb407961e6c7a8ccc0743a655966da16c8a06516c481ae75cb609053a9622fafcbb47bcc9f53226f3842a0abcde19eb86c3b SHA512 581866985709bff90a4f4fab9a24fc013ee43225b04fb2bd1128da02f0164de55f6d7d80d5cfcff5eedaf23b3fc38dc3c46e6f376e2f341b4991a3f1c54cd53b
 EBUILD cyclone-0.33.0.ebuild 1158 BLAKE2B 47fa760d10dc84bd13fe82b970cd693c4ba5eb03f5356c3ee28bff36abb1603e91691d1aa7077ede2b612e09c39bf575003448169dffe4cd16a835ab658f8711 SHA512 59a1d7d1b3f900e6b9aadd7177328a3af20a42fe09e1177075124a089f9f58d315f6eaf0c023d6f63f0463a265e8ee024c43dea773cd61bec1ba50fbfcd87103
-EBUILD cyclone-0.34.0.ebuild 1164 BLAKE2B edf4db39c92531cfe2240af4c48ee0c55c6cf533f37d2826a78a9fe8e642a868ede52813ac488177dbbdde18aa1f1d6ec8de322f789b2c7814de6d0b569eae17 SHA512 a95e0be903dd36092c989b46c9f3ac4165653d03a8cc453a328c0049f9c2c0bcd9c77eac4645107bdcf199e0e0389d81c84e1e5fa9743a4ef30d6baf1866c284
+EBUILD cyclone-0.34.0.ebuild 1176 BLAKE2B 137ac046e64f3e0955634df253e98a16a1e0a0a0fa5687e2fe77337755f354ff85985bffcef279ed7bdfe18e5c401f390c97b3b50993e715e9bf4da9f77bd7c6 SHA512 ed7ed7be719170649733474676c28e2dfd0e1ab456993233d95e3c54278d68b3ce60c69b0128c43b639e67a80ec2d5a3d50b3c7190fad30ae0f6f365b654c0b8
 EBUILD cyclone-9999.ebuild 1164 BLAKE2B b00e6cfba08aabf30efd64d9905696e8c46d9f31c811736cd21fac09e5f0dd7bc41f8811d44d062324c213bd3c0d3d4dbfa6ee17ec308577f06ef83cf71d94b8 SHA512 a24b4cf4f5454a1b41800c6b06c138d716dfd198e4ec7cfa8927a36df20aafe72e132d094e72c69c428f6ba729182fe21b3c04a5fc3bc9f39873499aab78832d
 MISC metadata.xml 1171 BLAKE2B 8a650cbe26ba242eb3a7ea3f06800cd48ad2f18b3622a4212f3a5280b0d7332d5393511ba276b683d1c0339a8dd93f2148aa9dc57b9870b16c47c1f48d13a6b8 SHA512 7951465c521d2f158f2a7f7e76a5b54b1c6873e95aec1cdc2b9e4207c1ae4890681677846397f55a02cdd05c4a137c1f2d9bfd5277581c890f1ffac8fc2c54d5
diff --git a/dev-scheme/cyclone/cyclone-0.34.0.ebuild b/dev-scheme/cyclone/cyclone-0.34.0.ebuild
index a60d8cdc7056..091a3a968b6e 100644
--- a/dev-scheme/cyclone/cyclone-0.34.0.ebuild
+++ b/dev-scheme/cyclone/cyclone-0.34.0.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${PN}-bootstrap-${PV}"
 fi
 
diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest
index ff4bacace837..6e57dc74ae07 100644
--- a/dev-scheme/gauche-gtk/Manifest
+++ b/dev-scheme/gauche-gtk/Manifest
@@ -1,5 +1,7 @@
+DIST Gauche-gtk-0.6.tgz 427255 BLAKE2B f5144adc98dd6e1017f43ff762a06d2390e6f5b39286151262b51d847fc35ad68c2885459502b10f014b32049eaebd8afaa98bd8a2cfc4640734e1b1d5381f57 SHA512 d7887577f6fa361118240651cdc61ba48ad706ea2cc285c2542dbd4972abcb2eaca631e4d77b1fe0a189d4424ec17d01bbeb67ea8a2fe8166cf8e65da81e87ca
 DIST Gauche-gtk2-0.6_pre1.tar.gz 205003 BLAKE2B ecc444c246aa20f67a0030d7d87528596d6c2d69beb7ffaef1b53f80963d2fcc1294a04cacf958df6c3331789b6b0260f911126941d6e672a6c57e3aa4807d81 SHA512 5379dafbfabd536e335c30af18f8ddd13e00238e6d99494bbc8e78ee9cf1db872c08b5deee42ac50898dedde39c441d837312d2d6f559a0d2ac2568c31926f70
-DIST Gauche-gtk2-0.6_pre20210518.tar.gz 205003 BLAKE2B ecc444c246aa20f67a0030d7d87528596d6c2d69beb7ffaef1b53f80963d2fcc1294a04cacf958df6c3331789b6b0260f911126941d6e672a6c57e3aa4807d81 SHA512 5379dafbfabd536e335c30af18f8ddd13e00238e6d99494bbc8e78ee9cf1db872c08b5deee42ac50898dedde39c441d837312d2d6f559a0d2ac2568c31926f70
+DIST Gauche-gtk2-0.6_pre20210518.tar.gz 205759 BLAKE2B 0f1a11d1b9c3324cc7c8fcb7bfcbcd1b23740e509241698f466cc52454c36ad4c6d4e7ad850b9a20c5a3cc3d854824162686911198aee24e43fe53ef6ca10e95 SHA512 a235271b34aafb89a9dfc62ee9db2cc260aa4ffc4b0d450689c699574a79f54299f6b8fbbfb62a32ba18947cf99546e4e118432f0e467457a2566ed4d4839d58
+EBUILD gauche-gtk-0.6.ebuild 787 BLAKE2B 7e99a09c6d2fa8e88974199e968bf8d731a2adf58bf387687045cb701259f1455f10e6e3c980a7f1b5ab6ccaacbdad27a2e7224493d07acf8d3de96371510761 SHA512 b82d1d5b4b052609c9ed1f623bbb9dd1fcf362ff544a8ea97fda1d2c310ad2caa1bb7d7d15523eb7ece495b6208f23819c8f220504e91ea0cbc0a9b995991e6c
 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
+EBUILD gauche-gtk-0.6_pre20210518-r1.ebuild 918 BLAKE2B eb40c7a0c84f200d8b12255ee3802dd94168bf7b0892cd6d1e7b38894ce506fed9dda45a21655948275712b0429b20862df400e354cb9bfb5df41ed9432d16b4 SHA512 eda1c5891e955ee6f4cbb42f91de130b2e9009e1b5a63cea7647a2f2c63ee9e4583561760079afb163ca2919855d46af6ae20e43ec3e0ef800b6777ee1d6a783
 MISC metadata.xml 332 BLAKE2B bfb94c256a66b7b190e052f373e4fea4ec5d79f1ebca1f41cfa04151fce72d5a2724593bf234ac73e9f4708fbfd367d6921a01017a4706368fcba4bfe26852fb SHA512 280107527381e07494f651ac1bbc5bb9f0737878196672dafd222c4f6b7021cd7586942c1522f9195bbb9bb56c6e6a49a6ba957d6a4a65b5f0ca6c1237f55ac2
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6.ebuild
new file mode 100644
index 000000000000..6fa3001ac5a3
--- /dev/null
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_P="${PN^g}-${PV}"
+
+DESCRIPTION="GTK2 binding for Gauche"
+HOMEPAGE="https://practical-scheme.net/gauche/"
+SRC_URI="https://github.com/shirok/${PN^g}2/releases/download/release-${PV}/${MY_P}.tgz"
+
+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_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-gtk/gauche-gtk-0.6_pre20210518.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre20210518-r1.ebuild
index d585ddc55762..5f58b4cc451b 100644
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre20210518.ebuild
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre20210518-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -6,7 +6,7 @@ EAPI="7"
 inherit autotools vcs-snapshot
 
 MY_P="${PN^g}2-${PV}"
-EGIT_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
+EGIT_COMMIT="4a468e48a5d8c2289c53b5d416f632f62ca7f887"
 
 DESCRIPTION="GTK2 binding for Gauche"
 HOMEPAGE="https://practical-scheme.net/gauche/"
diff --git a/dev-scheme/goosh/Manifest b/dev-scheme/goosh/Manifest
index 765808a76339..acff262af051 100644
--- a/dev-scheme/goosh/Manifest
+++ b/dev-scheme/goosh/Manifest
@@ -1,3 +1,3 @@
 DIST goosh-1.3.tar.gz 43503 BLAKE2B 7bc3c907638320889ef2c871acd2e4e9fbd0fdb8e1a3655cb42cc92eea9fe28f01533ecff8e3efa4488dd5f0d2c9cdc6aa5ba7e333a9acb1d430633479c6cc80 SHA512 55fc3b83b5e711453886d6fd47e7e16df329ac7f294c704e3676f7266383fda6ad5e53c3f8a707a7746dd0ccd33647cc5137a73f516396079702df47919ede81
-EBUILD goosh-1.3-r1.ebuild 373 BLAKE2B 0b5b4386796a7594fd2f19166c9c3f668b17ca541d6b305b618208193a98978dac712d8be0275bc1a07b8be62f7b4e5e5619d5a657eeca29abe47b314e4ef5a2 SHA512 be7852be260530b74dcf29565b79c1bc434d590d028b08153bb42767d7a9c2d3312d3b582d8a24817b24604327ef12616ac0bb58db2db5589a75e67ef9ab2edf
+EBUILD goosh-1.3-r1.ebuild 371 BLAKE2B 0bb7d5ac7661146b01822c7996120939fc5e2dede17c93e6dda3c444a6ee25b864a4b253e7100fa145806ed1814ab93e7cc6dffcfeb9a874045c7fb11b1784e7 SHA512 97a68172e6f3e93c7f56210d6078466be6bc4ca30652562ff088e0f7fda7fad4162790d8a2bdf35309070489bebd904eaf5672191a30197389cd7889de7f3ea4
 MISC metadata.xml 262 BLAKE2B b7b95793a5c170b7f4be71ed1ae2a6c586e04f52fd8695ac7fdd847f1ad02c28889a81ccac03973e7b7bbfdf631b6a93cfefcaa4c876d455da566fb5056bea38 SHA512 b917961961d723c21d2c0ad186d027867dc9916433d331f6d0733870855ecfa22065ed67df63f71f022a28f4ea3e96334d0dd6463025b6d3dcd999b66b712fa8
diff --git a/dev-scheme/goosh/goosh-1.3-r1.ebuild b/dev-scheme/goosh/goosh-1.3-r1.ebuild
index fe51640be163..01bb323d6b44 100644
--- a/dev-scheme/goosh/goosh-1.3-r1.ebuild
+++ b/dev-scheme/goosh/goosh-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://arglist.com/guile/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-scheme/guile-1.6"
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
new file mode 100644
index 000000000000..5f774265a8e6
--- /dev/null
+++ b/dev-scheme/guile-lib/Manifest
@@ -0,0 +1,3 @@
+DIST guile-lib-0.2.7.tar.gz 451202 BLAKE2B d8420a718697611443a40af089aad6e1d48390e5bef764f84955beeec8d6346066547d73c30898b96e727d4f470df6a032438067240bba8b25058bc65b85d9fa SHA512 d27d1398f81172e4488c5ac5c2d076baeeeaa12fa19d83a87faf0767c255b79f8eb24438950da3865e797299be90f7dc1dcc964076d53df9cab5925a61ad0d1f
+EBUILD guile-lib-0.2.7.ebuild 700 BLAKE2B cb6516946c1661b411a9d06007f716db055b7ec0a109e622a7ba5b1d0c5ef8460311d99192cbee351f885ec46652c862c10e1e5cbd682c8636523c9a38bb50d8 SHA512 b7b0e196ba7956b0b99f00bc7285d67203d3c273fbfc1e7039cbf54d4f1b19606b7eaa5c2c45b9665af516337aa7a37cd69103d7537979d7d7e7447daf1da9aa
+MISC metadata.xml 549 BLAKE2B 89c7b27010442ad8a785a1131687ef08e003f57a746f979cb0a7830ea514a1526ece108970f9d9d7737192a7d28622f179eeb7a3d1e683b50cdb64450e6d542c SHA512 a1d05f58fa0b97ccd796a85084aeeb7ab494f74f8f5a0e90b55ffe37eeecfa496d8ff5a20361152ed5b108c43c86e16e1a2e1f4d6ec7ef2009b813319ddcd7d7
diff --git a/dev-scheme/guile-lib/guile-lib-0.2.7.ebuild b/dev-scheme/guile-lib/guile-lib-0.2.7.ebuild
new file mode 100644
index 000000000000..a9f95bc2e4dc
--- /dev/null
+++ b/dev-scheme/guile-lib/guile-lib-0.2.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An accumulation place for pure-scheme Guile modules"
+HOMEPAGE="http://www.nongnu.org/guile-lib/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND=">=dev-scheme/guile-2.0.0:="
+DEPEND="${RDEPEND}"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_configure() {
+	econf --with-guile-site=yes
+}
diff --git a/dev-scheme/guile-lib/metadata.xml b/dev-scheme/guile-lib/metadata.xml
new file mode 100644
index 000000000000..af704cda2400
--- /dev/null
+++ b/dev-scheme/guile-lib/metadata.xml
@@ -0,0 +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>
+    Guile-Lib is intended as an accumulation place for pure-scheme Guile
+    modules, allowing for people to cooperate integrating their generic Guile
+    modules into a coherent library. Think "a down-scaled, limited-scope CPAN
+    for Guile".
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/guile-libyaml/Manifest b/dev-scheme/guile-libyaml/Manifest
new file mode 100644
index 000000000000..66049050fee6
--- /dev/null
+++ b/dev-scheme/guile-libyaml/Manifest
@@ -0,0 +1,3 @@
+DIST guile-libyaml-20211124.tar.gz 6221 BLAKE2B 12e35af8495543f90289bd437d27177901f01090c66ba113d128258c7bd448513332698659b48438a92b75d78dcd686b7ffad66e7c7adb2374f504b1e29485ad SHA512 17e6eef46e412db7be877bf54dc59f4ddb3f2235bb54a33f79aa0e938ad65f5fd68fc4247e055ecde3de37d8d872ccda5f0205d5f546d97458890b0b97764d0d
+EBUILD guile-libyaml-20211124.ebuild 1571 BLAKE2B 98988ae8bc9a11de867833ad45c43e35266f163da84fbcf9caab45231b6059e495253fb4f24e4c7ed5f42a179eda4e298125dd0a1a5ccf7d9a929d837c739cd6 SHA512 f151d50b11c3ba070fdc508b0dfc8966dc6aa327df5c4b959c603543dfa67ff7269add6a96059b9cea6ab4873285831e8fe813b48d39d8cf9f0e3e0d0ef6786e
+MISC metadata.xml 422 BLAKE2B fefc2dce459aed13173a55b088c011ce8e3d57221478ae72819d15784b70dbf0ede02ffd4d9042b0fc521132b80e37b6f3cc28e2e75c3f83f06eb2278fbe7a0d SHA512 a8ec0736b0ed6f53f9638531e509071a57d56d081f0dd0d9ec06e372d2f911d5ef4a98cdb53992cf52f68ea08f645789483b5d7b872bfa6aa9255e14619402af
diff --git a/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild b/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild
new file mode 100644
index 000000000000..36fd680e32a4
--- /dev/null
+++ b/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=2bdacb72a65ab63264b2edc9dac9692df7ec9b3e
+
+DESCRIPTION="Simple yaml module for Guile using the ffi-helper from nyacc"
+HOMEPAGE="https://github.com/mwette/guile-libyaml/"
+SRC_URI="https://github.com/mwette/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${H}"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.0:=
+	dev-libs/libyaml
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-scheme/guile-nyacc"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+guild_local() {
+	GUILE_LOAD_COMPILED_PATH="${S}" GUILE_LOAD_PATH="${S}" guild "${@}" || die
+}
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_compile() {
+	# Generate bindings using NYACC
+	guild_local compile-ffi --no-exec yaml/libyaml.ffi
+
+	# Compile modules
+	mkdir -p "${S}"/ccache || die
+	guild_local compile -o "${S}"/ccache/libyaml.go "${S}"/yaml/libyaml.scm
+	guild_local compile -o "${S}"/ccache/yaml.go "${S}"/yaml.scm
+}
+
+src_install() {
+	local site_dir="$(guile -c '(display (%site-dir))')"
+	insinto "${site_dir}"/yaml
+	doins yaml/libyaml.scm
+	insinto "${site_dir}"
+	doins yaml.scm
+
+	local site_ccache_dir="$(guile -c '(display (%site-ccache-dir))')"
+	insinto "${site_ccache_dir}"/yaml
+	doins ccache/libyaml.go
+	insinto "${site_ccache_dir}"
+	doins ccache/yaml.go
+
+	einstalldocs
+}
diff --git a/dev-scheme/guile-libyaml/metadata.xml b/dev-scheme/guile-libyaml/metadata.xml
new file mode 100644
index 000000000000..3f151f03aaf3
--- /dev/null
+++ b/dev-scheme/guile-libyaml/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+  <upstream>
+    <bugs-to>https://github.com/mwette/guile-libyaml/issues</bugs-to>
+    <remote-id type="github">mwette/guile-libyaml</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-scheme/guile-ncurses/Manifest b/dev-scheme/guile-ncurses/Manifest
new file mode 100644
index 000000000000..324c1e79fef7
--- /dev/null
+++ b/dev-scheme/guile-ncurses/Manifest
@@ -0,0 +1,3 @@
+DIST guile-ncurses-3.0.tar.gz 910030 BLAKE2B e7bfa1e7c7ff8fd4e8b653a5bcada99f8f047142322e4abb946cd42b27bd1d2014f904b5a73d5356ad95bec1c394d0b76ad06204a7d117ab4c2e9a3181633fa2 SHA512 6f36ec57b1835dc90f6691243e3b627e067522c78ea620fc109bf270016034842a933c2d9e09c1a3998a740ae17cb1b7ae291d3e4c578c54128eae4c88a450ac
+EBUILD guile-ncurses-3.0.ebuild 1343 BLAKE2B de7758bbda1c477256526d8ab703be4220d7946288feccdc75cff94460c52f69f1cbb866e3fa72482739220aeebcef32aa09356be214fa27da9de0270422624b SHA512 ceaa6f395e383b9167546021fab431e6bc413449548014f7b9d46a06614f004eb98bbd5e727dc115c0e35369d65c67c45338bf5181f9e443ac8459284be165e5
+MISC metadata.xml 547 BLAKE2B 6607b13dbae6f4aa4364cb8227c49bc96ab5bccd739af9c8c6731974132be80f9ef891c642c58cb0591678fdca5902df765f35a56df33faefd9833e695d950cf SHA512 a1fed1ceed50336ecdca1b6f8e17ea85bf81808fc2230215e52e654a3a7c8f10890978f057972f501d72d798b1e75b114fac4c6f53621120c205fdea1bf39057
diff --git a/dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild b/dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild
new file mode 100644
index 000000000000..361ce458158d
--- /dev/null
+++ b/dev-scheme/guile-ncurses/guile-ncurses-3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Guile FFI to ncurses library for text-based console UI"
+HOMEPAGE="https://www.gnu.org/software/guile-ncurses/"
+SRC_URI="mirror://gnu/guile-ncurses/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.0:=
+	sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/texinfo"
+
+# 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
+
+	# Remove bad tests
+	# > In procedure list-ref: Wrong type argument in position 1: #f
+	local bad_tests=(
+		curs_attr_attr_off_underline
+		curs_attr_attr_on_blink
+		curs_attr_attr_on_bold
+		curs_attr_attr_on_dim
+		curs_attr_attr_on_invis
+		curs_attr_attr_on_protect
+		curs_attr_attr_on_reverse
+		curs_attr_attr_on_standout
+		curs_attr_attr_on_underline
+		curs_attr_attr_set
+		curs_attr_attr_set_normal
+		curs_attr_standend
+		curs_attr_standout
+		curs_bkgd_bkgd
+		curs_bkgd_bkgdset
+	)
+	local bad_test
+	for bad_test in "${bad_tests[@]}" ; do
+		echo "#t" > test/${bad_test}.scm || die
+	done
+}
+
+src_test() {
+	emake check
+}
diff --git a/dev-scheme/guile-ncurses/metadata.xml b/dev-scheme/guile-ncurses/metadata.xml
new file mode 100644
index 000000000000..8619d62c721c
--- /dev/null
+++ b/dev-scheme/guile-ncurses/metadata.xml
@@ -0,0 +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>
+    GNU Guile-Ncurses is a library for the Guile Scheme interpreter that
+    provides functions for creating text user interfaces. The text user
+    interface functionality is built on the ncurses libraries: curses, form,
+    panel, and menu.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/guile-nyacc/Manifest b/dev-scheme/guile-nyacc/Manifest
new file mode 100644
index 000000000000..0e5a1ab4e6ba
--- /dev/null
+++ b/dev-scheme/guile-nyacc/Manifest
@@ -0,0 +1,3 @@
+DIST nyacc-1.06.7.tar.gz 1270540 BLAKE2B dfd5a961881126fbc285de0cb67cdfdadd14d1cb30c112da633ff776cd6d776658a2834c87c347a4020f9114516c4770247f54d71aada1731ca353a1c6210e1b SHA512 8e0c80a529a55742a7bd342deba8b450a8fef9201cf109f3416cead89ded8db53768a049ba3c9196f455e036645deb2e1b763889cb293068e486e6362c44aad5
+EBUILD guile-nyacc-1.06.7.ebuild 827 BLAKE2B 6cc1fb7cc3e6d8b2546db854f6d39ee73d89991fc3084a3925a94ebbe625acacd3626216218a3957eae786f39e80ccdfe2d7b79a597b835bef81181c6f37c917 SHA512 deff86bc0cebb4eccda86074dd329d23b99169cf06792fee3418f6736c699838b4743fd5e899179c108a277f4923586c76d6962091d0b7d6858d8cb2da2af837
+MISC metadata.xml 799 BLAKE2B bc52c1f638a7eab8b0f4af67dbf9d6c0860db0b390d6e19590cbed22a485a06c09bf12ad87d3a4b4431cd56a93a1991302d95bb0befd436db35bacdafe5b427b SHA512 acd277e9e37cc1b4b9b7bc7407408f1113c03e32bfb0ec1b7e533d3b77531d8a8d33f40f10b11c6417dfea67f8760e2a5f55c00eae42d9631315f0b7220f0aa2
diff --git a/dev-scheme/guile-nyacc/guile-nyacc-1.06.7.ebuild b/dev-scheme/guile-nyacc/guile-nyacc-1.06.7.ebuild
new file mode 100644
index 000000000000..9c5026a9a62b
--- /dev/null
+++ b/dev-scheme/guile-nyacc/guile-nyacc-1.06.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Guile modules for generating parsers and lexical analyzers"
+HOMEPAGE="http://www.nongnu.org/nyacc/"
+SRC_URI="mirror://nongnu/nyacc/nyacc-${PV}.tar.gz"
+S="${WORKDIR}/nyacc-${PV}"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.0:=
+	dev-scheme/bytestructures
+"
+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
+}
+
+src_install() {
+	default
+
+	# Fix docs location
+	mv "${D}"/usr/share/doc/nyacc "${D}"/usr/share/doc/${PF}
+}
diff --git a/dev-scheme/guile-nyacc/metadata.xml b/dev-scheme/guile-nyacc/metadata.xml
new file mode 100644
index 000000000000..235f03fb4487
--- /dev/null
+++ b/dev-scheme/guile-nyacc/metadata.xml
@@ -0,0 +1,18 @@
+<?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>
+    NYACC, for Not Yet Another Compiler Compiler, is set of guile modules for
+    generating parsers and lexical analyzers. It also provides sample parsers
+    and pretty-printers using SXML trees as an intermediate representation.
+    It provides a decent C parser and a `FFI Helper' tool to help create Guile
+    Scheme bindings for C-based libraries.
+    It provides (partially implemented) compilers based on above mentioned
+    parsers to allow execution with Guile as extension languages.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/guile-reader/Manifest b/dev-scheme/guile-reader/Manifest
new file mode 100644
index 000000000000..d9be47863360
--- /dev/null
+++ b/dev-scheme/guile-reader/Manifest
@@ -0,0 +1,3 @@
+DIST guile-reader-0.6.3.tar.gz 691612 BLAKE2B 504152d3a194705435efa4e2d2b51fd1bc22a998161b09ef0157c13bf46ef593be0101d6b72e197818a8ba18406db0de518423a168d36f54616dfcd4e807f3b9 SHA512 0f9f47ee5f24ebb79894863ac96d63b0c7d2801020a212c59d11c7685ff4006a646be988a696a9b623dc0e0605f46d4a9a8680bfabd299878e41eab92e75efd5
+EBUILD guile-reader-0.6.3.ebuild 679 BLAKE2B 27bf573dae94cf34617146b0bce110fe8b22b8efa0d948da6c02c2d27583d7bc1b702161afd8f76a016b24298112fc6a373ea915b174a7172038e086f0be15f8 SHA512 6d74372b049900eeb996f27dec66203575074f72cffca5054e88748d941b7badc291565fde4ddfa0f03af0e0a5474240e40c3bb4b7f29e3564ffdac0df20b198
+MISC metadata.xml 885 BLAKE2B 25f338ee36a7e294668db31c6f676b1137d8538a24fe22738b9afbe6417992fa1045166e255047b625b96f060094fa597d875c88d91ad6e7ccc8fd207e01d111 SHA512 fbe036926ce498cf2d3626962e5e178d9251fd708416ccd2e5873de9713185dfb68ea6b45a92d7d8687b95e729e07c64c328cb5926dafc0b35db7db24adaaa6d
diff --git a/dev-scheme/guile-reader/guile-reader-0.6.3.ebuild b/dev-scheme/guile-reader/guile-reader-0.6.3.ebuild
new file mode 100644
index 000000000000..fe10ccab8ab0
--- /dev/null
+++ b/dev-scheme/guile-reader/guile-reader-0.6.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Simple framework for building readers for GNU Guile"
+HOMEPAGE="https://www.nongnu.org/guile-reader/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND=">=dev-scheme/guile-2.0.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gperf"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
diff --git a/dev-scheme/guile-reader/metadata.xml b/dev-scheme/guile-reader/metadata.xml
new file mode 100644
index 000000000000..c3ad052549f5
--- /dev/null
+++ b/dev-scheme/guile-reader/metadata.xml
@@ -0,0 +1,20 @@
+<?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>
+    Guile-Reader is a simple framework for building readers for GNU Guile.
+    The idea is to make it easy to build procedures that extend Guile's read
+    procedure. Readers supporting various syntax variants can easily be
+    written, possibly by re-using existing "token readers" of a standard Scheme
+    readers. For example, it is used to implement Skribilo's R5RS-derived
+    document syntax.
+    Guile-Reader's approach is similar to Common Lisp's "read table", but
+    hopefully more powerful and flexible (for instance, one may instantiate as
+    many readers as needed).
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index f4d34c8c5f74..a2dfa7cff7f3 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -2,7 +2,7 @@ AUX 50guile-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b569
 AUX guile-1.8.8-fix_guile-config.patch 494 BLAKE2B e7cf0fe161b83e0561c0eac26889c407ed7fba41a79944a1fe060881e31217c40554f1bcc708940102b80dbf27edf3ba8de58850889bb9e3707166e04195f01d SHA512 3ef2bcb31d5b80dfa2f23b8802b98af713230e59aafe773ca3fd847fbdc7759ebb2d19cead1b6b362a6fa504dfff0c2036d5359aa82b601d664eb2a49a98c970
 AUX guile-1.8.8-gcc46.patch 1004 BLAKE2B 6680d9f6a5207078dac634d4504c0b4b7502a2f49dac089d8f5251d8d8cdcc37e408d0f446389ad0fc908ce7ea801ae3c1af59d7b03dd19f3ce7d1175e97ea68 SHA512 0ace93548dde387c344e13f083d79227cd09506e0cf58ac0892f25c43bfcefe9071e83912b921fba120262884fa92aaabe4d07f8337d89b6da73f0f2c077dcfa
 AUX guile-1.8.8-gcc5.patch 575 BLAKE2B a8766ca3eaf808ad4547312a11d203422be21e647a0b089c5709e5f747e6c5136a80dc521c118506086b4a7808aa3301e315420262923604a2bf5819a6d637ef SHA512 844a585679f8d1cbdbe9c4c7c5feb21ebca095a522d75db264c0f4c244153a1435a01647955fc98a0743fec48aeac28c1570dbce78bfd026544addba945a1cee
-AUX guile-1.8.8-gtexinfo-5.patch 460 BLAKE2B 895480608683caf27dda3d4e92b4c82ecde1a6d27e9e37de445fdf9665cbb432759d75b5cb0340ed9a15d2c3175b48647989bdaebe659c1a1104c221bb43c07e SHA512 19185a96bb6dcf7f1cac1908633d65d8cb673148469553cce4099256d05a94688834a61ddc0a18957f9fe253fffb2821817b4b29a4a604e8c152debb6e3323a6
+AUX guile-1.8.8-gtexinfo-5.patch 464 BLAKE2B e4bbe69136208f445b929d16b4ebc42dd22f503bb61485d1ee0b8d07aca6e45305b2bd07438d2a6ef482021ad60bc1f83983dcdaf98ea2aa06e05abb4dbf2974 SHA512 313c12aeb718fd8f0d5cd586a5b9aa1653ce108906299809695f5ef70b9c010098d993e677e469bf1bc062d0d7c1eb07a17a523f9af31f8306f0d2f48c21c744
 AUX guile-1.8.8-makeinfo-5.patch 2361 BLAKE2B 3720979563cba33c9d5058d070717e6c433b1c1e3e0e41a34d83179f1c2ae5bb5cb8a1a445d0da52f714aea18418d492a482d1dcf11ffe689c092a50d8f0191a SHA512 a69ed6cf2fd87c6f3d61cc914eed960fcdebaa151778b1ecf04f1774e6dddf07d17bf90fb3243a08e8c231e391843201d0ba26debedef33199d8dd75f8cbcd09
 AUX guile-1.8.8-mkdir-mask.patch 1300 BLAKE2B 941f4fdeafc769fe6d41b2303f7dc3f7972d5c40cae6c09bf1532171827ac3e284bf812276e0d9b7c276fe8312b306fcef9010b69d3d2dd5d13593e11be904e0 SHA512 e02fa50af16fb545b26560064cc7adb19caf523691dfb22044c1e01fe9c98c42804c3d13ac28d65cb61bf7667fb0f1d4aa703949cea321d382b871abd083454e
 AUX guile-1.8.8-readline.patch 953 BLAKE2B e08c20d919b3659f8f4b2bcee26b12d43f2b942c1b12859cacb5ab813fe2aa8790b29cbb694b9c75851d28a7c96e3296345d8c2261175ce6b71a4bd65eec6f1a SHA512 e86e6e7f035f9ff9d541b44987d7cb0e5a1f80f62b7b4a112dc933f5831b90a33b506c6601165e957a3973c38ca56d0e84eafaa76c78ae5db26d7887669f1443
@@ -20,10 +20,11 @@ DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381
 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
+DIST guile-3.0.8.tar.gz 10438342 BLAKE2B 79e96216fcb75bc198b53ce2b2389a93fa1590cd4ff93e0c5750bea2997b7eebb0736de57459e56356ee8b5a31aacec2121d180e98c4d779ed118c9c858b32b7 SHA512 7b2728e849a3ee482fe9a167dd76cc4835e911cc94ca0724dd51e8a813a240c6b5d2de84de16b46469ab24305b5b153a3c812fec942e007d3310bba4d1cf947d
+EBUILD guile-1.8.8-r4.ebuild 3108 BLAKE2B 6cdae9c84f0696c792b2c8a13856853e700ffc5d4ebf123d2ea50d8a03a42d8ee671da91c21e652da878dd404a95a7b6e0904622717369696724f1afc1029375 SHA512 42a2b19d45dd284877b4f88f487eaaf45997c6df9d0a007d2832215b9d25a34ffda9f51c3ad72d2d8df10cd6085179845ef18e04712e32ecb098d3153fc9525b
+EBUILD guile-2.0.14-r4.ebuild 2369 BLAKE2B 1c832e3d0da104c01d87c947f425b8cacbf2ae9acda6d92938d7034bdbe819ef821d4c8175e502a62eda722bf39833fceb40b3cd923fba0ab81efba88c5c6f27 SHA512 f0707b30ddbd395e9526b7ff5f679b92a1d606b57ffb983dfe60c0d78585ac9d27db5c1ef2bd317994115f0ed947d388b8490b049f17f13008b8d156cdcc0cf9
+EBUILD guile-2.2.6.ebuild 2256 BLAKE2B 3ca340b1e73bf1e67bec3cd2db3580f37a9eced2b5f8e5d855a6e8e463de6893e8b6973f1f7e042853975aa467a679aaefdb80a1f30cdfc7fb79cac6f0a9c792 SHA512 ee0f86afa7bc96cf09d65c736e4b0afbca4b63e7f9cadaa1b945407bf60b885af994092866c5baec7a8eb5e64bd42dbf38f5a63be552f3706ac8e7c5d12506ee
+EBUILD guile-2.2.7-r1.ebuild 2146 BLAKE2B 689318685e8f9af607276df084248e456d173c3a31efb94e2222dbf4f5ae1a1ecc475065db79501e444902d9cfbcc9c7425a6ab6ce76d6fce5d3c267b8aa9b24 SHA512 bc9970dc9c3d608a74cfe51d77efc45c41dff9613cdc7547f5bcf76cf91a862571c134dd9c816f82d553443a373ebbbcaaf5ff4eecd26a996bbbbc39430c1418
+EBUILD guile-3.0.7-r1.ebuild 2353 BLAKE2B af5db762cdb39d55a8d883e608f90fc5e57ae92644a175b4395f89a268efefda786c0f67099be2be8e1438b41b2fec95cc4e28104cf8939ebacbb23181ca7b8f SHA512 98f527cf1e0401955af4224658e75c1a14e69f0901e8ef2f8fa8f042f7f25c9b401c54732bde60506db85badb1d4f10f40c449536330d8f10effb314ab0c7b92
+EBUILD guile-3.0.8.ebuild 2109 BLAKE2B 6f0fb54bd40ffc89e99e6912eab2460723c78b9cbc700605a061c22cc98e5ebd4e8783b51ce2ff5fd7edca6ea13bf0fc2532d53e2d643b328c36d0cbfcb4dc26 SHA512 78f16566980ee6d6347c17bd74f18f3f8cb9ceffcfc4b749aabb72a719a7aa9cc40b503e3669ebfbaddd60868ff5ce6b0ae65fc236aa6c14d5b3acfe205af69e
 MISC metadata.xml 1041 BLAKE2B d01e2b55f3618fa4056f46d0a3cd2e2c5e006374a8c9fbc28adca37f4b4e5978e65c968762e5675e0f98ba2ce686e09f2997481c1365eb0787e979d9bfd012fb SHA512 ace5d0cea917c980c1958c174b869692d7a407132be9e9b223ac970ef3d9323c76a23e009e45990583993de0bb3c423243931cfeb9de7c3383d6b4b5efda4b3a
diff --git a/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch
index d7fbda15c101..703e1fab9a48 100644
--- a/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch
+++ b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch
@@ -2,8 +2,8 @@ $NetBSD: patch-doc_tutorial_guile-tut.texi,v 1.1 2013/11/30 07:06:25 dsainty Exp
 
 Compatibility with gtexinfo 5.2
 
---- doc/tutorial/guile-tut.texi	2010-12-14 06:24:39.000000000 +1300
-+++ doc/tutorial/guile-tut.texi	2013-11-30 19:44:28.304575529 +1300
+--- a/doc/tutorial/guile-tut.texi	2010-12-14 06:24:39.000000000 +1300
++++ b/doc/tutorial/guile-tut.texi	2013-11-30 19:44:28.304575529 +1300
 @@ -446,7 +446,7 @@
  Schemer} from that list.}
  
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r4.ebuild
index bd9822080ac9..e4d5e582d1d9 100644
--- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r4.ebuild
@@ -1,56 +1,64 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch autotools flag-o-matic elisp-common
+EAPI=8
 
-DESCRIPTION="Scheme interpreter"
+MAJOR="1.8"
+
+inherit autotools flag-o-matic elisp-common
+
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
-
 RESTRICT="!regex? ( test )"
 
+# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
+# but there are lots of collisions. Most in /usr/share/libguile. Therefore
+# I'm slotting this in the same slot as guile-1.6* for now.
+SLOT="12/8"
+
 RDEPEND="
 	>=dev-libs/gmp-4.1:0=
 	dev-libs/libltdl:0=
 	sys-devel/gettext
 	sys-libs/ncurses:0=
 	virtual/libcrypt:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/texinfo
-	sys-devel/libtool"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12/8"
-MAJOR="1.8"
+	sys-devel/libtool
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_guile-config.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-makeinfo-5.patch
+	"${FILESDIR}"/${P}-gtexinfo-5.patch
+	"${FILESDIR}"/${P}-readline.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-sandbox.patch
+	"${FILESDIR}"/${P}-mkdir-mask.patch
+	"${FILESDIR}"/${PN}-1.8.8-texinfo-6.7.patch
+)
+
+DOCS=( AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS )
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fix_guile-config.patch" \
-		"${FILESDIR}/${P}-gcc46.patch" \
-		"${FILESDIR}/${P}-gcc5.patch" \
-		"${FILESDIR}/${P}-makeinfo-5.patch" \
-		"${FILESDIR}/${P}-gtexinfo-5.patch" \
-		"${FILESDIR}/${P}-readline.patch" \
-		"${FILESDIR}/${P}-tinfo.patch" \
-		"${FILESDIR}/${P}-sandbox.patch" \
-		"${FILESDIR}/${P}-mkdir-mask.patch" \
-		"${FILESDIR}/${PN}-1.8.8-texinfo-6.7.patch"
+	default
 
 	sed \
 		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
 		-e "/AM_PROG_CC_STDC/d" \
 		-i guile-readline/configure.in || die
 
-	epatch_user
-
 	mv "${S}"/configure.{in,ac} || die
 	mv "${S}"/guile-readline/configure.{in,ac} || die
 
@@ -62,24 +70,25 @@ src_configure() {
 	filter-flags -ftree-vectorize
 
 	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable readline) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable emacs elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules \
-		EMACS=no
+	myconf=(
+		--disable-error-on-warning
+		--disable-static
+		--enable-posix
+		$(use_enable networking)
+		$(use_enable readline)
+		$(use_enable regex)
+		$(use deprecated || use_enable discouraged)
+		$(use_enable deprecated)
+		$(use_enable emacs elisp)
+		$(use_enable nls)
+		--disable-rpath
+		$(use_enable debug-freelist)
+		$(use_enable debug-malloc)
+		$(use_enable debug guile-debug)
+		$(use_with threads)
+		--with-modules
+	)
+	econf "${myconf[@]}" EMACS=no
 }
 
 src_compile() {
@@ -94,20 +103,19 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
+	default
 
 	# texmacs needs this, closing bug #23493
 	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile || die
+	echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" \
+		 > "${ED}"/etc/env.d/50guile || die
 
 	# necessary for registering slib, see bug 206896
 	keepdir /usr/share/guile/site
 
 	if use emacs; then
-		elisp-install ${PN} emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+		elisp-install ${PN} emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	fi
 }
 
diff --git a/dev-scheme/guile/guile-2.0.14-r4.ebuild b/dev-scheme/guile/guile-2.0.14-r4.ebuild
index 50d02983c91f..6cdb67fff567 100644
--- a/dev-scheme/guile/guile-2.0.14-r4.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r4.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=6
@@ -12,8 +12,8 @@ LICENSE="LGPL-3+"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 # emacs useflag removal not working
 
-# workaround for bug 596322
-REQUIRED_USE="regex"
+REQUIRED_USE="regex"  # workaround for bug 596322
+RESTRICT="strip"
 
 RDEPEND="
 	>=dev-libs/boehm-gc-7.0:=[threads?]
@@ -33,14 +33,18 @@ DEPEND="${RDEPEND}
 SLOT="12/22" # subslot is soname version
 MAJOR="2.0"
 
-DOCS=( GUILE-VERSION HACKING README )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-2-snarf.patch"
 	"${FILESDIR}/${P}-darwin.patch"
 	"${FILESDIR}/${P}-ia64-fix-crash-thread-context-switch.patch"
 )
 
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+DOCS=( GUILE-VERSION HACKING README )
+
 src_prepare() {
 	default
 	eautoreconf
@@ -75,7 +79,7 @@ src_install() {
 	find "${ED}" -name '*.la' -delete || die
 
 	# From Novell
-	# 	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+	#	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
 
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
index 7e08347d859f..ab320b7a78ec 100644
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,8 +30,23 @@ BDEPEND="
 	sys-devel/gettext"
 
 PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
 DOCS=( GUILE-VERSION HACKING README )
 
+src_prepare() {
+	# Remove tests that require network
+	local bad_test
+	for bad_test in test-suite/tests/web-*.test ; do
+		echo "#t" > "${bad_test}" || die
+	done
+
+	default
+}
+
 src_configure() {
 	# see bug #676468
 	mv prebuilt/32-bit-big-endian{,.broken} || die
@@ -60,7 +75,7 @@ src_install() {
 	default
 
 	# From Novell
-	# 	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+	#	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
 
diff --git a/dev-scheme/guile/guile-2.2.7-r1.ebuild b/dev-scheme/guile/guile-2.2.7-r1.ebuild
index 78619a6cc767..5ae0864f86fc 100644
--- a/dev-scheme/guile/guile-2.2.7-r1.ebuild
+++ b/dev-scheme/guile/guile-2.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.7-stack-up.patch"
 )
 
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
 DOCS=( GUILE-VERSION HACKING README )
 
 src_configure() {
diff --git a/dev-scheme/guile/guile-3.0.7-r1.ebuild b/dev-scheme/guile/guile-3.0.7-r1.ebuild
index 2bd3be08275a..0e90037860ba 100644
--- a/dev-scheme/guile/guile-3.0.7-r1.ebuild
+++ b/dev-scheme/guile/guile-3.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,10 @@ PATCHES=(
 	"${WORKDIR}/${P}-gnulib-glibc-2.34.patch"
 )
 
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
 DOCS=( GUILE-VERSION HACKING README )
 
 src_prepare() {
diff --git a/dev-scheme/guile/guile-3.0.7.ebuild b/dev-scheme/guile/guile-3.0.8.ebuild
index 2ae15278035a..efd31ce2549f 100644
--- a/dev-scheme/guile/guile-3.0.7.ebuild
+++ b/dev-scheme/guile/guile-3.0.8.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 MAJOR="3.0"
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
@@ -11,17 +11,19 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 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/boehm-gc-7.0[threads?]
 	dev-libs/gmp:=
 	dev-libs/libffi:=
-	dev-libs/libunistring:0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
+	dev-libs/libatomic_ops
+	dev-libs/libunistring:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
 	virtual/libcrypt:="
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -29,7 +31,14 @@ BDEPEND="
 	sys-devel/libtool
 	sys-devel/gettext"
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
+)
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
 DOCS=( GUILE-VERSION HACKING README )
 
 src_configure() {
@@ -39,7 +48,7 @@ src_configure() {
 	econf \
 		--disable-error-on-warning \
 		--disable-rpath \
-		--disable-static \
+		--disable-lto \
 		--enable-posix \
 		--without-libgmp-prefix \
 		--without-libiconv-prefix \
@@ -64,8 +73,8 @@ src_install() {
 	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
+	# necessary for registering slib, see bug #206896
 	keepdir /usr/share/guile/site
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 273686187ff8..d9626ab30de8 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,9 +1,13 @@
 AUX Makefile-nostrip.patch 635 BLAKE2B 6b8c6e573d64e284a4a6842fe8346b382f4f656a98bae59fff5c0b84c71557e74a9c91065f15d82910c3ecaeed720d38d42ba9366beaaeb9b5d1ffaa6baff954 SHA512 08221300c19fd115fe713a6e3f20e83f791d20807af33c27882f7f05e1dc20436dd1459f6b9e011118720c55d26c91f6d4650afa5977e6d2341898fbc7b54971
 AUX Makefile-starter.patch 1346 BLAKE2B 4f33f059ce0c9a02a27250d4893d00423854281ae6343443b7ffc7ddb7eed75951a31cbf11a9f89cf23d3c86513b54f6c42d9e66a006072f032c14957bbb9151 SHA512 a3dd1c1ed1cbb6ca596d32739ac56b1a4db188035572ff9015035061f69f0ef173c0b2dfae4a820b540c30e06d763c65e9d3192d16aaa6c6c25f6f74369f91f8
+AUX racket-8.4-ncurses.patch 4768 BLAKE2B 5d2a76efe004446624aac6ac23460a4daf9997a6fe1bd87bc890194939e38ca89ab08769668744afa45f3f5720ab0965a4ed50bf9569a6b3bfff71d302deca65 SHA512 028e0e3b57cfbe7baaea0c7c9c4c27561b663c9eaf4ea0716fda2ffa1d8cebc213ab1f7340671ed1d6a88329a079ee37f8d24a99427e89b7e8cd24ee70546c8d
 DIST racket-8.2-src-builtpkgs.tgz 150467561 BLAKE2B 5005aa852b089becd9d6da136a55a035ac5fd86bd1ad186ec30cdcf411927d444e1814797d63dbde3eb7b52bba7756e0464edf1d854d2ee7f5851caaae18ba55 SHA512 9e4c0cabfcbdb8c8742e8170548bee58021697e8b0842f575f94193db31adc04a7b9023ed8fd70dae197e5ec6f1aee7985d849be3ce5b4279f216e900ee143c7
 DIST racket-8.3-src-builtpkgs.tgz 150608486 BLAKE2B f002934c07afab4152ad8395c4ab5c6c87ef810f5cf79cf5ae0b41f4caa4508e0044f4246812513def14130d507af57aa61efaff8106eaeac0b86918bd775902 SHA512 7c340f65d221343beb2b4205cdc58648bd65dceabdb16f40cda425474faa905f4dd441193dc6cd4856f7863fb83834721394d6888027db356f830eceb127dbae
+DIST racket-8.4-src-builtpkgs.tgz 151809822 BLAKE2B c42f7943975a6f91a03ef0f668d218571dfc4159eac5a5722b9513b978413a9617b4e1bf3ccabef051014311ecf51fdc80d7563942e9e645c442ddfc4995a308 SHA512 afd9f357673a28ac5e4529ea0879a4edc3dbffc5b8627aa3553f1caf867be3296b94620dc2d86b8bb3f0c7ec7743d0057ce897c5caa705e02f2cc469ce4c7116
 DIST racket-minimal-8.2-src-builtpkgs.tgz 21187959 BLAKE2B 0f62a900e71ee101fa3acf0985b0a72215ac657285c5ce9e4f5f49189180b82dcca94ded9778b7ba92a42919f17b1dc24eec07e13c64c77e47fc958614d7dc0a SHA512 04950703fa73cdbbb10c234d57c89e70db6076b42d4a74ddb8cace9e0438b9a1431f7317baf31d667368ad75ae19e4eecec39667ba0c5b08a3580f8cc81f4f5e
 DIST racket-minimal-8.3-src-builtpkgs.tgz 21212037 BLAKE2B 76a742efe7ba2c44eb935d4852c20be355ccff9b935b39226ef1935184b0a9179ef6ca2ac0a64f3c7a6ae4a0082117a12c668d7804a0b73b9f1a391eaba61994 SHA512 3cab4a24cab5c1ac107c8aead2ada6fa3ec7d7aa122716c78af584f055dadf89497168e95b36d99115ecd1a1905dc1ec51774dd2c8099198ec7d6aa9d380039d
+DIST racket-minimal-8.4-src-builtpkgs.tgz 21279666 BLAKE2B 25d5eb405cedaa9cadfa776c4dd66b87f1641c86b638110f1a3a788465aaf573f5f8054e1e6913e6c0123840a1a2f64d5855db5f52acace3475b91d095272a76 SHA512 92433c08508cfb1bdb9093e5c7c726630826e9046de02fcb3d402f3dd76aa98fc2d9a5d09515d44e7a50eab0e38d963d2202f48a44741c3cf7fe8e47d9404e63
 EBUILD racket-8.2-r3.ebuild 5205 BLAKE2B 05b2762605383f5c48ef70cb87c5b791c04a5b721076ce9d52c51293573952898a16a535cc2b40be0c15c13e248cf52713c0617fd1471d4dd41a6f782e9c9250 SHA512 57cff4bd79dfb8ba5b800e6d1782d06968dd9e1ce59bd77c3691bba3b7d9c056e3bdc1bfeaa8377dc6cb0ba5d01f19cb18a67020c7a8b2b0375ea20b40ffbaf7
-EBUILD racket-8.3-r3.ebuild 4594 BLAKE2B 8a1891efdac183168c08c9dc08714215dd942e8a4542a6b4def17726b3608189180ab7398cf30ea0eb8283cf7cf002ddbad46c3263b049608986f684a5882e6d SHA512 017063c71fc9eef890717c76458703e00b38e6b88bfcda1b170bb90f9fa86db52f2d07062915cfa18b2c356f6f714afe942f6c360cb7f25ecd60094ecf71366e
-MISC metadata.xml 1640 BLAKE2B ef74fc40a4481c0fcb81b3ee5395aadbc460d5231f7e6bfbbe5d5ca4c0776f48215f5f63f1b41d9d161e6e2e6677a58e0073cd67b01d6f97e1583907326a3176 SHA512 fd42b9a4aeb2ccdeef42ffd60bcc297a5973c7e6cfac49e2aaaf090ce6bf0b9ec76954b3d13d10655e9f3ebffaa347a75d3906cd80e7ff426b0fee564f6c24a8
+EBUILD racket-8.3-r3.ebuild 4592 BLAKE2B df72e1388608938c636f9cf45827056b2e4c9d4102b7feeb99c8d33040c22a8efa62006aebfc2544f30b9f6dbca6c2bd22d17029d9c0c145759963c28cd17d25 SHA512 dafd2aec23a547333368908fa5fbc5a2c731581fc74025104c9dd2adaebe4de3a8aa622a7008bec8814cd91887657f52a1cc722760a53d6f3ab0203c2f2cbc99
+EBUILD racket-8.4-r1.ebuild 5386 BLAKE2B a028f3b6efc4bce5f0d25d4860903648fed822c36a7f12a7ebbed108c36590d12b540ad8044d10d97a18239da95f9ff3eb339115f47595a2ecf576e55b6de862 SHA512 20268d2e814500539b580dc26979fd0e5439255b0da4d16f34eb9abcdf95bb22222e79fb6903446ecceb00e41688f1ea4f3b709984a8ba34e1930021ac927555
+MISC metadata.xml 1878 BLAKE2B 9e9fb9e1e139c459b0e5d4b12034c09bb4fbf548c7868342bb207137779119d53ba1fae07a7be402b3a02d50ba5a7b6cf0d26d4329e971b9387685457956d564 SHA512 ab9639a08e8a2f1799c11964e900b58ba45ba044f1332a54dc476a20e143ffcb97ff97abfd28105a4a2b199dfa32ce48ac98622be1588c8fd8c5c24a627d4565
diff --git a/dev-scheme/racket/files/racket-8.4-ncurses.patch b/dev-scheme/racket/files/racket-8.4-ncurses.patch
new file mode 100644
index 000000000000..4bf429d82daa
--- /dev/null
+++ b/dev-scheme/racket/files/racket-8.4-ncurses.patch
@@ -0,0 +1,154 @@
+From 683388b0fcc8d0cc386e0ab749bcbba7cea18c8f Mon Sep 17 00:00:00 2001
+From: Matthew Flatt <mflatt@racket-lang.org>
+Date: Mon, 14 Feb 2022 06:26:25 -0700
+Subject: [PATCH] configure: try -ltinfo as curses linking flag
+
+---
+ ac/curses.m4   | 21 +++++++++++++++++++--
+ bc/configure   | 34 +++++++++++++++++++++++++++++++++-
+ cs/c/configure | 34 +++++++++++++++++++++++++++++++++-
+ 3 files changed, 85 insertions(+), 4 deletions(-)
+
+diff --git a/ac/curses.m4 b/ac/curses.m4
+index 25b0f1f99a3..d713c990949 100644
+--- a/ac/curses.m4
++++ b/ac/curses.m4
+@@ -22,7 +22,7 @@ if test "${skip_curses_check}" = "no" ; then
+       if test "${enable_curses}" = "no" ; then
+         if test "${enable_portable}" = "yes" ; then
+           if test "${curses_portable_link}" != "" ; then
+-            # Try adding portabel link flags
++            # Try adding portable link flags
+             ORIG_LIBS="$LIBS"
+             ORIG_CPPFLAGS="$CPPFLAGS"
+             ORIG_PREFLAGS="$PREFLAGS"
+@@ -62,7 +62,24 @@ if test "${skip_curses_check}" = "no" ; then
+           LIBS="$ORIG_LIBS"
+           curses_lib_flag=""
+         fi
+-      fi      
++      fi
++      if test "${enable_curses}" = "no" ; then
++        # Try adding -lncurses -ltinfo
++        ORIG_LIBS="$LIBS"
++        curses_lib_flag=" -lncurses -ltinfo"
++        LIBS="$LIBS $curses_lib_flag"
++        AC_TRY_LINK(
++        [#include <curses.h>]
++        [#include <term.h>],
++[        int errret; ]
++[        setupterm("", 0, &errret);]
++         return 0;
++         , enable_curses=yes, enable_curses=no)
++        if test "${enable_curses}" = "no" ; then
++          LIBS="$ORIG_LIBS"
++          curses_lib_flag=""
++        fi
++      fi
+     fi
+   fi
+  fi
+diff --git a/bc/configure b/bc/configure
+index 543fab87411..132d2dedd6c 100755
+--- a/bc/configure
++++ b/bc/configure
+@@ -5991,7 +5991,7 @@ rm -f core conftest.err conftest.$ac_objext \
+       if test "${enable_curses}" = "no" ; then
+         if test "${enable_portable}" = "yes" ; then
+           if test "${curses_portable_link}" != "" ; then
+-            # Try adding portabel link flags
++            # Try adding portable link flags
+             ORIG_LIBS="$LIBS"
+             ORIG_CPPFLAGS="$CPPFLAGS"
+             ORIG_PREFLAGS="$PREFLAGS"
+@@ -6055,6 +6055,38 @@ if ac_fn_c_try_link "$LINENO"; then :
+ else
+   enable_curses=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++        if test "${enable_curses}" = "no" ; then
++          LIBS="$ORIG_LIBS"
++          curses_lib_flag=""
++        fi
++      fi
++      if test "${enable_curses}" = "no" ; then
++        # Try adding -lncurses -ltinfo
++        ORIG_LIBS="$LIBS"
++        curses_lib_flag=" -lncurses -ltinfo"
++        LIBS="$LIBS $curses_lib_flag"
++        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <curses.h>
++        #include <term.h>
++int
++main ()
++{
++        int errret;
++        setupterm("", 0, &errret);
++         return 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  enable_curses=yes
++else
++  enable_curses=no
++fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+         if test "${enable_curses}" = "no" ; then
+diff --git a/cs/c/configure b/cs/c/configure
+index db2132b7f4d..2ec78292f56 100755
+--- a/cs/c/configure
++++ b/cs/c/configure
+@@ -5635,7 +5635,7 @@ rm -f core conftest.err conftest.$ac_objext \
+       if test "${enable_curses}" = "no" ; then
+         if test "${enable_portable}" = "yes" ; then
+           if test "${curses_portable_link}" != "" ; then
+-            # Try adding portabel link flags
++            # Try adding portable link flags
+             ORIG_LIBS="$LIBS"
+             ORIG_CPPFLAGS="$CPPFLAGS"
+             ORIG_PREFLAGS="$PREFLAGS"
+@@ -5699,6 +5699,38 @@ if ac_fn_c_try_link "$LINENO"; then :
+ else
+   enable_curses=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++        if test "${enable_curses}" = "no" ; then
++          LIBS="$ORIG_LIBS"
++          curses_lib_flag=""
++        fi
++      fi
++      if test "${enable_curses}" = "no" ; then
++        # Try adding -lncurses -ltinfo
++        ORIG_LIBS="$LIBS"
++        curses_lib_flag=" -lncurses -ltinfo"
++        LIBS="$LIBS $curses_lib_flag"
++        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <curses.h>
++        #include <term.h>
++int
++main ()
++{
++        int errret;
++        setupterm("", 0, &errret);
++         return 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  enable_curses=yes
++else
++  enable_curses=no
++fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+         if test "${enable_curses}" = "no" ; then
diff --git a/dev-scheme/racket/metadata.xml b/dev-scheme/racket/metadata.xml
index 8b99db59b68a..8a10d666d3ee 100644
--- a/dev-scheme/racket/metadata.xml
+++ b/dev-scheme/racket/metadata.xml
@@ -15,18 +15,25 @@ Extend Racket whenever you need to. Mold it to better suit your tasks without sa
 ==Grow your Skills==
 Whether you're just starting out, want to know more about programming language applications or models, looking to expand your horizons, or ready to dive into research, Racket can help you become a better programmer and system builder.
   </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/racket/racket/issues/</bugs-to>
+    <remote-id type="github">racket</remote-id>
+  </upstream>
   <use>
     <flag name="chez">
       Build Racket on Chez (Racket CS)
     </flag>
-    <flag name="futures"> 
+    <flag name="futures">
       Enable racket/future library for fine-grained hardware parallelism
     </flag>
-    <flag name="places"> 
+    <flag name="ncurses">
+      Add ncurses support for expeditor (REPL expression editor)
+    </flag>
+    <flag name="places">
       Enable racket/place library for share-nothing parallelism and message-passing communication. Compared to futures, places are heavyweight, but they have a simpler performance model.
     </flag>
-    <flag name="threads"> 
-      Enable support for green threads 
+    <flag name="threads">
+      Enable support for green threads
     </flag>
   </use>
 </pkgmetadata>
diff --git a/dev-scheme/racket/racket-8.3-r3.ebuild b/dev-scheme/racket/racket-8.3-r3.ebuild
index f614f17366c3..cc99f7caf28b 100644
--- a/dev-scheme/racket/racket-8.3-r3.ebuild
+++ b/dev-scheme/racket/racket-8.3-r3.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 +places +threads"
 # See bug #809785 re chez/threads
 REQUIRED_USE="chez? ( futures places ) futures? ( jit threads ) places? ( threads )"
diff --git a/dev-scheme/racket/racket-8.4-r1.ebuild b/dev-scheme/racket/racket-8.4-r1.ebuild
new file mode 100644
index 000000000000..1dae6d9cdb89
--- /dev/null
+++ b/dev-scheme/racket/racket-8.4-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature readme.gentoo-r1
+
+DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
+HOMEPAGE="https://racket-lang.org/"
+SRC_URI="
+	minimal? ( https://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz )
+	!minimal? ( https://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )
+"
+S="${WORKDIR}/${P}/src"
+
+# See https://blog.racket-lang.org/2019/11/completing-racket-s-relicensing-effort.html
+LICENSE="
+	|| ( MIT Apache-2.0 )
+	chez? ( Apache-2.0 )
+	!chez? ( LGPL-3 )
+"
+# Bytecode generated by Racket is not compatible between versions.
+# The bytecode version should be denoted by SLOT, in most cases
+# PV == SLOT but this has to be checked carefully and in cases
+# where we use _p, _pre, etc it will have to be set manually.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+chez +doc +futures +jit minimal ncurses +places +threads"
+# See bug #809785 re chez/threads
+REQUIRED_USE="chez? ( futures places ) futures? ( jit threads ) places? ( threads )"
+
+DEPEND="
+	!dev-tex/slatex
+	dev-db/sqlite:3
+	dev-libs/libffi:=
+	ncurses? ( sys-libs/ncurses:= )
+"
+RDEPEND="${DEPEND}"
+
+# Backports that will be probably available in next release (8.5)
+PATCHES=(
+	# Pick correct ncurses library
+	# https://github.com/racket/racket/commit/683388b0fcc8d0cc386e0ab749bcbba7cea18c8f
+	"${FILESDIR}"/${P}-ncurses.patch
+)
+
+# "mred" and "mzscheme" are binaries generated by Racket, not CC
+QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
+
+DOC_CONTENTS="
+If you wish to use sys-libs/readline instead of dev-libs/libedit
+for readline-like features in the Racket's REPL you can install
+the package 'readline-gpl' using raco, Racket's package manager
+https://pkgs.racket-lang.org/package/readline-gpl
+"
+
+# Package database files (for pkg_preinst & pkg_config)
+PKGDB=(
+	/usr/share/racket/info-cache.rktd
+	/usr/share/racket/links.rktd
+	/usr/share/racket/pkgs/pkgs.rktd
+)
+
+src_prepare() {
+	# Prepare the environment
+	unset PLTADDONDIR PLTCOLLECTS PLTCONFIGDIR PLTUSERHOME
+
+	default
+
+	# Remove bundled libffi
+	rm -r ./bc/foreign/libffi || die "failed to remove bundled libffi"
+}
+
+src_configure() {
+	# Libtool:
+	#   According to vapier, we should use the bundled libtool
+	#   such that we don't preclude cross-compile.
+	#   Thus don't use --enable-lt=/usr/bin/libtool
+	# Backend:
+	#   --enable-bc builds Racket w/o chez backend
+	# C Libraries:
+	#   --enable-libs & --disable-shared is the way to build
+	#   .a files that are needed to embed Racket into programs
+	#   https://docs.racket-lang.org/inside/cs-embedding.html
+	local myconf=(
+		--disable-shared
+		--disable-strip
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-libs
+		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
+		$(use_enable doc docs)
+		$(use_enable ncurses curses)
+	)
+	# Some options are togglable only for the BC version (are forced in CS)
+	! use chez && myconf+=(
+			--enable-float
+			--enable-foreign
+			--enable-gracket
+			--enable-libffi
+			$(use_enable futures)
+			$(use_enable jit)
+			$(use_enable places)
+			$(use_enable threads pthread)
+		)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install Racket boot files
+	use chez && emake -C "${S}"/cs/c DESTDIR="${ED}" unix-install-boot-files
+
+	# raco needs decompressed files for packages doc installation bug 662424
+	use doc && docompress -x /usr/share/doc/${PF}
+
+	# Create missing desktop files and icon
+	if ! use minimal ; then
+		newicon "${ED}/usr/share/racket/drracket-exe-icon.png" "racket.png"
+		make_desktop_entry "gracket" "GRacket" "racket" "Development;Education;"
+		make_desktop_entry "plt-games" "PLT Games" "racket" "Education;Game;"
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# If we are merging the same SLOT check if package
+	# database files exist and do not overwrite them
+	if has_version "${CATEGORY}/${PN}:${SLOT}" ; then
+		echo "We are installing the same SLOT: ${SLOT}"
+		local rktd
+		for rktd in "${PKGDB[@]}" ; do
+			if [[ -f "${EROOT}"/${rktd} ]] && [[ -f "${ED}"/${rktd} ]] ; then
+				einfo "Keeping old file: ${rktd}"
+				mv "${ED}"/${rktd} "${ED}"/${rktd}.bak ||
+					die "failed to create a backup of ${rktd}"
+				cp "${EROOT}"/${rktd} "${ED}"/${rktd} ||
+					die "failed to create a copy of ${rktd}"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	# If we have any pkgs not included in Racket main distribution (outsiders),
+	# then we have to re-setup them or during installation other pkgs will want
+	# to recompile parts of "outsider" pkgs they depend upon (and fail).
+	local outsiders=( $(raco pkg show -i | grep 'link' | sed 's|link.*||g') )
+	if [[ -n "${outsiders[@]}" ]] ; then
+		ebegin "Running \"raco setup\" for outsider packages"
+		echo "Outsiders: ${outsiders[@]}"
+		raco setup --all-users --force --no-docs --no-user --pkgs "${outsiders[@]}"
+		eend 0  # do not fail
+	fi
+
+	optfeature "readline editing features in REPL" dev-libs/libedit
+	optfeature "generating PDF files using Scribble" dev-texlive/texlive-fontsextra
+
+	readme.gentoo_print_elog
+}
+
+pkg_config() {
+	einfo "Swapping package database backup files"
+
+	for rktd in "${PKGDB[@]}" ; do
+		mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config
+		mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd}
+		mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak
+	done
+}
diff --git a/dev-scheme/scsh-lib/Manifest b/dev-scheme/scsh-lib/Manifest
new file mode 100644
index 000000000000..d5dff74a7847
--- /dev/null
+++ b/dev-scheme/scsh-lib/Manifest
@@ -0,0 +1,5 @@
+AUX scsh-lib-0.7-Makefile.in-LDFLAGS.patch 474 BLAKE2B 8f801b7c2e6883d41ca539e8bde0352caa5189d1398a7ef1138b13f7275f9a8fd20c5b2d83b3e9baa32005e8947f908cdbfc134d44427e5dee6855297459e4aa SHA512 0243c0b8378d5ebad2625a84c268f051fca6f836ca46bf0099b4163722eb29d8c24b9e9b125a37670a87873f03119387bcbafea072f8d9e86ad9f0dab392cbdf
+DIST scsh-0.7_pre20160820.tar.gz 227203 BLAKE2B 888a52a4866bfe4f8245fff4ca449a82cd67485aa8a3e8f67d20805f7120e62ed8dd37b7fe6139712652785d0d9f064bbeab0010722e9ce0b58bc59e44b054b3 SHA512 e2c223f64eb2a19dde19382dacad01aa04f8faabeeb15e1c1b3e28b2f675f4184825372f7aa281141797cd56f5ef999b4977dd7e68ae0a3b23631fd76182fba1
+DIST scsh-0.7_pre20160820_rx.tar.gz 46869 BLAKE2B 4be965c558cc21bde5fc24dee2ddc68a3e1d83d6b9701a7e484eb47c928ecdedfa896b944bbb1d709d014d9848a066a67a0d53f6dd86f435ea665ef99da1d40e SHA512 bc300f596b611ae296327b3046aa01cfb6b2be182c69abfe56e3e504573607d3dee55723b1d48951aa8534f450a0184fc7da0c1370fcffb9adba866ace3665b4
+EBUILD scsh-lib-0.7_pre20160820.ebuild 1463 BLAKE2B ad4887da5f7a6e83982b41501e6ba035259c62e422e0eca3e26aaddcc4a3e22041a96746edeac5eddf2a71fa13027853f68dc57ac5392d135f1aaf677eea454f SHA512 609d41a481be53235b21ea4654d793ad7b5e8c0d3dd81e966fd37ecb67a08246485d3dffbaa9d741a0da0ea4801dffd3cd042af8b56e0ca8aab257117fb038f7
+MISC metadata.xml 1045 BLAKE2B 2f1d0150a22fdc84722306255d81a993a76cdaeb3d34c70f1034fe46ac0dd299835f8b3cf1fde64b15fba698bbdfda46231f1d922bbc2f15e8c4e6a4c1c28de6 SHA512 11ee43a71406af52b501d537ad63714f65c5cbf03fcd135c3ec2673d7f5c3a8430e76b4db47d92a83c12db71140a623ba8c1024fee260b19d0aa1fb5f115c958
diff --git a/dev-scheme/scsh-lib/files/scsh-lib-0.7-Makefile.in-LDFLAGS.patch b/dev-scheme/scsh-lib/files/scsh-lib-0.7-Makefile.in-LDFLAGS.patch
new file mode 100644
index 000000000000..b2431c908922
--- /dev/null
+++ b/dev-scheme/scsh-lib/files/scsh-lib-0.7-Makefile.in-LDFLAGS.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -126,13 +126,13 @@ SCHEME = scheme/command-line.scm \
+ 	 rx/regress.scm
+ 
+ go: c/scsh-tramp.c
+-	$(CC) -o $@ $(CFLAGS) \
++	$(CC) -o $@ $(CFLAGS) $(CPPLAGS) $(LDFLAGS) \
+ 	-DVM=\"$(SCHEME48VM)\" \
+ 	-DIMAGE=\"scsh.image\" \
+ 	$(srcdir)/c/scsh-tramp.c
+ 
+ scsh: c/scsh-tramp.c
+-	$(CC) -o $@ $(CFLAGS) \
++	$(CC) -o $@ $(CFLAGS) $(CPPLAGS) $(LDFLAGS) \
+ 	-DVM=\"$(SCHEME48VM)\" \
+ 	-DIMAGE=\"$(LIB)/scsh.image\" \
+ 	$(srcdir)/c/scsh-tramp.c
diff --git a/dev-scheme/scsh-lib/metadata.xml b/dev-scheme/scsh-lib/metadata.xml
new file mode 100644
index 000000000000..22eefaa8cb02
--- /dev/null
+++ b/dev-scheme/scsh-lib/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription>
+    Scsh has two main components: a process notation for running programs
+    and setting up pipelines and redirections, and a complete syscall
+    library for low-level access to the operating system, i.e. to POSIX,
+    the least common denominator of more or less all Unices, plus widely
+    supported extensions such as symbolic links and BSD sockets.
+
+    Moreover, scsh provides an awk facility for pattern-directed
+    computation over streams of records, a rich facility for matching
+    regular-expression patterns in strings, event-based interrupt
+    handling, user-level threads, a futuristic module system, and an
+    interactive environment.
+
+    Scsh comes with extensive documentation describing these and other
+    features.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/scsh-lib/scsh-lib-0.7_pre20160820.ebuild b/dev-scheme/scsh-lib/scsh-lib-0.7_pre20160820.ebuild
new file mode 100644
index 000000000000..1765e54f8190
--- /dev/null
+++ b/dev-scheme/scsh-lib/scsh-lib-0.7_pre20160820.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# For snapshots: keep the hashes in sync with app-shells/scsh
+SCSH_H=114432435e4eadd54334df6b37fcae505079b49f
+RX_H=d3231ad13de2b44e3ee173b1c9d09ff165e8b6d5
+
+# compatible scheme48 version
+SCHEME48V=1.9.2
+
+inherit autotools
+
+DESCRIPTION="Unix shell embedded in Scheme (libraries and launcher)"
+HOMEPAGE="https://www.scsh.net/"
+SRC_URI="
+	https://github.com/scheme/scsh/archive/${SCSH_H}.tar.gz -> scsh-${PV}.tar.gz
+	https://github.com/scheme/rx/archive/${RX_H}.tar.gz -> scsh-${PV}_rx.tar.gz
+"
+S="${WORKDIR}/scsh-${SCSH_H}"
+
+RESTRICT="test"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# older versions were in conflict with scheme48's files, on the other hand,
+# new 2016 version uses scheme48
+RDEPEND="~dev-scheme/scheme48-${SCHEME48V}"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7-Makefile.in-LDFLAGS.patch )
+
+src_unpack() {
+	unpack scsh-${PV}.tar.gz
+
+	tar xf "${DISTDIR}/scsh-${PV}_rx.tar.gz" --strip-components 1 -C "${S}/rx/" ||
+		die "Failed to unpack scsh-${PV}_rx.tar.gz"
+}
+
+src_prepare() {
+	SCHEME48VM=/usr/$(get_libdir)/scheme48-${SCHEME48V}/scheme48vm
+	export SCHEME48VM
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-scheme48=${SCHEME48VM}
+}
+
+src_compile() {
+	emake SCHEME48VM=${SCHEME48VM}
+}
+
+src_install() {
+	emake SCHEME48VM=${SCHEME48VM} DESTDIR="${D}" enough dirs install-scsh
+
+	rm "${D}"/usr/bin/scsh || die
+}
diff --git a/dev-scheme/skribilo/Manifest b/dev-scheme/skribilo/Manifest
new file mode 100644
index 000000000000..e8605103d902
--- /dev/null
+++ b/dev-scheme/skribilo/Manifest
@@ -0,0 +1,4 @@
+AUX 50skribilo-gentoo.el 116 BLAKE2B 1b699d8a6965131650d6d46cd5d2f0280a6cb0c781194adf48b708fd826cc8f94c8d3e1109766e3966e26f161cd12e89f2cc61bd7a3cb0bdbf74051866cfa467 SHA512 f8cb01127dfcdf8f5c88a4c928f2f80db70a40f03166744d3a7989b34a6d4cf92e1815da329f64dccf7ea6fa1d489744a786f04e7f34fbee654bb80294e81356
+DIST skribilo-0.9.5.tar.gz 1520763 BLAKE2B c624174a29cb7eb7236b8de506ade00c58fdd895807bd3e052872b7d950be9106daef6015c34ff8b5e7888b43383cbfa5c29c62835d02121cac19062985c6032 SHA512 22dff4523039792bd3662f9f1302569bfb83d92b7106ae22b8926e264b00932ea50ab753bb83aed499d0aa651d0fe99fdfd28b83956ec3ad84b81078391fe014
+EBUILD skribilo-0.9.5.ebuild 1505 BLAKE2B b6c84dd3e5c5e33b14bf8e7d86222959af418c6a83d5f1c493106db3e9600fe1d0ceb06ab331ee30edb319f1e0ef9a59eca1c30fe30a0da17a045cf73982c019 SHA512 3660956df88e8a50f4c889b11c6f959dd2aca665823f7a71776bb763dea4fed47fa970565793684c9f21a46130da87ac495f1e3c7179e34c71ef4487497b3e12
+MISC metadata.xml 968 BLAKE2B d503b255bcca3c11002b1a09dafb983742b0e9610be1c4361c764fbe3edcd5c85ba60a9157825ce7f8e95bf73066bb8204d45d4fad372c36cadb14d9b237da3f SHA512 254374cdbc550ab09b684670adedc14dbdb29c95741d030959a3b07d830056561be40b4874def164688a2d7d2afa0474eb27ec17348717363e08351ad4660cfa
diff --git a/dev-scheme/skribilo/files/50skribilo-gentoo.el b/dev-scheme/skribilo/files/50skribilo-gentoo.el
new file mode 100644
index 000000000000..b6dc5061ebfd
--- /dev/null
+++ b/dev-scheme/skribilo/files/50skribilo-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'skribe-mode "skribe"
+  "Minor mode for editing Skribe sources." t)
diff --git a/dev-scheme/skribilo/metadata.xml b/dev-scheme/skribilo/metadata.xml
new file mode 100644
index 000000000000..24602493b44a
--- /dev/null
+++ b/dev-scheme/skribilo/metadata.xml
@@ -0,0 +1,21 @@
+<?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>
+    Skribilo is a free document production tool that takes a structured
+    document representation as its input and renders that document in a variety
+    of output formats: HTML and Info for on-line browsing, and Lout and LaTeX
+    for high-quality hard copies.
+    The input document can use Skribilo's markup language to provide
+    information about the document's structure, which is similar to HTML or
+    LaTeX and does not require expertise. Alternatively, it can use a simpler,
+    "markup-less" format that borrows from Emacs' outline mode and from other
+    conventions used in emails, Usenet and text.
+    Lastly, Skribilo provides Guile Scheme APIs.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/skribilo/skribilo-0.9.5.ebuild b/dev-scheme/skribilo/skribilo-0.9.5.ebuild
new file mode 100644
index 000000000000..fa72296a9295
--- /dev/null
+++ b/dev-scheme/skribilo/skribilo-0.9.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common
+
+DESCRIPTION="Document production tool written in Guile Scheme"
+HOMEPAGE="https://www.nongnu.org/skribilo/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+RESTRICT="strip test"  # tests fail, seem broken
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	media-gfx/imagemagick
+
+	>=dev-scheme/guile-2.0.0:=
+	dev-scheme/guile-lib
+	dev-scheme/guile-reader
+"
+DEPEND="${RDEPEND}"
+BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_configure() {
+	if ! use emacs ; then
+		export EMACS="no"
+		export EMACSLOADPATH="/dev/null"
+	fi
+
+	econf
+}
+
+src_compile() {
+	default
+
+	use emacs && elisp-compile ./emacs/*.el
+}
+
+src_install() {
+	default
+
+	if use emacs ; then
+		elisp-install ${PN} ./emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	else
+		local emacsd="${D}"/usr/share/emacs
+		if [[ -d "${emacsd}" ]] ; then
+			echo "Building without Emacs support but ${emacsd} found! Removing."
+			rm -r "${emacsd}" || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest
index 510f3f8acb44..6851ec222ceb 100644
--- a/dev-scheme/stklos/Manifest
+++ b/dev-scheme/stklos/Manifest
@@ -1,7 +1,4 @@
-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
 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
+EBUILD stklos-1.70.ebuild 1010 BLAKE2B 16443bb3410300e26513ca3b932726452216904d3343c52f7fc78f2315684eca1b82956414d7d5ca85146f407113d7b9ce7db1ef64bd55ca5d295792768203c1 SHA512 9890fbafa369de3b458747a38ae63744bd9e2641fac6c9657f7d5a75cd1005bb069218de5943da9b02dad1c0250981b85080fd0d6c36ebda79eb994c4ce51a64
 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
deleted file mode 100644
index 56f5440cf1dc..000000000000
--- a/dev-scheme/stklos/files/stklos-1.10-gentoo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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/stklos-1.10-r2.ebuild b/dev-scheme/stklos/stklos-1.10-r2.ebuild
deleted file mode 100644
index 72aa6c496083..000000000000
--- a/dev-scheme/stklos/stklos-1.10-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
index 74b2eb58dcf5..d138654b1211 100644
--- a/dev-scheme/stklos/stklos-1.70.ebuild
+++ b/dev-scheme/stklos/stklos-1.70.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://www.${PN}.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="threads"
 
 RDEPEND="dev-libs/boehm-gc[threads?]
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /dev-scheme
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)