gentoo resync : 15.12.2019

15 files changed, 137 insertions, 18 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 3e1e5af5342c..773c035a751e 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/elk/Manifest b/dev-scheme/elk/Manifest
index e95adfb7cda0..3f37766ec2fa 100644
--- a/dev-scheme/elk/Manifest
+++ b/dev-scheme/elk/Manifest
@@ -1,3 +1,3 @@
 DIST elk-3.99.8.tar.bz2 701206 BLAKE2B 93105702c2d8796fe0d1f7f4c1d0f4b128f01755d6f4366840978ed2224a2a3c27d261dc0cb6a3f8d0e199e9ba9c2ff1a5a61dbc5d593b122b40585c0fe631d8 SHA512 dd966bf6063b4e04c0947e56381cc9456ea81cf4ec66d04e80cb79485d39414f0b713520278a62fa4630068f245f33b28b08b5fd4a7defd0bcb20bf2eba4ed49
-EBUILD elk-3.99.8.ebuild 672 BLAKE2B 5dd2afd9246b2a40aa3f6418efe185fce7173e0a6ff0586f835d6bbc8cc18ba569f2d0852d754ad05b34777c7967f70f237af88c8179d273486429d43003d5d5 SHA512 d10c9e5cb66947d1768a467841803140fefb03196025ea5dea7b86e90087deda61620d10d593556a96ef495c8492f10bb875eedfec95803dfefb38e07f28e40a
+EBUILD elk-3.99.8.ebuild 868 BLAKE2B 93c7edfee4dac2ca95f9759ac6936a51af0a34929615cc32a49be20fe9319632063873a92121b550b55b71189c94a629762c5f5c8964bfeca91576e9ac48fb6a SHA512 9933eed5134bda1716b108eaa6c33376d71d80139ac2e0c1359f8b40f4055ff0d9d0f655584fa61e8585414d7b35610907a07ec7e0413878de9112bdeb67756d
 MISC metadata.xml 547 BLAKE2B dc640059cc4b8319dc041faf3e23d9d538621594783e8f4ed11083fc4cda5dcd85c1668f4bf48eb7eeea7de7e4765ed6db88a5543d4185db20aea06d82e1d548 SHA512 e1b074c8d4c1757696aeebf4baaf6f81dea9ea5d7c26aeabf08165be1db955556e77ff96d384557b22f6d508bc3393931b66e7690f3541bd702880827342a9d4
diff --git a/dev-scheme/elk/elk-3.99.8.ebuild b/dev-scheme/elk/elk-3.99.8.ebuild
index cf741d71b8c2..a9e62f4c49fe 100644
--- a/dev-scheme/elk/elk-3.99.8.ebuild
+++ b/dev-scheme/elk/elk-3.99.8.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 DESCRIPTION="Scheme implementation designed to be embeddable extension to C/C++ applications"
 HOMEPAGE="http://sam.zoy.org/elk"
 SRC_URI="http://sam.zoy.org/elk/${P}.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-DEPEND=""
+src_configure() {
+	econf --disable-static
+}
 
 src_compile() {
 	# parallel build is broken
-	emake -j1 || die "Make failed!"
+	emake -j1
 }
 
 # tests are run automatically during make and fail with default src_test
