gentoo resync : 14.07.2018

27 files changed, 268 insertions, 239 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index bdf956ae0661..dad2c6da8f9a 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 40c9a14fa929..60192b34c424 100644
--- a/dev-scheme/c-wrapper/Manifest
+++ b/dev-scheme/c-wrapper/Manifest
@@ -1,4 +1,7 @@
-AUX c-wrapper-system-libffi.diff 977 BLAKE2B c0d4e5c351e81abce1f84e7794bda615a09cccb530cf4d6f871aab53935eb6abf9f03ec582a9514f7bd576321430d06c4c7f14de43c06bb92886044877bf4056 SHA512 55eeebb61a23a0399acc90b8278ea8ae4738a35698590ae276376ee7d0ef02bb5913a4583a8f29a42bcbb91546238493310d0ae84b46260a96da33eacfd701d1
+AUX c-wrapper-closure.patch 205 BLAKE2B b633bbf97b3d76ab58b9a332ddc56f976b54f9eb3df0b235e7784e27141dda051e5d637839bf3be49c580845ad6898d9d526169abb14e6329642105dd5416c11 SHA512 284f08b6a8164d129dfe5e26500ca4946c037d0661614dfcab7caf4d5ce189ee299dbb70fa6a4d0f2ec5b0fdf9f1926891d07ce019fade329a0909c10586c790
+AUX c-wrapper-gcc-5.patch 1883 BLAKE2B 089f5b8427b13ff6ca8d9c9b5181724f691bfbf58cfd84b365a5cdc36efc9ea2582e973887d4da30e2ce52a91e5a1d0a6d9461a7b4d31b886c699e7805827969 SHA512 9c6d588f9246f5e80e1639ecadb0b4e1be1a1fe85ba4163592fa74dfec30dca2c61934d072f880fb031aad506387e463a8d399058ad45934bd4c7b16289bef07
+AUX c-wrapper-gentoo.patch 2015 BLAKE2B fedf622537151079df07aaa1091fe377b1e1ee8ebf95a4c8b290ca983376211e6897ddb14c8d3c8f38fc1a23073d5282c447b8e8d66578235b17bb3cddce76f1 SHA512 4184d3a4953478ff19374ff230bd7376eb8a8d7d90e1e91b1903b30af49f124d18b816639024a9b54a7099965ea2c5c8244ca64a7ce4db8f3fde32cbc13578d3
+AUX c-wrapper-glibc-2.25.patch 727 BLAKE2B 0c0dce0bfb78a92ff4c2cf6176a7b7de129e143737be897a074f06f88b6923915ec36a9e3ddb5410010c662e8e11bb17b89742349c2a01a3066c1c49c08cc57a SHA512 769c92156395f121d8ba3776904c279c5b97f791f7606b74c682264430ed71f1af31ce8655286cae7dfebb75ea8addc2fb304a87eb5972314c5ab082700921ee
 DIST c-wrapper-0.6.1.tgz 843981 BLAKE2B af28cf60eebe0da32c90c030bfdae4457d20731c31220f7eaac33291ea1be104a7aab11fad0560fe6e3d36a5d3afafbd8795fddd633e0c26be226c29012afbc9 SHA512 a03a4d57d112d2c23dac3716bae081e3e6f02dcef261bd8dd518ed8519b43e28f9e61a36f7584b2bcb1762112c128d0b698cda422cc0c9d1190cbf7502ea04b0
-EBUILD c-wrapper-0.6.1.ebuild 689 BLAKE2B 7e7e184317340cbbc8725a1f4e725e3416740a75f0f0700d5ab257d187899d36fba618d16bfbb9748c05269bad691f21b9a6bd99ccbdd0cb70dc35272e43715c SHA512 e2eaeb13265e7fff4376ad0e25e6805f5ee7ca4b94ac13c450043877ca56cecde4dca1e4113f08ff27e2aede54d8a1e29be9c63953b040f482d2520589d43e59
-MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
+EBUILD c-wrapper-0.6.1-r1.ebuild 834 BLAKE2B beeabb062993090ba0d462be5302682b28d1b8e9ac985fdaa4a5a225627eaa6930d3385d2bde19b5103ae1e51ca1a799f2f455c562e0b4ee5ec875c30ad0733f SHA512 067e958eee7fa751a79e8fd38cd57094fd212762966f4ba68a0e9ae5ede7ab4eaa2629941f57c01d464df3638f6386e567ff0097120148ccdba0ca095d750c5a
+MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild
index e20f77d0d1fa..cd0348a0133a 100644
--- a/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Foreign function interface for C and Objective-C libraries"
 HOMEPAGE="http://www.koguro.net/prog/c-wrapper/"
@@ -11,15 +11,23 @@ SRC_URI="http://www.koguro.net/prog/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~ia64 x86"
 IUSE="examples"
 
 RDEPEND="dev-scheme/gauche
 	virtual/libffi"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-closure.patch
+	"${FILESDIR}"/${PN}-gcc-5.patch
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-glibc-2.25.patch
+)
+HTML_DOCS=( doc/${PN}-ref{e,j}.html )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-system-libffi.diff
+	default
 	eautoreconf
 }
 
