gentoo Easter resync : 12.04.2020

16 files changed, 21 insertions, 62 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index c1aeea66492a..6fbb64b0f037 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gauche-cdb/Manifest b/dev-scheme/gauche-cdb/Manifest
index a21e7832a85b..fc6f864d42cf 100644
--- a/dev-scheme/gauche-cdb/Manifest
+++ b/dev-scheme/gauche-cdb/Manifest
@@ -1,5 +1,5 @@
 AUX gauche-cdb-gauche-package.patch 3764 BLAKE2B fd87c6521c10fd3fdc65951643f2b6b6b714d99ebd9d6de3aaf2d94dcd0d43818d1440153f89081dcb8751bcfa1eee48165f18bb77da4f117b7da65db909ada0 SHA512 6c746b96b9f54334e8592ab76721b71521eb6f09c9b5a99d2b43423ccea1c9603656505d4e3d35d0c03ceea1914a3bafff3a3ed527fee9512c96f495de9a658a
 AUX gauche-cdb-undefined-reference.patch 639 BLAKE2B cbf4d33e4b0b6a280bf7c5c8c5edd794fd3834b51be2c3e8f97ea42246c57b5d9bc29ec928ab267a91c58e102a0f415320f5ac1079d84d79b23d1a8e0a49a5ab SHA512 e316917e2915b3d0cecc002bb2be5714f86602810508f6b0fef283ba9ae0ac68952b3f93cf3e16bbb331c3544ee81bf37a9d84d1122f46789a5b17b1b2cb347c
 DIST Gauche-cdb-0.3.1.tar.gz 72048 BLAKE2B f4363ec9893e3f365c34965414620b46c08edcfdf5ed95a5934aeedd3af6e58f1cdedb7c4df90e95fa5a93ce3f95aeeb08fca0f3a440990d3383cd72bef8aa87 SHA512 c02629de9e96c561da0a928e2817056da27951a5ad988b7d105cc24aedd6d103001bf9dd4ae28c1729d701850d937a3134361c2ad83a4e1e51d565a95e8f1a68
-EBUILD gauche-cdb-0.3.1-r1.ebuild 590 BLAKE2B b84983ed49b14f0e90438c8e4d1fe5d81dd45799e9935fa4fa23e5733397a929f53709977acb28f9da387c2a45c551cc6bd68edde61e23dffa27515f39895858 SHA512 e09c5f0bd3de859782dc59bf5bccddcd027a55028b82ddcb3c988b1a2b2ceb836a75901799bab36066c68f25b5e942aa9f08bb4de08fc3a0dbdb7725c98d5718
+EBUILD gauche-cdb-0.3.1-r1.ebuild 591 BLAKE2B a9bfb97c3a9327a8e536e592559638f3175fbae702268ca11831ae006b18dbf409e5f508de7135a83a1e7dc84a1d755e190150de33e146e69d3fe3d692c9e97e SHA512 cc7189ac072b72a663f94caf2f123ef9662d4e705210984f7cc8ee0d22e8561edb788ff23ce6932fc951d1a90c57e3c402e5b09a3091785a390f23f1f8da670b
 MISC metadata.xml 327 BLAKE2B 296a3f702aeb51830de1c20b949ef214633f5ced8b46d140cf8949bdd49f80586f2ee7edb0690176a5d10c5f3e2d228e524d52afef934da424589253d39f628a SHA512 ab6ba356946b4e3887b52c7e27f32cbab85d9fa7fc38b574fe6a88beba33799867090316e1ecc5994c0115397c22c055d67d1188536b7ac6b4d8d833bef2ce28
diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
index 44cf5cd51e01..941d4acb9d24 100644
--- a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
+++ b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN%-*}/8407/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ia64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="dev-scheme/gauche:=
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 994f27dce3fb..93857a2a589d 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -6,6 +6,6 @@ AUX gauche-rfc.tls.patch 277 BLAKE2B 91e745207e64ba3c83a1252be6fa63c486a3ebf1481
 AUX gauche-xz-info.patch 1322 BLAKE2B f73447a306ec54ff372520c603adf2da46e1b71225a27d09af5c3ae8770431c5fef4d974cbf6e08fa1159807719c798680b18c7f624ec83b33d5ddf8688946f0 SHA512 22b6a37ea23bcba7e4ea4d09f26b069225cc36ef32dc0fbc865cfa4052765d0363811f693d6cc5cc8f3fdf355b93eec7c58934d18b2cb8079cadfd3b0cd4ffa4
 DIST Gauche-0.9.6.tgz 6927530 BLAKE2B 9b32a0db4fc41e2b35331818850e7aa3c1ac5b1294c76caa053abe1ae2da20a0ac4424470ca94626108f996700d1b7e52f6f9e5c6f0a2326f7e6862880f48aa1 SHA512 1d8a7f56fd9ca183d6dce1dedadfaec7c7150c29540e5158f2a61977f7406d7d7a8ab753ef1912865a7d7e9a9e2fa845d86b2eb4c5e07a176f1c60276bc1908f
 DIST Gauche-0.9.8.tgz 7101599 BLAKE2B 032c27b1bf5a15e7b1871801f57d9deefb4657c1921104bdb978f70df3627cf392be13dbe1a9cab4346d459c57ee4b31b622269cfc42451afdfaeb6751efc836 SHA512 53c8b022593385167a7fde7d6e8e1bfffeec91a765ffba3295c0c7a840b68977aad83d1460bdc77a5b3e0420b90eaaf55b1b7acba469f855cc6a1b72bd81f3cf
-EBUILD gauche-0.9.6-r1.ebuild 1333 BLAKE2B eb54cf0c0614b20607dc0d6deea8735011ce593b15baef07d8620038df15a6539a12e70d1bf637be8210d288841f9c3db838c1531530f216aec9fb45136f9fd1 SHA512 fd3105d9a607952619bbc3cb5c1081ff50ae7a42d8c8ec347d53867ac2e5d8e5134fcfd9408f6c92f80122780edb48d4c9bec0704d648c36125776e6c2a54a63
+EBUILD gauche-0.9.6-r1.ebuild 1334 BLAKE2B 5fab1bb3c2da1826226a225f44b91e457764e5f47f09047b2e15fbf9f995c704050b99ba5da65d2b032a57d56ff077bc10594c8ce20763d63af531f0224be0cf SHA512 6e9a6f6db38699beafdfc2d3a7de2567db5fbac972838534d817117a1685579f51bb2610b6ef5ae792789d99ed2fdd703f56905e1e586d1d6ee49d13a93ee8b0
 EBUILD gauche-0.9.8.ebuild 1380 BLAKE2B edf323d486910ff03eb7c83c6175f85fe7269c861a2902d2a215285772d1875bcd2943fd6c8739113c6726e430ba238a6515af2c70599739526e16ba98fb0721 SHA512 1d20187f9fcf7dc0f77b71a0586073aab80da418fe1362c112540d0e6fd1a3074664142ee6903c2397ade658c62d1ef8beb0ed42b0a876bc063b4aedae009f89
 MISC metadata.xml 909 BLAKE2B faaf122e0b844cf34bb8b4417cc5e5728e37bcd14a4717d23e42770d6ce2c732724f46f48e01e32684f2f229ea560e2968c11e86473eba50c93dd1184d110cd5 SHA512 031f92387b4dec50e4b534d70c15e70b2a0f7e4ffa9e8a70a47ed9467bcbc4bc57b2210ff50b0e49c1ed73028d6eee4dfd28994cd8e23bdf041364f052e985de
