gentoo resync : 28.04.2021

30 files changed, 93 insertions, 107 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index ac019a40b402..0aaddad0e2f6 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
index 92b548837f54..ac3b682db3e8 100644
--- a/dev-scheme/gambit/Manifest
+++ b/dev-scheme/gambit/Manifest
@@ -1,7 +1,7 @@
 AUX 50gambit-gentoo.el 386 BLAKE2B bf791e4b89573dcc5a4da472cb198dc9fb5f43f88f420089ffe543016e4f8483fc3a5ad4e1f7752d6a6d5a006556b268bd1a7360afc470c436fec96156b2e13d SHA512 acf956bd70c176b4cccbdab2dd1611ef5a30b7899d51b32341509168fdac52312f0f543c5c519ed005049a2e40d9dcfc67284adaebedd9a781fe12a3ea974e97
 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 1219 BLAKE2B 949bbe6256811f8e33d0772228021bcbe9b871bffb30718ea4c79940aff2abf478aae725c67813fdf1770cb4ace2a7c4cab2c739fc5d470719d03c828148f901 SHA512 88f748865b91486e8949dc49dda1e0dd3604e47fb00e13e67da5f3c46ce86405a1188bab64dd4665eb46d7e553504abc1db18abaf5725596c13497b71dcb4338
-EBUILD gambit-4.8.8-r2.ebuild 1286 BLAKE2B edff3dae6641060e5d25e6a691a2360a6ef1cdf6f9a330b09c581bb1559bc47efce52c9ff6f32c5ef5c14b1166d67fdba1fe60333819e9d78537b80d18afecdb SHA512 af718065b2cf3d31a15da9e2b98033a4196955d36eba9af0e425226a7b6699b9ef73962a1867e0941912dc1ec480f00de9d473b6d9aed49fd47c3228e2e03e93
-EBUILD gambit-4.9.3.ebuild 1293 BLAKE2B 8b00ec712c42642db531b7332ff4eba4187e35215054f7343cfde03853d12c14696032d99df827460fcf1913bedcce2ffd30a8acde8336b963a2843d1c89d419 SHA512 a55f3c1294519eb069242eb0b12536b0900434a736d8d2893bb93af499f7b21580a429423761ca7ddc2789c43c5ea132c453b8c1539190d6b869e7368e79858e
+EBUILD gambit-4.8.8-r1.ebuild 1212 BLAKE2B f119574ee36c9e00e1c73619412607fdecc01e315c13e601a19fef2e5927a6ac469d010f70d8ae8c8345418b4d79e95b3d08243de1cb480780acd781e6e42f85 SHA512 a2408ae4fa6173cec1c087e839b7b1b3060717f9c50ae6755e2c40bc9cf8e3b194c3ba02557c0e27294ed2e860b80196120d404a18a72997c602b95aabbfd879
+EBUILD gambit-4.8.8-r2.ebuild 1279 BLAKE2B 33a926240dd24747d00fe90e7b05105fc6dfc2c9de4a5287d749a39ff717805d73ccb35ed420d067398e43dc11280eedd7d3cd22f2169d7d1b117b1098a67d84 SHA512 d292801de5aa6db105ad04a5adbe5e791173d790e1ff7c72883c3768cd85eb94abf5691c8616745105cdbf961865af8cda43506c1e7f395093b5d90c716c3580
+EBUILD gambit-4.9.3.ebuild 1286 BLAKE2B 34802fab96d489648b60cab30a81f0310bc68cd429314acbd58a1c261b1faca5e81e77b0f71e85f1513a34752a7df1d23ccd2c75ff50ee609dcfc8383425b5cd SHA512 91a22d7bcd1ac2c3defb6b6d219f82ff27c8185241f3ab7c2b593ac9a66c9855948d5d9073a44851045729b72629fa59f62658deff668efee0fbd49cff11a0d1
 MISC metadata.xml 251 BLAKE2B 192529903b8f966db2ab52ecc2ca58c2f5d3a18686c070e272a275ab2cb877103675fdf3ed443d4294a78979f7d3afdf53d07d56ffa36247969d480bffb23e9a SHA512 4fda90c4191ba8ea396da2c4a434893d4b9df976a918e4fb5651acaf92c6efc9103b738681a3d29abe801a4ad09eecf5a4b0bd799dab5b5f1e42a34c3b27d918
diff --git a/dev-scheme/gambit/gambit-4.8.8-r1.ebuild b/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
index 3bc6f52e1f8d..4fc6bef58213 100644
--- a/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
+++ b/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils elisp-common
+inherit elisp-common
 
 MY_PV="${PV//./_}"
 MY_P="${PN}-v${MY_PV}"
diff --git a/dev-scheme/gambit/gambit-4.8.8-r2.ebuild b/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
index 4aeedab6e36b..f087e1c9559a 100644
--- a/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
+++ b/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils elisp-common
+inherit elisp-common
 
 MY_PV="${PV//./_}"
 MY_P="${PN}-v${MY_PV}"
diff --git a/dev-scheme/gambit/gambit-4.9.3.ebuild b/dev-scheme/gambit/gambit-4.9.3.ebuild
index fe1062004979..bb0afb8cb964 100644
--- a/dev-scheme/gambit/gambit-4.9.3.ebuild
+++ b/dev-scheme/gambit/gambit-4.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils elisp-common
+inherit elisp-common
 
 MY_PV="${PV//./_}"
 MY_P="${PN}-v${MY_PV}"
