gentoo resync : 28.09.2019

11 files changed, 122 insertions, 117 deletions

diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 3c1f78b190e7..13b8574dfbad 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,15 +1,11 @@
-AUX gauche-0.9-ext-ldflags.patch 384 BLAKE2B 49b80ce3cdac634ba03dc51483ef692cd4ddfecdfd9da9880ddf76b13c49d4fc2c67ac0d7c99ec9636210d11ddb6f68eef3a605f22cf96fd35da47f1665f1e67 SHA512 e38f1c7bc2fa6a1f5f56e20f9818d7f52e98ba8c3e101b642441421f5194bc4223c862e20d3d731da632642dc44545974483459727bb184d9da9b9742504f34d
-AUX gauche-0.9-rfc.tls.patch 401 BLAKE2B 8cc1fca64ebaa0630b9e0f3862bbe4c167977b8a354df3b7f154ff4f1078344b381826f2eafece97825b3454069b09b53c07eea87720684b93897011bd3d79cd SHA512 5b2baafa052208c1843e7d05789bf8a10c63fbb48de66ca7e8b7450a5cb23c1c5641c34a8ff8ee525aa073de21b1f970ba4c310b2678dc1f81293e51c22de321
-AUX gauche-0.9.5-bsd.patch 714 BLAKE2B a52d2fa09af6895db8e605cfc4d88f1537e4f95c800c6c2637fc117c4602686015b85ccf69836b7d290ea3f75131bad0c2e18d405ce33abdc34b11d4f7c3b8f2 SHA512 416aa04f7f3aee310fd0e2c8073caa247e0fa84bb32f32ccadd125a17d26d4410554e2a6643493a3dbaa034fe07b54ae44f0f053238ea909b317551541431bac
-AUX gauche-0.9.5-libressl.patch 707 BLAKE2B ffe38d9ff4637b59786bf338bc918e4cfe8328eee124c1883e9963dcfb06b5b34255bcf3bf80ce911802b3553649e9f050694a75abd241abf6a4ec813f99f22a SHA512 98941e03fa4f96e26d6c0ff85f3e16bcd69aa5c77140e42de86556bfba87b83f340dd6be7e2f23e2d92433e46198cd500ed488546493cdb91c9e8ff13b457fa7
-AUX gauche-0.9.5-unicode.patch 700 BLAKE2B c88e724d483f04863cce892db65f66b6abf9b2d7333bc70b7040c4f6c79fbe7ebd9d135c2c7596f592d4da3a8e09f7324c7deafd2e7e17401f09c68bdf86bc2d SHA512 4c58e2c6fcb5b58f8c130fec7af4c0af187f54c186d6e54ee1787cb8dd4baab51f9dfd776d1d8adbd86da0be0e813f6a82322e7ec22eafda2c626637f14097f8
+AUX gauche-0.9.6-rfc.tls.patch 408 BLAKE2B e4e41272e7b3a1393fc2e07ba90b9c883220447f0c4730e5bc1d268e1198b17a10374451323e181f5eae1e3d2793c8c708d0cc0365ebc2d8e82648804b0bc349 SHA512 457aebafad6fa5f3ad494bfb545e217d043b19c20929be2e067601ffb4b015bcf4654af9295758792c20ebb27dee9315f232a96d1154a56dd88d1baad015046f
 AUX gauche-ext-ldflags.patch 384 BLAKE2B 57b7463086c0763413b8fda3d7688c6a61bd4456b3209a80b6eabed088e0c71eb5ae4c53b18fb0e6b7468ac03fe33f7884f265ab1ea998e8457b0ef126e6e841 SHA512 df42c5f25adc5a67ad049ab78aeaa4f565d18818dd6dfff5a64a78e9e3101595a4279d72e8f946e4f7da7be30f9f11c089c7f4a65d2eb2135980414c3d6e9cbb
 AUX gauche-gauche.m4.patch 964 BLAKE2B f02f2a1fad5d2ce923d1f9a8af4506908afea5b24c65d30ac2dbc6402c826f1ee374bfbb0ac7e9896a980fa352620f7ef8d2d79fe1b0ccb4915e3ceb86dfd90d SHA512 81bd71285f9f7f7f6b310347905fa2b0c7b708a0bb8bfa33414b14591d5849f0b42d9a6f01f22abb307417778181c292d8ff7e42be259b7d4de09356ea1692ab