diff --git a/dev-scheme/gauche/gauche-0.9.6-r1.ebuild b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
index bddf6290d1ad..c921f5b02f7e 100644
--- a/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 libressl mbedtls test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
index 449c21514d1b..12ae02cbea49 100644
--- a/dev-scheme/guile-git/Manifest
+++ b/dev-scheme/guile-git/Manifest
@@ -1,5 +1,3 @@
-DIST guile-git-0.2.0.tar.gz 262570 BLAKE2B 5e2f326ab3afd23acb552cddf0175094f3efa817337b06219e048766b63df2a27a8fea38866452cc3137367410cfa6b9d4f7075f0586c4f8c429a5715dc194d1 SHA512 b5267130516db995132ff5bb5a19a68ccb3483d8ba5dff1a886a8acf4ecb43adf033638e59032b7a244eb4e35f72def3f40d7d071395154416e08dd5be86edf3
 DIST guile-git-0.3.0.tar.gz 275273 BLAKE2B 75c7e9b89446676adfa5e81c6cfeac9df19d77d1565450fdf892c01f9ef472dafe0ee7f8c8ff888421457d8e260e6f8e02a6e846952cbbff69ef4d75a467787c SHA512 98af9106c0b5d0f01c6d9550705c58116b8a38acb3c329e08822b8b81717c7c0147cfd74314e693c803e17b476af7b2f80ed2422652bbebfcc14271b654e839d
-EBUILD guile-git-0.2.0.ebuild 980 BLAKE2B e9232494051e051720051f1ff097e9db835d303dcab2ac395aed0ccde50a1cd6ff06bbcf8fa4edb608ac64bf485b095ae503b55fffda0ecf4df164701d29a14e SHA512 9c2191454055874400285a8377908bf68f6c8c569d904121518b4cad4516436888ca1d8c284c6e0d990d229c86fec7daf7d853a1f3464e9b1a52fc3248a40685
 EBUILD guile-git-0.3.0.ebuild 1079 BLAKE2B 509ec0ec6cf02f822645df372c413a63eb49a1916ffed3041cdeb6df7035d5b8daf19a9dbb30417931cbbbd8718c56d4b45f1df535ab176bfa93280b2f590eb2 SHA512 b62eba18eda59343d2ca647eab42654b27de247246c32edcb4ed1bf47ed94df4253682f17e9f08500340d14a63a06d3ce600d7e5888695a576532db637c58aae
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-scheme/guile-git/guile-git-0.2.0.ebuild b/dev-scheme/guile-git/guile-git-0.2.0.ebuild
deleted file mode 100644
index f92531a624ce..000000000000
--- a/dev-scheme/guile-git/guile-git-0.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Guile bindings of git"
-HOMEPAGE="https://gitlab.com/guile-git/guile-git"
-SRC_URI="https://gitlab.com/guile-git/guile-git/uploads/160f6a36c1be8d4fc1990a193081a04d/guile-git-${PV}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.11:=
-	dev-scheme/bytestructures
-	dev-libs/libgit2:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# guile is trying to avoid recompilation by checking if file
-	#     /usr/lib64/guile/2.2/site-ccache/<foo>
-	# is newer than
-	#     <foo>
-	# In case it is instead of using <foo> guile
-	# loads system one (from potentially older version of package).
-	# To work it around we bump last modification timestamp of
-	# '*.scm' files.
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-}
-
-src_test() {
-	emake check VERBOSE=1
-}
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 449889ce5d3a..d8c05b128f33 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -18,10 +18,10 @@ DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470
 DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d1017e4c944a8142e301e2e13d5ffd2aba73f7b0aa27efd84d068558b96a88452d1e0b79dc04db1921e22a621d SHA512 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
 DIST guile-2.2.4.tar.gz 18094974 BLAKE2B 36e9219bbe675b7ad8a73607a3acddae244a71cac1aff8dac77433da76ecb9f073df723ca3d22a15cf769b2fe5a981aa968bd0983020b3926f08f0b497bdf80e SHA512 a200b83a02ef23c8256d9bfb14a141bb6dbca01279a0587bfb672060429c49093088e4b765b7ee5c85cd587a1aeed77d9438d300d3e67cdd6cebbb794d88171e
 DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381dff44ca3ad176ad64adf9b0d200c0b8d34a41e34b15ecf24fa28ddccaa9b033cead25583ff9984b5b7c09ced5 SHA512 6a9264c2e10def5e69a0e755fb28a5f09b98bc202660d742b0ee144d4f486b049dcbce8bcece79c3af9421d43df6eca36adf82798520f75b09303f5e8c2092af
