gentoo resync : 02.02.2022

28 files changed, 292 insertions, 121 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 817b09e19c5d..65fdfd992570 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/akku/Manifest b/dev-scheme/akku/Manifest
index b22be523592d..f6eed7d91173 100644
--- a/dev-scheme/akku/Manifest
+++ b/dev-scheme/akku/Manifest
@@ -1,3 +1,3 @@
 DIST akku-v1.1.0.tar.gz 492996 BLAKE2B 7e3d549ed7f7fc0b6e84a41ff03d66398d2a464d6aa65dc92780a2b657d4476fef592543fba0fefe0da8ee429d97d4dcc0cf13ecd53c7be425b3f292b7b1c93d SHA512 e728bd80aaa21ca896e054e71a17ee519608b7c436f9613c688dba666f0120562174b7dca3156299528c1063a74e8faa8b8a77d1b7166d7506dec6b51d555825
 EBUILD akku-1.1.0.ebuild 949 BLAKE2B ad18d5354ef453f5fd6496ec30e9347b7071ee8aa94c6eb06faa726973638ba3ce8e8d22fa8b21487fe4b882d9424e52cdd0bee84459978297c8bd3fa5cb4c70 SHA512 1b0f1ae8cdeb070d447a31841fb9e79355de6aa96b3be7b9bce2cb630b15262c0dbfbc4763e5868df7d41392f5c34baa22669f5d9d1e3a5c9eea01e35ddb2411
-MISC metadata.xml 914 BLAKE2B f87257e7a1c6adee74c4d946ff6f788c2655ca83de90a967e94b56a4057057a731e582a9b6f870ee66ba01c75fac76857b793645a9e1fc9a3000dbcfc86064cd SHA512 5f9ae8349bcfadc22b6d7deec22c1a4e4fca285a6054b46329ab5cddf3e3c6658590716c3c17ad2af48f04471f67d881c7181721fdf74995e3d3573aa8f09ba9
+MISC metadata.xml 915 BLAKE2B f103bf7aa1b06d52543b8c5eadbd3edc7d37d53203907a3df762cbb930a2cfb567ab5322f2d13de5dfe058b7d5899ba91233dc482b45e5406824102b01e02534 SHA512 ea69b23c7e7cda45697dead30b70f45a9edc347b3e58286ffe347b5199ec4c7d853dff29cc624f1b08a2f9eff468abdfdb2b5239ae38e89db7d855be6d3cc8df
diff --git a/dev-scheme/akku/metadata.xml b/dev-scheme/akku/metadata.xml
index 4d0973104ed3..35faaa8be598 100644
--- a/dev-scheme/akku/metadata.xml
+++ b/dev-scheme/akku/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-scheme/chez-minikanren/Manifest b/dev-scheme/chez-minikanren/Manifest
index 07347e5c5ae2..108d708f10b7 100644
--- a/dev-scheme/chez-minikanren/Manifest
+++ b/dev-scheme/chez-minikanren/Manifest
@@ -1,3 +1,3 @@
 DIST chez-minikanren-2018.04.11.tar.gz 14068 BLAKE2B b3d8ca2499b37f085e34e59bfa47c7d2dc7869025b46c0ccee271556b4b3ed89e37a29374e3e78452041e88377ede7d751b81da0959e590d9b7be0adb72efc94 SHA512 39928df2548353917cfaaad37454ceb94db4c87ebbf8a1bd8e7ce3e32ed07a6660e9cc1aeb446e3b7abbc533e8cf24da1f3a2ce3c2efe9cc8c8ed1bd90b88278
 EBUILD chez-minikanren-2018.04.11.ebuild 1101 BLAKE2B 7453b261da0a11163e3a7a5fd5e7ad03b63cb898f35ac5da9230b70eeaaf7d7421e8842f4178b5580b36ccd9f8c5daa6ede73ebde72ee9bc08332bd84d30109a SHA512 3c3436f6d8fc5c6502221487ec8d622f1f51472d8dbc8ba62c998af04c6fbd9c73a1ce5a3f424dac80093291abbf272eae40a2a9f8cb9dd02ded9ae5f8feca1c
-MISC metadata.xml 850 BLAKE2B e2f9501b9b30f76f3f79db5f4cbc3776fc2cd5a274dcf398a462a28533e876ea83078cad593a25af8dd9d4ee195085b374eb8697a38bf342fe38c3dd7f0d6672 SHA512 26c8c73f9185272cf2a253416405d8236a86085634f4210bb451717f45e740e0670650d54464f6f3be6600dde09894f17a6fcc8f8725d91f2979d158089ad678
+MISC metadata.xml 851 BLAKE2B 9f5a4805d02e05ad51a9895d1d1f387f4a685815a78363f63df06679fd264904ed9e1cf60b38810eba50e334737ada58c30e27b6c866469bbc0578f2445f7d28 SHA512 31b96493fee86a992d87de9424a9ae463e6e5aede8065adee9397d95071e500686c9f4d37280ce3b691473cf7bb49fabe59cb9624e4048342286d1fa3047e456
diff --git a/dev-scheme/chez-minikanren/metadata.xml b/dev-scheme/chez-minikanren/metadata.xml
index eafae6b7cb51..b55deda0b0df 100644
--- a/dev-scheme/chez-minikanren/metadata.xml
+++ b/dev-scheme/chez-minikanren/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
index d5577597f90d..9c92637fa2b5 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 1266 BLAKE2B 85c7701d3c2b5e6cea3975f59c262fda6a6f38f0acd7093544ef62c647bc6fcbde06c5013d84f62ced3ea58efc5882ab1c6eb45fbb4b63f3366e19b1aea78c52 SHA512 27753e59489405becb7e70169447a24eea12ea3c273fd90a1cd7fd416fbab9b8ba6041977a9d57b24a9e9a55bcd2833ee83e31bcc6db2d6ba4b39c5281f535e9
+MISC metadata.xml 1267 BLAKE2B d234e2e88925fb2591463185f1b07dcc8629efbc3eec59bc81473cc25a919185e683db294202f62b8a759885e9958bab8f526ee2062293984b939c5ab7099896 SHA512 14d6f5ccb3c31686806364ea83ab417d9575c35fd17cef5178afc6f7a4ae368811e72a71d3dc06a0604bf42a24a3ac4dea17083604a55b23b9781fdb72ef7ef3
diff --git a/dev-scheme/chez/metadata.xml b/dev-scheme/chez/metadata.xml
index 7c0daa5cbed0..e539d1309d73 100644
--- a/dev-scheme/chez/metadata.xml
+++ b/dev-scheme/chez/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="person" proxied="yes">
diff --git a/dev-scheme/chibi/Manifest b/dev-scheme/chibi/Manifest
index f067681951ba..3e95dccf696c 100644
--- a/dev-scheme/chibi/Manifest
+++ b/dev-scheme/chibi/Manifest
@@ -1,4 +1,4 @@
 DIST chibi-0.10.tar.gz 1148573 BLAKE2B 1435d5734bfc44b6d6ddafdb339eea659345eea0db0e9b227830d7a6b6b14d3655af10906e43b6f8abd7eb2b90596fcb5dcc024abd2cba123a184f66ffcd0961 SHA512 348c20468e3b3b084ed25d38860f1afdecfb06ad9ff9ceb178c36930c14aa66a78f48b881a8eda28a30498662e7c722938212ea77b1cea89834d1a4377f0f648
 EBUILD chibi-0.10.ebuild 868 BLAKE2B 6101a3349563aaa2a20ac2343ad49ea7e1dbd27280cc22a1acfdf1944d36195d372d201f8b2107d498dacbe0f7df28be2d22b8412edfabe6afd2863255d0fcfc SHA512 9ca2b03ad437ac7dcae1b30640abcbce12e3a2b5012c8b8534c2a8e8ddc1c6ed887f3ae8e9e88a80e24be0d1c0ae576c13302c9ab7b215df9d2efb9dbb32bbd7
 EBUILD chibi-9999.ebuild 868 BLAKE2B 6101a3349563aaa2a20ac2343ad49ea7e1dbd27280cc22a1acfdf1944d36195d372d201f8b2107d498dacbe0f7df28be2d22b8412edfabe6afd2863255d0fcfc SHA512 9ca2b03ad437ac7dcae1b30640abcbce12e3a2b5012c8b8534c2a8e8ddc1c6ed887f3ae8e9e88a80e24be0d1c0ae576c13302c9ab7b215df9d2efb9dbb32bbd7