diff --git a/dev-scheme/greg/Manifest b/dev-scheme/greg/Manifest
deleted file mode 100644
index 72f438d21697..000000000000
--- a/dev-scheme/greg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX greg-2.0.0-guile2.patch 656 BLAKE2B 3d900d3f54ac8eb728dc34b6d835272310dd1209b85f1750351596bac24ba8b0a5b46e87ccdeb17970ad1dd380716bd314047dde78c374ac16ce4d51c1ee479a SHA512 93c7316960df570a3611dbe1b4ccff9b25ccbaf173c947b1259f158ddfbe52faa47b334ac83af78829ad3ebb10efef40f6e5f8abc4ea1a26c904c4a895823a33
-AUX greg-2.0.0-test.patch 187 BLAKE2B 9e4bf736c1b24f247836226d07aa51598111235c0aa6478d2852a782c1d03007e93ecb0604cc7099ebe9bc980b0ad22101d8fd91277b899454de2791f044652f SHA512 c4de1e03d627964ef907e88b8a361a00298ba967b065aff4351958cd216fa113d89b4152b74eb179e09ab15aee4669186934b62865b67462884eb72a08267a82
-DIST greg-2.0.0.tar.gz 453598 BLAKE2B 8f14f292949c9e252a941fa2fddcdb29efafc6e43edb863d2df72178d77e8d7826cbe7a098110f7ec88e6ca3b2d1b8725f9c7c9623f1ac5c7a5d3a65fbef8b93 SHA512 d20523b4f6fcfcb183615866a3b322dad39579707f6979ad1edf11dac4c93f5c8dda109a4d832aae597b44397befe81afb6ae9be282556228ade1ad48e8a17eb
-EBUILD greg-2.0.0-r1.ebuild 658 BLAKE2B 2e7da0fef2bb6baa0218f66c010d0026d259439727693dfcdd23090740a88ec11cdca2ba65d9cc2b4b67064f8214f0e0f1012a2771bad8c4683d1fb3da1f0a8f SHA512 c2b73dd196638a9c966bc0ac404f2b41018157739fdde758aa4baae1623e165db2fba47d7a7b6e99bc3eddd207fe4b27a724f35c1c64d42a587cc4b1143710cd
-MISC metadata.xml 219 BLAKE2B a36027db1fafb2a6fb4952ec04a882494f6f5d3543a1dd71bad734ad49a47a17ac7ebb843960e2b82b0fd2322d71fd76a3d9266e85c82fa66e21770b9030753e SHA512 2d421746cac7e5e6a59e81fdc273cda856245e88c88a489118c94a58c9db3ddde6497be6a8c076309f895c1c0280fe77514332ddcfd5cb884fc255016f66b5b7
diff --git a/dev-scheme/greg/files/greg-2.0.0-guile2.patch b/dev-scheme/greg/files/greg-2.0.0-guile2.patch
deleted file mode 100644
index 7b78fc9dbd79..000000000000
--- a/dev-scheme/greg/files/greg-2.0.0-guile2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- greg-2.0.0/configure.ac.old	2012-09-23 13:25:24.000000000 +0200
-+++ greg-2.0.0/configure.ac	2012-09-23 13:25:31.000000000 +0200
-@@ -48,7 +48,10 @@
- AC_HEADER_STDC
- AC_HEADER_TIME
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h signal.h sys/file.h sys/fcntl.h sys/ioctl.h sys/stropts.h unistd.h utime.h libguile.h errno.h)
-+AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h signal.h sys/file.h sys/fcntl.h sys/ioctl.h sys/stropts.h unistd.h utime.h errno.h)
-+
-+CFLAGS=`GUILE_AUTOCOMPILE=0 $GUILECONFIG compile`
-+AC_CHECK_HEADER(libguile.h)
- 
- 
- # Checks for typedefs, structures, and compiler characteristics.
diff --git a/dev-scheme/greg/files/greg-2.0.0-test.patch b/dev-scheme/greg/files/greg-2.0.0-test.patch
deleted file mode 100644
index 26a6cdf1c0ad..000000000000
--- a/dev-scheme/greg/files/greg-2.0.0-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 3cda45d..c61b34e 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -23,7 +23,6 @@
- 
- 
- all:
--	./test.sh
- 
- check:
- 	./test.sh
diff --git a/dev-scheme/greg/greg-2.0.0-r1.ebuild b/dev-scheme/greg/greg-2.0.0-r1.ebuild
deleted file mode 100644
index 4bbcd2f8fb71..000000000000
--- a/dev-scheme/greg/greg-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Testing-Framework for guile"
-HOMEPAGE="http://gna.org/projects/greg/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2"
-
-RDEPEND=">=dev-scheme/guile-1.8"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-guile2.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_test() {
-	cd test || die
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${BUILD_DIR}/src/.libs"
-	export GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${BUILD_DIR}/src/"
-	guile -s "${S}"/src/greg || die
-}
diff --git a/dev-scheme/greg/metadata.xml b/dev-scheme/greg/metadata.xml
deleted file mode 100644
index 4028bdb661a0..000000000000
--- a/dev-scheme/greg/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
index 5afe6cec680d..e89f60feeb5f 100644
--- a/dev-scheme/guile-git/Manifest
+++ b/dev-scheme/guile-git/Manifest
@@ -1,3 +1,5 @@
-DIST guile-git-0.4.0.tar.gz 295398 BLAKE2B 6fac958282d8e7e7162ca942a7c524c02846917f7e2ee2c7b10f72437193dfd0e33813ec9d101371b95c09e10b7b04d3c5a7f784c95cf39187624f83b2affb5b SHA512 59a4d3bd93f8e074d3df91ed190378f9e65c191945eb78f3eac894130cac8f068841a8a9e5c00131b19d99d5e483d07c4c9b0479dddf5885b2c2da28763f2de8
-EBUILD guile-git-0.4.0.ebuild 1326 BLAKE2B a1bde34f757e9a985eae53985e4719a4a2457994aab606bf7b31d9f8696109e6f3e8f791a153c54cc0f40b536a274be477597215212d475712e55b0fba69cdb8 SHA512 e6069f37863ef7c757bc56067778c77c74b1ddc1fbed7822db57f57c0060d9731a69ccc32d00caacdcd5d1864ac8c68c0855abdf7733ae59f78be24bf9f0c655
+DIST guile-git-0.5.0.tar.gz 304072 BLAKE2B 4f71448d19261fe1dd40fbeafbf9c3a6affbd3ddc16352c2829d28ff3b0253a0017cc40e02fa15eb0141ed9230c1fa2397b46c9076b5e144a629416b937ab1eb SHA512 3ba48ca91208c08ac3a629b0ee97060cc5982c2d823b198cc9ef823a168a434283499a241fc936fa81ba67ee2f5a01db7db563fe0e9d3112da6eb3d77136ee03
+DIST guile-git-0.5.1.tar.gz 305077 BLAKE2B f1dd4dade424045f992f9df9fb6c0c6e010deab26d77b32c6a7febda20e03192c91a5ec024bfdf05ea9585c7be307610c1eea6d569a5a97b90d5eedf715e5c59 SHA512 b5a07fc3e2a6c8d6277b3a2d6c2d47461e76441573dcf02c046e272853e3d46266adb2025e15f203d590b751def21c026eb55ed66a6f81795c1409ae5d6aa3c2
+EBUILD guile-git-0.5.0.ebuild 1326 BLAKE2B a550a881b24281c81d63921066302ba51e512a2de870071e8cd650f8c7f0f0d2d05789edf4a564a3d8ef501c022e2329adaf2ac2122199ebb39f6bacc8f93b02 SHA512 5342544e4c0150b5e5bab5b42f19b9f46e2c75d7a9defb1e8016022b1beac0a1fc1aa7e5b7600ede01059bcf37a3e8d8e3a9d8fd97d681d3d0a7f0eafafc5f13
+EBUILD guile-git-0.5.1.ebuild 1326 BLAKE2B c846b257e729e7c41fb7f59281373ede6d96321612d7a2b1582a1751ead68e8a5d671d4a70e28e0f4c71f08d29acb7a0b940992478d9138cfeebb09ed7ec2798 SHA512 642614d2c1aed98a302e9ee0283863724cc77af3554b2db387364ebc12fa619f8f4503eb97436e62238828fcc1369abc25327d4288da27e74429ecbaa8892b30
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-scheme/guile-git/guile-git-0.4.0.ebuild b/dev-scheme/guile-git/guile-git-0.5.0.ebuild
index c6779123e6af..d34955c8f172 100644
--- a/dev-scheme/guile-git/guile-git-0.4.0.ebuild
+++ b/dev-scheme/guile-git/guile-git-0.5.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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/2600bb0dfdfb00bfbe46811dccad51d8/guile-git-${PV}.tar.gz"
+SRC_URI="https://gitlab.com/guile-git/guile-git/uploads/30be542d90619ca844dd3a3ed2e13808/guile-git-${PV}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
diff --git a/dev-scheme/guile-git/guile-git-0.5.1.ebuild b/dev-scheme/guile-git/guile-git-0.5.1.ebuild
new file mode 100644
index 000000000000..de7b4a6e6e1a
--- /dev/null
+++ b/dev-scheme/guile-git/guile-git-0.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 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/4ffd7377b0b74da4051356121b46116f/guile-git-${PV}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# older libgit seems to be incompatible with guile-git bindings
+# https://github.com/trofi/nix-guix-gentoo/issues/7
+RDEPEND="
+	>=dev-scheme/guile-2.0.11:=
+	dev-scheme/bytestructures
+	>=dev-libs/libgit2-1:=
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT=test # Tets suite needs a fix: https://gitlab.com/guile-git/guile-git/issues/18
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_FLAGS_IGNORED='.*[.]go'
+
+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 497812ecbf35..84d1a6d2c90c 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -19,9 +19,9 @@ DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470
 DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381dff44ca3ad176ad64adf9b0d200c0b8d34a41e34b15ecf24fa28ddccaa9b033cead25583ff9984b5b7c09ced5 SHA512 6a9264c2e10def5e69a0e755fb28a5f09b98bc202660d742b0ee144d4f486b049dcbce8bcece79c3af9421d43df6eca36adf82798520f75b09303f5e8c2092af
 DIST guile-2.2.7.tar.gz 18129833 BLAKE2B 03c88d753f83e5a797f12808b7b053c9cf6c51f87fb8f3c3db89e54528aafb0e54de2eb951cc622e98fada82a558932bb074a8e739f4175144d4b06ba42f7d60 SHA512 ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773
 DIST guile-3.0.4.tar.gz 21619204 BLAKE2B c8639019d8d69618726f40ecd44ed5a5790c34872119e806d4851671c61fd592608d066f4584df4a8db5f971b64ba9089bbbe935176923b413621953202bbc2d SHA512 d707d89ef0f94f74eb4678bcc79dfa99ea068d68a789f47039b5f00c0b8b01ace567a567c0f971fdc0dfc620c11d9536fc003d8d8e049e2cc158ce8b171e1134