-EBUILD guile-1.8.8-r3.ebuild 3083 BLAKE2B 5303f25b3a8cd51eabfa49a5c2a5f8036b81cf128d595b8a25ea730128abad26648d7499180ec58f4201c03ca2075a7471f48ac1b677c6954b22fa2d12f38c09 SHA512 34b132e007fde79965692e41f9507f7e8cde8f6609f0b81162b4733c3daa3729ed10ad85d12d4192a33630b086c2afa11f92e2c5e0bb596a82998629fb47e9fe
-EBUILD guile-2.0.13-r2.ebuild 2073 BLAKE2B 4c9205a93ca6b49438619c4221fd2729ecc9495d7c16af1a5fe5e52a3948487c138b0e50aeccbfc45496d80f324296317d4d98fc52de483ad19061ca3d8abd57 SHA512 7db0e37d3054683e2e63170ca5bec50c76ce397725785215dc9db9f7ad96c9796740e25e3da9184df9482c8c7546681184f5d669a9e64a852f8e47d64689eb1e
-EBUILD guile-2.0.14-r3.ebuild 2208 BLAKE2B 60959c5199ac02b833803626fa931f3466553caf8964dbcfa256d2953f110b299efc9e645b83876b22005ae08dab64ba40af4979bb41ab07f58ce78880967af4 SHA512 fd03b6bb43ea39af9712eb865b1fef9de61f8b7faca5b2a952f1ba49b1ca6997928df982a752c09e845a0030756fa22926a8289f9083b6f7c55d35375d05c8c4
-EBUILD guile-2.2.3.ebuild 2057 BLAKE2B 41581f5ebd3d690eae55b50a488b02e052e9a54bc26c7829d2f2e5d7d97828c0b2d6b00fa7a7eb1ec468b12e93e1b8cad26ad7f39d21fb8d5a8920431f1b7aa5 SHA512 0935d7633a4fc79ebc1c6fd21d94beee2894eb105978779f7bbb2afee178ca77817d3d2e6d7eb048609764132e6798a56b08323ff69adbe3ba680732b3ab49e6
-EBUILD guile-2.2.4.ebuild 2047 BLAKE2B d17a1daaf08926dcd31424907e0a1680b8f632130e93c08b3da54763a432800f2cf89d31a3bc035d3e4eb277f809b04bd52443767f57b6ccc1d64fde8e8c33ad SHA512 5c526e4c2d366cc35b14f8885972f839435fbddb278019ec4cca08d7ef134a436ae4d4fdce4842651846c0c79a18af6ccb1e647b91ed7e5a73ea319a3fce0fe8
-EBUILD guile-2.2.6.ebuild 2035 BLAKE2B 9e4080a2c5a479915bbaa52ea192a8f5c36d83173023d907ffdc5f6c0a3a2e6c4951e5358c2b58e305807dd7c62567061094f1f73ddedf41c5e65b5c36a8045e SHA512 7ca7ff02ee9d121c896b2123e51b562b0bf2ce4372aa9e75ee528a615c0b469b20a65c6add7f9242e934f3a5d5bc4d391aa902ecadf85d090160be110f0ad7aa
+EBUILD guile-1.8.8-r3.ebuild 3082 BLAKE2B 8fd7216abf80b8ddbc565102188a46814ec8f72a6248c097c787aa79fb3b7c99f7c267eeea5698754844e9b38d7721209df4cd9b9d1a370d779850ecd37e92a5 SHA512 e868fbacf0e872ee132d155f7eb8ea5299633b06225d928645e563fbc7006ba54ee919f73432875c5cae1ebaf66d4f9347793aa878aaf22e77d5fe5cf2aade96
+EBUILD guile-2.0.13-r2.ebuild 2069 BLAKE2B 94b6846aeeef97975d63020fc46f377adc85ab8bd72e1ba19bc50fea9274f9434041a61514f6b631c95cb3eafc4d1a67695acfca2890c1085b9f5a639512da7b SHA512 6d6a8000250c0c02e67e2ef2a7b3c8b88d29cdecbab23d9914c896c557f84182501bcc584d08356a0230e1bc5e7638ba48001bca779debc4a34c20ceba9e2155
+EBUILD guile-2.0.14-r3.ebuild 2207 BLAKE2B 74ab61e75ad3b594edad33a618d3eeb09123c0cdb6e8735fb60940ac5ad0792af1e5a5667f68456bebfb150a7cc48faee5ab74e7820ec795fab67f4c0f4dd229 SHA512 fd403a6a03cf5ff9262e78e214d25adc7f4d24dde26fc3e15b2e1ace42c5b5a016e063357c6faa232ca984986ada896ea3c460ab130237f0a709586180752ba9
+EBUILD guile-2.2.3.ebuild 2053 BLAKE2B dd077c62de61dec6a17ef20f1c83599165bd9810df7e09ab2bf36ed72350b89a8783822ea0811e7eec0732fe89406ca97bbc0a92f8c533803a8e3ffe153f245d SHA512 17d651310a0dc6fd2540867cc3d57c8eac6097db0e8a0af8ebfcfe5832336217fa64efad7670a6b3e00ebe2c01a397bd4e37d5820e5a3f6ea41dd861ca58ff4f
+EBUILD guile-2.2.4.ebuild 2044 BLAKE2B 2a795894587bbbb9a0a41c66bfe8d980e2dd77d4cee3ff00f0a4ce6647fff446e3f9b9ca1324b3fdef3ceb3acb38c8e59241e1a0632455a6f21fecf5fa05b027 SHA512 6bcb9a6ec18d17fc5cbd7a699f9a60687f5318ae20c810a30b190297a7035eb9243ccb53b2c643bdcd357b369be915e16b21d6c9c683fa472d2139cc135ab463
+EBUILD guile-2.2.6.ebuild 2031 BLAKE2B 27fdfc47ce10bb2c21a6bb3f6ec87172945da8541792b4cca5d0ca607865ea308d0f69216c8cd0c9b7cf4ab56d6e048a58f7ca5708c7aa9132060354b9fa925e SHA512 6b7aa5ea8494b21634c6eaa047d73f836a917fa376d1013c0d6bf8da929405791603b02e4a9aa477f2acbe3a7eb7e9373ff0d60778d6d0dd47fd8b5800398ad8
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
index ed93ec083d25..bd0e20373544 100644
--- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -9,7 +9,7 @@ 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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
 
 RESTRICT="!regex? ( test )"