@@ -29,7 +37,6 @@ src_test() {
 
 src_install() {
 	default
-	dohtml doc/*
 
 	if use examples; then
 		docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-closure.patch b/dev-scheme/c-wrapper/files/c-wrapper-closure.patch
new file mode 100644
index 000000000000..24be1d052fd7
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-closure.patch
@@ -0,0 +1,10 @@
+--- a/src/closure_alloc.c
++++ b/src/closure_alloc.c
+@@ -100,6 +100,7 @@
+             ++(node->n);
+             return;
+         }
++        node = node->next;
+     }
+ 
+     node = malloc(sizeof(FreeNode));
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
new file mode 100644
index 000000000000..091b1e2da105
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
@@ -0,0 +1,45 @@
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -1668,6 +1668,7 @@
+ {
+     static ScmObj trigger_line = SCM_FALSE;
+     ScmObj line_str;
++    ScmObj regexp = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
+ 
+     /* skip the first line '# 1 "<stdin>"' */
+     Scm_ReadLineUnsafe(SCM_PORT(in));
+@@ -1682,16 +1683,26 @@
+         }
+     }
+ 
+-    while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+-        if (SCM_NULLP(macro_list)) {
++    line_str = SCM_NIL;
++    while (!SCM_NULLP(macro_list)) {
++        ScmObj body_str = line_str;
++        if (SCM_NULLP(body_str)
++            && SCM_EOFP(body_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+             Scm_Error("[bug] lost macro body");
+-        } else {
+-            ScmObj pos_name_args = SCM_CDAR(macro_list);
+-            macro_list = SCM_CDR(macro_list);
+-            Scm_FilenameSet(SCM_CAAR(pos_name_args));
+-            Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
+-            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)))
++            && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) {
++            if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
++                Scm_Error("[bug] unexpected EOF while parsing macro body");
++            }
++            body_str = Scm_StringAppend2(SCM_STRING(body_str), SCM_STRING(line_str));
++            line_str = SCM_NIL;
++        }
++        ScmObj pos_name_args = SCM_CDAR(macro_list);
++        macro_list = SCM_CDR(macro_list);
++        Scm_FilenameSet(SCM_CAAR(pos_name_args));
++        Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
++        parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), body_str);
+     }
+ 
+     SCM_RETURN(SCM_UNDEFINED);
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch b/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch
new file mode 100644
index 000000000000..e94d55fa0d21
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch
@@ -0,0 +1,51 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,7 @@
+ 
+ dnl Check for libraries
+ dnl Add your macro calls to check required libraries, if you have any.
++PKG_CHECK_MODULES([FFI], [libffi])
+ 
+ dnl Platform-dependent configuration.
+ AC_ARG_ENABLE(objc, [  --enable-objc           turn on Objective-C support])
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -20,9 +20,10 @@
+ GAUCHE_PACKAGE = @GAUCHE_PACKAGE@
+ INSTALL        = @GAUCHE_INSTALL@
+ 
+-CPPFLAGS       = -I./libffi/include -DGAUCHE_API_0_8_8 @CPPFLAGS@
++CPPFLAGS       = -DGAUCHE_API_0_8_8 @FFI_CFLAGS@ @CPPFLAGS@
++CFLAGS         = @CFLAGS@
+ LDFLAGS        = @LDFLAGS@
+-LIBS           = libffi/.libs/libffi.a @LIBS@
++LIBS           = @FFI_LIBS@ @LIBS@
+ 
+ YACC           = @YACC@
+ 
+@@ -38,7 +39,7 @@
+ SCMFILES  = 
+ HEADERS   = 
+ 
+-TARGET    = libffi/.libs/libffi.a $(ARCHFILES)
++TARGET    = $(ARCHFILES)
+ GENERATED = libffi
+ CONFIG_GENERATED = libffi/Makefile Makefile cwcompile
+ 
+@@ -62,13 +63,13 @@
+ 	cd libffi; $(MAKE)
+ 
+ c-ffi.$(SOEXT): $(ffi_SRCS)
+-	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS)
++	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS)
+ 
+ c-lex.$(SOEXT): $(clex_SRCS)
+-	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS)
++	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS)
+ 
+ c-parser.$(SOEXT): $(cparser_SRCS) y.tab.c
+-	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS)
++	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS)
+ 
+ c-grammar.y: c-grammar.scm genyacc.scm
+ 	$(GOSH) genyacc.scm --outfile=c-grammar.y $<
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch b/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch
new file mode 100644
index 000000000000..0776b255bbac
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch
@@ -0,0 +1,13 @@
+--- a/lib/c-wrapper/c-parser.scm
++++ b/lib/c-wrapper/c-parser.scm
+@@ -1115,7 +1115,9 @@
+                 (raise e))))
+      (call-with-gcc-io include-dirs headers options
+                        (lambda (in out)
+-                         (let ((macro-list (queue->list (macro-queue))))
++                         (let ((macro-list (filter (lambda (m)
++                                                     (not (string-prefix?  "__glibc_macro_warning" (car m))))
++                                                   (queue->list (macro-queue)))))
+                            (for-each (lambda (macro-def)
+                                        (display (car macro-def) out)
+                                        (newline out))
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff b/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff
deleted file mode 100644
index 7ee9a4011ef3..000000000000
--- a/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- c-wrapper-0.6.1.orig/configure.ac
-+++ c-wrapper-0.6.1/configure.ac
-@@ -53,6 +53,7 @@
- 
- dnl Check for libraries
- dnl Add your macro calls to check required libraries, if you have any.
-+PKG_CHECK_MODULES([FFI], [libffi])
- 
- dnl Platform-dependent configuration.
- AC_ARG_ENABLE(objc, [  --enable-objc           turn on Objective-C support])
---- c-wrapper-0.6.1.orig/src/Makefile.in
-+++ c-wrapper-0.6.1/src/Makefile.in
-@@ -20,9 +20,9 @@
- GAUCHE_PACKAGE = @GAUCHE_PACKAGE@
- INSTALL        = @GAUCHE_INSTALL@
- 
--CPPFLAGS       = -I./libffi/include -DGAUCHE_API_0_8_8 @CPPFLAGS@
-+CPPFLAGS       = -DGAUCHE_API_0_8_8 @FFI_CFLAGS@ @CPPFLAGS@
- LDFLAGS        = @LDFLAGS@
--LIBS           = libffi/.libs/libffi.a @LIBS@
-+LIBS           = @FFI_LIBS@ @LIBS@
- 
- YACC           = @YACC@
- 
-@@ -38,7 +38,7 @@
- SCMFILES  = 
- HEADERS   = 
- 
--TARGET    = libffi/.libs/libffi.a $(ARCHFILES)
-+TARGET    = $(ARCHFILES)
- GENERATED = libffi
- CONFIG_GENERATED = libffi/Makefile Makefile cwcompile
- 
diff --git a/dev-scheme/c-wrapper/metadata.xml b/dev-scheme/c-wrapper/metadata.xml
index 21dc8fdf43ff..7ffc4339bc56 100644
--- a/dev-scheme/c-wrapper/metadata.xml
+++ b/dev-scheme/c-wrapper/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/gauche-gl/Manifest b/dev-scheme/gauche-gl/Manifest
index b0c0f5d10acc..d9261c5d427b 100644
--- a/dev-scheme/gauche-gl/Manifest
+++ b/dev-scheme/gauche-gl/Manifest
@@ -1,6 +1,4 @@
 AUX gauche-gl-0.6-simple.viewer.patch 806 BLAKE2B a2e3e35f704a108ec6bf7a809558db14daddb972487aa11dbbca01d894ba5752822ea4f2f869722a96043543fd3c794c2b92bcc2091184a957059b4c2f90afc4 SHA512 ed9d08b02e7035b5415cefb501b323a86e434389149f49ec3612e00a282c5b709da2f900768749577387537189f68e2ac32320ecae118dd32ec4fed5ea40407f
-DIST Gauche-gl-0.5.1.tgz 1161233 BLAKE2B cd216e8242016d81dc49907c0036c65deece07e91db3e9043e86ec666d22ca1cb6f7bb2e4bf7307e8c742bf0423a1d9f54404a3196d940509bafea186b044693 SHA512 7b3834e46e4789f6dcd6a2e01b2d5cfc8fa29aa69c5969e8bb9d9e2af9fe4f82af23a5f13677f27e8ae7ba63855f833dfcdac6f285a0c56041d0eaef48c8a94b
 DIST Gauche-gl-0.6.tgz 1369790 BLAKE2B b077eeee7a2d64908b36e1d279a1131eef40e98104a983e581856320529207682d17e2c9577ff892c873492f4b78631d86a4c642b1e4f8ecd364acb4ee41482e SHA512 60f763ba832048f9932cabd2e8ce8595ba2a1f0b86f1212b1f6919d6b9b8ba33ed1076f119e53059ceac7f6e46a6ead3ba0e23cce81af3097355cd97b3b4b673
-EBUILD gauche-gl-0.5.1.ebuild 924 BLAKE2B 032251cd9ca9e7116dc5e98357d473708c66454e37733603b372f34d2756e76cdd39942e0eebd0eca9d7b35da13e5809e8334ad8763be97685b64572873a3c8b SHA512 93ceb81e8e0700f49ce69da7b4158fbe09a8a54d230f15346ade7ef4209285941d857930f4660cdad98db296403d4337840909c6f3806a2898749b1d57a45a5a
-EBUILD gauche-gl-0.6.ebuild 985 BLAKE2B 0ea732bf21285903b84cf054067471f0bd670472593f6b74bc2e8567bad842bb759b15a14020978ae81bd2e42773cce6c7cdc290747bcc04751d4a812f310093 SHA512 815ea7f80fdb604b6d950be91f076bef24f2778741c748ad7a07e0f966b6ea528fbd6da0d86a0a3c35c87b84c87d5e584dd1c188635c45e4682f9d1f880ce70c
-MISC metadata.xml 424 BLAKE2B 60f56acfe8e45eb60fcacf2ace14eabd675f4d3243f507ae8a14d5e3108ba8f4d7d74f38576b2d8f4be8328e0b2d7a3c41fe09bc193dde045c35a9ff9ff791e4 SHA512 479e7282a112fb7d38611d6177f0ac3b3a134e58359e2cda220a6bab96a8d1c9951e3debc8d6e0e8a3c1a428301367f30a86842e4bf323d505a0973f96b1e44c
+EBUILD gauche-gl-0.6.ebuild 982 BLAKE2B 77b819cd9a4a400b2d5ce6f87c81062fe2c96295335f4d02101ffb9bb10e74050e6886930789fd0762184a3eaa1f4ffdfeab33e457c99375cd8dafedffbcf273 SHA512 ab2f53872ff4e5a3716d1f964b3e44c008b9a05a53bace9d19322a27cda9d0cb8989f4c182adc7a2fb044a6299efd1e246a874850ebe95b4b92458ecf32a9d34
+MISC metadata.xml 511 BLAKE2B 7f30786edc8a2494edd39bb70eb224120d66f403d44a90df2f6c64a5522ecfef0664b0bb9483eb8d03407bb820f95bf4ef7a1f60a56aa47dcd41ba446b358f8c SHA512 0d55a838abec8b2f819168db7bd079defa5e4b0c4e7737a6fb3e913b030faacfec52825c4d55edbae8b6fdd6f782b7640bf9fc2bbf992993249f85d1353f50d4
diff --git a/dev-scheme/gauche-gl/gauche-gl-0.5.1.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.5.1.ebuild
deleted file mode 100644
index 1e5a2c734c05..000000000000
--- a/dev-scheme/gauche-gl/gauche-gl-0.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P^g}"
-
-DESCRIPTION="OpenGL binding for Gauche"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE="cg examples"
-
-RDEPEND=">=dev-scheme/gauche-0.9.2
-	media-libs/freeglut
-	virtual/opengl
-	x11-libs/libXmu
-	cg? ( media-gfx/nvidia-cg-toolkit )"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf $(usex cg --enable-cg "")
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples
-		dodoc examples/*.scm
-		# install simple
-		dodoc -r examples/simple
-		# install glbook
-		dodoc -r examples/glbook
-		dodoc -r examples/images
-		# install slbook
-		dodoc -r examples/slbook
-		# install cg examples
-		use cg && dodoc -r examples/cg
-	fi
-}
diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
index 337001f237d6..17f401405eb6 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="cg examples"
 
 RDEPEND=">=dev-scheme/gauche-0.9.4
@@ -22,9 +22,7 @@ RDEPEND=">=dev-scheme/gauche-0.9.4
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-simple.viewer.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-simple.viewer.patch )
 
 src_configure() {
 	econf $(usex cg --enable-cg "")
diff --git a/dev-scheme/gauche-gl/metadata.xml b/dev-scheme/gauche-gl/metadata.xml
index 86d5e8fbae5f..1cf61eefae9c 100644
--- a/dev-scheme/gauche-gl/metadata.xml
+++ b/dev-scheme/gauche-gl/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
 	</maintainer>
 	<longdescription>
 		OpenGL binding of Gauche
@@ -11,6 +12,7 @@
 		<flag name="cg">Enable NVidia Cg binding</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">shirok/Gauche-gl</remote-id>
 		<remote-id type="sourceforge">gauche</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest
index c8db376c75ee..8a57b6728499 100644
--- a/dev-scheme/gauche-gtk/Manifest
+++ b/dev-scheme/gauche-gtk/Manifest
@@ -1,6 +1,3 @@
-AUX gauche-gtk-gtk-lib.hints.diff 3208 BLAKE2B fe6d59d93304cbc0fa883791582ff18e0101b39a95849cca402ad7f7753e074d9ec2c917431aa6dfe09e07bfdcdbaacb4deaed64bb89a64f15bca6d056ed8cd1 SHA512 4315e517d52f39cd8d19e6abadc244c4c23c059e7adc137e247b5b1926d09d6d924b8fc1bc376add58a42ec365da0024a19d1a4d9ac709bf8b1dca86663da747
-AUX gauche-gtk-h2s-cpp.diff 472 BLAKE2B 8690be6daad3a989dcbd1cb88ae1c129d0d084a70f74f7c2e557479650513a3f3c3b3c0d624fc7a26b65adb8f516becd8cf2444cc6e51e62d8f97f5a8e1e9b0e SHA512 9615dc4586873424379da75874d50c14459afbfbe37c186a8ad592fad7153ca2e2bc48f8320ffc91e8c86f9c7a34ae0ed96544cab43d6ca80a29a176501e8862
-AUX gauche-gtk-h2s-gdk-pixbuf.diff 778 BLAKE2B 9bf1af16b498ed60d59513e7b7419120c148eda41042b6b691005189222421aa874e517c3d35badf6af5b6f2a14f7120e4722e9a63d3db60f8b86437c66c4f4b SHA512 a2ab9c550fcde6ae46b086210062dfb8504aafff398258da01dea9f0c8488e58ce1644a74f8b5414e4aa05e475be0ef5a69131482caf04626511d4c9e4a0df98
-DIST Gauche-gtk-0.6_pre1.tar.gz 203261 BLAKE2B c0b29dcafcff600faf4ad3236eb15ec86867cc6ea0ea218f1f4a57b2757cbcb16686815633de2787afff9ab36e4079f13f242c1a357f6e8e832faaddc66b3fe8 SHA512 150d9169f893ab4ca80956aab93523cf8d9a5e831f7ba4f577314fa6fac72910238cbb5f375fa6b265b3b6a013bba2674c37c8219c391dd212d52267e2360bb3
-EBUILD gauche-gtk-0.6_pre1.ebuild 1537 BLAKE2B 498dd33d1ed836dd4894794e4b844760ab50cefde7e8e47a2293ec859e027445d50cc4977c10577b48669b4da8a266d7482732eb4dc15a921f8fb6a340b767df SHA512 b1796a2ca03301c9245a6c82d87c0413db43831d1e48ca6e304e384bf307821030f7a1129536fb6aba74e6254a3f1708ff55cef458d6ea69953c278c12b16925
-MISC metadata.xml 440 BLAKE2B 73be748ce7ab16813cd7ab68b46db4e17f24430da98b044107a01deaf523e10a93d071824ace8c2004cb152596bf5b95f3dde617f0548f0271b1db2c85e33297 SHA512 7f82bf6234ca08b343fa1ce530be8567a8ef4e8d30bd2f9b114b9ea2a551e985c2b7f3a8f9496f0c323d25331e69ec83bfd764aaec678a248f991cc71cc3bbb9
+DIST Gauche-gtk-0.6_pre1.tar.gz 205235 BLAKE2B 90f2c69c7521817fd81bee007618fe35c6a20678812139f2f99964cccb953e6ceaa301886a703702ac67184526d5cb3d24db786ef0869f54490acbcb6e3745f3 SHA512 5d47af94f3683c25787bb31b2b077ab5526f84e67db49b95a04d59ee57d1249a9b6666a9223305fe47597a2fa77a6e8d81507a05b1a83a4a76ac5f867738f228
+EBUILD gauche-gtk-0.6_pre1.ebuild 1390 BLAKE2B 0de1649be822ec57f2eb0096f3a0a02c55c43234f5f5afb0b98ce63709a3070f3385b6bd84cd845a667a8fa4647b11df28cc44dce7ba8c36bb4af8c0a3f3afd7 SHA512 e41c093a915947b78468c57dc02d8c2fb7c30fff7e036bcceea39fe80c3a31097df8181cc9858bc7e69877b7dc169dca7d51d5bf5315d7b0ac85eca48f1728d9
+MISC metadata.xml 471 BLAKE2B 5c17e51d4c199f82572546d44c846f55d6bc0dce86ac8780dd96a188fd447f0d5047f09ad3186eac3cf1adefe3a7332a5072f65144e6a6f244ab8871e11259b8 SHA512 64fa480b1c697341c1c215f5aae1c7875c796e11ed05e08045635996c996183b8d1decbc1a31846ee5374d81f33ce282fb44bcc84489f9fa854a063d7cbb527d
diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff b/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff
deleted file mode 100644
index be54ee550ba7..000000000000
--- a/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/src/gtk-lib.hints
-+++ b/src/gtk-lib.hints
-@@ -527,8 +527,10 @@ SCM_RETURN(Scm_Values2(Scm_MakeInteger(n_properties), h));"
-   (add-mixin! "Scm_GtkEditableClass" "Scm_GtkCellEditableClass"))
- 
- ;; we can't free the return value of gtk_entry_get_text.
--(define-cproc gtk-entry-get-text (entry::<gtk-entry>)
--  "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_entry_get_text(entry)));")
-+(define-cproc-fix gtk-entry-get-text
-+  (fix-arguments! '(entry::<gtk-entry>))
-+  (fix-body!
-+   "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_entry_get_text(entry)));"))
- 
- ;;==================================================================
- ;; gtkfilesel.h
-@@ -539,8 +541,10 @@ SCM_RETURN(Scm_Values2(Scm_MakeInteger(n_properties), h));"
- ;; gtk_file_selection_get_filename returns mbstr encoded by the current
- ;; locale.  We canonicalize it to utf8.  The Scheme glue code converts
- ;; it to Gauche's internal encoding.
--(define-cproc gtk-file-selection-get-filename (sel::<gtk-file-selection>)
--  "const gchar *fn_mb = gtk_file_selection_get_filename(sel);
-+(define-cproc-fix gtk-file-selection-get-filename
-+  (fix-arguments! '(sel::<gtk-file-selection>))
-+  (fix-body!
-+   "const gchar *fn_mb = gtk_file_selection_get_filename(sel);
-   gchar *fn_utf8 = g_filename_to_utf8(fn_mb, -1, NULL, NULL, NULL);
-   if (fn_utf8 == NULL) {
-     Scm_Error(\"got a filename including multibyte chars which can't be converted to UTF8: %s\", fn_mb);
-@@ -549,7 +553,7 @@ SCM_RETURN(Scm_Values2(Scm_MakeInteger(n_properties), h));"
-   SCM_RETURN(SCM_MAKE_STR_COPYING(fn_utf8));
- #else
-   SCM_RETURN(Scm_MakeString(fn_utf8, -1, -1, SCM_MAKSTR_COPYING|SCM_MAKSTR_INCOMPLETE));
--#endif")
-+#endif"))
- 
- (define-cproc gtk-file-selection-get-selections (sel::<gtk-file-selection>)
-   "gchar **fns_mb = gtk_file_selection_get_selections(sel);
-@@ -609,10 +613,14 @@ SCM_RETURN(Scm_Values2(Scm_MakeInteger(n_properties), h));"
- (input-file "gtklabel.h")
- 
- ;; Memory is owned by the widget so we don't need to free them.
--(define-cproc gtk-label-get-text (label::<gtk-label>)
--  "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_text(label)));")
--(define-cproc gtk-label-get-label (label::<gtk-label>)
--  "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_label(label)));")
-+(define-cproc-fix gtk-label-get-text
-+  (fix-arguments! '(label::<gtk-label>))
-+  (fix-body!
-+   "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_text(label)));"))
-+(define-cproc-fix gtk-label-get-label
-+  (fix-arguments! '(label::<gtk-label>))
-+  (fix-body!
-+   "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_label(label)));"))
- 
- (define-cproc-fix gtk-label-get-seleciton-bounds
-   (fix-arguments! '(label::<gtk-label>))
-@@ -1121,9 +1129,11 @@ return SCM_MAKE_STR_COPYING((char*)string);"))
- 
- (input-file "gtkprogressbar.h")
- 
--(define-cproc gtk-progress-bar-get-text (pbar::<gtk-progress-bar>)
--  "gchar *g = gtk_progress_bar_get_text(pbar);
--  SCM_RETURN(SCM_MAKE_STR_COPYING_SAFELY(g));")
-+(define-cproc-fix gtk-progress-bar-get-text
-+  (fix-arguments! '(pbar::<gtk-progress-bar>))
-+  (fix-body!
-+   "gchar *g = gtk_progress_bar_get_text(pbar);
-+  SCM_RETURN(SCM_MAKE_STR_COPYING_SAFELY(g));"))
- 
- ;;==================================================================
- ;; gtkradiobutton
diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-cpp.diff b/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-cpp.diff
deleted file mode 100644
index 081c83df1fe5..000000000000
--- a/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-cpp.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/h2s/parse.scm
-+++ b/lib/h2s/parse.scm
-@@ -329,6 +329,8 @@
-       (#/^\}\s*([\w_]+)/ (#f name) (make-enum name (reverse enums))) ; ----->
-       ;; empty line:
-       (#/^\s*$/ () (loop (read-line) enums))
-+      ;; preprocessor directive:
-+      (#/^\s*#\s*\w+/ () (loop (read-line) enums))
-       ;; 
-       (test has-comment? (skip-comment line (cut loop <> enums) err-eof)) ;  what if?:      new_value,  /* boring comment*/
-       (#/\s+([\w_]+),?/ (#f enum)
diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-gdk-pixbuf.diff b/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-gdk-pixbuf.diff
deleted file mode 100644
index 9e8bbcf6e72d..000000000000
--- a/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-gdk-pixbuf.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/h2s-gtk.scm
-+++ b/src/h2s-gtk.scm
-@@ -50,6 +50,11 @@
- (define pango-directory
-   (find-header-dir #`"pango-,|pango-version|/pango/pango.h"
-                    *header-search-paths*))
-+(define gdk-pixbuf-directory
-+  (guard (e [(<error> e)
-+             gtk-directory])
-+    (find-header-dir #`"gdk-pixbuf-,|gtk-version|/gdk-pixbuf/gdk-pixbuf.h"
-+                     *header-search-paths* )))
- 
- 
- (define (parse-gdk)
-@@ -64,7 +69,7 @@
-                  (call-with-input-file "PANGOFILES" port->string-list)))
- 
- (define (parse-gdk-pixbuf)
--  (parse-headers #`",|gtk-directory|/gdk-pixbuf"
-+  (parse-headers #`",|gdk-pixbuf-directory|/gdk-pixbuf"
-                  (call-with-input-file "GDKPIXBUFFILES" port->string-list)))
- 
- ;; defaults for the gauche-gtk package:
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 83b465480233..258e582076d3 100644
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
-inherit autotools eutils
+inherit autotools vcs-snapshot
 
 MY_P="${P/g/G}"
 MY_PN="${PN/g/G}2"
-PV_COMMIT="598828842a339a44c32ab8c16f5f9a77f3c1c799"
+PV_COMMIT="6fca535f7bb950f81db066bd1afdca9d55e9b460"
 
 DESCRIPTION="GTK2 binding for Gauche"
 HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="https://github.com/shirok/${MY_PN}/tarball/${PV_COMMIT} -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/shirok/${MY_PN}/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="examples glgd nls opengl"
 RESTRICT="test"
 
@@ -27,29 +27,28 @@ RDEPEND="x11-libs/gtk+:2
 		x11-libs/gtkglext
 		dev-scheme/gauche-gl
 	)"
-S="${WORKDIR}/shirok-${MY_PN}-${PV_COMMIT:0:7}"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-h2s-gdk-pixbuf.diff
-	epatch "${FILESDIR}"/${PN}-gtk-lib.hints.diff
-	epatch "${FILESDIR}"/${PN}-h2s-cpp.diff
+	default
 	eautoconf
 }
 
 src_configure() {
-	local myconf
+	local myconf=()
 	if use opengl; then
 		if use glgd; then
-			myconf="--enable-glgd"
 			if use nls; then
-				myconf="${myconf}-pango"
+				myconf+=( --enable-glgd-pango )
+			else
+				myconf+=( --enable-glgd )
 			fi
 		else
-			myconf="--enable-gtkgl"
+			myconf+=( --enable-gtkgl )
 		fi
 	fi
 
-	econf ${myconf}
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -58,8 +57,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
+	default
 
 	if use examples; then
 		docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-scheme/gauche-gtk/metadata.xml b/dev-scheme/gauche-gtk/metadata.xml
index 883d438926be..4dd4d4ed3fd8 100644
--- a/dev-scheme/gauche-gtk/metadata.xml
+++ b/dev-scheme/gauche-gtk/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
 	</maintainer>
 	<longdescription>
 		Gauche extension module to use GTK.
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 573234fffc1b..746e2bc16b58 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,11 +1,15 @@
+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-ext-ldflags.patch 384 BLAKE2B 49b80ce3cdac634ba03dc51483ef692cd4ddfecdfd9da9880ddf76b13c49d4fc2c67ac0d7c99ec9636210d11ddb6f68eef3a605f22cf96fd35da47f1665f1e67 SHA512 e38f1c7bc2fa6a1f5f56e20f9818d7f52e98ba8c3e101b642441421f5194bc4223c862e20d3d731da632642dc44545974483459727bb184d9da9b9742504f34d
+AUX gauche-ext-ldflags.patch 384 BLAKE2B 57b7463086c0763413b8fda3d7688c6a61bd4456b3209a80b6eabed088e0c71eb5ae4c53b18fb0e6b7468ac03fe33f7884f265ab1ea998e8457b0ef126e6e841 SHA512 df42c5f25adc5a67ad049ab78aeaa4f565d18818dd6dfff5a64a78e9e3101595a4279d72e8f946e4f7da7be30f9f11c089c7f4a65d2eb2135980414c3d6e9cbb
 AUX gauche-gauche.m4.patch 592 BLAKE2B ae22e11c85fa4cbae7217a8b632041a9f4241023f38105e906035210bcd82604ac69bb36c5874c4662a32e0cb551a9f59cc96487096c12356f9ef19c6d25de79 SHA512 5082265340c6011d653f20de3a89f1eed1a48b896d521bb42aff1f748cafd3c60953c3b723ab9b053dcd941ed6b61f00f9f69a25f16db74d987228db2318ac68
-AUX gauche-rfc.tls.patch 401 BLAKE2B 8cc1fca64ebaa0630b9e0f3862bbe4c167977b8a354df3b7f154ff4f1078344b381826f2eafece97825b3454069b09b53c07eea87720684b93897011bd3d79cd SHA512 5b2baafa052208c1843e7d05789bf8a10c63fbb48de66ca7e8b7450a5cb23c1c5641c34a8ff8ee525aa073de21b1f970ba4c310b2678dc1f81293e51c22de321
+AUX gauche-rfc.tls.patch 408 BLAKE2B e4e41272e7b3a1393fc2e07ba90b9c883220447f0c4730e5bc1d268e1198b17a10374451323e181f5eae1e3d2793c8c708d0cc0365ebc2d8e82648804b0bc349 SHA512 457aebafad6fa5f3ad494bfb545e217d043b19c20929be2e067601ffb4b015bcf4654af9295758792c20ebb27dee9315f232a96d1154a56dd88d1baad015046f
 AUX gauche-rpath.patch 215 BLAKE2B 081374abd3272ae10b7614af92c8f16054c1eaa6fb636d9f6300589751197f9b19b706a4fe500e985c25ea250f9a2a2338d903094d9ca95c2622e618ea6ce9ed SHA512 1bda4c2e0bb3928d040eb07d56a9eb0aebd68e52bd0756160ef3eec46ba8c1869b8a37dbb798a712a59918d6bf77e7ca74ec38a4e2e30bb6417f967b5cdc8da6
 AUX gauche-xz-info.patch 1322 BLAKE2B f73447a306ec54ff372520c603adf2da46e1b71225a27d09af5c3ae8770431c5fef4d974cbf6e08fa1159807719c798680b18c7f624ec83b33d5ddf8688946f0 SHA512 22b6a37ea23bcba7e4ea4d09f26b069225cc36ef32dc0fbc865cfa4052765d0363811f693d6cc5cc8f3fdf355b93eec7c58934d18b2cb8079cadfd3b0cd4ffa4
 DIST Gauche-0.9.5.tgz 6458675 BLAKE2B ca7f1ad48841a2a6a98632980d8a4fe5065234de5c23835c24e633345ba77fd4d3610d073c00a8da00c1e794e22a74e493793d8fca4a7f3ed1a3161a29622f30 SHA512 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a
-EBUILD gauche-0.9.5.ebuild 1256 BLAKE2B a22e812a27afc996f7c268de2bdd381144830bf19a7ac8ffc9320d02fdda3c37dafc6d5f48ad78857f97333212dec6997d621ae8f6508cd887089da68f6dd037 SHA512 ce92dcfe445b86f5a69e39cc6b0dfbe3dafff4ff66637474ac5ae152a2baa91649a37cc665573ca242309355d21913e322498e2fa6d35d8f21ae1783022844a3
-MISC metadata.xml 786 BLAKE2B 754139591a9964738cd54b869143cc1f51334a5481127a3a19893e5a30316d67c05bdd2f49155d36dd0e123e99ff16f9983b7a9abdf7022986328fca12b964be SHA512 cb9c550a806862c79a5c05eb317ffda442b543b3f07d114165958615672e093647bec4a3109dca0518f1f29be06e86c3ddc737f44cb2d93437beb5607d532368
+DIST Gauche-0.9.6.tgz 6927530 BLAKE2B 9b32a0db4fc41e2b35331818850e7aa3c1ac5b1294c76caa053abe1ae2da20a0ac4424470ca94626108f996700d1b7e52f6f9e5c6f0a2326f7e6862880f48aa1 SHA512 1d8a7f56fd9ca183d6dce1dedadfaec7c7150c29540e5158f2a61977f7406d7d7a8ab753ef1912865a7d7e9a9e2fa845d86b2eb4c5e07a176f1c60276bc1908f
+EBUILD gauche-0.9.5.ebuild 1264 BLAKE2B 5431d4bca6b19bdaf5097abec31e4ac72799d79de9d694c26480ec0efb116038f4094459963d29612b1e0c85b5a7f20313000e8125fc4f4d8fe4df4dfef2363a SHA512 156a765380e68cbba229cb62423aceeefa040f9089e9059d3d2a02a6e5e2bf0c6abdada8372dca43493fa64148355922567afa00c9fbd6d68257a1eb17e0445f
+EBUILD gauche-0.9.6.ebuild 1218 BLAKE2B 651120d2c2c922f828632fb732c063cc06401d2cf51efd7852cff36e22de864d95ee814a9f2649429f9e782614a99d36cb302537a49f70913fcbf5bf083193ce SHA512 129e0c1e4e81f1d04f599196b8ad445893a7d67d4294d4e90b7046bbcf25f6555591f8f0f015d6e9cb28edef3d1d70693024db6dd233be04dae512e4c90bc2ae
+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
new file mode 100644
index 000000000000..b4aedef2a316
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
@@ -0,0 +1,11 @@
+--- 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-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
new file mode 100644
index 000000000000..1e5ef71b6c91
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
@@ -0,0 +1,12 @@
+--- a/ext/tls/ssltest-mod.scm
++++ b/ext/tls/ssltest-mod.scm
+@@ -53,7 +53,8 @@
+      ($ format #t "~a\n" $ regexp-replace-all* line
+         #/\.\.\/ssl\// srcpath-replace
+         #/openssl /    kicker-replace
+-        #/system/      "safe_system")))
++        #/system/      "safe_system"
++        #/(s_server) / "\\1 -4 ")))
+ 
+   (p "#include <errno.h>"
+      "int safe_system(const char *commands)"
diff --git a/dev-scheme/gauche/files/gauche-ext-ldflags.patch b/dev-scheme/gauche/files/gauche-ext-ldflags.patch
index b4aedef2a316..a5a21532d1ee 100644
--- a/dev-scheme/gauche/files/gauche-ext-ldflags.patch
+++ b/dev-scheme/gauche/files/gauche-ext-ldflags.patch
@@ -1,11 +1,11 @@
 --- a/ext/Makefile.ext.in
 +++ b/ext/Makefile.ext.in
 @@ -22,7 +22,7 @@
- LIBS         = $(XLIBS) @LIBS@ 
+ 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@
+ BUILD_GOSH_FLAGS =
  
  # These are set by configure
- DEFS     = @DEFS@
diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.patch b/dev-scheme/gauche/files/gauche-rfc.tls.patch
index 1e5ef71b6c91..cf570df0ed38 100644
--- a/dev-scheme/gauche/files/gauche-rfc.tls.patch
+++ b/dev-scheme/gauche/files/gauche-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/gauche-0.9.5.ebuild b/dev-scheme/gauche/gauche-0.9.5.ebuild
index 8cf193dcbceb..2ace0a45f69b 100644
--- a/dev-scheme/gauche/gauche-0.9.5.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.5.ebuild
@@ -27,11 +27,11 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-rpath.patch
 	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-ext-ldflags.patch
 	"${FILESDIR}"/${PN}-xz-info.patch
-	"${FILESDIR}"/${PN}-rfc.tls.patch
-	"${FILESDIR}"/${P}-libressl.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 )
diff --git a/dev-scheme/gauche/gauche-0.9.6.ebuild b/dev-scheme/gauche/gauche-0.9.6.ebuild
new file mode 100644
index 000000000000..37e0c2b459d4
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+MY_P="${P^g}"
+
+DESCRIPTION="A Unix system friendly Scheme Interpreter"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 libressl mbedtls test"
+
+RDEPEND="sys-libs/gdbm
+	mbedtls? ( net-libs/mbedtls )"
+DEPEND="${RDEPEND}
+	test? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl:0 )
+	)"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gauche.m4.patch
+	"${FILESDIR}"/${PN}-ext-ldflags.patch
+	"${FILESDIR}"/${PN}-xz-info.patch
+	"${FILESDIR}"/${PN}-rfc.tls.patch
+)
+DOCS=( AUTHORS ChangeLog HACKING README )
+
+src_prepare() {
+	default
+	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--with-libatomic-ops=no \
+		--with-slib="${EPREFIX}"/usr/share/slib \
+		--with-tls=axtls$(usex mbedtls ',mbedtls' '')
+}
+
+src_test() {
+	emake -j1 -s check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-pkg install-doc
+	einstalldocs
+}
diff --git a/dev-scheme/gauche/metadata.xml b/dev-scheme/gauche/metadata.xml
index b2990653937c..b56db088465d 100644
--- a/dev-scheme/gauche/metadata.xml
+++ b/dev-scheme/gauche/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>scheme@gentoo.org</email>
@@ -16,6 +17,9 @@
 
 		Gauche runs on several Unix-like platforms.
 	</longdescription>
+	<use>
+		<flag name="mbedtls">Enable support for <pkg>net-libs/mbedtls</pkg></flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">gauche</remote-id>
 	</upstream>