-EBUILD guile-1.8.8-r3.ebuild 3110 BLAKE2B 1eb2f9cb4391aca8312fcadaaa3095bffac5d839c6e999b0b3ff69fc7feb44ec2bcccfea7a07d5950848f045e9bcec1239e720f488b5191a206679a440c1e478 SHA512 f2f102135d692d3858ca39ef4eecfc1068a5ee471c78829e480a49845b7b96b3cb2a7b59e04330f85c6ca4822a55d252641ac317cc991878ed309c96a4993d46
-EBUILD guile-2.0.14-r3.ebuild 2188 BLAKE2B fb49b76bfb8ebd5c83789bedb391d5821b0f67e7952a3c7138ab36f0bdd8c75b7ccce3c34be869bf1c4350d30caf87720ba38f006e1f74ae57eb07b5a67ddfc7 SHA512 7bf2544ecc1fcb2872c8b5c930c052a3d0da6bd01cfbbafaaaaaae047e39baf117fc68dc33743d5af9080e7812c50b44a2b363dbf3566710497be4f890d4ddac
-EBUILD guile-2.2.6.ebuild 1952 BLAKE2B 8b27bf269ec95d32a4107a7f60aa70149f0d614d70c6e0163a4cdba79412303b281768893499296c3e080e70e6f362fdbd121ad0ca8259b4fa2d27c371d6228a SHA512 144f6f7fef58f7d083a667eafadc1eb8c6595d98d5895599628f0bf31773ffa889f1a449ed0ee3375ca32766080eec7da128d31975cc923e835d6356ebec1401
-EBUILD guile-2.2.7.ebuild 1996 BLAKE2B be430fa15183c5ef60307b791bd07d77d89f4e432cb671c07efffe88da696b22d13e9a840db064ad3ccc132d52bda6cb9809570d4c13209386a8b807728490df SHA512 b5bf4fde9dcf73d4b352f6f80dc7e45bf24428dee49256981a13e3e96e46db945b68fd15bb06a3513414036623c19cc350bc34638dbaaee2a46718a9c4179506
+EBUILD guile-1.8.8-r3.ebuild 3111 BLAKE2B 42fa46c88577128e3b1780a1da8de245a1e893c61b025e11ec4c6edad2ee80e199310b7cd6d1881535875fd397239e2199cfb249b2dccbadb1150e51147dfd34 SHA512 7a1a089009d1d1779393191b2af859a1e02c4dd57d56025febe00d474121c52eeee78f4f7cef54347968aa11e6c0facd9109e8b57caf7766964d8db36552c386
+EBUILD guile-2.0.14-r3.ebuild 2189 BLAKE2B e1ae06964de056946f12b99bcb9db0f9eaeb063adc967d860154ccd2353981e082e6675cfbe61f0d7169dc3b04a49c7f35b82f2ece22b781701ac700735bf19b SHA512 6736243a00ba8157810aa5681ca2d4042af75949f71f79e4e8a06f8c3d543f4b9aae38adc575cb8b0ce4e06a79fbd50c4f4b98615be589ed86f6664b6ee62f77
+EBUILD guile-2.2.6.ebuild 1953 BLAKE2B 99ae78d4ed8c6a0a05b709df1237ca9b6bbca61df809c1f4cadd06147207e1abb90f0ef82ccf16c8e6aad4e653f0778f2c54eb965525d543139ba668341ce01b SHA512 ee2877ec48fb3e4f9e81859add46d4e0817627532b183faeb5f81cfd9b0a891084d5ee8e2c21256425c60f5c8166b64b910dceda0506e2fc14e8328f25ba01e6
+EBUILD guile-2.2.7.ebuild 1997 BLAKE2B ebe12dde9a3ace796ab102211d6abb0a8bdc2f34f4ae789d6acebebb1abd879d834e3312f4ea8b25e14f65967de8ef88a2822e42a652d9002f81af9fb933c02f SHA512 a8359229c2645571892caed06e42c36b79cc9922835ef3bc9c241fbdc1c14b925632542093b0907c8b0611e619e977acc917b050f7ff23c207dbddfd9123edbf
 EBUILD guile-3.0.4.ebuild 1987 BLAKE2B c7d633a838f0927b5c612315cbd21034dda7bf209c924d206131a18bdc4f744cb99d839efd2a21c068522a67245115b9127f7e27fa4bbc099680c62f7ccab5f7 SHA512 b35e2217db2549f0e935a39d4195f70e71ba9aba606aa533c4b794738a13973c5aeb846bf5dea24664c164066be98d8974292124aa756484327b529f9af7ac17
 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 2dde4709bf46..9f2c52887848 100644
--- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools flag-o-matic elisp-common
+inherit epatch autotools flag-o-matic elisp-common
 
 DESCRIPTION="Scheme interpreter"
 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"
+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 )"
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index 41331bb755df..de674a417c37 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
index a15c5f5dafe4..7e08347d859f 100644
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 +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.7.ebuild b/dev-scheme/guile/guile-2.2.7.ebuild
index b8688bf0e917..41715f39ed11 100644
--- a/dev-scheme/guile/guile-2.2.7.ebuild
+++ b/dev-scheme/guile/guile-2.2.7.ebuild
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index d1dd75a02723..9c41babc5a36 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,5 +1,5 @@
 AUX kawa-1.14.patch 1482 BLAKE2B 76f1ab83fee8ece2d30138b4fed314a056dc32b4c3a07eccbc75307a36779c0a5c3bd519e7bfa5d03c1108714ea9c2f13cd1e5852c2622a9b701387f6e9fe0b0 SHA512 796621da5483629953ed421e7643439702e088c74098af234b4023d50841dd98374a9b51d6549a3791a47bb8c6904aaebfd82cb668cd1e082f595d63c8bc3f92
 DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
 DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
-EBUILD kawa-1.14-r2.ebuild 2499 BLAKE2B 0b13733762bb50b2c23f6be4503dd4f6e2362a2898629de4fd821ae35480f5d0318ce58355a69660b4e3092372528b000c539de80f92a4cc290d78545447de64 SHA512 a55df8f1e0743e18bdfd90367fa35307813be5b03907e3a35242e95c2f86334963c2ee063bbcce80587b5a3794b37d69ea611bbc75cc40a2549a479ad0a05137
+EBUILD kawa-1.14-r2.ebuild 2532 BLAKE2B 3c05839e512ca81a47c3c59cc7b2f7ccd02421a12630b0924bf9679b382cb8f4876b834699d9c782a97ba40f1047404cc322f136c254f48f9771f4a04650f0d7 SHA512 6af4070642ba6e617fe8d8117b2d355a4e53e4283fffeb292be804d03bb82c5ed725dc48cbfe1a6aaade16ee73902e1642768194b4a03fbacc0113393c711e1e
 MISC metadata.xml 1177 BLAKE2B 6f75d25e4e8f905da3977ed207582a99c61fcab45524ed252185f98c8d719824808f3bb64d57d51c4bb8e0cd3c06876ff7f8ddb35b5c8934eb34a9ba6b1c8193 SHA512 d98cd9143f9a1dd5c7dbab14bd476b5e6d09ee2b8718c92303ec94cf86162c1f94e8b1f1267cb497d4ebf1aa4d8fac8062e3aee373e39a78663229957e31201c
