gentoo resync : 21.07.2018

26 files changed, 307 insertions, 74 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index dad2c6da8f9a..7d6dab398d61 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gauche-cdb/Manifest b/dev-scheme/gauche-cdb/Manifest
index acf3017016e9..fb2a0f37d5d6 100644
--- a/dev-scheme/gauche-cdb/Manifest
+++ b/dev-scheme/gauche-cdb/Manifest
@@ -1,5 +1,5 @@
-AUX gauche-cdb-0.3.1-gauche-package.diff 3751 BLAKE2B 622fe297d0230387861592c65ebefbc9d46c281378199589765782793599565a97ad4e878fb6fa36ad0a526be98119e10f6730ffc8f166d62f4a23e20a996773 SHA512 8c7e95615e1a54125d972d0ad88ae58964cc72d1d7a993e5e04ef8cac6c12e146f01248d0de3879e1633c6335e2077e1a4b4071684b6e20490bcd163ff9accf4
-AUX gauche-cdb-0.3.1-undefined-reference.diff 709 BLAKE2B 0f3332a6599c0b1d698a81f144c685de75505f3d9b7b68ab5a298e0aba4e0221aea1372c30ae737f3eb2b6893877efd35149023cb0f783a3409d48deb3f20b58 SHA512 9f4aa26b4ca3196e683eba79dfd719f291a45fd0a5783718bfe6ffb1cd70d2067d4181df17dc100a128552cadd721b8c82a777a481b7c008d92cafc764441587
+AUX gauche-cdb-gauche-package.patch 3764 BLAKE2B fd87c6521c10fd3fdc65951643f2b6b6b714d99ebd9d6de3aaf2d94dcd0d43818d1440153f89081dcb8751bcfa1eee48165f18bb77da4f117b7da65db909ada0 SHA512 6c746b96b9f54334e8592ab76721b71521eb6f09c9b5a99d2b43423ccea1c9603656505d4e3d35d0c03ceea1914a3bafff3a3ed527fee9512c96f495de9a658a
+AUX gauche-cdb-undefined-reference.patch 639 BLAKE2B cbf4d33e4b0b6a280bf7c5c8c5edd794fd3834b51be2c3e8f97ea42246c57b5d9bc29ec928ab267a91c58e102a0f415320f5ac1079d84d79b23d1a8e0a49a5ab SHA512 e316917e2915b3d0cecc002bb2be5714f86602810508f6b0fef283ba9ae0ac68952b3f93cf3e16bbb331c3544ee81bf37a9d84d1122f46789a5b17b1b2cb347c
 DIST Gauche-cdb-0.3.1.tar.gz 72048 BLAKE2B f4363ec9893e3f365c34965414620b46c08edcfdf5ed95a5934aeedd3af6e58f1cdedb7c4df90e95fa5a93ce3f95aeeb08fca0f3a440990d3383cd72bef8aa87 SHA512 c02629de9e96c561da0a928e2817056da27951a5ad988b7d105cc24aedd6d103001bf9dd4ae28c1729d701850d937a3134361c2ad83a4e1e51d565a95e8f1a68
-EBUILD gauche-cdb-0.3.1-r1.ebuild 580 BLAKE2B be24c4a876da31bb8d422d86fafda86f069db7858258cf6bf4d3ac9607732322e1fc29a81ef114e907a9c920fee98823b89253ae194db7f466dbe68bde900b28 SHA512 107348b757fa9fa4b5d01a1a9610f9a832311ab43124c9fe8920fe9415cd2952ec18f8cbef881110741f3153713ae7f920bbf344073f74118218f4f607e4a9d5
-MISC metadata.xml 296 BLAKE2B b4f40c5389c14637456012f92ba3be281395a6880ba7793ea8613c4d8daf381fb0e25ed330d90e34020072ce65a5d92885a648c44021e493df83381ef8848488 SHA512 337649e4855f527c3f342c81034140381e5bdbf070f3ee3ca777196bbbbf90c5900e393519881ea5f8775c0d221a3b4564bddb35b5a2dd607216ab3dde64d652
+EBUILD gauche-cdb-0.3.1-r1.ebuild 592 BLAKE2B 6feff099444ec6bbfa51d050860912780348a5ab86d3450ca10284a49f1188750ec9f96f1dedee56ea0363465059a27d179e78994751dc75203ff216ed31b26b SHA512 9f92799d603904972d7fb9b08898d72bfc5e868079a27f978df46805a3b9818ca30e667af23c0a16caa5f2e0e2e85e7d28e39c268f0d8fc393646231ad204d33
+MISC metadata.xml 327 BLAKE2B 296a3f702aeb51830de1c20b949ef214633f5ced8b46d140cf8949bdd49f80586f2ee7edb0690176a5d10c5f3e2d228e524d52afef934da424589253d39f628a SHA512 ab6ba356946b4e3887b52c7e27f32cbab85d9fa7fc38b574fe6a88beba33799867090316e1ecc5994c0115397c22c055d67d1188536b7ac6b4d8d833bef2ce28
diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-gauche-package.patch
index ae093062243d..2f09f6c64c73 100644
--- a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff
+++ b/dev-scheme/gauche-cdb/files/gauche-cdb-gauche-package.patch
@@ -1,5 +1,5 @@
---- Gauche-cdb-0.3.1.orig/Makefile.in
-+++ Gauche-cdb-0.3.1/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -10,76 +10,57 @@
  VPATH       = $(srcdir)
  
@@ -18,7 +18,9 @@
 -GOSH     = @GOSH@
 -GAUCHE_CONFIG = @GAUCHE_CONFIG@
 +DESTDIR        =
