gentoo resync : 15.01.2020

21 files changed, 129 insertions, 22 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 773c035a751e..26da23317ec0 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
index c8a8b418ce4e..5624a67761a5 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 1262 BLAKE2B eab93729c4a70ede0c25aee2cce40342718f39adec2c4a913775871f0fe08baa4a7a69c331d8c53e191251d8930e9e504c75b6cfdc6f60fb072a1793abe1c4df SHA512 ae4f5b4df3d72634074c882b76f73a7261a46a6978a5fe2387a91d94c3ca56ee1d99042b84e0adf78568938246a8ebb023f809a07eceeb0cda15facc844698b3
-EBUILD gambit-4.8.8-r2.ebuild 1329 BLAKE2B 82479a1bb78ee29382c3d4554c98e318148802f7844e5b2475b860358ea10d21aaa8ce30fa2db5fd137225924d5459157fa597b76afa477a3efe10aeea41531b SHA512 f5e876c31e855dd20e858e21bf02109bcb0144f0047015a0ac022a72381c3f8a34d0b1fa4064601fcfb271afaeb366ee642d7dd5f724322c749b84a2fc04affd
-EBUILD gambit-4.9.3.ebuild 1333 BLAKE2B b71d2e811e015ff1a22c5ee3bb003c7eaa60564ef19c1fb135607d6f2f55d2d7f13e36366155a6f9df9a04059602dd489461eea5293eede53e60647fa43d4b5a SHA512 74ccb5f787738f760de4bcdc1ad3e825b621130e59f1d31d5c3aec9861252431fd4b01ea998e111f2c9b87332ad5cee457d78eeddcc8b155c35c4a63195db317
+EBUILD gambit-4.8.8-r1.ebuild 1272 BLAKE2B 0fc77ed3b8c46f155fd42cdce5921cadbe01b6acd7df8cd4377d09017c668248cfe3af3e712aee4a36b5f4e8f6bd65755aab34c6049adfbd59c3f9d9549f2d89 SHA512 4bd216c8c895487d3fa52fea06947976a2ffd846d150229f06e41d78c992a5bed4c95c8888ead14a181a75816759b297098d0acf833f09c0928da3f7d4bff962
+EBUILD gambit-4.8.8-r2.ebuild 1339 BLAKE2B c4e94229d61a2534f5a45179d4de9587ad0910fdf587e3840f99902669166a3e72fc5e59b435c07c9fd7dceac33bafde6ba0665c29437e96a20adce81ec87bff SHA512 c5003a09cfa47289de1afaf1334cf96302f7b2078c0a5c0ab15aa3d582943ca766197ed648b5ebcc792a135644fdc2afa589d35023d4662956c08eb17231ad29
+EBUILD gambit-4.9.3.ebuild 1346 BLAKE2B ba9af9b1a6f5a641425ca2daaecf2abf9dd6fb98ad5c8edc6c438822d6c401d2acad75bf282d0e7f2f5ffd86be789dd20f1b9b54b1d42f1c2ed3a5d4b4f8b946 SHA512 72a631dfddfdaf809caf1b8f09351b869ca2a35b330008b3d5179b539a0bdf55d62c020080476844ccf72f9371581f3f38c73f6420a7081f3c7d49b5f7a0b5c1
 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 3922406eab4c..841070ee792a 100644
--- a/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
+++ b/dev-scheme/gambit/gambit-4.8.8-r1.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
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 RDEPEND="ssl? ( dev-libs/openssl:0 )"
 DEPEND="
 	${RDEPEND}
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 
 SITEFILE="50gambit-gentoo.el"
diff --git a/dev-scheme/gambit/gambit-4.8.8-r2.ebuild b/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
index d8fd8612bfc2..1b865cf41e16 100644
--- a/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
+++ b/dev-scheme/gambit/gambit-4.8.8-r2.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
@@ -22,7 +22,7 @@ RDEPEND="ssl? (
 	)"
 DEPEND="
 	${RDEPEND}
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 
 SITEFILE="50gambit-gentoo.el"