-MISC metadata.xml 1354 BLAKE2B f42d034ab15ba6df9f4cea3be5d6e5c66a61b55dbd6ada20cff02fbc79d2683e7eb5d8e95ce1b62b6cca54a521018e0abff7e15251dd5af8dfe1cd9ad1c56c3d SHA512 52c10ed2024fc27179e0a043cc00840ad81c9c5d31365ce27787691ca846a1a1ab065af4376655fff97a88638003c9ef4c1831a3b13a216f7f200b075a16fb09
+MISC metadata.xml 1355 BLAKE2B 0fcce80e3e0fd747b74e5cb5e83904a22de2596bba8c5e664e1d0fd29e9ed43d62357b618994cc586391a66a60ca6fb53a68a9cfd221853ad66171b9b7a47a8e SHA512 f0f8613e22a15e02d34de4c41352a797fba65c2c8fc78b37f9024bfcc57ab99391d2ffa28eb0173d872421744d901655beedadb44e32a04a467917b3a8476fe2
diff --git a/dev-scheme/chibi/metadata.xml b/dev-scheme/chibi/metadata.xml
index 6a31c51ea163..07e375919d8c 100644
--- a/dev-scheme/chibi/metadata.xml
+++ b/dev-scheme/chibi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-scheme/cyclone/Manifest b/dev-scheme/cyclone/Manifest
index 840195e58cef..fe8d7ce042a7 100644
--- a/dev-scheme/cyclone/Manifest
+++ b/dev-scheme/cyclone/Manifest
@@ -3,4 +3,4 @@ DIST cyclone-0.34.0.tar.gz 3947685 BLAKE2B db86669bda00c89cee0d6b9224e7cb407961e
 EBUILD cyclone-0.33.0.ebuild 1158 BLAKE2B 47fa760d10dc84bd13fe82b970cd693c4ba5eb03f5356c3ee28bff36abb1603e91691d1aa7077ede2b612e09c39bf575003448169dffe4cd16a835ab658f8711 SHA512 59a1d7d1b3f900e6b9aadd7177328a3af20a42fe09e1177075124a089f9f58d315f6eaf0c023d6f63f0463a265e8ee024c43dea773cd61bec1ba50fbfcd87103
 EBUILD cyclone-0.34.0.ebuild 1164 BLAKE2B edf4db39c92531cfe2240af4c48ee0c55c6cf533f37d2826a78a9fe8e642a868ede52813ac488177dbbdde18aa1f1d6ec8de322f789b2c7814de6d0b569eae17 SHA512 a95e0be903dd36092c989b46c9f3ac4165653d03a8cc453a328c0049f9c2c0bcd9c77eac4645107bdcf199e0e0389d81c84e1e5fa9743a4ef30d6baf1866c284
 EBUILD cyclone-9999.ebuild 1164 BLAKE2B b00e6cfba08aabf30efd64d9905696e8c46d9f31c811736cd21fac09e5f0dd7bc41f8811d44d062324c213bd3c0d3d4dbfa6ee17ec308577f06ef83cf71d94b8 SHA512 a24b4cf4f5454a1b41800c6b06c138d716dfd198e4ec7cfa8927a36df20aafe72e132d094e72c69c428f6ba729182fe21b3c04a5fc3bc9f39873499aab78832d
-MISC metadata.xml 1170 BLAKE2B 149b376724bbeeb8409589b7787923ea92cfd91fb4b80a7b44d703b9582c7d98b98dcbb09bf85a4e02c014d59e5e27cfa9f74c83bcc7d7cd3c0342d7458fdfd2 SHA512 8b08db6e5a9c61c8dcf31dc79a947dc2e25a07bb2a5ea6e343e5baeb76cfa72d46a26615f83f1f1f906a32bfcbd8d49662fe2474e8da8acb3d00328124b9af36
+MISC metadata.xml 1171 BLAKE2B 8a650cbe26ba242eb3a7ea3f06800cd48ad2f18b3622a4212f3a5280b0d7332d5393511ba276b683d1c0339a8dd93f2148aa9dc57b9870b16c47c1f48d13a6b8 SHA512 7951465c521d2f158f2a7f7e76a5b54b1c6873e95aec1cdc2b9e4207c1ae4890681677846397f55a02cdd05c4a137c1f2d9bfd5277581c890f1ffac8fc2c54d5
diff --git a/dev-scheme/cyclone/metadata.xml b/dev-scheme/cyclone/metadata.xml
index 6c74a3aa3c53..c85d72e2ef83 100644
--- a/dev-scheme/cyclone/metadata.xml
+++ b/dev-scheme/cyclone/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
index b5a1ee8f7c44..067487b643b0 100644
--- a/dev-scheme/gambit/Manifest
+++ b/dev-scheme/gambit/Manifest
@@ -1,7 +1,8 @@
 AUX 50gambit-gentoo.el 386 BLAKE2B bf791e4b89573dcc5a4da472cb198dc9fb5f43f88f420089ffe543016e4f8483fc3a5ad4e1f7752d6a6d5a006556b268bd1a7360afc470c436fec96156b2e13d SHA512 acf956bd70c176b4cccbdab2dd1611ef5a30b7899d51b32341509168fdac52312f0f543c5c519ed005049a2e40d9dcfc67284adaebedd9a781fe12a3ea974e97