@@ -26,5 +27,13 @@ src_test() {
 
 src_install() {
 	# parallel install is broken
-	emake -j1 DESTDIR="${D}" install || die "Install failed"
+	emake -j1 DESTDIR="${D}" \
+		docsdir="${EPREFIX}"/usr/share/doc/${PF} \
+		examplesdir="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		install
+	einstalldocs
+	docompress -x /usr/share/doc/${PF}
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 13b8574dfbad..994f27dce3fb 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 1306 BLAKE2B 5510d5ca97b3d233e78a83dda05d1828c8cf3f63dd2dd539dae6b88d8a87946900d13bd2db48a3b874ad405f97380a5a1b673d0f55ab26e7eb9af690002b8217 SHA512 e89c0abf8e7bde935d9e5e5db9d3cba678944778075abad134fdb3bb582b37107f5c41c71a0aa1a85462b8e25a0d47a05faef7ad6a1ddd3be94646b6a7b6e8b6
-EBUILD gauche-0.9.8.ebuild 1353 BLAKE2B 86b73106e619634d25bcc3a004483c5e34c3381b96f93bb12d2f0e8c5e423485371cc6c24813b7c740b7d522b1e39c1d27b3df2a06fd82143d6f9274243f98c8 SHA512 74fb8df90abe2fc64285d94175fd1ad2135486c78b40a125c86d92d4757e43be458056da14a4fb2394dce8bac00b550e34a3793cae533e3f6f3ad6f5bfe16a6f
+EBUILD gauche-0.9.6-r1.ebuild 1333 BLAKE2B eb54cf0c0614b20607dc0d6deea8735011ce593b15baef07d8620038df15a6539a12e70d1bf637be8210d288841f9c3db838c1531530f216aec9fb45136f9fd1 SHA512 fd3105d9a607952619bbc3cb5c1081ff50ae7a42d8c8ec347d53867ac2e5d8e5134fcfd9408f6c92f80122780edb48d4c9bec0704d648c36125776e6c2a54a63
+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 c82f8d5df9b5..bddf6290d1ad 100644
--- a/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 libressl mbedtls test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/gdbm
 	mbedtls? ( net-libs/mbedtls:= )"
diff --git a/dev-scheme/gauche/gauche-0.9.8.ebuild b/dev-scheme/gauche/gauche-0.9.8.ebuild
index 64108c8c95b3..eb8bdf456b70 100644
--- a/dev-scheme/gauche/gauche-0.9.8.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.8.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)7"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 libressl mbedtls test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/gdbm
 	mbedtls? ( net-libs/mbedtls:= )"
diff --git a/dev-scheme/guile-gcrypt/Manifest b/dev-scheme/guile-gcrypt/Manifest
index 098eeedac73d..404fcfb4e8c0 100644
--- a/dev-scheme/guile-gcrypt/Manifest
+++ b/dev-scheme/guile-gcrypt/Manifest
@@ -1,3 +1,5 @@
 DIST guile-gcrypt-0.1.0.tar.gz 47119 BLAKE2B f0d135ae0eeecd324d51ebfcb2fd9c131e57c9d822f0729e0cddde05fe4c4df6d854e1394a4ef5361e046f10279e60a10c781e0df2432ec4034d62631a0c2619 SHA512 90934b2347cc94a59537e34b07608a8678ed3af4ce62b42f0659eb3bca4290a2707b2c166a50a16422cb17d03d2a1a3fa59a203404c1b05b0d02cb753f367c52
+DIST guile-gcrypt-0.2.0.tar.gz 50993 BLAKE2B 427a950da7eb433ea7475956504a423714717e4e7896906eccc84c3a94261e3c93dc24e75ddcbb1f0cee9a7bc7054021e0d6673d11ca9fe5aed7ebcaa5c30ff4 SHA512 82a86dcdf9fb09125203fbcfc3d43cf0afbd9ebfb8f889c7c602d8534a37136bb555d4b7920e7964468c6fdbfdc0f242dcd3c0fe42490c552a8013c1a6638552
 EBUILD guile-gcrypt-0.1.0.ebuild 584 BLAKE2B afe6f460d3be289320dbf886a8d2c0cd708330793e84b8eebf90c38507d96a816729b6be39547f28234a45ea347dcb5b600b9eca31bb95a065fb23d88a2d6e19 SHA512 4a53c023959a5625bc62fc69e774bd61bef5638d65cfaabb289275676f69db55f167e3fb65c6b06f38ed190cd5ffd0dc17e0c6b820ad678dbe8acd7543f0347d
+EBUILD guile-gcrypt-0.2.0.ebuild 690 BLAKE2B 7a3f2e1f2c8f233715f4fc7755b6a0de0830e70629d19f52957e89e26c710c54fc72861cee21ac978740a172e80859a74bf7ead59a50d3b7e6a13d3aac5b563b SHA512 2499278d6637ebb04610c127e50c474109bc609b6026effd3542b86b9490f98e37809769d6c5cad7ef501d7b683d965b59569e76c5f5b15a1d773ed94e95aef0
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-scheme/guile-gcrypt/guile-gcrypt-0.2.0.ebuild b/dev-scheme/guile-gcrypt/guile-gcrypt-0.2.0.ebuild
new file mode 100644
index 000000000000..05bb44f4372f
--- /dev/null
+++ b/dev-scheme/guile-gcrypt/guile-gcrypt-0.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Guile bindings of libgcrypt"
+HOMEPAGE="https://notabug.org/cwebber/guile-gcrypt"
+SRC_URI="https://notabug.org/cwebber/guile-gcrypt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.11:=
+	dev-libs/libgcrypt:0=
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+
+	# upstream tag on top of source tree. has no autogenerated files
+	eautoreconf
+}
diff --git a/dev-scheme/guile-sqlite3/Manifest b/dev-scheme/guile-sqlite3/Manifest
index 00ee1fef4bbf..874fe4d56104 100644
--- a/dev-scheme/guile-sqlite3/Manifest
+++ b/dev-scheme/guile-sqlite3/Manifest
@@ -1,3 +1,3 @@
 DIST guile-sqlite3-0.1.0.tar.gz 23832 BLAKE2B cff04a320ab239bf0d90c01ffc4e557bf5bf2978a433fcca0413b09f3c3b2ee5ed75f3655077dc493ae42a11a8e027f0a17b74c97e3eecadfb67f2e0e7912693 SHA512 8c1f58024c464e5628162e3ba1bf129809403bcc5d2329b55b6628f419ff8d5ead21d87f0bdcbb458ce5798d62184af177616bbfbeb653c34450c716f6b3ab26