diff --git a/dev-scheme/guile/guile-2.0.13-r2.ebuild b/dev-scheme/guile/guile-2.0.13-r2.ebuild
index 042d420fa89c..e1049aaf9651 100644
--- a/dev-scheme/guile/guile-2.0.13-r2.ebuild
+++ b/dev-scheme/guile/guile-2.0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit flag-o-matic autotools
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 LICENSE="LGPL-3+"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 # emacs useflag removal not working
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index 1624bd767afa..4022c51ef38e 100644
--- a/dev-scheme/guile/guile-2.0.14-r3.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r3.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic autotools ltprune
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 LICENSE="LGPL-3+"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 # emacs useflag removal not working
diff --git a/dev-scheme/guile/guile-2.2.3.ebuild b/dev-scheme/guile/guile-2.2.3.ebuild
index 06943660c138..5fa9b08d7dd3 100644
--- a/dev-scheme/guile/guile-2.2.3.ebuild
+++ b/dev-scheme/guile/guile-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
diff --git a/dev-scheme/guile/guile-2.2.4.ebuild b/dev-scheme/guile/guile-2.2.4.ebuild
index 937f6e478849..a8dadf42f4ce 100644
--- a/dev-scheme/guile/guile-2.2.4.ebuild
+++ b/dev-scheme/guile/guile-2.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
index 894d90a6a476..2724d116552f 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index 7a7a76cba9c8..0e2ebb741290 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -2,5 +2,5 @@ AUX 50slib 39 BLAKE2B a7e221f173cfc2b24c72f047130e6b4c289533a22dc7d59fca49a147ed
 AUX slib-3.2.5-fix-makefile-guile.patch 882 BLAKE2B 6e9c80b476cafa24477aae5b30e8c35f116cfbd0261f06b15672e39cc94e2ef6cb116104a41e5c0f1ebcb887664d9f43ec6c5b21ab3286d5a33c56d081ca9a4b SHA512 74997578edd5472f084a3b899c4e11b67432a4776bce6a19cbd4300316bf413f38374711a9a5cd3c10cd6cac01cb6d337d6f2ad18236bc4747c0bccf88948e3a
 AUX slib-3.2.5-fix-paths.patch 1627 BLAKE2B bea0c823ca1f4e006953128cb5fe2886f5e84efbcf2d1ee32c801524d3bbbaf65899853c476697b501673501b112e7bd9382f7e372d27745cd190d3fa66a0bd4 SHA512 bdd667f20ca0ef57707a4df379186b58ef5ffab38e61a7e8e4ef697d7a90ebbafa8e4ca1f887d87520290656f2445fe1a9f4bd4e22634587908f70059dde0f30
 DIST slib-3b5.zip 1105432 BLAKE2B ae9a6bb34b318875048fad05403a90342b070770013ecd8b022846dc3c43c708511ce6f8ec2be6da2329b01dcc1ed0a641bf68569fd022bb4e2187e20efac0b0 SHA512 f6ebf163fe34498141ab61b6887a9a5db8f2fe0aef1f6c70a7a5783dde6d1268d7e724bc340b73b36189b09013e7079584e0af74f0876e5ebfa46b53d847923e