+DIST gambit-4.9.4.tar.gz 15453486 BLAKE2B 59761f98fe380604b7b5d8be162769506536aaffb35e97c24a755b3cd62e2e72e830468add0ca098e87fba3d1716363b9125b0141dea4eee5608fa55abcbe2cf SHA512 f2963e5e33ad5cc773924cd1ac01bdf6ad68ba6514419583c4a94c0c878ae223c06c9a90b9058cec9c2237f905b6e3cd879360b04415473199a1a515ae4194ee
 DIST gambit-v4_8_8.tgz 13272335 BLAKE2B d15bf944c8da3050c1fee6854044d904712075f070d75797c463a5510590514a06a4f05a81697d4bcd814adc5c00693f27b09834624909356049c02bbad02419 SHA512 99367cf5726d0d3aa59e39f1ef8b69347d92b7f3055e0656d66cbadb69ed4d8e499825395eddd41a4409b9cc57c2d2242ac5b8c29c37b84950b57468b5d92909
 DIST gambit-v4_9_3.tgz 13736448 BLAKE2B 664e90e3cc2419aa07264ac84abf0aacce43fd2339a72dc502745961a56097b6c161a89d12faa4b88a95841b8d45e37c199438d3fa8b9914db431406cc2d0e4b SHA512 0ee8eb5a2a0b63c0250f4d8d5bcf71d7c57b7444bf1a4c31c084fc9aef6f7932bf607a0a0b835987e7ada3a995cf732cc46593eb4b9dd79fc918358c57c4285f
-EBUILD gambit-4.8.8-r1.ebuild 1212 BLAKE2B f119574ee36c9e00e1c73619412607fdecc01e315c13e601a19fef2e5927a6ac469d010f70d8ae8c8345418b4d79e95b3d08243de1cb480780acd781e6e42f85 SHA512 a2408ae4fa6173cec1c087e839b7b1b3060717f9c50ae6755e2c40bc9cf8e3b194c3ba02557c0e27294ed2e860b80196120d404a18a72997c602b95aabbfd879
-EBUILD gambit-4.8.8-r2.ebuild 1218 BLAKE2B 633be5720acae1980c08c45ad8f91e0b5f8af1fa306106a445a5d1aaef01997076d3bac21bb18b230c37a7b3e581cf7638897f90e0e502f601dbf496d91ccc1e SHA512 80ca5a7ed2c98255ebb5233441016f6e137bc60e871d8944ecf9e5c4d397d4ab739fc70b3db8ab4bce2496b38fc03d3ff9b80d65d78f761b9c793b312f2ebec7
-EBUILD gambit-4.9.3.ebuild 1225 BLAKE2B 648e77b1d3b00f1f3d79a0f25f9272379f9750df66064b93d909791be0111808db589a368644a42d7a923d2a182fbb393323219364bac9ebd13f06bfa2f020cb SHA512 02f7c350c6674587c097ebd3448ae65739c18f3acfc6603b30c4d5383a3508eabf3737f82bab4190040f45638e03cb83e9cc19abbd34bfce771f94afa71c1ff5
-MISC metadata.xml 252 BLAKE2B 4680544207c9b29a195f9784832d934535f9626ed11fba23b8a84848b28db674789a8e9f919915919e6d38b144a4636699ba4b07a7160a634b794baf1b619b22 SHA512 758f7ad6a8a1ce8ae164517d615b08bb069e3cf680296159d323d7d34457b990b4657bb14fa9803d9fc77d69f6818b0d06636bcf442ad1bfa22aa2528ec97635
+EBUILD gambit-4.8.8-r2.ebuild 1248 BLAKE2B 06aa2099a15e630acab87ae87be91e7c23cbb2c173d437444fc33e86564f47e6aa2695bb661c00808f12f6c29bce0e30eca98658c5121db3f21fe37e81728c45 SHA512 615493ea15f0496c6bf5054f926bed6d89b83bcfe5d839c1fee22da5e61ab7524db0d27c5aa140506b502c9aff90b8e59456684b9c19ad59ba16ff8f7033711c
+EBUILD gambit-4.9.3-r2.ebuild 1248 BLAKE2B 06aa2099a15e630acab87ae87be91e7c23cbb2c173d437444fc33e86564f47e6aa2695bb661c00808f12f6c29bce0e30eca98658c5121db3f21fe37e81728c45 SHA512 615493ea15f0496c6bf5054f926bed6d89b83bcfe5d839c1fee22da5e61ab7524db0d27c5aa140506b502c9aff90b8e59456684b9c19ad59ba16ff8f7033711c
+EBUILD gambit-4.9.4.ebuild 1347 BLAKE2B c96bef7713587f62d88057d3f8f0c570107f29120025072b1e837ab1d0e01227c8608b1bb4feea7c64d33903f0707c21f22b05b6c151bd474a305b653f5c86c8 SHA512 27eebb147816861cd42200ead403c164817323ab1e53bd57a50b496590ffc12ecff5916399bfd42593952966b3c7ccea9021914dd49d9cf958fd29fa6925ce7d
+MISC metadata.xml 582 BLAKE2B 31f6ae847fca53c9b516584ca645e6d5d49b1bf3f3bb32effbd04e2b3c5a9c356dd3bec11b4f0f606cf1669a397e3e8473eac374cc4505383417d16173689783 SHA512 2662ddc6db6ab8dbae6db3d7f26da0c32def518e03d1ee375a5b5059e607cce588c14115c82908e0ab3a6f7c57b28eb7c9c10e439499179210a13da7e8333485
diff --git a/dev-scheme/gambit/gambit-4.8.8-r2.ebuild b/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
index acb5d61f3959..76a2291343a4 100644
--- a/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
+++ b/dev-scheme/gambit/gambit-4.8.8-r2.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=6
+EAPI=8
 
 inherit elisp-common
 