-AUX gauche-rfc.tls.patch 408 BLAKE2B e4e41272e7b3a1393fc2e07ba90b9c883220447f0c4730e5bc1d268e1198b17a10374451323e181f5eae1e3d2793c8c708d0cc0365ebc2d8e82648804b0bc349 SHA512 457aebafad6fa5f3ad494bfb545e217d043b19c20929be2e067601ffb4b015bcf4654af9295758792c20ebb27dee9315f232a96d1154a56dd88d1baad015046f
-AUX gauche-rpath.patch 215 BLAKE2B 081374abd3272ae10b7614af92c8f16054c1eaa6fb636d9f6300589751197f9b19b706a4fe500e985c25ea250f9a2a2338d903094d9ca95c2622e618ea6ce9ed SHA512 1bda4c2e0bb3928d040eb07d56a9eb0aebd68e52bd0756160ef3eec46ba8c1869b8a37dbb798a712a59918d6bf77e7ca74ec38a4e2e30bb6417f967b5cdc8da6
+AUX gauche-info.patch 3580 BLAKE2B e2563129f965c14c051f08ec5a2556b925cb0611f53a05b86a255f394be296db242ea77e7928947d5ecc56e34e22eebf45175f3bae51303d0dd8d341504cabef SHA512 393505178660b046971ba7090a57cce879561e2bd8d2005c771173e65d522bc8b9c7677a19cb49b3b5b94ba265dc0da6137d5999d743d6ae781eaa185ea86e89
+AUX gauche-rfc.tls.patch 277 BLAKE2B 91e745207e64ba3c83a1252be6fa63c486a3ebf148149b5772720a862299fa9bbf122a75ed8a537a29b78d75cf785ccc72de3194969931c62b52a7c1b7007208 SHA512 6aceaf321a1593765c91a83b14e057b2ee514e768299fa43c71bbe5f04b8b60a0537fd68cb8b4b5a61b091d5c4f50dc227bde2637d6be33956089dc0e40ab968
 AUX gauche-xz-info.patch 1322 BLAKE2B f73447a306ec54ff372520c603adf2da46e1b71225a27d09af5c3ae8770431c5fef4d974cbf6e08fa1159807719c798680b18c7f624ec83b33d5ddf8688946f0 SHA512 22b6a37ea23bcba7e4ea4d09f26b069225cc36ef32dc0fbc865cfa4052765d0363811f693d6cc5cc8f3fdf355b93eec7c58934d18b2cb8079cadfd3b0cd4ffa4
-DIST Gauche-0.9.5.tgz 6458675 BLAKE2B ca7f1ad48841a2a6a98632980d8a4fe5065234de5c23835c24e633345ba77fd4d3610d073c00a8da00c1e794e22a74e493793d8fca4a7f3ed1a3161a29622f30 SHA512 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a
 DIST Gauche-0.9.6.tgz 6927530 BLAKE2B 9b32a0db4fc41e2b35331818850e7aa3c1ac5b1294c76caa053abe1ae2da20a0ac4424470ca94626108f996700d1b7e52f6f9e5c6f0a2326f7e6862880f48aa1 SHA512 1d8a7f56fd9ca183d6dce1dedadfaec7c7150c29540e5158f2a61977f7406d7d7a8ab753ef1912865a7d7e9a9e2fa845d86b2eb4c5e07a176f1c60276bc1908f
-EBUILD gauche-0.9.5.ebuild 1286 BLAKE2B 960fb3e9285fccb8d8fee1ae8449f81b0cee12d65ab3c5ea6df4ae6ce8cb1ffaf5d0a482e2555bde44578a6194bbdc6cc116707f0fbe0ce8852fb0e18cff0586 SHA512 bf77dbcb3edf3678c9cec171a8158e6f06951c2a5c0446c0238423431707ca4dfcf20ee82d9f79a19a04121a7778e3487e55168dc8a326a9bb2d5890584927ec
-EBUILD gauche-0.9.6-r1.ebuild 1310 BLAKE2B 11156ccc173cd9d60466f8fa04d816df140f95a66410c5bf28a491dfab6e8bd6845af251d7d27aaa2c88666981f7926aa5e8e933f1ba4a1e38155f41d7eeda81 SHA512 4d260286193cfcbada479e8c7051f44f7ce5c7e9cb02367ed4af55100a0bc0322f4f2ca2a512cdff92fdc7d3d2e521f1027759e86d46e21c0f16e7daff746f33
+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
 MISC metadata.xml 909 BLAKE2B faaf122e0b844cf34bb8b4417cc5e5728e37bcd14a4717d23e42770d6ce2c732724f46f48e01e32684f2f229ea560e2968c11e86473eba50c93dd1184d110cd5 SHA512 031f92387b4dec50e4b534d70c15e70b2a0f7e4ffa9e8a70a47ed9467bcbc4bc57b2210ff50b0e49c1ed73028d6eee4dfd28994cd8e23bdf041364f052e985de
