Merge branch 'edge' into next

9 files changed, 56 insertions, 15 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 6fbb64b0f037..60f8d951f9d4 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/c-wrapper/Manifest b/dev-scheme/c-wrapper/Manifest
index 7e7b727c4044..2cf44582edd7 100644
--- a/dev-scheme/c-wrapper/Manifest
+++ b/dev-scheme/c-wrapper/Manifest
@@ -1,8 +1,9 @@
 AUX c-wrapper-closure.patch 205 BLAKE2B b633bbf97b3d76ab58b9a332ddc56f976b54f9eb3df0b235e7784e27141dda051e5d637839bf3be49c580845ad6898d9d526169abb14e6329642105dd5416c11 SHA512 284f08b6a8164d129dfe5e26500ca4946c037d0661614dfcab7caf4d5ce189ee299dbb70fa6a4d0f2ec5b0fdf9f1926891d07ce019fade329a0909c10586c790
-AUX c-wrapper-gcc-5.patch 1883 BLAKE2B 089f5b8427b13ff6ca8d9c9b5181724f691bfbf58cfd84b365a5cdc36efc9ea2582e973887d4da30e2ce52a91e5a1d0a6d9461a7b4d31b886c699e7805827969 SHA512 9c6d588f9246f5e80e1639ecadb0b4e1be1a1fe85ba4163592fa74dfec30dca2c61934d072f880fb031aad506387e463a8d399058ad45934bd4c7b16289bef07
+AUX c-wrapper-gcc-5.patch 2046 BLAKE2B 645b7ee67edd8e6d08fdf7f2dd591c745a420eb001cac6aede3f0393871bc538a96ee438ef8d66d5c49e16e493219a9f2607d242c79398e687b62aca22e7f1ee SHA512 174c8f364c1f9660ebb2034a7edbcd8ed640515c883b7cacd672286f70787df4314de2ad90aeca7c528f2522a8bd61c916b73fb06f4dd23e428c2dd55fb44fdd
 AUX c-wrapper-gentoo.patch 2015 BLAKE2B fedf622537151079df07aaa1091fe377b1e1ee8ebf95a4c8b290ca983376211e6897ddb14c8d3c8f38fc1a23073d5282c447b8e8d66578235b17bb3cddce76f1 SHA512 4184d3a4953478ff19374ff230bd7376eb8a8d7d90e1e91b1903b30af49f124d18b816639024a9b54a7099965ea2c5c8244ca64a7ce4db8f3fde32cbc13578d3
 AUX c-wrapper-glibc-2.25.patch 727 BLAKE2B 0c0dce0bfb78a92ff4c2cf6176a7b7de129e143737be897a074f06f88b6923915ec36a9e3ddb5410010c662e8e11bb17b89742349c2a01a3066c1c49c08cc57a SHA512 769c92156395f121d8ba3776904c279c5b97f791f7606b74c682264430ed71f1af31ce8655286cae7dfebb75ea8addc2fb304a87eb5972314c5ab082700921ee
 AUX c-wrapper-info.patch 1920 BLAKE2B 62c60a2dd8783fc0a56d386e02faa8f04bdd570c7119999e51071414f8084f78d47acda9d916b576bea7ba35c65bd0d4c7519cbe52235a40c49e324139587df8 SHA512 1778eb0183e8f6e19fcb8071bb49e542d98f82b49932aeb5c8dc6638c50ea3b802efb5b92837f90854f47d4400b224e6895b3a6bea042b29a91f855fdf319de8
+AUX c-wrapper-texinfo-6.7.patch 1052 BLAKE2B 6c042ee1a386d611be9bd1155fe930995b026eac5722e2264d8b73dee29b2a0371916f7f087c8b8a2031e34e70a064c8396d1870e0f759898e39eaf97d55a068 SHA512 ca2f1697cb81ba7a0cdcccfdab8fde71e94dd8ef8be570bebf9b4cceda0723c178114fc0c713f3998eb102ad19c17889197a80e8f5410032da96e0788d1fc2c8
 DIST c-wrapper-0.6.1.tgz 843981 BLAKE2B af28cf60eebe0da32c90c030bfdae4457d20731c31220f7eaac33291ea1be104a7aab11fad0560fe6e3d36a5d3afafbd8795fddd633e0c26be226c29012afbc9 SHA512 a03a4d57d112d2c23dac3716bae081e3e6f02dcef261bd8dd518ed8519b43e28f9e61a36f7584b2bcb1762112c128d0b698cda422cc0c9d1190cbf7502ea04b0