-EBUILD guile-sqlite3-0.1.0.ebuild 594 BLAKE2B 386d686e584dfc0835b7c4c13b26b03d4636dcc64ef46957d7c2e7c12b467a85d02917ed9d46a9bd4693badcea131b61c888927dbe24572b4625fd28398a0396 SHA512 cd93cda177eee234b4b96d3e3c1166533274394988fa7b5d214fc8f329ab1208778a48e60cdc18d9a68147922d05178664fd89990396e4d1e830f276fdaef243
+EBUILD guile-sqlite3-0.1.0.ebuild 599 BLAKE2B b77ee09ed5fa96dfa00b7f97640ead2ab40a83b56d5b1b6aa0bf29c4f6870f26a78d5eea0b34337eb5525162770b79b7407e99392670d3ab551b295a36785eb4 SHA512 00e2ec20d89098aa972b8e6d8991887e1b3880568f9bb9bd15a61982d62d17dccf03e1f0ef2d4c2729a78ea94c76cb238c4e0d6892c80f5140434bab9c2b3f76
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild
index b406491f9454..37fa893a5c22 100644
--- a/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild
+++ b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="Guile bindings of sqlite3"
-HOMEPAGE="https://notabug.org/civodul/guile-sqlite3.git"
-SRC_URI="https://notabug.org/civodul/guile-sqlite3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://notabug.org/guile-sqlite3/guile-sqlite3"
+SRC_URI="https://notabug.org/guile-sqlite3/guile-sqlite3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ GPL-2"
 SLOT="0"
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 5cc322c8f24c..5d5c3022ef2d 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -17,9 +17,11 @@ DIST guile-2.0.13.tar.gz 7808173 BLAKE2B e1d59356173b54595512c0322ac596ccf46f566
 DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
 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 3073 BLAKE2B 4108679370301f49192f5197ed499040b871a6b48e36e4b25356addfe39cc23fb2f2745018adef6a59cf735a0ba965bdd81ae308ca845214b877e3f2907d1f39 SHA512 2813fe73867f13dd8369f6d4a18937f469a9c77577d55ba944c2c2039fc51a949a0a1f4993a1a5729a0f49ad3685bf5c8a2731c928c18cf9915e414193af42be
 EBUILD guile-2.0.13-r2.ebuild 2073 BLAKE2B 4c9205a93ca6b49438619c4221fd2729ecc9495d7c16af1a5fe5e52a3948487c138b0e50aeccbfc45496d80f324296317d4d98fc52de483ad19061ca3d8abd57 SHA512 7db0e37d3054683e2e63170ca5bec50c76ce397725785215dc9db9f7ad96c9796740e25e3da9184df9482c8c7546681184f5d669a9e64a852f8e47d64689eb1e
 EBUILD guile-2.0.14-r3.ebuild 2207 BLAKE2B e9f5c028f3e7b151b714549533f00e5c86e07dcd1e3d63a178c7bbf6a52031b48e5fcc45db94d1cbc37f827961fd0eb74c94960c7a117aa74491a1a6ccb0af75 SHA512 dea404226f9efc3a1abe806e26c7619d3cb6514b23ec103e708cff00a8d1535b30aeda9b8500ffefa4aa1bcad3ac1f71487b683e761d0ce77b97d8c0fbe55f97
 EBUILD guile-2.2.3.ebuild 1989 BLAKE2B 52eb4da270d12eae457c689293e0ba2e208b0e0f3f12fadcfde948c28dec84728701f91f008917533bb771e80849bed3fd846b23761d4a87c959244db517b852 SHA512 3749e1fff824fd4951b92bbc5e3347e7ced1d7fc3121096be46f748bda1cae8fce715ebd25d319e01f4a0e8b4663f260cd0f20b6fe35de406498ca0b159d5760