diff --git a/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
deleted file mode 100644
index b4aedef2a316..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ext/Makefile.ext.in
-+++ b/ext/Makefile.ext.in
-@@ -22,7 +22,7 @@
- LIBS         = $(XLIBS) @LIBS@ 
- CFLAGS       = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS)
- CPPFLAGS     = @CPPFLAGS@ $(XCPPFLAGS)
--LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@
-+LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @LDFLAGS@ @SHLIB_SO_LDFLAGS@
- 
- # These are set by configure
- DEFS     = @DEFS@
diff --git a/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch b/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
deleted file mode 100644
index 615020df8dfe..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit da2ea76503e8f1784d0f0be26435d4c8e0d1b12f
-Author: Shiro Kawai <shiro@acm.org>
-Date:   Sat Oct 15 11:44:28 2016 -1000
-
-    Avoid preprocessor symbols redefinition on OpenBSD
-
-    https://sourceforge.net/p/gauche/mailman/message/35429549/
-
-diff --git a/ext/net/gauche-net.h b/ext/net/gauche-net.h
-index d4f1dcd..decba64 100644
---- a/ext/net/gauche-net.h
-+++ b/ext/net/gauche-net.h
-@@ -362,8 +362,12 @@ extern ScmObj Scm_GetAddrinfo(const char *nodename,
-                               struct addrinfo *hints);
- extern ScmObj Scm_GetNameinfo(ScmSockAddr *addr, int flags);
- 
-+#ifndef NI_MAXHOST
- #define NI_MAXHOST  1025
-+#endif
-+#ifndef NI_MAXSERV
- #define NI_MAXSERV    32
-+#endif
- 
- #endif /* HAVE_IPV6 */
- 
diff --git a/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch b/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
deleted file mode 100644
index 7b4c839dccb8..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit c26a4836e767807dd8c98d280c4d9e742b759edd
-Author: Shiro Kawai <shiro@acm.org>
-Date:   Sun Oct 9 02:04:19 2016 -1000
-
-    rfc.tls - Detect LibreSSL as well
-
-diff --git a/ext/tls/test.scm b/ext/tls/test.scm
-index 63a1d04..efbfbca 100644
---- a/ext/tls/test.scm
-+++ b/ext/tls/test.scm
-@@ -37,7 +37,7 @@
-      [(not gauche.os.windows)
-       (guard (e [(<process-abnormal-exit> e)
-                  (no-openssl "couldn't run openssl command")])
--        (if-let1 m ($ #/OpenSSL\s+([\d\.]+\w*)/
-+        (if-let1 m ($ #/(?:OpenSSL|LibreSSL)\s+([\d\.]+\w*)/
-                       $ process-output->string `(,openssl-cmd "version"))
-           (let1 vers (m 1)
-             (unless (version>=? vers "1.0.1")
diff --git a/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch b/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
deleted file mode 100644
index a87ca5d7c39c..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit d31eb5c02b65514e695b45c0c01cbd45a36bac4a
-Author: OOHASHI Daichi <dico.leque.comicron@gmail.com>
-Date:   Thu Oct 20 10:48:17 2016 +0900
-
-    (char-general-category #\x20000) should be Lo
-
-diff --git a/src/gauche/char_utf_8.h b/src/gauche/char_utf_8.h
-index 082e764..5f92d13 100644
---- a/src/gauche/char_utf_8.h
-+++ b/src/gauche/char_utf_8.h
-@@ -294,7 +294,7 @@ static inline unsigned char Scm__LookupCharCategory(ScmChar ch)
- {
-     if (ch == SCM_CHAR_INVALID || ch >= 0x10ffff) {
-         return SCM_CHAR_CATEGORY_Cn;
--    } else if (ch <= 0x20000) {
-+    } else if (ch < 0x20000) {
-         return ucs_general_category_00000[ch];
-     } else {
-         return ucs_general_category_20000(ch);
diff --git a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9.6-rfc.tls.patch
index 1e5ef71b6c91..cf570df0ed38 100644
--- a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
+++ b/dev-scheme/gauche/files/gauche-0.9.6-rfc.tls.patch
@@ -4,8 +4,8 @@
       ($ format #t "~a\n" $ regexp-replace-all* line
          #/\.\.\/ssl\// srcpath-replace
          #/openssl /    kicker-replace
--        #/system/      "safe_system")))
-+        #/system/      "safe_system"
+-        #/system\s*\(/      "safe_system(")))
++        #/system\s*\(/ "safe_system("
 +        #/(s_server) / "\\1 -4 ")))
  
    (p "#include <errno.h>"
diff --git a/dev-scheme/gauche/files/gauche-info.patch b/dev-scheme/gauche/files/gauche-info.patch
new file mode 100644
index 000000000000..f60f1f8a87d8
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-info.patch
@@ -0,0 +1,95 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -417,7 +417,6 @@
+ AC_CHECK_PROGS(AR, ar gar)
+ AC_CHECK_PROGS(AS, as gas)
+ AC_CHECK_PROGS(MAKEINFO, makeinfo)
+-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
+ 
+ dnl for cross build
+ AC_CHECK_PROGS(BUILD_CC, ${build}-gcc ${build_alias}-gcc gcc cc)
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -16,7 +16,6 @@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTDIR    = $(top_srcdir)/mkinstalldirs
+ MAKEINFO     = @MAKEINFO@
+-GZIP_PROGRAM = @GZIP_PROGRAM@
+ VERSION_INFO = @PACKAGE_STRING@
+ 
+ MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm
+@@ -58,7 +57,7 @@
+ 	texi html htmls dvi pdf info \
+ 	clean distclean maintainer-clean
+ 
+-.SUFFIXES: .texi .html .info.gz .pdf .dvi
++.SUFFIXES: .texi .html .info .pdf .dvi
+ 
+ all: info
+ 
+@@ -66,7 +65,7 @@
+ 	if test ! -d "$(DESTDIR)$(mandir)/man1"; then $(MKINSTDIR) "$(DESTDIR)$(mandir)/man1"; fi
+ 	$(INSTALL_DATA) $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
+ 	if test ! -d "$(DESTDIR)$(infodir)"; then $(MKINSTDIR) "$(DESTDIR)$(infodir)"; fi
+-	if test -f gauche-refe.info.gz -o -f gauche-refj.info.gz; then \
++	if test -f gauche-refe.info -o -f gauche-refj.info; then \
+ 	  for info in *.info*; do \
+ 	    $(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \
+ 	  done; \
+@@ -94,8 +93,8 @@
+ %/index.html : %.texi
+ 	$(MAKEDOC) htmls $< "$(MAKEINFO)" "$(VERSION_INFO)"
+ 
+-%.info.gz : %.texi
+-	$(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
++%.info : %.texi
++	$(MAKEDOC) info $< "$(MAKEINFO)"
+ 
+ %.pdf : %.texi
+ 	$(MAKEDOC) pdf $< "$(MAKEINFO)"
+@@ -113,7 +112,7 @@
+ htmls : gauche-refe/index.html gauche-refj/index.html
+ dvi : gauche-refe.dvi gauche-refj.dvi
+ pdf : gauche-refe.pdf gauche-refj.pdf
+-info : gauche-refe.info.gz gauche-refj.info.gz
++info : gauche-refe.info gauche-refj.info
+ 
+ gauche-refe.texi : $(TEXIS) extract.scm
+ 	$(GOSH) $(srcdir)/extract.scm -en -o gauche-refe.texi $(srcdir)/gauche-ref.texi
+--- a/doc/makedoc.scm
++++ b/doc/makedoc.scm
+@@ -16,7 +16,7 @@
+    [gauche.sys.setenv (sys-putenv "LANG=C")]
+    [else])
+   (if (match (cdr args)
+-        [("info" input makeinfo gzip)     (do-info input makeinfo gzip)]
++        [("info" input makeinfo)          (do-info input makeinfo)]
+         [("html" input makeinfo)          (do-html input makeinfo)]
+         [("htmls" input makeinfo version) (do-htmls input makeinfo version)]
+         [("pdf" input makeinfo)           (do-pdf input makeinfo)]
+@@ -27,7 +27,7 @@
+ (define (usage)
+   (print "Usage: gosh makedoc.scm command args ...")
+   (print "Valid commands (and args):")
+-  (print "  info input MAKEINFO GZIP            - generate info doc")
++  (print "  info input MAKEINFO                 - generate info doc")
+   (print "  html input MAKEINFO                 - generate single html")
+   (print "  htmls input MAKEINFO VERSION-STRING - generate html files in subdir")
+   (print "  pdf input MAKEINFO                  - generate pdf")
+@@ -55,14 +55,11 @@
+         (warn "makeinfo version ~a or greater is required, but ~a's \
+                version is ~a.  Skipping.\n" min-version makeinfo vers)))))
+ 
+-(define (do-info input makeinfo gzip)
++(define (do-info input makeinfo)
+   (define info (path-swap-extension input "info"))
+   (or (string-null? makeinfo)
+-      (string-null? gzip)
+       (not (check-makeinfo-version makeinfo "5.0"))
+-      (and (do-process (make-cmd `(,makeinfo ,input)))
+-           (begin (remove-files (glob #"~|info|*.gz"))
+-                  (do-process (make-cmd `(,gzip ,info ,@(glob #"~|info|-[0-9]*"))))))))
++      (and (do-process (make-cmd `(,makeinfo ,input))))))
+ 
+ (define (do-html input makeinfo)
+   (or (string-null? makeinfo)
diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.patch b/dev-scheme/gauche/files/gauche-rfc.tls.patch
index cf570df0ed38..5eb3b991d3b7 100644
--- a/dev-scheme/gauche/files/gauche-rfc.tls.patch
+++ b/dev-scheme/gauche/files/gauche-rfc.tls.patch
@@ -1,12 +1,10 @@
 --- a/ext/tls/ssltest-mod.scm
 +++ b/ext/tls/ssltest-mod.scm
-@@ -53,7 +53,8 @@
-      ($ format #t "~a\n" $ regexp-replace-all* line
+@@ -87,6 +87,7 @@
          #/\.\.\/ssl\// srcpath-replace
          #/openssl /    kicker-replace
--        #/system\s*\(/      "safe_system(")))
-+        #/system\s*\(/ "safe_system("
-+        #/(s_server) / "\\1 -4 ")))
+         #/system\s*\(/      "safe_system("
++        #/(s_server) / "\\1 -4 "
+         )))
  
    (p "#include <errno.h>"
-      "int safe_system(const char *commands)"
diff --git a/dev-scheme/gauche/files/gauche-rpath.patch b/dev-scheme/gauche/files/gauche-rpath.patch
deleted file mode 100644
index 8774bac7be13..000000000000
--- a/dev-scheme/gauche/files/gauche-rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -709,7 +709,6 @@
-   fi
-   if test "$RPATH_FLAG" != ""; then
-     RPATH_TMP=$RPATH_FLAG'`pwd`'
--    RPATH_REAL=$RPATH_FLAG'$(LIB_INSTALL_DIR)'
-   fi
- fi
- AC_SUBST(RPATH_FLAG)
diff --git a/dev-scheme/gauche/gauche-0.9.6-r1.ebuild b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
index 384b30032a63..c82f8d5df9b5 100644
--- a/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 libressl mbedtls test"
 
 RDEPEND="sys-libs/gdbm
@@ -29,7 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gauche.m4.patch
 	"${FILESDIR}"/${PN}-ext-ldflags.patch
 	"${FILESDIR}"/${PN}-xz-info.patch
-	"${FILESDIR}"/${PN}-rfc.tls.patch
+	"${FILESDIR}"/${P}-rfc.tls.patch
 )
 DOCS=( AUTHORS ChangeLog HACKING README )
 
diff --git a/dev-scheme/gauche/gauche-0.9.5.ebuild b/dev-scheme/gauche/gauche-0.9.8.ebuild
index b78449844741..64108c8c95b3 100644
--- a/dev-scheme/gauche/gauche-0.9.5.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.8.ebuild
@@ -12,29 +12,27 @@ HOMEPAGE="http://practical-scheme.net/gauche/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 libressl test"
+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"
 
-RDEPEND="sys-libs/gdbm"
+RDEPEND="sys-libs/gdbm
+	mbedtls? ( net-libs/mbedtls:= )"
 DEPEND="${RDEPEND}
 	test? (
 		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		libressl? ( dev-libs/libressl:0 )
 	)"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-rpath.patch
+	"${FILESDIR}"/${PN}-ext-ldflags.patch
 	"${FILESDIR}"/${PN}-gauche.m4.patch
+	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${PN}-rfc.tls.patch
 	"${FILESDIR}"/${PN}-xz-info.patch
-	"${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-0.9-rfc.tls.patch
-	"${FILESDIR}"/${P}-bsd.patch
-	"${FILESDIR}"/${P}-libressl.patch
-	"${FILESDIR}"/${P}-unicode.patch
 )
-DOCS=( AUTHORS ChangeLog HACKING README )
+DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
 
 src_prepare() {
 	default
@@ -46,8 +44,10 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable ipv6) \
+		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
 		--with-libatomic-ops=no \
-		--with-slib="${EPREFIX}"/usr/share/slib
+		--with-slib="${EPREFIX}"/usr/share/slib \
+		--with-tls=axtls$(usex mbedtls ',mbedtls' '')
 }
 
 src_test() {