-EBUILD c-wrapper-0.6.1-r1.ebuild 865 BLAKE2B db6d9de7e8eede933e58c1af0b57c0e5d2ec41a37296e6d733c4b3b015d6d7ce2f79db09df3cd82c985892a7a0ea46299ce30ed5d49e08da52fb231b41cd9525 SHA512 29ca63e7a896f2b32e5173fdf412d6fa1b96033a61fabcb216e92840993aac2bdf2b07ad4165b70478ad1c9be8949d750a88538ca80f4d013e82dde2b3611c4f
+EBUILD c-wrapper-0.6.1-r1.ebuild 934 BLAKE2B 15453a8ac7702e0fab6bde100a6f1cfcdb7541d487b51d09c156ab84deff9589fc87518b3b14e916c1de6ae55a272aa6ea8d038ec0892f828f99ccd06fba196c SHA512 4d47e63118477a144b854be1761d384e0f82e0e362e4954b29396014af5eaf88b201a5276334c6ce13ffcd7280bb7872a8cdc812075d2ebfb0ca1e48fd060643
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild
index 4bf3c117c0ba..f0b7aece565f 100644
--- a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools
 
@@ -11,12 +11,13 @@ SRC_URI="http://www.koguro.net/prog/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE="examples"
 
 RDEPEND="dev-scheme/gauche:=
-	virtual/libffi"
+	dev-libs/libffi:="
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-closure.patch
@@ -24,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
 	"${FILESDIR}"/${PN}-glibc-2.25.patch
 	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${PN}-texinfo-6.7.patch
 )
 HTML_DOCS=( doc/${PN}-ref{e,j}.html )
 
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
index 091b1e2da105..98dfaa2f945c 100644
--- a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
@@ -8,7 +8,7 @@
  
      /* skip the first line '# 1 "<stdin>"' */
      Scm_ReadLineUnsafe(SCM_PORT(in));
-@@ -1682,16 +1683,26 @@
+@@ -1682,16 +1683,30 @@
          }
      }
  
@@ -28,7 +28,11 @@
 -            parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), line_str);
          }
 +        while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))