-EBUILD slib-3.2.5-r1.ebuild 2777 BLAKE2B dbf9cd4fb4fd09a1b65762a9f76960a30d31cd2f015ecc2aa3d2a4902a2cce83b1ebd744acb5f0849e71c5f0b5304cb6520db8d94e1fe7078e1802742b707821 SHA512 1b564a0e22cc6d5b325cd3bc50107c59092773aa7c2b0d584701e3095c17329b8ebd1d6ed417e1c32c2e75c491e3008762022b3440a13a72f5a109504f23e46c
+EBUILD slib-3.2.5-r1.ebuild 2778 BLAKE2B 00bddf9b439d37d214be96679f8565e832f1ee8bc7aaeebec231b1a13ef5cf16d3156adf99109dbbb131dbc4dde8dd31b95f869a5abe0001e360ab952e6487db SHA512 c6bb0a4f120c980da71e1a1ccaf88f544a8c9ae125ce10d6f76fc953a8caaf0f9cb0883216772e4d71978b7fc64fcd5d926fcc44be9945cea62eb17a8f69bfb7
 MISC metadata.xml 580 BLAKE2B 64dcf4957037aed50b50ea0648103f9b9f2cc040736751a1bf584464855fed650efe1d3e437ef122356e3f83f7c9b528ddea493193aebe49dc285a7066281d69 SHA512 5b75cfc410ff0ec6a324590f69001ac38410e963df6490695abb85132168cd37ccf685b9281026eea2fc82e59340fccecde58887aa3b64f88003970b979d5807
diff --git a/dev-scheme/slib/slib-3.2.5-r1.ebuild b/dev-scheme/slib/slib-3.2.5-r1.ebuild
index 071d4e4cc677..4f4ebf8fbf0c 100644
--- a/dev-scheme/slib/slib-3.2.5-r1.ebuild
+++ b/dev-scheme/slib/slib-3.2.5-r1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="mirror"
 
 LICENSE="public-domain BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="gambit scm"
 
 RDEPEND="