diff --git a/dev-scheme/gambit/gambit-4.9.3.ebuild b/dev-scheme/gambit/gambit-4.9.3.ebuild
index 698275f61fc2..e0242a86fef8 100644
--- a/dev-scheme/gambit/gambit-4.9.3.ebuild
+++ b/dev-scheme/gambit/gambit-4.9.3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="ssl? (
 DEPEND="
 	${RDEPEND}
 "
-BDEPEND="emacs? ( virtual/emacs )"
+BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 
 SITEFILE="50gambit-gentoo.el"
 
diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest
index 9b6a96b65d6f..3c9b5e145908 100644
--- a/dev-scheme/gauche-gtk/Manifest
+++ b/dev-scheme/gauche-gtk/Manifest
@@ -1,3 +1,4 @@
-DIST Gauche-gtk2-0.6_pre1.tar.gz 205235 BLAKE2B 90f2c69c7521817fd81bee007618fe35c6a20678812139f2f99964cccb953e6ceaa301886a703702ac67184526d5cb3d24db786ef0869f54490acbcb6e3745f3 SHA512 5d47af94f3683c25787bb31b2b077ab5526f84e67db49b95a04d59ee57d1249a9b6666a9223305fe47597a2fa77a6e8d81507a05b1a83a4a76ac5f867738f228
-EBUILD gauche-gtk-0.6_pre1.ebuild 1377 BLAKE2B c43e39a345214abdebfbc89e53bc089d95a2783cce1caef28c6df0d56d5b28da2056b893996fdba49b996f4589f0378b88b3ea58ad4a61f4bf7e502d74a53880 SHA512 0d6700c3fb5fbe82a6417f6ece3ad994577cfc7bb690a0cb62fe6c52da2eae440cfeb7aa5097699b728f0f9436a261b571bef28d5c2a2bb4abfb9df59596cacd
+AUX gauche-gtk-glgd.patch 509 BLAKE2B c9c0c02edb732b96b81eedc98d757761dc16fd15b48083f981524c115311a1c9347ab72de611abf9e90a0df0702aaf1975bbb249bcc9d4ac163f4985edfe4310 SHA512 48f4b60711d2bf6fc08c757c7238d0f18225d37022b4e0b0511ef370d26abbc1db7ddd2763f3ec22d08b7ff3a2b648ebc8b605cb7532fb0039e76d3121d16833
+DIST Gauche-gtk2-0.6_pre1.tar.gz 205003 BLAKE2B ecc444c246aa20f67a0030d7d87528596d6c2d69beb7ffaef1b53f80963d2fcc1294a04cacf958df6c3331789b6b0260f911126941d6e672a6c57e3aa4807d81 SHA512 5379dafbfabd536e335c30af18f8ddd13e00238e6d99494bbc8e78ee9cf1db872c08b5deee42ac50898dedde39c441d837312d2d6f559a0d2ac2568c31926f70
+EBUILD gauche-gtk-0.6_pre1.ebuild 1418 BLAKE2B f929407d48c44e8b38cf80b5818c5f3c321df84e34187ce20fe4dc0a8ad47393ead7623cabdfb4f903bc64b2f627742adcbd61246d0800301e3507e9d41ff547 SHA512 b28b6dc87b47a7cafb1c9a906e4196c4c18fa69afa95b2186b62c129ffa815148e8171ff5edbfde19c4a6ec36aaa98e51b6413375a6192b98d1ffb08bb2182db
 MISC metadata.xml 471 BLAKE2B 5c17e51d4c199f82572546d44c846f55d6bc0dce86ac8780dd96a188fd447f0d5047f09ad3186eac3cf1adefe3a7332a5072f65144e6a6f244ab8871e11259b8 SHA512 64fa480b1c697341c1c215f5aae1c7875c796e11ed05e08045635996c996183b8d1decbc1a31846ee5374d81f33ce282fb44bcc84489f9fa854a063d7cbb527d
diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch b/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch
new file mode 100644
index 000000000000..36a723fee98d
--- /dev/null
+++ b/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch
@@ -0,0 +1,14 @@
+--- a/glgd/glgdGraph.c
++++ b/glgd/glgdGraph.c
+@@ -19,11 +19,7 @@
+ #define GLGDGRAPH_CAMORBIT              (0)
+ #define GLGDGRAPH_NODENAME              (1)
+ #define GLGDGRAPH_LINKNAME              (2)
+-#ifdef __MINGW32__
+ #define _MAXFLT                         (HUGE_VAL)
+-#else  /*!__MINGW32__*/
+-#define _MAXFLT                         (HUGE)
+-#endif /*!__MINGW32__*/
+ #define _PANGO_DPI                      (72)
+ #define _PANGO_SCALE                    (3)
+ #define _TEXW                           (1024)
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
index beb3882420d1..408f80d26af2 100644
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit autotools vcs-snapshot
 
 MY_P="${PN^g}2-${PV}"
-PV_COMMIT="6fca535f7bb950f81db066bd1afdca9d55e9b460"
+PV_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
 
 DESCRIPTION="GTK2 binding for Gauche"
 HOMEPAGE="http://practical-scheme.net/gauche/"
@@ -28,6 +28,8 @@ RDEPEND="x11-libs/gtk+:2
 	)"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PN}-glgd.patch )