++#ifdef SCM_REGEXP_MULTI_LINE
++            && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
++#else
 +            && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) {
++#endif
 +            if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
 +                Scm_Error("[bug] unexpected EOF while parsing macro body");
 +            }
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch
new file mode 100644
index 000000000000..97acd86470eb
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch
@@ -0,0 +1,34 @@
+--- a/doc/c-wrapper-ref.texi
++++ b/doc/c-wrapper-ref.texi
+@@ -14,7 +14,7 @@
+ @direntry
+ * c-wrapper reference: (c-wrapper-refj.info).	A generic wrapper for C libraries.
+ @end direntry
+-@documentencoding euc-jp
++@documentencoding UTF-8
+ @c COMMON
+ @comment %**end of header
+ 
+--- a/doc/extract
++++ b/doc/extract
+@@ -138,8 +138,6 @@
+         ((en) (filter #/^@c EN$/ #/^@c JP$/))
+         ((jp) (filter #/^@c JP$/ #/^@c EN$/))))
+ 
+-    (define outenc (if (eq? *lang* 'jp) 'euc-jp 'utf8))
+-    
+     (unless (= (length a) 1) (usage))
+ 
+     (when (eq? *lang* 'jp)
+@@ -148,9 +146,9 @@
+     (with-input-from-file (car a)
+       (lambda ()
+         (if *outfile*
+-          (with-output-to-file *outfile* do-it :encoding outenc)
++          (with-output-to-file *outfile* do-it :encoding 'utf8)
+           (let1 out (open-output-conversion-port
+-                     (current-output-port) outenc)
++                     (current-output-port) 'utf8)
+             (with-output-to-port out do-it)
+             (close-output-port out))))
+       :encoding 'euc-jp)
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 93857a2a589d..b124bc50282b 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -5,7 +5,7 @@ AUX gauche-info.patch 3580 BLAKE2B e2563129f965c14c051f08ec5a2556b925cb0611f53a0
 AUX gauche-rfc.tls.patch 277 BLAKE2B 91e745207e64ba3c83a1252be6fa63c486a3ebf148149b5772720a862299fa9bbf122a75ed8a537a29b78d75cf785ccc72de3194969931c62b52a7c1b7007208 SHA512 6aceaf321a1593765c91a83b14e057b2ee514e768299fa43c71bbe5f04b8b60a0537fd68cb8b4b5a61b091d5c4f50dc227bde2637d6be33956089dc0e40ab968
 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
+DIST Gauche-0.9.9.tgz 7244347 BLAKE2B 843fe0c7341c7020ad9130edfc41f02eeda0bc2e1f8983f83faf443f69073e132a9a2f37e6a6260334ab9aacc3e976a2df68d4c43f17f6ea07531c14e783efec SHA512 ff6fdc80bd14c4a5dc57b5a6ac9558078a557cd30c2efe98146c3817a7830ef2b3f5bb6184ce6b8ac9b1b9cb636f041643fa761b2f99e6dd0602e13e7928e210
 EBUILD gauche-0.9.6-r1.ebuild 1334 BLAKE2B 5fab1bb3c2da1826226a225f44b91e457764e5f47f09047b2e15fbf9f995c704050b99ba5da65d2b032a57d56ff077bc10594c8ce20763d63af531f0224be0cf SHA512 6e9a6f6db38699beafdfc2d3a7de2567db5fbac972838534d817117a1685579f51bb2610b6ef5ae792789d99ed2fdd703f56905e1e586d1d6ee49d13a93ee8b0
-EBUILD gauche-0.9.8.ebuild 1380 BLAKE2B edf323d486910ff03eb7c83c6175f85fe7269c861a2902d2a215285772d1875bcd2943fd6c8739113c6726e430ba238a6515af2c70599739526e16ba98fb0721 SHA512 1d20187f9fcf7dc0f77b71a0586073aab80da418fe1362c112540d0e6fd1a3074664142ee6903c2397ade658c62d1ef8beb0ed42b0a876bc063b4aedae009f89
+EBUILD gauche-0.9.9.ebuild 1370 BLAKE2B 62b61d1ac88a5bae4506811c663a974386ce9fe850d6543ab2ccfd575eb3c2f0429d39f7eb99266a2a75d1778b09a4a44c3c52a969642c6de13addf3725f5fbc SHA512 23b6639bdf6056e7cfc5bd917978fd03e2d94d7230ed64a4c00ccbda7c65f59d1bbc988c4873fcf49a3e6159bbadbecaba860383518daf19b3acf9b822b68c32
 MISC metadata.xml 909 BLAKE2B faaf122e0b844cf34bb8b4417cc5e5728e37bcd14a4717d23e42770d6ce2c732724f46f48e01e32684f2f229ea560e2968c11e86473eba50c93dd1184d110cd5 SHA512 031f92387b4dec50e4b534d70c15e70b2a0f7e4ffa9e8a70a47ed9467bcbc4bc57b2210ff50b0e49c1ed73028d6eee4dfd28994cd8e23bdf041364f052e985de
diff --git a/dev-scheme/gauche/gauche-0.9.8.ebuild b/dev-scheme/gauche/gauche-0.9.9.ebuild
index eb8bdf456b70..74e9ca5b8579 100644
--- a/dev-scheme/gauche/gauche-0.9.8.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit autotools eapi7-ver
+inherit autotools
 
 MY_P="${P^g}"
 
diff --git a/dev-scheme/guile-json/Manifest b/dev-scheme/guile-json/Manifest
index d7820f7ada4b..721ff2e7f0e9 100644
--- a/dev-scheme/guile-json/Manifest
+++ b/dev-scheme/guile-json/Manifest
@@ -1,3 +1,3 @@
-DIST guile-json-3.3.0.tar.gz 122495 BLAKE2B 656529e0ff76fa31b0a385f56ddeb937488e252e176b8468f8b2b6a6166cac5c2bbab1e08b4460b263dd0932d7acf2dab4a9924793c7496e37896381220aef1a SHA512 e4204e0e9649a308b6146c17ef2ed3fc1a804404d4bb6ce09b6fdb0d09823f185c333e87f5cc940e5affc08f5562550785511ca1f220efbc7ecfe15cedc14881
-EBUILD guile-json-3.3.0.ebuild 534 BLAKE2B 082ff16fd3bba09f0176a30233c035ffa840e4b6ba852ae43932a53394be1ee4d10ac86fb8ea34338617609bc60d8f274e3474573ce355cdcf5e7802bfd2d881 SHA512 6202f61844afd9ca2c1b1e4e7e91f9ecd977ac8dcdbdacab81eb71f14ae9cde5e16fabf6d5c469966305403877db40dbf155ec24d2fed5d7e828c1319899b6e6
+DIST guile-json-3.4.0.tar.gz 146506 BLAKE2B f6d0b4c8897b18530018446186012a886094392b689e69024b99d2015fe3fcb2394e4a371cac34cf1d5244f081a42dbde49f6ba04249518ad76184230d64344e SHA512 c9681b2e19a1dc00161888c58172de84b0ab5a24eafd3870146e7f047af7d208fb57aa64b9fa3b1255958093ea24fb264652d622a1fda9f5cb107ce0518254fe
+EBUILD guile-json-3.4.0.ebuild 534 BLAKE2B 5d6e51ea5cee86f383d649e716ca9b38073f1e80fc3f006ed4ee5fdc5de7e94ab4da3f3758421427df8a71a79be07567732528f930bb6b58734067cf2469941f SHA512 24679b344c6f631bec24a14611b4ee95238e2bf2dd80c4230bd5bb09527f653dcc86417ebca823ce1fe2488ea07b5b303004c2a45a81dc9d280da5d7e06e89b6
 MISC metadata.xml 326 BLAKE2B d05d251d501000390dccc9c07656dc4a36a8c7b2fca80ccb9cc147ab6fcf270e03574e4614676a3e5c2a2a2b2c000463d3c73595a5f5da7941de840ce8b69a94 SHA512 08bc92338019e10651874c2a45053da7e5d61f9d0013849f3939902c452dc43abee97be085d8f6520dac35fc12bd01fd71e1a1ecaf48e5be947a203768f04449
diff --git a/dev-scheme/guile-json/guile-json-3.3.0.ebuild b/dev-scheme/guile-json/guile-json-3.4.0.ebuild
index a698fb2fe037..e7d525951ddb 100644
--- a/dev-scheme/guile-json/guile-json-3.3.0.ebuild
+++ b/dev-scheme/guile-json/guile-json-3.4.0.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