diff --git a/dev-scheme/kawa/kawa-1.14-r2.ebuild b/dev-scheme/kawa/kawa-1.14-r2.ebuild
index 70472bc33773..b4e6737db228 100644
--- a/dev-scheme/kawa/kawa-1.14-r2.ebuild
+++ b/dev-scheme/kawa/kawa-1.14-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2
+inherit java-pkg-2
 
 DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
 HOMEPAGE="https://www.gnu.org/software/kawa/"
@@ -36,6 +36,10 @@ RDEPEND="
 
 xtestsuite="XQTS_${XQTS_Ver}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}.patch
+)
+
 src_unpack() {
 	unpack kawa-${PV}.tar.gz || die
 	if use xqtests; then
@@ -46,7 +50,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
+	default
+
+	java-pkg-2_src_prepare
 }
 
 src_configure() {
diff --git a/dev-scheme/scheme48/Manifest b/dev-scheme/scheme48/Manifest
index 45112ea28f12..749cb3f43650 100644
--- a/dev-scheme/scheme48/Manifest
+++ b/dev-scheme/scheme48/Manifest
@@ -1,5 +1,5 @@
 AUX 50scheme48-gentoo.el 198 BLAKE2B 48b8efe86b0392d03a5456680f05b7dcc810757a80bab44a6af5adc43d97179b41880a2f4910bed5c408e5162c9498cc3b3a9fd865629cc230032aade98eb4b7 SHA512 874355b78d5ddcc55add22d7171ae92e4115c8e84883a89e76848ad362c070c00d8ec12e1841eabd1bc0d2a786d789e36f3f109b0d3e5dd879a9faca1fb8e4b7
 AUX CVE-2014-4150.patch 407 BLAKE2B 7f71707166eaaf668c28b5af41cfd50c73790962cc70630ddc4ac6a615943f399eaecc9a1719d72f4679eefdde035c1bde6e5c57b1680f45b871a89008adb4c2 SHA512 b15b5c9ccc1cf2fba1c15244a4ec0a08d49188fc3476ee1abea74d4415cbd59e94d1a5ad7be39b73fd82a393e29a13569a8178017b6ca82320646a1ac9260eb7
 DIST scheme48-1.9.2.tgz 3951356 BLAKE2B 5a021c80d9986d51e9a9be9a469aa21f4e782e6464e5ccd51d3fdc3e7bd58f5151cafe5f81ec5f48ceeabfc235de6e8412dc18462a417932eb98db9e82d26045 SHA512 a854e3c6f5b02c585fa125899dee276500b91e21cc773202fd4cb84f2e0566a0e19cc34b5f96a3265fab6bf06422e869a2e48433eb2d8fac83a1179fda62e2d1
-EBUILD scheme48-1.9.2-r1.ebuild 1457 BLAKE2B 6d2b13fef1385065affde4c9b8550d3757f28cab57c91d6f248b9063bfd14960b061c301689c58f3a1b492f5340b45974329b767b127695bb249d4c974da505d SHA512 52df073e777fb3617232818493b9f8006379d1bfbb249f8fd3c3eec97a447f961968071181b5a8d8d7c36ce642603ff7b27543eafcc7721b1ed6d701eea62053
+EBUILD scheme48-1.9.2-r1.ebuild 1451 BLAKE2B b00533095c20e65cf4f49121ddf2f1abe12069f8b677cf9ef6cbf6908e7f1384bffbe1bcb36bfed09a8fee6a892c4f1415a7a93e60d2336e9b611c22d232316b SHA512 a21b45e2bad4d6913f728d51ad8f4bdd0bc31db430ee050ed5b755b9a3f2c94e14e6b07c124c94af0639e13fea76dc80dc6b79d2086e12a5b91f11a63ad951dd
 MISC metadata.xml 535 BLAKE2B 5e924b66834d42091699b6ce8335b205e1ffcb66c794a2173ab3793393514cd2061482e5e6190ad7bbf74e364db78a5657d556749560ebcadda91b5efa98c966 SHA512 b7fc727061a594f67a9ff8ec36dd64150cebf6813b1438fb5173b7679ce65bda92ba5ea9501816cfed738797b012f198da27622a1fb038800181dd16c2d50917
diff --git a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
index 971ae3a19060..ab6fbfde0f60 100644
--- a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit elisp-common multilib eutils flag-o-matic
+
+inherit elisp-common epatch flag-o-matic
 
 DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language"
 HOMEPAGE="http://www.s48.org/"
@@ -15,6 +16,7 @@ IUSE="doc emacs"
 
 DEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 RDEPEND="${DEPEND}"
+
 SITEFILE=50scheme48-gentoo.el
 
 src_prepare() {
@@ -23,7 +25,7 @@ src_prepare() {
 
 src_configure() {
 	append-cflags -fno-strict-aliasing
-	econf --docdir=/usr/share/doc/${P}
+	econf --docdir=/usr/share/doc/${PF}
 }
 
 src_compile() {
diff --git a/dev-scheme/scm/Manifest b/dev-scheme/scm/Manifest
index 844541d00cd8..51970c33c495 100644
--- a/dev-scheme/scm/Manifest
+++ b/dev-scheme/scm/Manifest
@@ -1,6 +1,6 @@
 AUX scm-5.5.6-multiplefixes.patch 3014 BLAKE2B 08891323ec487c703a04f72043b73edb0d8e697366f71910a4a728a8ad937c75db310cefdb96144a1af9334edd2da9fc5c720530c6cb0f741e310ee06277e6c1 SHA512 e746ebca91e26569354f09403cf1610c745281af3477d92587a8b52de704998a61d1aeac75bfadfed8aead84243aa01f626438399cfffe92c73bba9fa9564f22
 AUX scm-5.5.6-respect-ldflags.patch 395 BLAKE2B 1fec97642ad348678070df454bbc2c7e64e17907f986a95cf96a3ead621ebe6f22a2f5dbcccc4fe9f7a8b8b951d935bafc5a64ce5cc0b48a514d2cda6ecebfb3 SHA512 03f740acdde590dbdc67046795aa1bed609721cbf83e7c153f5d1d5524c4761e3025c808855bf5b56d44d917c4aefa7198b96d66729e565b277c1acac7c53356
 DIST scm-5e6.zip 912968 BLAKE2B c059b49364abd25bb2335ad11f82791b96ac95aa9529b914396d08592e46e5aa5cba178b791fc96e3ea3066670c48bdd728609463bea398300b81d979fb304cb SHA512 897370f043401a7961eb1c2e22c951e2144505a1670e328e2c3eab33d52da83f195b873fb7cf8486f412ae52316cfc437c9f2da1432ade70f82eb0da12c2f852
-EBUILD scm-5.5.6-r3.ebuild 3748 BLAKE2B 57a6831ad11a13aaf38a01803c8473ca03f5fd3656416d26f80f8f45d111c85719a193020ae9ec268ce0310dd94a8775e499a3bf9116d601c2a400bd896a82b0 SHA512 2adc31ae7fb930c22931d52298c71f22a721f5a91a9b3c21ebe2a61896a491f0b04baad4040d8b4573a53aef8d2bbfeebeb92bd9f716615b6b4177435c3819a3
+EBUILD scm-5.5.6-r3.ebuild 3741 BLAKE2B 71e479b6df69b8a33ce6b4f826fc955d6c7361726fa4c50fe1bb3906b427d3cf97cdbeb5117d412249953bf8b185fe8e11a56a800cbf3d3cf97a9f2b29a61718 SHA512 ed4bd81f329cd9fffc6504dbce66e6017491448c9b9d32a75536231ca4c1a83f772cb5f428033c552ed85802b2fb0e23f6a9d9df035c135193cca63e312d1b0a
 EBUILD scm-5.5.6-r4.ebuild 3714 BLAKE2B 5c1aafbfe92f0185ad45cd4a5c8eb73eed2995dd975e45c5d5635b2242153c503f1fedfea7708385edcb6b4e282dac1143e4d5860729082057a48c48c15f8ec0 SHA512 b8400426ec602f874be94488b916fd6ed865d21d4808e3ef617a1b9d01d98dee382dc09fe56f130af9b7606ae7964934eba2a9f4af86d1d44d26d971598c5a9a
 MISC metadata.xml 1636 BLAKE2B ad72069e26e5a229c33efa845450fe5991d4c6bb14c39ccf22ba1a2d7903b969354a244a09e6684af4f588b2196e12aa60d658a5f842b5b127396a250377b2b0 SHA512 f0936782a77db52a61d47c86f9d638c66ac9848e8b62fcef182b5346abd55e83a5f275b6a60c865551dd134dcb85a77906d4662f91ed505d167608f8901dc0d0
diff --git a/dev-scheme/scm/scm-5.5.6-r3.ebuild b/dev-scheme/scm/scm-5.5.6-r3.ebuild
index 4c86dd6c608b..7f9e5ca83411 100644
--- a/dev-scheme/scm/scm-5.5.6-r3.ebuild
+++ b/dev-scheme/scm/scm-5.5.6-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit versionator eutils flag-o-matic
+inherit versionator flag-o-matic
 
 #version magic thanks to masterdriverz and UberLord using bash array instead of tr
 trarr="0abcdefghi"
diff --git a/dev-scheme/tinyscheme/Manifest b/dev-scheme/tinyscheme/Manifest
index 691e9b60c1ec..34ea0458b7ed 100644
--- a/dev-scheme/tinyscheme/Manifest
+++ b/dev-scheme/tinyscheme/Manifest
@@ -1,4 +1,4 @@
 AUX tinyscheme-1.41-makefile.patch 1152 BLAKE2B 7d75c4a04912e46606d27bc8bab66a868a05547577b4b80962da3d86f169fc64fed7f591c99fc6308f03a8957c99191ec2ebba30d76d2d186a0781c95d0fab9a SHA512 e7ff9a2cc45f1f7f07df3619bf48b2d14c4adf39c452786e4aa0ebb134264f0111f001296e617b6511cd8f28ee3dbdc9f90b5922540aafd91becc358c5de98da
 DIST tinyscheme-1.41.tar.gz 61761 BLAKE2B b657376561eee0ceae02d102ae7da7ce777dcbc78c98b54b0c00c578fb06ccdd3fba8aca5ce150ca188917b8e5f1e9acb63c9c5dc2e050aafa78b0705a20d47c SHA512 a9c1c9cd7a11bf31e0f8ac813ebd6e731cb56b9526fd14d343d7f8c479a8e1b561b744b3f522512adc023cacd1acbf52aa18bf5d8db68f767971660305b79b0f
-EBUILD tinyscheme-1.41.ebuild 1374 BLAKE2B 388085d75b10b3cdef40ed1e7cd108c812a62f6b522defa822f85b1b84e48929f231df88415f60e173ca64023ce04e444f00fba2f6495ef717dc5104a32d3c73 SHA512 60c8a2f3604170f7225811cec6d8cf1f336d0f3a556b60a5b74511cc3478c755e3d0d39c53db5aaf7630d76967db7c73f8935066f95742936fb7d9df84c2a2dc
+EBUILD tinyscheme-1.41.ebuild 1381 BLAKE2B b47d21dcbdd986aad1e226a208fca93cf6a91a748f5abfe0b3ab32d7896130cdc1422905b77ba05c4f9949d1ab3cd6b795195cfbae705314b561d5bd357b9d57 SHA512 80873bdd026112320db089720fc934b915b6ab2895465342b3920d85079fc20e702f8e092dc17855d908bdb9704febb7556d50ad72eca8ead058a9ba68044c04
 MISC metadata.xml 867 BLAKE2B ded640d5a97da7be0b173ec36eb47ab640bdb3024137c93e3ec37d6c9863297b5885040d49f42575de1de6d34f14fa442be94259480808a701619b8105b74c73 SHA512 42f4d045a180c0000df235d368602cf0af1c0b95de53c1bfd4b32089a641d6633d1ac2a713de1a1de09243b479c9e4bf7561b1d664c589c483bfa9b2e865b1fc
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
index 9fac91f01d19..c911e4ebae6a 100644
--- a/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
+++ b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit epatch flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Lightweight scheme interpreter"
 HOMEPAGE="http://tinyscheme.sourceforge.net"
diff --git a/dev-scheme/xdgdirs/Manifest b/dev-scheme/xdgdirs/Manifest
index 456503f380e8..78627b4bbea6 100644
--- a/dev-scheme/xdgdirs/Manifest
+++ b/dev-scheme/xdgdirs/Manifest
@@ -1,3 +1,3 @@
 DIST xdgdirs-2.2.tar.xz 359784 BLAKE2B 437d5a5840957c6e0482e38fcb8fa95c22e8d22001b26dd1c047d9c96e96c85fc47627880c9e92c1f5474c7c3bf61da29f8c9f28a4aa85b32d207ca29cf783dd SHA512 f57cf6e39e3c4ef7faa9034f9e42fb87a8398613f86a7d4f305810c9a845f649e56b754fc5a03fae41b368cd897527e9a8151eb16d1d91c6e4b170ba27bb1b11
-EBUILD xdgdirs-2.2.ebuild 497 BLAKE2B ff4a6d6fc36854ebed5dc4b54e5f6cbca40eb2dffbd7fc78bf66ddf8e344576f9caef25f6666a1d192ff0bb887d7fab4693728c378094052488a0fdcfe775af9 SHA512 8b766087733cda322fc5eda7878ad50abb9b728575aae91ad4f7fc1397eb4d06a94274f063b25846c83b938aad0986d7f24c68532168c64499fd53836a413116
+EBUILD xdgdirs-2.2.ebuild 508 BLAKE2B e724dd16fd07ca8b86c511658828c06e420fe68aafc1e4c0f23b72f4c84939cd81825a00215ffe093de2d94a5989cb6ac1ee2944a3b68628bc68abaadf4c16e1 SHA512 00704534441f7e68060483026dfc3904e20e1426db7799eef8e2a86a3526e4bcbb0e6249614a4c628319fd1997c86f35a5bc3a2b7fe9a5ae076c38b40233a014
 MISC metadata.xml 314 BLAKE2B 8e9e8559fd42cb257cd46adf553710d03be8504cc0b14203214db61dcc3fab7bd6560401bcfb62db9e8aebe021c39fa0de44840594607899b88d23e7321beac0 SHA512 77dcab99d3bead4f808db8a9104ece46bcb94eeb86989f2e104c0306c3b19f308efd0ef130b56c49d33a1b773d3468c8b3eac3acd2041ad5deb1b1527bb83095
diff --git a/dev-scheme/xdgdirs/xdgdirs-2.2.ebuild b/dev-scheme/xdgdirs/xdgdirs-2.2.ebuild
index eb024b533f87..316a909bb073 100644
--- a/dev-scheme/xdgdirs/xdgdirs-2.2.ebuild
+++ b/dev-scheme/xdgdirs/xdgdirs-2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.gnuvola.org/software/xdgdirs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-scheme/ypsilon/Manifest b/dev-scheme/ypsilon/Manifest
index 6a892b816a41..50580fa8f378 100644
--- a/dev-scheme/ypsilon/Manifest
+++ b/dev-scheme/ypsilon/Manifest
@@ -1,4 +1,4 @@
 AUX ypsilon-0.9.6_p3-asneeded.patch 353 BLAKE2B ea32b5ffd6ed20a54ea28e799e9cb38a3df5f0fa251c7d47ed097949b80b7af0118b4f96634e4d6888a001bc031c239530047200e24e408f31b94233c252e083 SHA512 12709409fc4663bc945a8bb182c0c0155d37c85b739adb99c9ca7ff31fdebbbe8e67b8fa3e0a98e93b01d9d5aa2f47db1630b0c57d3b1a0e462bddb92fa604e2
 DIST ypsilon-0.9.6.update3.tar.gz 4555843 BLAKE2B 65cdf9d154dbe201967a0eea9b21b90f86eb7a88975bb9f4013f801ed28e6da09eb29a793287f0870f6b27f3e63594a79e7894a6a6780342223a728c229babb0 SHA512 9ea5e3e70481c538bcaf671feb7f764015fb44702bcec4e2873007e065bf48d7d9b0cfc8f9dcc51e0083b0bf5296fd8ac40a1f851d76019a18b21fa7e292ee89
-EBUILD ypsilon-0.9.6_p3.ebuild 864 BLAKE2B 3ea49a2882a9187cd8af3aaf24f3b9fee05355610547a0fd88188a4fa4213988e23b80c89ff0669f869b77e5aa32f1244bf7ccdcd46a8d8550f768c7006c74d3 SHA512 5b7916b941ef813da3a0314b691138989ba0d5982c75c18e07f1f2df57a0697734f6c777810ba1173104620b9c0b76490c46e9ff9a3046320f84bb902b579543
+EBUILD ypsilon-0.9.6_p3.ebuild 861 BLAKE2B 66af82997a60a00aed532af93ac16f7028102eae1c6dc509c79f9f2bbd9fdeb7b5550687635197c652c40922724fa4995e1d991e1ba8a465458c1ca4c40ec56d SHA512 e34568cd000bf7e1a12fe1c41ea2b9dd3fd89e1c50fa6c3d167458d7b960ae90017a7459b66d47296320c02d93e68edefcef3a8417b1e5e162d0804330ffb3f5
 MISC metadata.xml 486 BLAKE2B d562278ad0676d151db2d3bf07a11749bcf43483c28d783d6831a42ab70b070c993e97fadbcf5854ca9232a9325efc180171ee16414db0dad1e2b42abc9b2e45 SHA512 5ad24cb19a09eba414c8099f9300eb81b254797641e6234e2819e10d8fc52066d6bf75e639f71a5bf8bd9e10178cf56342a129401ceec31689bea4b82bc28eb9
diff --git a/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild b/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild
index e68eb684fb61..3b4f21c6ca6b 100644
--- a/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild
+++ b/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit epatch flag-o-matic toolchain-funcs
 
 MY_P="${P/_p/.update}"
 DESCRIPTION="R6RS-compliant Scheme implementation for real-time applications"