++CFLAGS         = @CFLAGS@
 +CPPFLAGS       = @CPPFLAGS@  # AC_LIB_LINKFLAGS adds to this..
++LDFLAGS        = @LDFLAGS@
 +GOSH           = "@GOSH@"
 +GAUCHE_CONFIG  = "@GAUCHE_CONFIG@"
 +GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@"
@@ -76,9 +78,7 @@
 -$(MODULE)_head.c $(MODULE)_tail.c :
 -	$(GAUCHE_CONFIG) --fixup-extension $(MODULE)
 +$(PACKAGE).$(SOEXT): $(cdb_SRCS)
-+	$(GAUCHE_PACKAGE) compile --verbose \
-+	    --libs="$(cdb_LIBS)" --cppflags="$(CPPFLAGS)" \
-+	    $(PACKAGE) $(cdb_SRCS)
++	$(GAUCHE_PACKAGE) compile --verbose --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(cdb_LIBS)" $(PACKAGE) $(cdb_SRCS)
  
  check : all
  	@rm -f test.log
@@ -109,8 +109,8 @@
  
  distclean : clean
  	rm -rf $(CONFIG_GENERATED)
---- Gauche-cdb-0.3.1.orig/configure.ac
-+++ Gauche-cdb-0.3.1/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -4,18 +4,11 @@
  AC_INIT(Gauche-cdb, 0.3.1)
  AC_CONFIG_SRCDIR(cdb.stub)
diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-undefined-reference.patch
index b63a68ddbda2..6b6619dc26ed 100644
--- a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff
+++ b/dev-scheme/gauche-cdb/files/gauche-cdb-undefined-reference.patch
@@ -1,5 +1,5 @@
---- Gauche-cdb-0.3.1.orig/cdb.scm
-+++ Gauche-cdb-0.3.1/cdb.scm
+--- a/cdb.scm
++++ b/cdb.scm
 @@ -60,7 +60,7 @@
    (unless (slot-bound? self 'path)
      (error "path must be set to open cdb database"))
@@ -9,8 +9,8 @@
    (let ((path (slot-ref self 'path))
          (rwmode (slot-ref self 'rw-mode)))
      (case rwmode
---- Gauche-cdb-0.3.1.orig/cdb.stub
-+++ Gauche-cdb-0.3.1/cdb.stub
+--- a/cdb.stub
++++ b/cdb.stub
 @@ -69,7 +69,7 @@
  
   static void cdb_finalize(ScmObj obj, void *data)
diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
index 04f12d3afa76..416778ad184b 100644
--- a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
+++ b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2012 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
 
-MY_P="${P/g/G}"
+MY_P="${P^g}"
 
 DESCRIPTION="CDB binding for Gauche"
 HOMEPAGE="http://sourceforge.jp/projects/gauche/"
-SRC_URI="mirror://sourceforge.jp/gauche/8407/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge.jp/${PN%-*}/8407/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="ia64 x86"
+KEYWORDS="~amd64 ia64 x86"
 IUSE=""
 
 RDEPEND="dev-scheme/gauche
@@ -21,8 +21,12 @@ RDEPEND="dev-scheme/gauche
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-gauche-package.patch
+	"${FILESDIR}"/${PN}-undefined-reference.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gauche-package.diff
-	epatch "${FILESDIR}"/${P}-undefined-reference.diff
+	default
 	eautoreconf
 }
diff --git a/dev-scheme/gauche-cdb/metadata.xml b/dev-scheme/gauche-cdb/metadata.xml
index c30645235ea2..b700519a0a23 100644
--- a/dev-scheme/gauche-cdb/metadata.xml
+++ b/dev-scheme/gauche-cdb/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">gauche</remote-id>
diff --git a/dev-scheme/gauche-gl/Manifest b/dev-scheme/gauche-gl/Manifest
index d9261c5d427b..b6e3fd7da2c5 100644
--- a/dev-scheme/gauche-gl/Manifest
+++ b/dev-scheme/gauche-gl/Manifest
@@ -1,4 +1,4 @@
 AUX gauche-gl-0.6-simple.viewer.patch 806 BLAKE2B a2e3e35f704a108ec6bf7a809558db14daddb972487aa11dbbca01d894ba5752822ea4f2f869722a96043543fd3c794c2b92bcc2091184a957059b4c2f90afc4 SHA512 ed9d08b02e7035b5415cefb501b323a86e434389149f49ec3612e00a282c5b709da2f900768749577387537189f68e2ac32320ecae118dd32ec4fed5ea40407f
 DIST Gauche-gl-0.6.tgz 1369790 BLAKE2B b077eeee7a2d64908b36e1d279a1131eef40e98104a983e581856320529207682d17e2c9577ff892c873492f4b78631d86a4c642b1e4f8ecd364acb4ee41482e SHA512 60f763ba832048f9932cabd2e8ce8595ba2a1f0b86f1212b1f6919d6b9b8ba33ed1076f119e53059ceac7f6e46a6ead3ba0e23cce81af3097355cd97b3b4b673
-EBUILD gauche-gl-0.6.ebuild 982 BLAKE2B 77b819cd9a4a400b2d5ce6f87c81062fe2c96295335f4d02101ffb9bb10e74050e6886930789fd0762184a3eaa1f4ffdfeab33e457c99375cd8dafedffbcf273 SHA512 ab2f53872ff4e5a3716d1f964b3e44c008b9a05a53bace9d19322a27cda9d0cb8989f4c182adc7a2fb044a6299efd1e246a874850ebe95b4b92458ecf32a9d34
+EBUILD gauche-gl-0.6.ebuild 984 BLAKE2B b84e05cf811681ae0785f602a16bb5eccb91f94d13d1cf22a2ae7175f0f45a7f1503d2c87cd04e11ab4b61af718b129a1d503ff27fd731d67fc9ab8cb28299f5 SHA512 20967e29a9c84c2322f222c3fd90d375d9868722eb90ecc61f072e24a5f9f38ec76f31bc7fc4445d3c405f17b6f0e4add501b3f01a953a0ebb4d65142ee48b16
 MISC metadata.xml 511 BLAKE2B 7f30786edc8a2494edd39bb70eb224120d66f403d44a90df2f6c64a5522ecfef0664b0bb9483eb8d03407bb820f95bf4ef7a1f60a56aa47dcd41ba446b358f8c SHA512 0d55a838abec8b2f819168db7bd079defa5e4b0c4e7737a6fb3e913b030faacfec52825c4d55edbae8b6fdd6f782b7640bf9fc2bbf992993249f85d1353f50d4
diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
index 17f401405eb6..3d8aac3c5ebe 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
@@ -7,7 +7,7 @@ MY_P="${P^g}"
 
 DESCRIPTION="OpenGL binding for Gauche"
 HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
+SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest
index 8a57b6728499..9b6a96b65d6f 100644
--- a/dev-scheme/gauche-gtk/Manifest
+++ b/dev-scheme/gauche-gtk/Manifest
@@ -1,3 +1,3 @@
-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
+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
 MISC metadata.xml 471 BLAKE2B 5c17e51d4c199f82572546d44c846f55d6bc0dce86ac8780dd96a188fd447f0d5047f09ad3186eac3cf1adefe3a7332a5072f65144e6a6f244ab8871e11259b8 SHA512 64fa480b1c697341c1c215f5aae1c7875c796e11ed05e08045635996c996183b8d1decbc1a31846ee5374d81f33ce282fb44bcc84489f9fa854a063d7cbb527d
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 258e582076d3..beb3882420d1 100644
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
@@ -5,13 +5,12 @@ EAPI="6"
 
 inherit autotools vcs-snapshot
 
-MY_P="${P/g/G}"
-MY_PN="${PN/g/G}2"
+MY_P="${PN^g}2-${PV}"
 PV_COMMIT="6fca535f7bb950f81db066bd1afdca9d55e9b460"
 
 DESCRIPTION="GTK2 binding for Gauche"
 HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="https://github.com/shirok/${MY_PN}/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/shirok/${PN^g}2/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-scheme/gauche-kakasi/Manifest b/dev-scheme/gauche-kakasi/Manifest
index 76bcce205cb3..bed5b7016c67 100644
--- a/dev-scheme/gauche-kakasi/Manifest
+++ b/dev-scheme/gauche-kakasi/Manifest
@@ -1,3 +1,4 @@
+AUX gauche-kakasi-gauche-package.patch 4790 BLAKE2B ce0df43e310bfb2cd110f27e651faa307a4f64631fd9e494db9b0e0cf2ee70a1744973a26fd61aaebdbca6d284d4722d68837f46c1b9779eea5b3bb0840ba93e SHA512 5eccf08bcbab4644bf9f89da37dd81ffd64b486c4ea9f30206d5fbe53cb0e5b2e5a4131a8b84b0cd19a7b6bb7f0e28618af0e1fddc60028773cb40d671cd2eec
 DIST Gauche-kakasi-0.1.tgz 56568 BLAKE2B 965c59918da2005b14c127ea23bf1b7e001809889a1caa9cde5af97b22ea23952dcc269e8860f37354e98264c659f222826cc6e3f7f9db49701c33c3e898246a SHA512 761fb704482f4e6705ca80b894b245391efee92d409e9438e59afae56d0b7d9907ed40ab3a5bcc3ec9f2a8115bdbc622c48eaec3b0ed38c99677bf1f9f0f7bed
-EBUILD gauche-kakasi-0.1.ebuild 526 BLAKE2B 60888ca0e53fd8581eb5adfc9334bbfb385890eeff800cf934031ceee9f6127c03f55c11a628c8764f916e5d74029487b3dad6d0a96d4384f94e6a15fe59507a SHA512 cc49b0f8d98694f90e8e634451485a27990ab3e13417692c457e6f34f1a3380be5bc5e98b77ad78325170c9b837ebf6137f826f5601dfe98bec435096fd77438
-MISC metadata.xml 293 BLAKE2B 20c14387d27ce02863cad327186a68c286d39e41ac1ac6ce6644e275b9ff212fbb772b5135ff16dfec167e29a035230c2d4f433a97905af1f46da5c027a2509b SHA512 68d1c85bbeadabc482cf7953834f7fe7f8b78b063fbb9418a0359b3d877a68e59d548fb546efce013f525e60c288fa9a0a0b58b899af3a1cc4934581957fbae9
+EBUILD gauche-kakasi-0.1.ebuild 571 BLAKE2B d5285162234a87b39957d5e9f61deabac775a7923507ab3d7fa697deaa88fecc3f4a962dbf1fe258a28a021700bb2450df65c19ecf6b461f8c6a4770c390a7ef SHA512 a658281a9fd4cfb33b8df67d470afbf9de5e28529cafed979ba8ea04a5fc4ac434612600cd2b1a513f7fdcdb50fae10b9254c2266276d17335adcc3ae7f6b4e2
+MISC metadata.xml 324 BLAKE2B 47f0589f82e21477fd1cbf7c1465607376c926fbfffff0a81b76ef369c61f5eb48079c011b25a5f277ada590a286789ce69c2ac460288dd5f9cb5904a1d5590f SHA512 038b2ee1239617c8b16963724da26eb459e8ba3fd5598d3ffdc502d9642dbe6fa44da8b8c30ae51213383407396523cca3f6a646435c458e6f6626d406f9073b
diff --git a/dev-scheme/gauche-kakasi/files/gauche-kakasi-gauche-package.patch b/dev-scheme/gauche-kakasi/files/gauche-kakasi-gauche-package.patch
new file mode 100644
index 000000000000..ca2e3fd73da0
--- /dev/null
+++ b/dev-scheme/gauche-kakasi/files/gauche-kakasi-gauche-package.patch
@@ -0,0 +1,156 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,58 +10,43 @@
+ VPATH       = $(srcdir)
+ 
+ # These may be overridden by make invocators
+-DESTDIR  =
+-OPTFLAGS = @OPTFLAGS@
+-CC       = @CC@
+-LIBS     = -lkakasi @LIBS@
+-CFLAGS   = @CFLAGS@ @KAKASI_INCDIR@ $(OPTFLAGS)
+-LDFLAGS  = @LDFLAGS@ @KAKASI_LIBDIR@ 
+-INSTALL_TYPE = @INSTALL_TYPE@
+-
+-# Set by configure
+-GOSH     = @GOSH@
+-GAUCHE_CONFIG = @GAUCHE_CONFIG@
+-OBJEXT   = @OBJEXT@
+-DSOEXT   = @SOEXT@
++DESTDIR        =
++CFLAGS         = @CFLAGS@ @KAKASI_INCDIR@
++CPPFLAGS       = @CPPFLAGS@
++LDFLAGS        = @LDFLAGS@ @KAKASI_LIBDIR@
++GOSH           = "@GOSH@"
++GAUCHE_CONFIG  = "@GAUCHE_CONFIG@"
++GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@"
++INSTALL        = "@GAUCHE_INSTALL@"
+ 
+-INSTALL  = @GAUCHE_INSTALL@
++# Other parameters
++SOEXT    = @SOEXT@
++OBJEXT   = @OBJEXT@
++EXEEXT   = @EXEEXT@
+ 
+-MODULE   = kakasi
++# Module-specific stuff
++PACKAGE   = kakasi
+ 
+-ARCHFILES = $(MODULE).$(DSOEXT)
+-SCMFILES  = text/$(MODULE).scm
+-HEADERS   = 
++ARCHFILES = $(PACKAGE).$(SOEXT)
++SCMFILES  = text/$(PACKAGE).scm
++HEADERS   =
+ 
+ TARGET    = $(ARCHFILES)
+-OBJS      = kakasi_head.$(OBJEXT) \
+-            kakasi.$(OBJEXT)      \
+-            kakasilib.$(OBJEXT)   \
+-            kakasi_tail.$(OBJEXT)
+-GENERATED = kakasilib.$(OBJEXT) kakasi_head.c kakasi_tail.c
++GENERATED =
+ CONFIG_GENERATED = Makefile config.cache config.log config.status \
+-		   configure.lineno autom4te*.cache Gauche-kakasi.gpd
+-
+-HEADER_INSTALL_DIR  = $(DESTDIR)`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)incdir`
+-SCM_INSTALL_DIR     = $(DESTDIR)`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)libdir`
+-ARCH_INSTALL_DIR    = $(DESTDIR)`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)archdir`
+-
+-all : $(TARGET)
+-
+-.SUFFIXES: .o .stub
++		   configure.lineno autom4te*.cache @PACKAGE_NAME@.gpd
+ 
+-.c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++HEADER_INSTALL_DIR  = "$(DESTDIR)`$(GAUCHE_CONFIG) --siteincdir`"
++SCM_INSTALL_DIR     = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitelibdir`"
++ARCH_INSTALL_DIR    = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitearchdir`"
+ 
+-.stub.c:
+-	$(GOSH) genstub $<
++kakasi_SRCS = kakasi.c kakasilib.stub
++kakasi_LIBS = -lkakasi
+ 
+-kakasilib.c : kakasilib.stub
+-
+-$(MODULE).$(DSOEXT): $(OBJS)
+-	$(CC) -Wl,-rpath -Wl,`gauche-config --sysarchdir` $(LDFLAGS) $(MODULE).$(DSOEXT) $(OBJS) $(LIBS)
++all : $(TARGET)
+ 
+-$(MODULE)_head.c $(MODULE)_tail.c :
+-	$(GAUCHE_CONFIG) --fixup-extension $(MODULE)
++$(PACKAGE).$(SOEXT): $(kakasi_SRCS)
++	$(GAUCHE_PACKAGE) compile --verbose --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(kakasi_LIBS)" $(PACKAGE) $(kakasi_SRCS)
+ 
+ check : all
+ 	@rm -f test.log
+@@ -71,10 +56,11 @@
+ 	$(INSTALL) -m 444 -T $(HEADER_INSTALL_DIR) $(HEADERS)
+ 	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR) $(SCMFILES) 
+ 	$(INSTALL) -m 555 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
+-	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/.packages Gauche-kakasi.gpd
++	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/.packages @PACKAGE_NAME@.gpd
+ 
+ clean :
+-	rm -rf core $(TARGET) $(OBJS) $(GENERATED) *~ test.log so_locations
++	$(GAUCHE_PACKAGE) compile --clean $(PACKAGE) $(kakasi_SRCS)
++	rm -rf core $(TARGET) $(GENERATED) *~ test.log so_locations
+ 
+ distclean : clean
+ 	rm -rf $(CONFIG_GENERATED)
+--- a/configure.in
++++ b/configure.in
+@@ -7,10 +7,6 @@
+ 
+ AC_PREREQ(2.54)
+ AC_INIT(Gauche-kakasi, 0.1, shiro@acm.org)
+-dnl If you want to use the system name (OS, architecture, etc) in the
+-dnl configure, uncomment the following line.  In such a case, you need
+-dnl to copy config.guess and config.sub from automake distribution.
+-AC_CANONICAL_SYSTEM
+ 
+ dnl Sets several Gauche-specific parameters.
+ AC_GAUCHE_INIT_EXT
+@@ -27,16 +23,10 @@
+ AC_SUBST(KAKASI_INCDIR)
+ AC_SUBST(KAKASI_LIBDIR)
+ 
+-dnl Sets the default value of INSTALL_TYPE macro.
+-dnl You can set it either 'site' or 'sys'.  Usually, user-provided
+-dnl extensions are installed as 'site' category.
+-AC_GAUCHE_INSTALL_TYPE(site)
+-
+ dnl Get compiler parameters which Gauche has been compiled with.
+ dnl Do not use AC_PROG_CC.  You need to compile and link with the
+ dnl same programs as gosh.
+ AC_GAUCHE_CC
+-AC_GAUCHE_FLAGS
+ 
+ dnl Check for other programs.
+ dnl Add your macro calls to check existence of programs, if you have any.
+@@ -44,9 +34,9 @@
+ dnl Check for libraries
+ dnl Add your macro calls to check required libraries, if you have any.
+ 
+-dnl Set LDFLAGS to generate dlopen-able extension.
+-dnl This should come after all tests, or the tests that does link will fail.
+-AC_GAUCHE_FIX_LIBS
++AC_SUBST(CFLAGS)
++AC_SUBST(CPPFLAGS)
++AC_SUBST(LDFLAGS)
+ 
+ dnl Output
+ AC_GAUCHE_MAKE_GPD
+--- a/kakasilib.stub
++++ b/kakasilib.stub
+@@ -43,7 +43,7 @@
+   SCM_RETURN(sr);")
+ 
+ (define-cproc kakasi-close-kanwadict ()
+-  (return <fixnum> "kakasi_close_kanwadict"))
++  "SCM_RETURN(SCM_MAKE_INT(kakasi_close_kanwadict()));")
+ 
+ ;; Local variables:
+ ;; mode: scheme
diff --git a/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild b/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild
index fd5ecde1baa4..10ac8a46a9a9 100644
--- a/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild
+++ b/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild
@@ -1,35 +1,31 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI="6"
 
-IUSE=""
+inherit autotools
 
-MY_P="${P/g/G}"
+MY_P="${P^g}"
 
 DESCRIPTION="Kakasi binding for Gauche"
-HOMEPAGE="http://gauche.sf.net/"
-SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
+HOMEPAGE="http://sourceforge.jp/projects/gauche/"
+SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="~amd64 ~ia64 x86"
+IUSE=""
 
-DEPEND=">=dev-scheme/gauche-0.8
+RDEPEND="dev-scheme/gauche
 	>=app-i18n/kakasi-2.3.4"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-
-	econf || die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
+PATCHES=( "${FILESDIR}"/${PN}-gauche-package.patch )
 
-	dodoc AUTHORS ChangeLog README*
+src_prepare() {
+	default
 
+	mv configure.{in,ac}
+	eautoreconf
 }
diff --git a/dev-scheme/gauche-kakasi/metadata.xml b/dev-scheme/gauche-kakasi/metadata.xml
index 5a36f36510cd..8eaf7545ebf5 100644
--- a/dev-scheme/gauche-kakasi/metadata.xml
+++ b/dev-scheme/gauche-kakasi/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gauche</remote-id>
diff --git a/dev-scheme/gauche-mecab/Manifest b/dev-scheme/gauche-mecab/Manifest
new file mode 100644
index 000000000000..2b01b18a798c
--- /dev/null
+++ b/dev-scheme/gauche-mecab/Manifest
@@ -0,0 +1,3 @@
+DIST Gauche-mecab-1.0.2.tar.gz 12724 BLAKE2B 7e18910f5e45750b6fe3a916a0350071be97f0c860bdf27733639599ec2e302305887ae04b7239c9da90e0913bc2ba03626f105a0004bd3c7f087016b66cef63 SHA512 2d000a0c0f795af93e2728249e7ab339c19d388546d3a300d5960079b9bf360a23c7758867edaca4abb871329689372b645e27eb20bed139aeb997e4d7583c43
+EBUILD gauche-mecab-1.0.2.ebuild 457 BLAKE2B eab6b25ba349e1e1949abe7a39639960e7bd8cd7d57c2c76f7b653cc665bbc79db9f0442d4bcc4d4f5066be8e90a5fb25b2b405808f121e2f05a8e6d335d0e80 SHA512 7127b97844fa51b7205927a5500b41f4cb873f9d62c763873672fcfa772b57c7aae2248877a4de3a71b017d40a5265ae4d8e1edb3b10fc0fe572a9ed6b6bba4b
+MISC metadata.xml 332 BLAKE2B 479ab433d1fc419c4c5d1fad6cdd30d747321df30fe27f9ee6d4d999988ed3cb6e4fd73fe858a62dbc1dcee677989d8e136b16a166def9c98dd34cdaa2447226 SHA512 54aa5b0506659acf8a3c049303d7c156b250e095c6da7b0bae138fd3e0d2c693fc87f19996e08606ac5f4f3a00685186c97458a7c6989e2803f7717ffd1ecc5e
diff --git a/dev-scheme/gauche-mecab/gauche-mecab-1.0.2.ebuild b/dev-scheme/gauche-mecab/gauche-mecab-1.0.2.ebuild
new file mode 100644
index 000000000000..1f7af5b4816a
--- /dev/null
+++ b/dev-scheme/gauche-mecab/gauche-mecab-1.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="${P^g}"
+
+DESCRIPTION="MeCab binding for Gauche"
+HOMEPAGE="https://github.com/shirok/Gauche-mecab"
+SRC_URI="https://github.com/shirok/${PN^g}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/mecab
+	>=dev-scheme/gauche-0.9.5"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-scheme/gauche-mecab/metadata.xml b/dev-scheme/gauche-mecab/metadata.xml
new file mode 100644
index 000000000000..fb1515c4d158
--- /dev/null
+++ b/dev-scheme/gauche-mecab/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+		<name>Akinori Hattori</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">shirok/Gauche-mecab</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/gauche-qdbm/Manifest b/dev-scheme/gauche-qdbm/Manifest
index 51acfe90d2b6..b1d8f2fae243 100644
--- a/dev-scheme/gauche-qdbm/Manifest
+++ b/dev-scheme/gauche-qdbm/Manifest
@@ -1,5 +1,6 @@
-AUX gauche-qdbm-0.2-gauche-package.diff 3815 BLAKE2B 3ec79da0df5f1d4b2f4908b1ad871b0bc1b9314c156f691afa72f85867da343ac618b0aa5aee50ac70922db0541f649f791f3560362f9b4610ea461ee96028cc SHA512 353ac7479a64f3fc1dcf4ced2ca686e81abfb886d17a8b936df84147dea529a419225741a33beb7f098d4b3bd1083d91eb8adbdbde78969a2aa547088ae2607a
-AUX gauche-qdbm-0.2-undefined-reference.diff 422 BLAKE2B fcc8551676e6e3867f9fd4b8fa00a15d292eb79128e1c4224d1ee479db0554ad3b884beffcd7c5b1a4e23e4e02b7cae1933018189fbe97b498ecb9869f4f5e48 SHA512 856346d2c45bea79bb606c751fd48afb8677412a7f17910de4c9f948f6bdeca6b06100bb5e346dcd2a12ae0038043d55ac9d1f930705a1d9b7acf4e7649f78d1
+AUX gauche-qdbm-gauche-package.patch 4106 BLAKE2B 94e7dcf114aad23bd974efd6e8dca72a9e53d15a3dc6e0fe960215be2d1742d241d8bcda72435036f98b26b4f85c377d455b066f45c2b3adfa2f226a448914a2 SHA512 d4c732708b1ade664084e7193046467aea02c7cf23bcc7484d0aa8e404afc5a31b49b68f85ed0531e7231319962065394f1ffd49686718fdb9e9299d693e0078
+AUX gauche-qdbm-test.patch 509 BLAKE2B d25e07515e8e8a5fd8428b3438f77ee250ab4828280cd84cbb6d8be27847e6109204cd2adfd8dee69f571cfed2a54367dd9c3b32665310ffcf2da8e2fd803946 SHA512 b6903f20440aeddc8f1977d66aa54458d241f53a195ac1ba9d2c60ddef0167c4053aa662e8da0595f5427f502a20e948763e7648d13d452cb37ad1abd33cf54f
+AUX gauche-qdbm-undefined-reference.patch 389 BLAKE2B 8730afd098e3b12365470d3544bcfd8cf03b2058af0cf4c63107f66c364aec50a7516d699a2e292ef1f40eacb0ec76458730509db576b3e53bdea57ff634f5cd SHA512 67aaf78272973c283da3c128e7479688ec4207395da5b0af0e33b9c209d8f1dac547dca57787db218bc954ac3af34b25f2b6862acfe5362c439bb244878be282
 DIST Gauche-qdbm-0.2.tar.gz 73311 BLAKE2B d8937147368416ef17ca5e953d91a6e906f16e65b73c87d01515346c0be5e5bb3646e7b26a8847d4b29bcf7abd4e7114fdbfd74a122f5fd1cc6205768e1789eb SHA512 9286d22f1ad32f213c34670ca0a3fef4d43da8d7e0bed019cd5891400eb7337cd3adfb7cc788350e1f1ab535b87af0fa0a6096d33fa73da6049888ce0006e821
-EBUILD gauche-qdbm-0.2-r1.ebuild 580 BLAKE2B e1d6aed7431f0e74bcf570600d9c269ab8ce06e1933a10e8ca99f2298f4fa4f0eaa4cb27df34cf33eb7d1696c5edde5447539c5cc632c5c3a59a9c3ad251b3b6 SHA512 2eb7e9ce9df8d696284d5f03bd76d12cfbf62ff0f9a9d54ef1db5dcc791b293014ea5d0737eb8f18967997c0f2542770cde17763883a7302d058791a748bbb61
-MISC metadata.xml 296 BLAKE2B b4f40c5389c14637456012f92ba3be281395a6880ba7793ea8613c4d8daf381fb0e25ed330d90e34020072ce65a5d92885a648c44021e493df83381ef8848488 SHA512 337649e4855f527c3f342c81034140381e5bdbf070f3ee3ca777196bbbbf90c5900e393519881ea5f8775c0d221a3b4564bddb35b5a2dd607216ab3dde64d652
+EBUILD gauche-qdbm-0.2-r1.ebuild 630 BLAKE2B 8f3f50a3705d5dd55a466610964fee9aed9af7f2b32c9584910033dd6ae98ffa020091f12ea5f06a37a1222ee818aea57257ff5f1b68e0980fc622dc5dc41f2b SHA512 e78d00335099b817a63d13b5eafb34b5b7214f6576b5103be138db680e1808c55cc9894f39d5bfdfd0e958c5267d7836826ca537e70e6faf6bcdaf4ec91b8d53
+MISC metadata.xml 327 BLAKE2B 296a3f702aeb51830de1c20b949ef214633f5ced8b46d140cf8949bdd49f80586f2ee7edb0690176a5d10c5f3e2d228e524d52afef934da424589253d39f628a SHA512 ab6ba356946b4e3887b52c7e27f32cbab85d9fa7fc38b574fe6a88beba33799867090316e1ecc5994c0115397c22c055d67d1188536b7ac6b4d8d833bef2ce28
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff b/dev-scheme/gauche-qdbm/files/gauche-qdbm-gauche-package.patch
index a4e305600423..0c74472113a0 100644
--- a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-gauche-package.patch
@@ -1,5 +1,5 @@
---- Gauche-qdbm-0.2.orig/Makefile.in
-+++ Gauche-qdbm-0.2/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -10,79 +10,57 @@
  VPATH       = $(srcdir)
  
@@ -18,7 +18,9 @@
 -GOSH     = @GOSH@
 -GAUCHE_CONFIG = @GAUCHE_CONFIG@
 +DESTDIR        =
++CFLAGS         = @CFLAGS@
 +CPPFLAGS       = @CPPFLAGS@  # AC_LIB_LINKFLAGS adds to this..
++LDFLAGS        = @LDFLAGS@
 +GOSH           = "@GOSH@"
 +GAUCHE_CONFIG  = "@GAUCHE_CONFIG@"
 +GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@"
@@ -79,9 +81,7 @@
 -$(MODULE)_head.c $(MODULE)_tail.c :
 -	$(GAUCHE_CONFIG) --fixup-extension $(MODULE)
 +$(PACKAGE).$(SOEXT): $(qdbm_SRCS)
-+	$(GAUCHE_PACKAGE) compile --verbose \
-+	    --libs="$(qdbm_LIBS)" --cppflags="$(CPPFLAGS)" \
-+	    $(PACKAGE) $(qdbm_SRCS)
++	$(GAUCHE_PACKAGE) compile --verbose --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(qdbm_LIBS)" $(PACKAGE) $(qdbm_SRCS)
  
  check : all
  	@rm -f test.log
@@ -112,8 +112,8 @@
  
  distclean : clean
  	rm -rf $(CONFIG_GENERATED)
---- Gauche-qdbm-0.2.orig/configure.ac
-+++ Gauche-qdbm-0.2/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -4,18 +4,11 @@
  AC_INIT(Gauche-qdbm, 0.2)
  AC_CONFIG_SRCDIR(qdbm.c)
@@ -134,3 +134,14 @@
 +AC_GAUCHE_MAKE_GPD
  echo $PACKAGE_VERSION > VERSION
  AC_OUTPUT(Makefile)
+--- a/depot.stub
++++ b/depot.stub
+@@ -219,7 +219,7 @@
+   SCM_RETURN(SCM_MAKE_INT(r));")
+ 
+ (define-cproc qdbm-dpprimenum (num::<fixnum>)
+-  (return <int> "dpprimenum"))
++  "  SCM_RETURN(SCM_MAKE_INT(dpprimenum(num)));")
+ 
+ (define-enum DP_OREADER)
+ (define-enum DP_OWRITER)
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-test.patch b/dev-scheme/gauche-qdbm/files/gauche-qdbm-test.patch
new file mode 100644
index 000000000000..2153c8978feb
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-test.patch
@@ -0,0 +1,13 @@
+--- a/test.scm
++++ b/test.scm
+@@ -32,8 +32,8 @@
+ (test* "qdbm-dpclosed?" #t (qdbm-dpclosed? qdbm))
+ (test* "qdbm-dpremove" #t (qdbm-dpremove "test.dbm"))
+ 
+-(test* "qdbm-innerhash" -468784272 (qdbm-dpinnerhash "key"))
+-(test* "qdbm-outerhash" -448645494 (qdbm-dpouterhash "key"))
++(test* "qdbm-innerhash" 604957552 (qdbm-dpinnerhash "key"))
++(test* "qdbm-outerhash" 625096330 (qdbm-dpouterhash "key"))
+ (test* "qdbm-primenum" 10223 (qdbm-dpprimenum 10000))
+ 
+ ;; The following is taken from ext/dbm/test.scm.
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff b/dev-scheme/gauche-qdbm/files/gauche-qdbm-undefined-reference.patch
index d6a6efb99b4f..cf80940c97ef 100644
--- a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-undefined-reference.patch
@@ -1,5 +1,5 @@
---- Gauche-qdbm-0.2.orig/qdbm.scm
-+++ Gauche-qdbm-0.2/qdbm.scm
+--- a/qdbm.scm
++++ b/qdbm.scm
 @@ -72,7 +72,7 @@
    (unless (slot-bound? self 'path)
      (error "path must be set to open qdbm database"))
diff --git a/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
index 9a99480a7c48..8bfec2a242da 100644
--- a/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
+++ b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2012 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
 
-MY_P="${P/g/G}"
+MY_P="${P^g}"
 
 DESCRIPTION="QDBM binding for Gauche"
 HOMEPAGE="http://sourceforge.jp/projects/gauche/"
-SRC_URI="mirror://sourceforge.jp/gauche/6988/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge.jp/${PN%-*}/6988/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~sparc x86"
+KEYWORDS="~amd64 ~ia64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-scheme/gauche
@@ -21,8 +21,13 @@ RDEPEND="dev-scheme/gauche
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-gauche-package.patch
+	"${FILESDIR}"/${PN}-test.patch
+	"${FILESDIR}"/${PN}-undefined-reference.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gauche-package.diff
-	epatch "${FILESDIR}"/${P}-undefined-reference.diff
+	default
 	eautoreconf
 }
diff --git a/dev-scheme/gauche-qdbm/metadata.xml b/dev-scheme/gauche-qdbm/metadata.xml
index c30645235ea2..b700519a0a23 100644
--- a/dev-scheme/gauche-qdbm/metadata.xml
+++ b/dev-scheme/gauche-qdbm/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">gauche</remote-id>
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 746e2bc16b58..d7a740411e76 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -4,12 +4,12 @@ AUX gauche-0.9.5-bsd.patch 714 BLAKE2B a52d2fa09af6895db8e605cfc4d88f1537e4f95c8
 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 57b7463086c0763413b8fda3d7688c6a61bd4456b3209a80b6eabed088e0c71eb5ae4c53b18fb0e6b7468ac03fe33f7884f265ab1ea998e8457b0ef126e6e841 SHA512 df42c5f25adc5a67ad049ab78aeaa4f565d18818dd6dfff5a64a78e9e3101595a4279d72e8f946e4f7da7be30f9f11c089c7f4a65d2eb2135980414c3d6e9cbb
-AUX gauche-gauche.m4.patch 592 BLAKE2B ae22e11c85fa4cbae7217a8b632041a9f4241023f38105e906035210bcd82604ac69bb36c5874c4662a32e0cb551a9f59cc96487096c12356f9ef19c6d25de79 SHA512 5082265340c6011d653f20de3a89f1eed1a48b896d521bb42aff1f748cafd3c60953c3b723ab9b053dcd941ed6b61f00f9f69a25f16db74d987228db2318ac68
+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-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 1264 BLAKE2B 5431d4bca6b19bdaf5097abec31e4ac72799d79de9d694c26480ec0efb116038f4094459963d29612b1e0c85b5a7f20313000e8125fc4f4d8fe4df4dfef2363a SHA512 156a765380e68cbba229cb62423aceeefa040f9089e9059d3d2a02a6e5e2bf0c6abdada8372dca43493fa64148355922567afa00c9fbd6d68257a1eb17e0445f
-EBUILD gauche-0.9.6.ebuild 1218 BLAKE2B 651120d2c2c922f828632fb732c063cc06401d2cf51efd7852cff36e22de864d95ee814a9f2649429f9e782614a99d36cb302537a49f70913fcbf5bf083193ce SHA512 129e0c1e4e81f1d04f599196b8ad445893a7d67d4294d4e90b7046bbcf25f6555591f8f0f015d6e9cb28edef3d1d70693024db6dd233be04dae512e4c90bc2ae
+EBUILD gauche-0.9.6-r1.ebuild 1286 BLAKE2B 99cf17263f8f2d15920a614e1e971a0011b9bc0e20ca50acdfbf206af8ae5a075552ac9766bc7d5fa64a53095d79006d8a67d4f5b9d66e208f6bda8fe45c9211 SHA512 c64b9008790293453e8ef3df0576a78e095320a294f881097535a84961676a0f26aa19d9fa04cd781e342c77046a4d3d98c67d73aa845eb2ed26ccfbb2f2077f
 MISC metadata.xml 909 BLAKE2B faaf122e0b844cf34bb8b4417cc5e5728e37bcd14a4717d23e42770d6ce2c732724f46f48e01e32684f2f229ea560e2968c11e86473eba50c93dd1184d110cd5 SHA512 031f92387b4dec50e4b534d70c15e70b2a0f7e4ffa9e8a70a47ed9467bcbc4bc57b2210ff50b0e49c1ed73028d6eee4dfd28994cd8e23bdf041364f052e985de
diff --git a/dev-scheme/gauche/files/gauche-gauche.m4.patch b/dev-scheme/gauche/files/gauche-gauche.m4.patch
index 1b9947cf5798..a5c5455f1702 100644
--- a/dev-scheme/gauche/files/gauche-gauche.m4.patch
+++ b/dev-scheme/gauche/files/gauche-gauche.m4.patch
@@ -16,3 +16,12 @@
  OPTFLAGS="$GCCOPT $I686OPT"
  AC_SUBST(OPTFLAGS)
  ])
+@@ -150,7 +147,7 @@
+ dnl
+ AC_DEFUN([AC_GAUCHE_MAKE_GPD],
+ 	 [
+-GAUCHE_PACKAGE_CONFIGURE_ARGS=`echo "$ac_configure_args" | sed 's/@<:@\\"\`\$@:>@/\\\\&/g'`
++GAUCHE_PACKAGE_CONFIGURE_ARGS=`echo "$ac_configure_args" | sed 's/@<:@\$\\"\`@:>@/\\\\&/g'`
+ AC_MSG_NOTICE([creating ${PACKAGE_NAME}.gpd])
+ $GAUCHE_PACKAGE make-gpd "$PACKAGE_NAME" \
+   -version "$PACKAGE_VERSION" \
diff --git a/dev-scheme/gauche/gauche-0.9.6.ebuild b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
index 37e0c2b459d4..17f4e9bbdc4e 100644
--- a/dev-scheme/gauche/gauche-0.9.6.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
@@ -43,6 +43,7 @@ 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-tls=axtls$(usex mbedtls ',mbedtls' '')