-EBUILD guile-2.2.4.ebuild 1989 BLAKE2B fa975757aec08c6fcb6f54dd3b2444b62f8729afa2da4a13080409fc1147dc6156c8ffa7e42f6bb983ffc403d6cfdbdfddf0723f21bd7074ec733a90d27bc935 SHA512 246ba38dc4b77a8018103d37b47561225a8ec609ce72fbb7e132ae5fe7e467c93fc3d55b400ca42998e398d4db78d32e56d71dd2e96b903e4a6d10a80af6b10d
+EBUILD guile-2.2.4.ebuild 1982 BLAKE2B 2ab03d328f337222a93348d4505bf72f00636b5d2e4c0022e30a4b22b27914bcf5388aba3a9a115264e2416665db41ed0a0ba18ddfb07731700bb49edfe779b1 SHA512 fe781ca57119dcbd0d1e1aacdb050bb094ea9129943b90178da88240d3f2e8886949e0f4c618658db3dfa299a1dde3ab4b1d38fa879890620f5e18e91f34a7e0
+EBUILD guile-2.2.6.ebuild 1967 BLAKE2B aba57d8266055b7c789554fdcdeadb45a3b068a2c0bdaa030d6ce0916a3423300d2a6aedfe63ec4b0c8a4e3572cc9aceab4d37f7317f8f19eca86946f3705066 SHA512 6bbd71d13069bbd292a0bbe6c1cc6f35c92bf5cc61428d56081167b01a5bbc0e0d38f7866dbf4e98f64f5326b47d3433548742a2e9b932fdf0fa395d8038cc4f
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-2.2.4.ebuild b/dev-scheme/guile/guile-2.2.4.ebuild
index 0cbe70677647..15669e438e77 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 ~sh 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
new file mode 100644
index 000000000000..d9730393a3d7
--- /dev/null
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MAJOR="2.2"
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+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"
+IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
+REQUIRED_USE="regex" # workaround for bug 596322
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-libs/boehm-gc-7.0:=[threads?]
+	dev-libs/gmp:=
+	virtual/libffi:=
+	dev-libs/libltdl:=
+	dev-libs/libunistring:0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/libtool
+	sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+DOCS=( GUILE-VERSION HACKING README )
+
+src_configure() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+	econf \
+		--disable-error-on-warning \
+		--disable-rpath \
+		--disable-static \
+		--enable-posix \
+		--without-libgmp-prefix \
+		--without-libiconv-prefix \
+		--without-libintl-prefix \
+		--without-libltdl-prefix \
+		--without-libreadline-prefix \
+		--without-libunistring-prefix \
+		$(use_enable debug guile-debug) \
+		$(use_enable debug-malloc) \
+		$(use_enable deprecated) \
+		$(use_enable networking) \
+		$(use_enable nls) \
+		$(use_enable regex) \
+		$(use_with threads)
+}
+
+src_install() {
+	default
+
+	# From Novell
+	# 	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+	dodir /usr/share/gdb/auto-load/$(get_libdir)
+	mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
+
+	# necessary for registering slib, see bug 206896
+	keepdir /usr/share/guile/site
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-scheme/tinyscheme/Manifest b/dev-scheme/tinyscheme/Manifest
index 5ef1d5baf7ce..6949e564eb50 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 1383 BLAKE2B 4f1b408eb014a714ef418bce8a11605eb07804797e3fe31fd75d0a3968dfe344bad59bf3a32a54b559dcd865e8d60605aacf2722881444e247c8d1162969250c SHA512 e0fb286733b75e80ef450267a9a268814ac501c85516dc59071483bfb119825a36b7ab124d9a82778446a50bf64684fdfac1c4cc2d2f19e71a59afe73b3dad4c
+EBUILD tinyscheme-1.41.ebuild 1361 BLAKE2B 80ea70a0aee7bd4afd4a2c9a087d12dd262e349039e6b243575c3d218386539e297924c8f74f16a32397749fbe3f7232abd2f5ed4b74784da3d5d531ee70ed0c SHA512 2a1400b9c3e1b961f384f72dc482a1d355c9a85cd3f799f730a115b1d87e955f5907ff5db5b71807413df58676952a2d443789dda0273c48999257002b878c24
 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 4819bc573162..e8622924cdf0 100644
--- a/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
+++ b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
@@ -45,7 +45,7 @@ src_install() {
 
 	newlib.so ${tslib} ${tslibx}
 	dosym ${tslibx} /usr/$(get_libdir)/${tslib}
-	dodoc Manual.txt || die "dodoc failed"
+	dodoc Manual.txt
 
 	if use static-libs; then
 		dolib.a libtinyscheme.a