@@ -14,13 +14,12 @@ SRC_URI="http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v${PV%.*}/sour
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="
-	${RDEPEND}
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/ghostscript-gpl
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
 
diff --git a/dev-scheme/gambit/gambit-4.8.8-r1.ebuild b/dev-scheme/gambit/gambit-4.9.3-r2.ebuild
index 4fc6bef58213..76a2291343a4 100644
--- a/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
+++ b/dev-scheme/gambit/gambit-4.9.3-r2.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=6
+EAPI=8
 
 inherit elisp-common
 
@@ -16,9 +16,10 @@ LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="ssl? ( dev-libs/openssl:0 )"
-DEPEND="
-	${RDEPEND}
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/ghostscript-gpl
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
 
diff --git a/dev-scheme/gambit/gambit-4.9.3.ebuild b/dev-scheme/gambit/gambit-4.9.3.ebuild
deleted file mode 100644
index f6c6e6d84539..000000000000
--- a/dev-scheme/gambit/gambit-4.9.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common
-
-MY_PV="${PV//./_}"
-MY_P="${PN}-v${MY_PV}"
-
-DESCRIPTION="Gambit-C is a native Scheme to C compiler and interpreter"
-HOMEPAGE="http://www.iro.umontreal.ca/~gambit/"
-SRC_URI="http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v${PV%.*}/source/${MY_P}.tgz"
-
-LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-
-SITEFILE="50gambit-gentoo.el"
-
-S="${WORKDIR}/${MY_P}" #-devel
-
-IUSE="emacs ssl static"
-
-src_configure() {
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable ssl openssl) \
-		--enable-gnu-gcc-specific-options \
-		--enable-gnu-gcc-no-strict-aliasing \
-		--enable-single-host \
-		--disable-absolute-shared-libs \
-		--enable-type-checking
-}
-
-src_compile() {
-	emake bootstrap
-
-	if use emacs; then
-		elisp-compile misc/*.el || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /usr/share/"${MY_PN}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/gambit/gambit-4.9.4.ebuild b/dev-scheme/gambit/gambit-4.9.4.ebuild
new file mode 100644
index 000000000000..2aca0c767e16
--- /dev/null
+++ b/dev-scheme/gambit/gambit-4.9.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common
+
+DESCRIPTION="Gambit-C is a native Scheme to C compiler and interpreter"
+HOMEPAGE="http://www.iro.umontreal.ca/~gambit/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-tags-v${PV}"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs ssl static"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/ghostscript-gpl
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+
+DOCS=( INSTALL.txt README README.md )
+SITEFILE="50gambit-gentoo.el"
+
+src_configure() {
+	local myconf=(
+		$(use_enable !static shared)
+		$(use_enable ssl openssl)
+		--enable-gnu-gcc-specific-options
+		--enable-gnu-gcc-no-strict-aliasing
+		--enable-single-host
+		--disable-absolute-shared-libs
+		--enable-type-checking
+	)
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	emake bootstrap
+
+	if use emacs; then
+		elisp-compile misc/*.el || die
+	fi
+}
+
+src_test() {
+	cd tests || die
+	emake test{1..10}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install -j1
+	dodoc doc/gambit.{pdf,ps,txt}
+	einstalldocs
+
+	keepdir /usr/share/${PN}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-scheme/gambit/metadata.xml b/dev-scheme/gambit/metadata.xml
index 3f8eb92a383b..6f90824e202e 100644
--- a/dev-scheme/gambit/metadata.xml
+++ b/dev-scheme/gambit/metadata.xml
@@ -1,8 +1,17 @@
 <?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>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription>
+    The Gambit Scheme system is a complete, portable, efficient and reliable
+    implementation of the Scheme programming language.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/gambit/gambit/issues/</bugs-to>
+    <remote-id type="github">gambit/gambit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 5265f3f89d5a..a075fd3964ee 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,10 +1,13 @@
+AUX gauche-0.9.10-info.patch 3580 BLAKE2B e2563129f965c14c051f08ec5a2556b925cb0611f53a05b86a255f394be296db242ea77e7928947d5ecc56e34e22eebf45175f3bae51303d0dd8d341504cabef SHA512 393505178660b046971ba7090a57cce879561e2bd8d2005c771173e65d522bc8b9c7677a19cb49b3b5b94ba265dc0da6137d5999d743d6ae781eaa185ea86e89
 AUX gauche-0.9.10-srfi-134.patch 2281 BLAKE2B 5854b345162f319092090578afa8899d129e865ed75e5902d3518cd736e7268453dc4f4043fbdac5d90073026e8fcd28e2a42b911021da0dc44047dfd7cd9e18 SHA512 797267d2276b90736c0824566b1c9218399d0e68e972fa53830dfb85ad6946b2a6ad2a19aaabbba9aa63c1c36b5628856318a4d3b328b1cbed0ca3ac5f73c8b5
 AUX gauche-ext-ldflags.patch 384 BLAKE2B 57b7463086c0763413b8fda3d7688c6a61bd4456b3209a80b6eabed088e0c71eb5ae4c53b18fb0e6b7468ac03fe33f7884f265ab1ea998e8457b0ef126e6e841 SHA512 df42c5f25adc5a67ad049ab78aeaa4f565d18818dd6dfff5a64a78e9e3101595a4279d72e8f946e4f7da7be30f9f11c089c7f4a65d2eb2135980414c3d6e9cbb
 AUX gauche-gauche.m4.patch 964 BLAKE2B f02f2a1fad5d2ce923d1f9a8af4506908afea5b24c65d30ac2dbc6402c826f1ee374bfbb0ac7e9896a980fa352620f7ef8d2d79fe1b0ccb4915e3ceb86dfd90d SHA512 81bd71285f9f7f7f6b310347905fa2b0c7b708a0bb8bfa33414b14591d5849f0b42d9a6f01f22abb307417778181c292d8ff7e42be259b7d4de09356ea1692ab
-AUX gauche-info.patch 3580 BLAKE2B e2563129f965c14c051f08ec5a2556b925cb0611f53a05b86a255f394be296db242ea77e7928947d5ecc56e34e22eebf45175f3bae51303d0dd8d341504cabef SHA512 393505178660b046971ba7090a57cce879561e2bd8d2005c771173e65d522bc8b9c7677a19cb49b3b5b94ba265dc0da6137d5999d743d6ae781eaa185ea86e89
+AUX gauche-info.patch 3633 BLAKE2B 70f3be628d369acca97524370cb66c08e24390434c1b8c92e02004548f168d2e6f999b87e6903de50212c22ba249f91ef79bf7ce9c2109c05f3a7d4f12a4f9bb SHA512 a6d3873d940bccf59fff486bbd26fd5f101281e88e65926634992cb72c8c17eb8d95046ae6f739e0757431a339b891637ba9149cb7396abb2f265b4cc2406e29
 AUX gauche-rfc.tls.patch 277 BLAKE2B 91e745207e64ba3c83a1252be6fa63c486a3ebf148149b5772720a862299fa9bbf122a75ed8a537a29b78d75cf785ccc72de3194969931c62b52a7c1b7007208 SHA512 6aceaf321a1593765c91a83b14e057b2ee514e768299fa43c71bbe5f04b8b60a0537fd68cb8b4b5a61b091d5c4f50dc227bde2637d6be33956089dc0e40ab968
 AUX gauche-xz-info.patch 1248 BLAKE2B 8c87339d3739da774da858f43345bb6063fe2fafdfda3e791a67aee7773be4c1312c11aa37f1532203a7e1d4805cf3fa0ec80ce28f52d05c43df8536efa199a2 SHA512 7cbbfc17ef28aaa29dffe03d2d8afa01cc92897f5c08c9ba1ddd7926d45207100a44ccb8efd745f2f98c8d9a83ca0ca20a6c611329c3a80dea5692002467c52b
 DIST Gauche-0.9.10.tgz 7701616 BLAKE2B ecffc8cbffdbbea53a52468bcc190c57eede51ade78ccafd323299458f333794cc613bbfa11090d261993908020ccf8d42c2142da5996e1e55188f28e03cc28b SHA512 f014ec00903fc91b90da8dbdaace04a64d12695c631e923d5cdca3574aaf6701374f5adbed20c395881b047bb5a448352614d4ce7f16b6e38f69382bf8e66ed0
+DIST Gauche-0.9.11-p1.tgz 8104827 BLAKE2B 5c35ced6f64296e294804add967045b8e5aca817b65648f7c6708c774b1c1e218676517f86c3d8c8eb11d983e0a6b396ed00de1f95ecdc5a4dd5eee157f58bea SHA512 51be78d7f9bb62987e76c9867006c367ecb27eaf444f022d93bb92010e51ffb6b922cfc39aaab51cc9edbc94d7f7bb21e021705abb1a8fabd0bdbc52d4c92ee8
 DIST gauche-0.9.10-sys-ctermid.patch.xz 10328 BLAKE2B f4cde73528624d07a8c7d820b8cf10a0b96e5f13394df3113b8d40ddb43996afc5e519a34fa1de72529e42e1fb6e1feec60213bbf5df97e7725f4c0cd2c621e3 SHA512 7d16a9e6097d458bcad9db68fbedd2f694afade681bf9b876e0a2f6c232be85fb58e3d7dca6b208117b300e2bf529027b736b381d8eca29c688628725c0466ed
-EBUILD gauche-0.9.10-r1.ebuild 1457 BLAKE2B 7a48d9785d98db2a516235e463311a5f620345f2ddb1530dc62fae75acec14dcf1053158dd69d5ddf6323abf48e326deb13b41d2d6825706430f8ea8ce0ad842 SHA512 a4c370a394b7e2346cc384f0a0face23ae4cb8101b1bb52bfd75cbf80f9a53ccf20adc3f7ebf55313be89ab958174c10ef6b44fcb28395042cfd4bef4d265d18
+EBUILD gauche-0.9.10-r1.ebuild 1453 BLAKE2B 5f873039adc0c6aff74f3432926c572e3c644542a1092543635f04c13abb63244765191abe61c173bdcbc0751a08f5eb45266c489d3958a0d8cd4b6f2c5f2b34 SHA512 00b41696e8b9f40e497c0a9ba9365efe457e28f4b72f759c40c8685cc3d9b6a232c24466101499d4825a7a8852d3d21a6f9f958f1e33cca3d6922f5c50fe0872
+EBUILD gauche-0.9.11_p1.ebuild 1380 BLAKE2B 6bfc5a98ab744e1457e75ad6ade576dc87830051cbfe94e5b3e94537e8f401bc0462f71fced9eb7b4c704514e7f613be641656246f682b80255a138f8cbdeb3c SHA512 937017884c763b5f8a958952644f4ae5c1dd230c10dc146c57d2f8923d3604f34b30aea1bf7c71ed39b9b1773c1af7c54a7456e5c77236640fa7b347b742f987
 MISC metadata.xml 910 BLAKE2B e521ff4a434554441bb94b2c2246a02f5f1d976b77cde7fd8f8364108cb6c000c794f8413d636b8b13bbb89ec03b3042d3ccb0599a25c6894aef4e5282544c50 SHA512 6a3d126f858bd4b8eb9cf2475fb5d25f9f23c5caf62406941ef3646a5b36c7c8143f83d8dfabb6aa36abd2cce31e65a11a5451ec2f33964c3d51662e09bd37a0
diff --git a/dev-scheme/gauche/files/gauche-0.9.10-info.patch b/dev-scheme/gauche/files/gauche-0.9.10-info.patch
new file mode 100644
index 000000000000..f60f1f8a87d8
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.10-info.patch
@@ -0,0 +1,95 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -417,7 +417,6 @@
+ AC_CHECK_PROGS(AR, ar gar)
+ AC_CHECK_PROGS(AS, as gas)
+ AC_CHECK_PROGS(MAKEINFO, makeinfo)
+-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
+ 
+ dnl for cross build
+ AC_CHECK_PROGS(BUILD_CC, ${build}-gcc ${build_alias}-gcc gcc cc)
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -16,7 +16,6 @@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTDIR    = $(top_srcdir)/mkinstalldirs
+ MAKEINFO     = @MAKEINFO@
+-GZIP_PROGRAM = @GZIP_PROGRAM@
+ VERSION_INFO = @PACKAGE_STRING@
+ 
+ MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm
+@@ -58,7 +57,7 @@
+ 	texi html htmls dvi pdf info \
+ 	clean distclean maintainer-clean
+ 
+-.SUFFIXES: .texi .html .info.gz .pdf .dvi
++.SUFFIXES: .texi .html .info .pdf .dvi
+ 
+ all: info
+ 
+@@ -66,7 +65,7 @@
+ 	if test ! -d "$(DESTDIR)$(mandir)/man1"; then $(MKINSTDIR) "$(DESTDIR)$(mandir)/man1"; fi
+ 	$(INSTALL_DATA) $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
+ 	if test ! -d "$(DESTDIR)$(infodir)"; then $(MKINSTDIR) "$(DESTDIR)$(infodir)"; fi
+-	if test -f gauche-refe.info.gz -o -f gauche-refj.info.gz; then \
++	if test -f gauche-refe.info -o -f gauche-refj.info; then \
+ 	  for info in *.info*; do \
+ 	    $(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \
+ 	  done; \
+@@ -94,8 +93,8 @@
+ %/index.html : %.texi
+ 	$(MAKEDOC) htmls $< "$(MAKEINFO)" "$(VERSION_INFO)"
+ 
+-%.info.gz : %.texi
+-	$(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
++%.info : %.texi
++	$(MAKEDOC) info $< "$(MAKEINFO)"
+ 
+ %.pdf : %.texi
+ 	$(MAKEDOC) pdf $< "$(MAKEINFO)"
+@@ -113,7 +112,7 @@
+ htmls : gauche-refe/index.html gauche-refj/index.html
+ dvi : gauche-refe.dvi gauche-refj.dvi
+ pdf : gauche-refe.pdf gauche-refj.pdf
+-info : gauche-refe.info.gz gauche-refj.info.gz
++info : gauche-refe.info gauche-refj.info
+ 
+ gauche-refe.texi : $(TEXIS) extract.scm
+ 	$(GOSH) $(srcdir)/extract.scm -en -o gauche-refe.texi $(srcdir)/gauche-ref.texi
+--- a/doc/makedoc.scm
++++ b/doc/makedoc.scm
+@@ -16,7 +16,7 @@
+    [gauche.sys.setenv (sys-putenv "LANG=C")]
+    [else])
+   (if (match (cdr args)
+-        [("info" input makeinfo gzip)     (do-info input makeinfo gzip)]
++        [("info" input makeinfo)          (do-info input makeinfo)]
+         [("html" input makeinfo)          (do-html input makeinfo)]
+         [("htmls" input makeinfo version) (do-htmls input makeinfo version)]
+         [("pdf" input makeinfo)           (do-pdf input makeinfo)]
+@@ -27,7 +27,7 @@
+ (define (usage)
+   (print "Usage: gosh makedoc.scm command args ...")
+   (print "Valid commands (and args):")
+-  (print "  info input MAKEINFO GZIP            - generate info doc")
++  (print "  info input MAKEINFO                 - generate info doc")
+   (print "  html input MAKEINFO                 - generate single html")
+   (print "  htmls input MAKEINFO VERSION-STRING - generate html files in subdir")
+   (print "  pdf input MAKEINFO                  - generate pdf")
+@@ -55,14 +55,11 @@
+         (warn "makeinfo version ~a or greater is required, but ~a's \
+                version is ~a.  Skipping.\n" min-version makeinfo vers)))))
+ 
+-(define (do-info input makeinfo gzip)
++(define (do-info input makeinfo)
+   (define info (path-swap-extension input "info"))
+   (or (string-null? makeinfo)
+-      (string-null? gzip)
+       (not (check-makeinfo-version makeinfo "5.0"))
+-      (and (do-process (make-cmd `(,makeinfo ,input)))
+-           (begin (remove-files (glob #"~|info|*.gz"))
+-                  (do-process (make-cmd `(,gzip ,info ,@(glob #"~|info|-[0-9]*"))))))))
++      (and (do-process (make-cmd `(,makeinfo ,input))))))
+ 
+ (define (do-html input makeinfo)
+   (or (string-null? makeinfo)
diff --git a/dev-scheme/gauche/files/gauche-info.patch b/dev-scheme/gauche/files/gauche-info.patch
index f60f1f8a87d8..14aa58bc7e21 100644
--- a/dev-scheme/gauche/files/gauche-info.patch
+++ b/dev-scheme/gauche/files/gauche-info.patch
@@ -1,16 +1,16 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -417,7 +417,6 @@
- AC_CHECK_PROGS(AR, ar gar)
- AC_CHECK_PROGS(AS, as gas)
+@@ -382,7 +382,6 @@
+ AC_PROG_LN_S
+ AC_CHECK_TOOLS(AR, ar gar)
  AC_CHECK_PROGS(MAKEINFO, makeinfo)
 -AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
  
- dnl for cross build
- AC_CHECK_PROGS(BUILD_CC, ${build}-gcc ${build_alias}-gcc gcc cc)
+ if test -z "$MAKEINFO" -o -z "$GZIP_PROGRAM"; then
+   build_doc="No (requires makeinfo and gzip to build documents)"
 --- a/doc/Makefile.in
 +++ b/doc/Makefile.in
-@@ -16,7 +16,6 @@
+@@ -18,7 +18,6 @@
  INSTALL_DATA = @INSTALL_DATA@
  MKINSTDIR    = $(top_srcdir)/mkinstalldirs
  MAKEINFO     = @MAKEINFO@
@@ -18,7 +18,7 @@
  VERSION_INFO = @PACKAGE_STRING@
  
  MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm
-@@ -58,7 +57,7 @@
+@@ -59,7 +58,7 @@
  	texi html htmls dvi pdf info \
  	clean distclean maintainer-clean
  
@@ -27,7 +27,7 @@
  
  all: info
  
-@@ -66,7 +65,7 @@
+@@ -67,7 +66,7 @@
  	if test ! -d "$(DESTDIR)$(mandir)/man1"; then $(MKINSTDIR) "$(DESTDIR)$(mandir)/man1"; fi
  	$(INSTALL_DATA) $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
  	if test ! -d "$(DESTDIR)$(infodir)"; then $(MKINSTDIR) "$(DESTDIR)$(infodir)"; fi
@@ -36,9 +36,9 @@
  	  for info in *.info*; do \
  	    $(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \
  	  done; \
-@@ -94,8 +93,8 @@
- %/index.html : %.texi
- 	$(MAKEDOC) htmls $< "$(MAKEINFO)" "$(VERSION_INFO)"
+@@ -98,8 +97,8 @@
+ %-draft/index.html : %.texi
+ 	$(MAKEDOC) htmls $< "$(MAKEINFO)" "Development HEAD DRAFT"
  
 -%.info.gz : %.texi
 -	$(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
@@ -47,8 +47,8 @@
  
  %.pdf : %.texi
  	$(MAKEDOC) pdf $< "$(MAKEINFO)"
-@@ -113,7 +112,7 @@
- htmls : gauche-refe/index.html gauche-refj/index.html
+@@ -118,7 +117,7 @@
+ htmls-draft : gauche-refe-draft/index.html gauche-refj-draft/index.html
  dvi : gauche-refe.dvi gauche-refj.dvi
  pdf : gauche-refe.pdf gauche-refj.pdf
 -info : gauche-refe.info.gz gauche-refj.info.gz
@@ -88,7 +88,7 @@
        (not (check-makeinfo-version makeinfo "5.0"))
 -      (and (do-process (make-cmd `(,makeinfo ,input)))
 -           (begin (remove-files (glob #"~|info|*.gz"))
--                  (do-process (make-cmd `(,gzip ,info ,@(glob #"~|info|-[0-9]*"))))))))
+-                  (do-process (make-cmd `(,gzip "-n" ,info ,@(glob #"~|info|-[0-9]*"))))))))
 +      (and (do-process (make-cmd `(,makeinfo ,input))))))
  
  (define (do-html input makeinfo)
diff --git a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild b/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
index 561857d35c8f..d76fcb55857d 100644
--- a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.10-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="8"
@@ -22,15 +22,13 @@ RDEPEND="sys-libs/gdbm
 	virtual/libcrypt:=
 	mbedtls? ( net-libs/mbedtls:= )"
 DEPEND="${RDEPEND}
-	test? (
-		dev-libs/openssl:0
-	)"
+	test? ( dev-libs/openssl:0 )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-ext-ldflags.patch
 	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${P}-info.patch
 	"${FILESDIR}"/${PN}-rfc.tls.patch
 	"${FILESDIR}"/${PN}-xz-info.patch
 	"${FILESDIR}"/${P}-srfi-134.patch
diff --git a/dev-scheme/gauche/gauche-0.9.11_p1.ebuild b/dev-scheme/gauche/gauche-0.9.11_p1.ebuild
new file mode 100644
index 000000000000..f5bfcb4e1b79
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.11_p1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+MY_P="${P^g}"
+MY_P="${MY_P/_p/-p}"
+
+DESCRIPTION="A Unix system friendly Scheme Interpreter"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="https://github.com/shirok/${PN^g}/releases/download/release${PV//./_}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)8"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 mbedtls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/gdbm
+	virtual/libcrypt:=
+	mbedtls? ( net-libs/mbedtls:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/openssl:0 )"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-ext-ldflags.patch
+	"${FILESDIR}"/${PN}-gauche.m4.patch
+	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${PN}-rfc.tls.patch
+	"${FILESDIR}"/${PN}-xz-info.patch
+)
+DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
+
+src_prepare() {
+	default
+	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		--with-libatomic-ops=no \
+		--with-slib="${EPREFIX}"/usr/share/slib \
+		--with-tls=axtls$(usex mbedtls ',mbedtls' '')
+}
+
+src_test() {
+	emake -j1 -s check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-pkg install-doc
+	einstalldocs
+}
diff --git a/dev-scheme/guile-colorized/Manifest b/dev-scheme/guile-colorized/Manifest
index 1dd79fd22ac1..a34c23529914 100644
--- a/dev-scheme/guile-colorized/Manifest
+++ b/dev-scheme/guile-colorized/Manifest
@@ -1,4 +1,4 @@
 DIST guile-colorized-0.1_p20191205.tar.bz2 15496 BLAKE2B a85fc44c3b6b8433362197a4f1da216ea99793673ee4592e6ea32178d2952d0f43f5a4e79304185d0c67b6dee668bf52d53970df97954a37650cd8b7770e7abd SHA512 4cd9833c70debf0086ba69252e1fb8b9fc33707ec1f3bb6dfb144d5a35db6f38e3af585cbc889936c8ebb38dea0f8808f483bd51ed1722c9b9df857d31a7cec7
 EBUILD guile-colorized-0.1_p20191205.ebuild 997 BLAKE2B ded12f4d420da627e6e558571e0225d76d99d105d2efa5523578be92db4d0137efc7c64381b7f6e8ddc2380897c8fa5fcccdf908500a5b73701e57e8528d4428 SHA512 53e82ae6be1cbe27e627b48f5e9232cf75a21488660e44b99f0920181375a4c14e21df41a645735b7b6e6e8b5cfcf0a1451f4a02be08a46233c340d95aa499e1
 EBUILD guile-colorized-9999.ebuild 997 BLAKE2B ded12f4d420da627e6e558571e0225d76d99d105d2efa5523578be92db4d0137efc7c64381b7f6e8ddc2380897c8fa5fcccdf908500a5b73701e57e8528d4428 SHA512 53e82ae6be1cbe27e627b48f5e9232cf75a21488660e44b99f0920181375a4c14e21df41a645735b7b6e6e8b5cfcf0a1451f4a02be08a46233c340d95aa499e1
-MISC metadata.xml 435 BLAKE2B 4ec60047cd79724e2cccaaee8c32bb8cfc7b3c4bb559b50f474d258689e5a0684346100f51f4ebb4b7f8b8ae37f631b7c376a227d8d2f0e5393eccf230522ce8 SHA512 0e0219b207ba1adb3dbed202e783d2b89440bec331654fabcff61739f9afa28a843621476503848a60f022351548f730c0dad28dac3fcff2ae51f41897d54aa0
+MISC metadata.xml 436 BLAKE2B d51f05ea50cf7b4625c1b96a3c7c96be337ef23b332ada78be90b2d7287eb0054e9148c9b69fe06e5ddffabb89d396649456fe65f6e02e2cbf94b95eae866dab SHA512 c03bd300ad1f5fea6d8c8dd947244c6a4e85f5d5c5ff5cd2dc5fcd458b7acdaf9ee0f11ecb6b5474e22ef8d4363171a2002daad93c7a6df061e1e960c61e1c0e
diff --git a/dev-scheme/guile-colorized/metadata.xml b/dev-scheme/guile-colorized/metadata.xml
index c1ef4deb0fd4..c68c99f4254d 100644
--- a/dev-scheme/guile-colorized/metadata.xml
+++ b/dev-scheme/guile-colorized/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-scheme/guile-gi/Manifest b/dev-scheme/guile-gi/Manifest
index 5c898bf17e0e..31b594c8d0db 100644
--- a/dev-scheme/guile-gi/Manifest
+++ b/dev-scheme/guile-gi/Manifest
@@ -3,4 +3,4 @@ DIST guile-gi-0.3.2.tar.gz 350346 BLAKE2B 8680891e3a0854b2741a26847ad0f75262d83b
 EBUILD guile-gi-0.3.1.ebuild 1111 BLAKE2B c0e6ee4d8f9526d42cb1d1fbeb1735978802ce77e46019e2811db26f2f793360ec2ad0652f1286b5b523cf627a80773bb5f3b43d81659094341f9fa69269e8ee SHA512 5b205b6387c468afc7c063c79b8485496d466154cbd486f3b09d340ce9e00958951547137a1407ea7bf1a95bc39a6f24fa0a5f691c8bd9648471fd234d502c47
 EBUILD guile-gi-0.3.2.ebuild 1128 BLAKE2B 81b49e6902d2ea4ef43fe2c05917f4c86837cad73c4a3713a74a3f90d1a9a93d4332b904ce3c90d93990efaa22a2e97e128f468fb7af6e13aec85df1ebe8aeec SHA512 8b1e40945a1cef2063ad99a5b5ddf99529d41fe4106dc2ec6bc0eb1394fbf7f317409e49e735f3c17126c3eae74ad56ea8fa60de913e591071a70838f34e8fd7
 EBUILD guile-gi-9999.ebuild 1128 BLAKE2B 81b49e6902d2ea4ef43fe2c05917f4c86837cad73c4a3713a74a3f90d1a9a93d4332b904ce3c90d93990efaa22a2e97e128f468fb7af6e13aec85df1ebe8aeec SHA512 8b1e40945a1cef2063ad99a5b5ddf99529d41fe4106dc2ec6bc0eb1394fbf7f317409e49e735f3c17126c3eae74ad56ea8fa60de913e591071a70838f34e8fd7
-MISC metadata.xml 929 BLAKE2B efe3b5d7302ac0b8d39cddfc579952d7e2bfa6f56f9f69e6dc2b9315812069839c149e9b6638f4a3a6cb92c0a68fa0c27648d26c9e706fca8a2da04c26356844 SHA512 c68a55f58cc905451110fad27ca02c987d11c942efab0eb4befaa1a94a37b2a83f92488d1be2d043f0354bfe55bbf352aa08c4f22d1c2893b7e8731d901bd4fe
+MISC metadata.xml 930 BLAKE2B 6a48602d7421f891f2c6596b1e39725218febc0b49f00f9e1aa4c5b7b362505a050ccc6adfaf324d5122d11d0f890b6240d4bf6f3aa4c9428ee12cc9811b172a SHA512 c48c0021ccdd9e0e17c13f98c170986866a120bf70f56e74db19df99fca7cdfa245a264c92d017dbe259927e90d344fb28a9da4235403618e6970444a712df1e
diff --git a/dev-scheme/guile-gi/metadata.xml b/dev-scheme/guile-gi/metadata.xml
index 1817ffcfd32d..a40d5a3a466e 100644
--- a/dev-scheme/guile-gi/metadata.xml
+++ b/dev-scheme/guile-gi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-scheme/owl-lisp/Manifest b/dev-scheme/owl-lisp/Manifest
index 7e6ec29d396a..961d536c8424 100644
--- a/dev-scheme/owl-lisp/Manifest
+++ b/dev-scheme/owl-lisp/Manifest
@@ -1,4 +1,4 @@
 DIST owl-v0.2.tar.gz 515574 BLAKE2B 054a06d33554cc31f5e1c756bf3ff5ea4fb5cec220048fb939aa9dcd19c586cef54ae8ddc80e1ee8befedfa2e42fc1bf9ea4bcfe37e6743154ff678346444e87 SHA512 f0dc4badc84be1ebd1ad8f6a84c8fc292449b0f66a9416f202f9010e89aa2971c6470599173db67bf3db3e4b6a61d777ee369eda76fa7c42114748e8fe48b7b2
 EBUILD owl-lisp-0.2.ebuild 828 BLAKE2B 768195c6399bdf8442205696eb198f0efdbbaf5f2be174ccd679f09909b9dde905d779121a2ffef64cba2a58a416053e73b920b4b6e939711a1590a80c98013b SHA512 b560e6b8600d8cae5c7a4f3a328f1def7bffb618651cef8ba1c271912498cc9410d6a23a4b5c69edea6f9dfce5a2e284db6ec184446c89ad65a1f4bfd686a208
 EBUILD owl-lisp-9999.ebuild 740 BLAKE2B f1947c80c4bde952f1ef8186bd97285acea0dea3ac65c40eccdf3d64534cb88479a6e58fb3394cd90d7c2464f08d861e68cbc1e311cca0817728b14c8617506c SHA512 58e71b363cb90524661649ab466d4c2767713b2f91eedf7964c427e7af6a8e420ee4f750bc89970f0945019eff318504bf65fac226276e5c5a7d5f6ceaa28467
-MISC metadata.xml 792 BLAKE2B 86d345f529357a07597c295f93140136ac23a50a3e052f2f08726329ee62dc6a3e487c7215d2c0a2e32a44b9897933527f34d4857332758a24a7c5d8dfa36eab SHA512 f4b53a54b3c678b143abbe1a6b1e10ff0dc043cb4a3ef25838815179bc8916166f4bace591dd3ca89e4225f6164ce4a34e21053a7fb7ed4d321c37eaac14d623
+MISC metadata.xml 793 BLAKE2B 54cc42daf49b4f39ad4119e2128e9cdc9e2749dafbb5a1ff63c84e60a6d410caa39034de5fcafd82ca36ac7291b6f3afe92cad929c4c59270f0fec01c0828d4d SHA512 7e360c32aedf4ec42abac5b1df86c1225f863a885087363d0f16ba5c971b342743f49afccfbb9d81c821ba180c4f6033b27ab46dedcbdbafb597dee8a1820c15
diff --git a/dev-scheme/owl-lisp/metadata.xml b/dev-scheme/owl-lisp/metadata.xml
index 904d4e58388f..d11399931bf9 100644
--- a/dev-scheme/owl-lisp/metadata.xml
+++ b/dev-scheme/owl-lisp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">