+
 src_prepare() {
 	default
 	eautoconf
diff --git a/dev-scheme/guile-gcrypt/Manifest b/dev-scheme/guile-gcrypt/Manifest
index 404fcfb4e8c0..d940d0188808 100644
--- a/dev-scheme/guile-gcrypt/Manifest
+++ b/dev-scheme/guile-gcrypt/Manifest
@@ -1,5 +1,7 @@
 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
+DIST guile-gcrypt-0.2.1.tar.gz 51129 BLAKE2B adb597bca654ac57b27f18cdd391edacb98e200ce274907494d6e4c7052f3cda093281d8e27e2bab0fbf9b572b17fc9bd90c8a8275d61144c8becadc6d7c8c07 SHA512 c5de73f204f55b337b097ab6205f389c580b2ff825a672f3d042b2d74ca9a8038952d0c656e9def0d441075764cf4c937f648fa8c9bd598fa7efea2b5542559c
 EBUILD guile-gcrypt-0.1.0.ebuild 584 BLAKE2B afe6f460d3be289320dbf886a8d2c0cd708330793e84b8eebf90c38507d96a816729b6be39547f28234a45ea347dcb5b600b9eca31bb95a065fb23d88a2d6e19 SHA512 4a53c023959a5625bc62fc69e774bd61bef5638d65cfaabb289275676f69db55f167e3fb65c6b06f38ed190cd5ffd0dc17e0c6b820ad678dbe8acd7543f0347d
 EBUILD guile-gcrypt-0.2.0.ebuild 690 BLAKE2B 7a3f2e1f2c8f233715f4fc7755b6a0de0830e70629d19f52957e89e26c710c54fc72861cee21ac978740a172e80859a74bf7ead59a50d3b7e6a13d3aac5b563b SHA512 2499278d6637ebb04610c127e50c474109bc609b6026effd3542b86b9490f98e37809769d6c5cad7ef501d7b683d965b59569e76c5f5b15a1d773ed94e95aef0
+EBUILD guile-gcrypt-0.2.1.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.1.ebuild b/dev-scheme/guile-gcrypt/guile-gcrypt-0.2.1.ebuild
new file mode 100644
index 000000000000..05bb44f4372f
--- /dev/null
+++ b/dev-scheme/guile-gcrypt/guile-gcrypt-0.2.1.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-json/Manifest b/dev-scheme/guile-json/Manifest
index 1e9a1282b96b..bd7361a77ccf 100644
--- a/dev-scheme/guile-json/Manifest
+++ b/dev-scheme/guile-json/Manifest
@@ -1,3 +1,7 @@
 DIST guile-json-0.6.0.tar.gz 99122 BLAKE2B d8b9aebae47b7ed1d89153e82eedbe7b2e0200cbe802c1ce5f43a6149a3f1df08326c1945da97a0a466a8b23fa941d52b16c07ef86c20301548bac00149e8c63 SHA512 90ab2a428669b5c2163e9b6b13e6f7fd7452e95d996f3cea44c3fd7bbf35e2d3759416e63a74b2193ba161f8022e845c0f058c3d20e89c18116660427a503d2e
+DIST guile-json-3.2.0.tar.gz 120917 BLAKE2B 2c1e897bb4c09b32ddd04d8617372501329fbfa64f117718aacb2c3be9ee2db694ad44e577b0fb81abd8067f64de38650f76a652605bbbad1fba3c5a02bcb383 SHA512 f1670d792d742313d346cae642d524fa64aff51bfcb29a20c0a197f5b730c8accc1fb9e4d40ff01a5a6f97488d4c39eaa31c4863e663b09c01fd3544457a2b73
+DIST guile-json-3.3.0.tar.gz 122495 BLAKE2B 656529e0ff76fa31b0a385f56ddeb937488e252e176b8468f8b2b6a6166cac5c2bbab1e08b4460b263dd0932d7acf2dab4a9924793c7496e37896381220aef1a SHA512 e4204e0e9649a308b6146c17ef2ed3fc1a804404d4bb6ce09b6fdb0d09823f185c333e87f5cc940e5affc08f5562550785511ca1f220efbc7ecfe15cedc14881
 EBUILD guile-json-0.6.0.ebuild 403 BLAKE2B 45d37472437999fe7958d4c7ed18149f45c4e2d456193ecbf81ca5d09b7c77124c9a3e55151e7e470558885b56aca6ac41ae714b55774e9e27a44687189824aa SHA512 6ea9f42d8c661aa3f6d631ded253465bb4e32d62d45f826f5819346947e91f5fd03b8e6f805b7648ecc2e701cf46a18b097c865d23cd19b9afaf3621ade4e9e7
-MISC metadata.xml 251 BLAKE2B 192529903b8f966db2ab52ecc2ca58c2f5d3a18686c070e272a275ab2cb877103675fdf3ed443d4294a78979f7d3afdf53d07d56ffa36247969d480bffb23e9a SHA512 4fda90c4191ba8ea396da2c4a434893d4b9df976a918e4fb5651acaf92c6efc9103b738681a3d29abe801a4ad09eecf5a4b0bd799dab5b5f1e42a34c3b27d918
+EBUILD guile-json-3.2.0.ebuild 400 BLAKE2B 1e107d8b1a89c18b598cb35f5d002a29e66ca7696ef8453aeebad2c9364a60f824f57a31632866b29aa4af007f685ae45081a6f45f403f8be8a9cebf0c16f208 SHA512 84ab060f83fe6759016fcab6c066fafb0d3a4ef913db3935ec47abda71384cd158f54f4271c7a9ee565e7296605c5ac64ec3286052a823573aaa51cc7739b606
+EBUILD guile-json-3.3.0.ebuild 534 BLAKE2B 082ff16fd3bba09f0176a30233c035ffa840e4b6ba852ae43932a53394be1ee4d10ac86fb8ea34338617609bc60d8f274e3474573ce355cdcf5e7802bfd2d881 SHA512 6202f61844afd9ca2c1b1e4e7e91f9ecd977ac8dcdbdacab81eb71f14ae9cde5e16fabf6d5c469966305403877db40dbf155ec24d2fed5d7e828c1319899b6e6
+MISC metadata.xml 326 BLAKE2B d05d251d501000390dccc9c07656dc4a36a8c7b2fca80ccb9cc147ab6fcf270e03574e4614676a3e5c2a2a2b2c000463d3c73595a5f5da7941de840ce8b69a94 SHA512 08bc92338019e10651874c2a45053da7e5d61f9d0013849f3939902c452dc43abee97be085d8f6520dac35fc12bd01fd71e1a1ecaf48e5be947a203768f04449
diff --git a/dev-scheme/guile-json/guile-json-3.2.0.ebuild b/dev-scheme/guile-json/guile-json-3.2.0.ebuild
new file mode 100644
index 000000000000..e232bd9893b7
--- /dev/null
+++ b/dev-scheme/guile-json/guile-json-3.2.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="JSON module for Guile"
+HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
+SRC_URI="http://download.savannah.nongnu.org/releases/guile-json/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-scheme/guile-2.0.0"
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/guile-json/guile-json-3.3.0.ebuild b/dev-scheme/guile-json/guile-json-3.3.0.ebuild
new file mode 100644
index 000000000000..a698fb2fe037
--- /dev/null
+++ b/dev-scheme/guile-json/guile-json-3.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="JSON module for Guile"
+HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
+SRC_URI="http://download.savannah.nongnu.org/releases/guile-json/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-scheme/guile-2.0.0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
diff --git a/dev-scheme/guile-json/metadata.xml b/dev-scheme/guile-json/metadata.xml
index 8703fdc61595..2cba0fe62404 100644
--- a/dev-scheme/guile-json/metadata.xml
+++ b/dev-scheme/guile-json/metadata.xml
@@ -5,4 +5,7 @@
 	<email>scheme@gentoo.org</email>
 	<name>Gentoo Scheme Project</name>
 </maintainer>
+<maintainer type="person">
+	<email>slyfox@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 5d5c3022ef2d..bd67d19f6e42 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 3073 BLAKE2B 4108679370301f49192f5197ed499040b871a6b48e36e4b25356addfe39cc23fb2f2745018adef6a59cf735a0ba965bdd81ae308ca845214b877e3f2907d1f39 SHA512 2813fe73867f13dd8369f6d4a18937f469a9c77577d55ba944c2c2039fc51a949a0a1f4993a1a5729a0f49ad3685bf5c8a2731c928c18cf9915e414193af42be
+EBUILD guile-1.8.8-r3.ebuild 3083 BLAKE2B fd3e0fd6018af8954c43ea88728679985951b2c560ea90a2a88e83ac74980aab9e4164e97cb3dca09ffd7eaa18e737e2247289251cab378086f0571328eb7877 SHA512 1bdc7aed2a154ea805fd1d03f2a0aeec8c66a93efbf49ce1c18c75acbeafc17c5a030f0fd8eaab7dfa5231b0aba84bf99c0f2295490c692b3b872bc5424d8d77
 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 1982 BLAKE2B 2ab03d328f337222a93348d4505bf72f00636b5d2e4c0022e30a4b22b27914bcf5388aba3a9a115264e2416665db41ed0a0ba18ddfb07731700bb49edfe779b1 SHA512 fe781ca57119dcbd0d1e1aacdb050bb094ea9129943b90178da88240d3f2e8886949e0f4c618658db3dfa299a1dde3ab4b1d38fa879890620f5e18e91f34a7e0
-EBUILD guile-2.2.6.ebuild 1967 BLAKE2B aba57d8266055b7c789554fdcdeadb45a3b068a2c0bdaa030d6ce0916a3423300d2a6aedfe63ec4b0c8a4e3572cc9aceab4d37f7317f8f19eca86946f3705066 SHA512 6bbd71d13069bbd292a0bbe6c1cc6f35c92bf5cc61428d56081167b01a5bbc0e0d38f7866dbf4e98f64f5326b47d3433548742a2e9b932fdf0fa395d8038cc4f
+EBUILD guile-2.2.3.ebuild 2057 BLAKE2B 41581f5ebd3d690eae55b50a488b02e052e9a54bc26c7829d2f2e5d7d97828c0b2d6b00fa7a7eb1ec468b12e93e1b8cad26ad7f39d21fb8d5a8920431f1b7aa5 SHA512 0935d7633a4fc79ebc1c6fd21d94beee2894eb105978779f7bbb2afee178ca77817d3d2e6d7eb048609764132e6798a56b08323ff69adbe3ba680732b3ab49e6
+EBUILD guile-2.2.4.ebuild 2048 BLAKE2B effe9233c99b47cd7136f7665d6539e6fff798c87e2d70f0b187c98976faac99645327022e9d7c7182800bc793b9b5209fb4ec0c9556b05cb65d793d879d376b SHA512 8dd142a3ada438a72c220afbea5f889816d35f191afa3537ddfde271828fcb258445c9431afdc4953790dd8afbe317675304f98d9c460ad1a956f711c009d342
+EBUILD guile-2.2.6.ebuild 2035 BLAKE2B 9e4080a2c5a479915bbaa52ea192a8f5c36d83173023d907ffdc5f6c0a3a2e6c4951e5358c2b58e305807dd7c62567061094f1f73ddedf41c5e65b5c36a8045e SHA512 7ca7ff02ee9d121c896b2123e51b562b0bf2ce4372aa9e75ee528a615c0b469b20a65c6add7f9242e934f3a5d5bc4d391aa902ecadf85d090160be110f0ad7aa
 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 99ec9f055c3c..520a30a1d674 100644
--- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/libltdl:0=
 	sys-devel/gettext
 	sys-libs/ncurses:0=
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	readline? ( sys-libs/readline:0= )"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
diff --git a/dev-scheme/guile/guile-2.2.3.ebuild b/dev-scheme/guile/guile-2.2.3.ebuild
index 694a2d600403..06943660c138 100644
--- a/dev-scheme/guile/guile-2.2.3.ebuild
+++ b/dev-scheme/guile/guile-2.2.3.ebuild
@@ -38,6 +38,9 @@ src_configure() {
 	# see bug #178499
 	filter-flags -ftree-vectorize
 
+	# see bug #676468
+	mv prebuilt/32-bit-big-endian{,.broken} || die
+
 	econf \
 		--disable-error-on-warning \
 		--disable-rpath \
diff --git a/dev-scheme/guile/guile-2.2.4.ebuild b/dev-scheme/guile/guile-2.2.4.ebuild
index 15669e438e77..fb2e0c382eb4 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"
@@ -38,6 +38,9 @@ src_configure() {
 	# see bug #178499
 	filter-flags -ftree-vectorize
 
+	# see bug #676468
+	mv prebuilt/32-bit-big-endian{,.broken} || die
+
 	econf \
 		--disable-error-on-warning \
 		--disable-rpath \
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
index d9730393a3d7..894d90a6a476 100644
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -36,6 +36,9 @@ src_configure() {
 	# see bug #178499
 	filter-flags -ftree-vectorize
 
+	# see bug #676468
+	mv prebuilt/32-bit-big-endian{,.broken} || die
+
 	econf \
 		--disable-error-on-warning \
 		--disable-rpath \
diff --git a/dev-scheme/scheme48/Manifest b/dev-scheme/scheme48/Manifest
index 6d6e653eba2a..a406d9005771 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 1455 BLAKE2B a34e562a426657375068781521411a92be9b7eb1eb0a7b21837da5ea673b64764f640ec1e1f787d876b68faa1c65a5718f22fda678db33e28e068943e1df1266 SHA512 61a0c1b4da65956b87ac8a7e7259d78dfab281bb83caab5833c168be1def1851682385a33942bcc18b85362610ece81c68751f1d994bb5686be51edbe3586582
+EBUILD scheme48-1.9.2-r1.ebuild 1468 BLAKE2B 36b027dde41e32a08363a0adf4e4d50ab2fd2225b789bf1066851aab4d61fb1f8338d991bbf5872cc5b8f3404dcde43439560577a1d95728a02652da7ec8d066 SHA512 38c1d2cfc57521f495015c1d23149db884d39bd47156a5f03f10867fe46c0f857ae60b25c0fad611e9a5f7d01c37220849e983690546328ce7075791184209ec
 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 a30f3415f0c0..0fce39d5a322 100644
--- a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc emacs"
 
-DEPEND="emacs? ( virtual/emacs )"
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 RDEPEND="${DEPEND}"
 SITEFILE=50scheme48-gentoo.el