gentoo resync : 30.06.2018

17 files changed, 200 insertions, 356 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index bc60f9a31898..aab9c628096e 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/escm/Manifest b/dev-scheme/escm/Manifest
index c8a847f809b6..11eaf68743fd 100644
--- a/dev-scheme/escm/Manifest
+++ b/dev-scheme/escm/Manifest
@@ -1,3 +1,3 @@
 DIST escm-1.1.tar.gz 22344 BLAKE2B 4b1ee5a2e002cf0908c1cba58d39dc454cfcedcb11ff7f24344824947103d7670108263d210e020b7d0189f3745a002bb4345d8b50a9f334d89850baa30c9ae9 SHA512 7df97d8b9e7c4b46b412e3dd24a2b0b3f4028d45b1940d12b09f0801c93ab1868ef5c239d8f1bfb18d5c86f473aa543d9b735eb1f05b4bb3e4b17177d2ed9102
-EBUILD escm-1.1.ebuild 615 BLAKE2B 9ca308aee99a01c0868ffd9921fab5d2ea0448f49d0a47074dc4f1e7504e43d583c157f127961e5c4223546dfc98103ba6102401de29cc581be4f50ad2691c44 SHA512 b70a5ac5abd4bd8e626a73146bc9a556a0c0585585ffaa958cffe494022c89c3c9c8f85a638ae012394ca0b6d140c068ddba5aa4f56f49a63a93e64bfbf75ae6
+EBUILD escm-1.1-r1.ebuild 645 BLAKE2B 545844fe9195db6ef4e55a5864b9631b3a05d0ba2faabcf047babd2c8f0f3c5e4a1da64b80363c7757470f1106f206295ceabb065f45dec19e4a5b218660963f SHA512 897f3e028752f2e573739211b7a9db42f54906baf606518d76db67da44883d333930a05b78774a2e4b3ce9891524a8c33763810e98a8a75dc05b6306e9abe64e
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/dev-scheme/escm/escm-1.1.ebuild b/dev-scheme/escm/escm-1.1-r1.ebuild
index 3aac05017dca..2881ec1fb9fa 100644
--- a/dev-scheme/escm/escm-1.1.ebuild
+++ b/dev-scheme/escm/escm-1.1-r1.ebuild
@@ -1,7 +1,7 @@
-# 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 toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://practical-scheme.net/vault/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="|| (
@@ -20,14 +20,18 @@ RDEPEND="|| (
 	)"
 S="${WORKDIR}/${PN}"
 
+HTML_DOCS=( ${PN}.html )
+
 src_prepare() {
 	sed -i -e "6s/scm, snow/scm gosh, gosh/" configure.in
+
+	default
 	eautoconf
 	tc-export CC
 }
 
 src_install() {
-	dobin escm
-	doman escm.1
-	dodoc ChangeLog escm.html
+	dobin ${PN}
+	doman ${PN}.1
+	einstalldocs
 }
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 16e59ae80510..573234fffc1b 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,10 +1,3 @@
-AUX gauche-0.9-ext-ldflags.patch 411 BLAKE2B 49e7903aa4f0200690e9022b80c1c2a74587608729918f2fa72290379469c98a691212adad71bbbcd75c1f850d8b265eb08461f93b1dcb310cce8b4ccd3a0e0c SHA512 237733fac1f8120927f0e1d4170f9545d124eaef3877dd796f95e099191a954b923a7648fd26d99d47a9a489a659aad154cc109842045d90a19d79c18f442da0
-AUX gauche-0.9-gauche.m4.patch 528 BLAKE2B d5c584c9a9540a0ff3c14f9bf569621f40df0af6525475ac58e5c6650d52d845a4674b94828f042d25f59709e4caa784e074cb3d0726dee7aeede438d462f9f0 SHA512 c8bd47b2769d27200272adc0475c890adaa09e66a187a54e8c16462ffca69a156976264642a6db5bd4ee53f3278c488f526ffb7cd26f56041c7e646d5d9ed2d7
-AUX gauche-0.9-rfc.tls.patch 537 BLAKE2B 1d7ca6fd34df09293c77e576f03ab7b29aec49aaae0d591bd96e895d17d79b99e3a73a6edc47fda29dd9e7e083fef9f3c62b1acf07d0a5e7aac9c9f80b4855ce SHA512 9a3d4954ce582afcf544baef751311c8a9216f2122c87b7e2bb8aa2afa8f4c398d8d59ca86687d05c17e368f08fb8264e1441fb3ba474e04ebf78ea20acf81e7
-AUX gauche-0.9-rpath.patch 242 BLAKE2B 96f34f61244d4171917a754368c01e736406f7ba848fc650bc74a7a52e30fc650e06b4b44075b3653ab7eead4a6431885b3a7423f9ea5cc05bb956c4f8470272 SHA512 46cc19db79ce7652b200ba6aec46c42d58ca7bb8ad0a0f884fa0999c14cfd9c8d42aae83c05f442091bc435f6ecf5010521e022af90be4e180c51da81145f08d
-AUX gauche-0.9-xz-info.patch 1438 BLAKE2B d8220a3983afff9cf3c0810afe7cebdbb83ac1a33d6d2942590938eb0da6522cc16df0dfce0f5d0955803fac70d7eb6b5252055f3fafa94b7aa9b091e89cd1f0 SHA512 c425a2e70376920fcc4bf8e7ce904db6f625eeeacc58a199b2f9513c98281ef84186887a28c2f8bd7c7e60461fb9fce3a10066a24914420d2a08029736c6c199
-AUX gauche-0.9.3.3-file.util.patch 701 BLAKE2B 299f5625901d22845289079540efeca05df627c58f639e8fade3e190a1a86b87ec15249e1393aa6549336e62a09120d6767f76b2ed2d7dcc45bd37e0e908afc3 SHA512 0b64093cc949394dc5e3d77c8c4cadda068ebb2010bd1f67d04ec65be2f13ac6f3a334abf93afdd41ccdda7e5f1d303dd44b368531985d9732f289df38979f49
-AUX gauche-0.9.3.3-gauche.threads.patch 4111 BLAKE2B 5cb27f7fce34025c101be96740a2997380cdbc3a5b677f743ec19a04fb6bbc2b3204b992cd4a6d6c5db7e1dd16e478472b8013cd4a9a0d15be7911ae05e1a240 SHA512 a3f4a72686759328a6cc958505806dd2aa782ba05859fd4d02933d17129952fa7a19440c84e2be454275643709282fa202d943b85431bac03d0953682e0aa24f
 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
@@ -13,10 +6,6 @@ AUX gauche-gauche.m4.patch 592 BLAKE2B ae22e11c85fa4cbae7217a8b632041a9f4241023f
 AUX gauche-rfc.tls.patch 401 BLAKE2B 8cc1fca64ebaa0630b9e0f3862bbe4c167977b8a354df3b7f154ff4f1078344b381826f2eafece97825b3454069b09b53c07eea87720684b93897011bd3d79cd SHA512 5b2baafa052208c1843e7d05789bf8a10c63fbb48de66ca7e8b7450a5cb23c1c5641c34a8ff8ee525aa073de21b1f970ba4c310b2678dc1f81293e51c22de321
 AUX gauche-rpath.patch 215 BLAKE2B 081374abd3272ae10b7614af92c8f16054c1eaa6fb636d9f6300589751197f9b19b706a4fe500e985c25ea250f9a2a2338d903094d9ca95c2622e618ea6ce9ed SHA512 1bda4c2e0bb3928d040eb07d56a9eb0aebd68e52bd0756160ef3eec46ba8c1869b8a37dbb798a712a59918d6bf77e7ca74ec38a4e2e30bb6417f967b5cdc8da6
 AUX gauche-xz-info.patch 1322 BLAKE2B f73447a306ec54ff372520c603adf2da46e1b71225a27d09af5c3ae8770431c5fef4d974cbf6e08fa1159807719c798680b18c7f624ec83b33d5ddf8688946f0 SHA512 22b6a37ea23bcba7e4ea4d09f26b069225cc36ef32dc0fbc865cfa4052765d0363811f693d6cc5cc8f3fdf355b93eec7c58934d18b2cb8079cadfd3b0cd4ffa4
-DIST Gauche-0.9.3.3.tgz 5042189 BLAKE2B 28aaae506d89f0ba8dc7dd78eaf78678875d8d785a9ee67352f00e82531cafa4ec711f4ee55b9b791476cc1e196585131db8f63c3d2ac9584fb4fa0ab54b9291 SHA512 5743781d88454d579d853a50c5c7651c52bdcea8b7b2130408e1c7761cee73edfdebaf258342e837ef7d5a3886e08bbb33b2862d1e19585f519ada5cb7475d1c
-DIST Gauche-0.9.4.tgz 5601987 BLAKE2B 3c1181d4ff17b7c90fb1fb30401f9f284290fee05dfb368ced69c813966220152e81269c954f66d9b31ed182912d6552011e73ae92d69418160f86f7c0e758c8 SHA512 815e719d78950a31c238fd7879e09f40d6b3a83a3ebf9d5f7cd3cc7ada081e5f20fbc6b432900e3455bc59e5e60014bf77605b8c9c5f27def53f89284b9cfca3
 DIST Gauche-0.9.5.tgz 6458675 BLAKE2B ca7f1ad48841a2a6a98632980d8a4fe5065234de5c23835c24e633345ba77fd4d3610d073c00a8da00c1e794e22a74e493793d8fca4a7f3ed1a3161a29622f30 SHA512 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a
-EBUILD gauche-0.9.3.3.ebuild 1104 BLAKE2B 04eaacf89c634c62dc86cad070746851179c01fc5418ea4decf725104e4a5bc264a99cac541f57a9771b55a780e8b41cd5c36ad6e8fa4c566840c3bbe28945cb SHA512 21599f83cabb6e31a819c59b04dc615347049418a516fefb1ae0ac6a8db95df92afb2ad227f58ad069675743880cac6a661a283f518a432da6c7e171eb711202
-EBUILD gauche-0.9.4-r1.ebuild 1181 BLAKE2B 459ace86ab36fc4ddb8524322ad3cffb145b89eebc58821c7f720029e0d65b257746b4e01132dd00f38e68f824a42d5fd35c4dd200dedcd2df1ff0ba34bdbfcf SHA512 0d7014d7c7ad24a313af3a6f27e8123019d115852477c1fa56612323eabc4c17be70fb021261ea7013e911d78fa76a4258b9e96101e485ba52bf83d50f097b19
-EBUILD gauche-0.9.5.ebuild 1251 BLAKE2B 124386fc9039b75f6ab6f7cb07ab837f33e091efc80fee0969c86ddb450ff2e79dd68b77187fcca0a3f433bf477133ba27c3acecac9a13265856401ee633a048 SHA512 b4cc7e1bc78a8e6fc4790cc47b687afeecd96e932fa290dceffa1b8312197615de3d3971f18ddef3f1e0ebf4ae8b1ec7baa9d729a630b4419ec67b58f1e73395
+EBUILD gauche-0.9.5.ebuild 1256 BLAKE2B a22e812a27afc996f7c268de2bdd381144830bf19a7ac8ffc9320d02fdda3c37dafc6d5f48ad78857f97333212dec6997d621ae8f6508cd887089da68f6dd037 SHA512 ce92dcfe445b86f5a69e39cc6b0dfbe3dafff4ff66637474ac5ae152a2baa91649a37cc665573ca242309355d21913e322498e2fa6d35d8f21ae1783022844a3
 MISC metadata.xml 786 BLAKE2B 754139591a9964738cd54b869143cc1f51334a5481127a3a19893e5a30316d67c05bdd2f49155d36dd0e123e99ff16f9983b7a9abdf7022986328fca12b964be SHA512 cb9c550a806862c79a5c05eb317ffda442b543b3f07d114165958615672e093647bec4a3109dca0518f1f29be06e86c3ddc737f44cb2d93437beb5607d532368
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 a9de4114d2bf..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Gauche-0.9.1.orig/ext/Makefile.ext.in
-+++ Gauche-0.9.1/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-gauche.m4.patch b/dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch
deleted file mode 100644
index 8c4d3180836a..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Gauche-0.9.4.orig/m4/gauche.m4
-+++ Gauche-0.9.4/m4/gauche.m4
-@@ -103,15 +103,11 @@
-   i686-*) I686OPT="-DUSE_I686_PREFETCH";;
- esac
- case "$CC" in
--  gcc*)  # some systems may have gcc-2.95, gcc-3, etc.
-+  *gcc*)  # some systems may have gcc-2.95, gcc-3, etc.
-     case "$target" in
-       *mingw*) ;;
-       *)     GCCOPT="-fomit-frame-pointer";;
-     esac
--    case "$target" in
--     i586-*) GCCOPT="$GCCOPT -march=i586";;
--     i686-*) GCCOPT="$GCCOPT -march=i686";;
--    esac
-     ;;
- esac
- OPTFLAGS="$GCCOPT $I686OPT"
diff --git a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
deleted file mode 100644
index 0bce39ad9929..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Gauche-0.9.3.2.orig/ext/tls/Makefile.in
-+++ Gauche-0.9.3.2/ext/tls/Makefile.in
-@@ -77,6 +77,9 @@
- 	@sed -e "s@\.\./ssl/@../../$(srcdir)/axTLS/ssl/@g" \
-              -e "s/system/safe_system/g" \
-              -e "s@openssl @sh ../../$(srcdir)/kick_openssl @g" \
-+             -e "/do_reneg = 1;/i#if 0" \
-+             -e "/do_reneg = 0;/a#endif" \
-+             -e "/SSL_server_test(/,/)/s/ -tls1//" \
-              $(srcdir)/axTLS/ssl/test/ssltest.c >> $(SSLTEST_GENERATED)
- 	@cat $(srcdir)/system-fix.c >> $(SSLTEST_GENERATED)
- 
diff --git a/dev-scheme/gauche/files/gauche-0.9-rpath.patch b/dev-scheme/gauche/files/gauche-0.9-rpath.patch
deleted file mode 100644
index ca76cb831234..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9-rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Gauche-0.9.1.orig/configure.ac
-+++ Gauche-0.9.1/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/files/gauche-0.9-xz-info.patch b/dev-scheme/gauche/files/gauche-0.9-xz-info.patch
deleted file mode 100644
index 809879c4cbd8..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9-xz-info.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Gauche-0.9.1.orig/lib/gauche/interactive/info.scm
-+++ Gauche-0.9.1/lib/gauche/interactive/info.scm
-@@ -84,7 +84,8 @@
-                             :pred (lambda (p)
-                                     (or (file-is-readable? p)
-                                         (file-is-readable? #`",|p|.gz")
--                                        (file-is-readable? #`",|p|.bz2"))))
-+                                        (file-is-readable? #`",|p|.bz2")
-+                                        (file-is-readable? #`",|p|.xz"))))
-         (errorf "couldn't find info file ~s in paths: ~s" *info-file* paths))
-     ))
- 
---- Gauche-0.9.1.orig/lib/text/info.scm
-+++ Gauche-0.9.1/lib/text/info.scm
-@@ -63,6 +63,7 @@
- ;; Find gunzip location
- (define gunzip (find-file-in-paths "gunzip"))
- (define bzip2  (find-file-in-paths "bzip2"))
-+(define xz     (find-file-in-paths "xz"))
- 
- ;; Read an info file FILE, and returns a list of strings splitted by ^_ (#\x1f)
- ;; If FILE is not found, look for compressed one.
-@@ -74,6 +75,8 @@
-            (with-input-from-process #`",gunzip -c ,file" thunk)]
-           [(and bzip2 (file-exists? #`",|file|.bz2"))
-            (with-input-from-process #`",bzip2 -c -d ,|file|.bz2" thunk)]
-+          [(and xz (file-exists? #`",|file|.xz"))
-+           (with-input-from-process #`",xz -c -d ,|file|.xz" thunk)]
-           [else (error "can't find info file" file)]))
-   (with-input-from-info
-    (lambda ()
diff --git a/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch b/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch
deleted file mode 100644
index 1e4cd5d19521..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 15fb279dccb83d66d7e866a0e6f4e3f9ff64fd8d
-Author: Shiro Kawai <shiro@acm.org>
-Date:   Thu Nov 29 23:17:55 2012 -1000
-
-    Fix file.util test
-
-    The current test may fail when a size of a directory happens to
-    100.  Patch from NIIBE Yutaka.
-
---- a/ext/file/test.scm
-+++ b/ext/file/test.scm
-@@ -290,7 +290,8 @@
-          (reverse
-           (directory-fold "test.out"
-                           (^[path result]
--                            (if (= (file-size path) 100)
-+                            (if (and (file-is-regular? path)
-+				     (= (file-size path) 100))
-                                 (cons path result)
-                                 result))
-                           '()
diff --git a/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch b/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch
deleted file mode 100644
index a44ee75b8d1a..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-commit 60d82dd56c15a533562cf28111af5d3365d5d354
-Author: Shiro Kawai <shiro@acm.org>
-Date:   Thu May 31 15:23:22 2012 -1000
-
-    Fixed thread-terminate! bug that SEGVs when applied on non-running threads
-
---- a/ext/threads/test.scm
-+++ b/ext/threads/test.scm
-@@ -100,6 +100,18 @@
-            (thread-terminate! t1)
-            (thread-join! t1))))
- 
-+;; this SEGVs on 0.9.3.3. test code from @cryks.
-+(test* "thread termination before running" 'terminated
-+       (let1 t1 (make-thread (^[] #f))
-+         (thread-terminate! t1)
-+         (thread-state t1)))
-+
-+(test* "thread termination while being stopped" 'terminated
-+       (let1 t1 (thread-start! (make-thread (^[] (let loop () (loop)))))
-+         (thread-stop! t1)
-+         (thread-terminate! t1)
-+         (thread-state t1)))
-+
- ;;---------------------------------------------------------------------
- (test-section "thread and error")
- 
---- a/ext/threads/threads.c
-+++ b/ext/threads/threads.c
-@@ -432,36 +432,41 @@ ScmObj Scm_ThreadTerminate(ScmVM *target)
-     }
- 
-     (void)SCM_INTERNAL_MUTEX_LOCK(target->vmlock);
--    do {
--        /* This ensures only the first call of thread-terminate! on a thread
--           is in effect. */
--        if (target->canceller == NULL) {
--            target->canceller = vm;
--
--            /* First try */
--            target->stopRequest = SCM_VM_REQUEST_TERMINATE;
--            target->attentionRequest = TRUE;
--            if (wait_for_termination(target)) break;
--
--            /* Second try */
-+    if (target->state == SCM_VM_RUNNABLE || target->state == SCM_VM_STOPPED) {
-+        do {
-+            /* This ensures only the first call of thread-terminate! on a
-+               thread is in effect. */
-+            if (target->canceller == NULL) {
-+                target->canceller = vm;
-+
-+                /* First try */
-+                target->stopRequest = SCM_VM_REQUEST_TERMINATE;
-+                target->attentionRequest = TRUE;
-+                if (wait_for_termination(target)) break;
-+
-+                /* Second try */
-+                SCM_ASSERT(target->thread);
- #if defined(GAUCHE_USE_PTHREADS)
- # if defined(GAUCHE_PTHREAD_SIGNAL)
--            pthread_kill(target->thread, GAUCHE_PTHREAD_SIGNAL);
-+                pthread_kill(target->thread, GAUCHE_PTHREAD_SIGNAL);
- # endif /*defined(GAUCHE_PTHREAD_SIGNAL)*/
- #elif defined(GAUCHE_USE_WTHREADS)
--            /* TODO: implement signal mechanism using an event */
-+                /* TODO: implement signal mechanism using an event */
- #endif  /* defined(GAUCHE_USE_WTHREADS) */
--            if (wait_for_termination(target)) break;
-+                if (wait_for_termination(target)) break;
- 
--            /* Last resort */
--            thread_cleanup_inner(target);
-+                /* Last resort */
-+                thread_cleanup_inner(target);
- #if defined(GAUCHE_USE_PTHREADS)
--            pthread_cancel(target->thread);
-+                pthread_cancel(target->thread);
- #elif defined(GAUCHE_USE_WTHREADS)
--            TerminateThread(target->thread, 0);
-+                TerminateThread(target->thread, 0);
- #endif
--        }
--    } while (0);
-+            }
-+        } while (0);
-+    }
-+    /* target either is terminated or hasn't been run */
-+    target->state = SCM_VM_TERMINATED;
-     (void)SCM_INTERNAL_MUTEX_UNLOCK(target->vmlock);
-     return SCM_UNDEFINED;
- }
---- a/test/control.scm
-+++ b/test/control.scm
-@@ -72,7 +72,7 @@
- ;;
- 
- (cond-expand
-- [gauche.sys.pthreads
-+ [gauche.sys.threads
-   (test-section "control.thread-pool")
-   (use control.thread-pool)
-   (test-module 'control.thread-pool)
-@@ -173,7 +173,15 @@
-            (let1 xjob (add-job! pool work)
-              (terminate-all! pool :force-timeout 0.05)
-              (job-status xjob))))
--  ]
-+
-+  ;; This SEGVs on 0.9.3.3 (test code by @cryks)
-+  (test* "thread pool termination" 'terminated
-+         (let ([t (thread-start! (make-thread (cut undefined)))]
-+               [pool (make-thread-pool 10)])
-+           (terminate-all! pool)
-+           (thread-terminate! t)
-+           (thread-state t)))
-+  ] ; gauche.sys.pthreads
-  [else])
- 
- (test-end)
diff --git a/dev-scheme/gauche/gauche-0.9.3.3.ebuild b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
deleted file mode 100644
index 011ca66086e3..000000000000
--- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils
-
-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 test"
-
-RDEPEND="sys-libs/gdbm"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl )"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9-rpath.patch
-	"${FILESDIR}"/${PN}-0.9-gauche.m4.patch
-	"${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-0.9-xz-info.patch
-	"${FILESDIR}"/${PN}-0.9-rfc.tls.patch
-	"${FILESDIR}"/${P}-gauche.threads.patch
-	"${FILESDIR}"/${P}-file.util.patch
-)
-
-src_prepare() {
-	default
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-slib="${EPREFIX}"/usr/share/slib
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install-pkg install-doc
-	dodoc AUTHORS ChangeLog HACKING README
-}
diff --git a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
deleted file mode 100644
index 4cdcd5cc5d74..000000000000
--- a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils
-
-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 test"
-
-RDEPEND="sys-libs/gdbm"
-DEPEND="${RDEPEND}
-	test? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9-rpath.patch
-	"${FILESDIR}"/${PN}-0.9-gauche.m4.patch
-	"${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-0.9-xz-info.patch
-	"${FILESDIR}"/${PN}-0.9-rfc.tls.patch
-)
-
-src_prepare() {
-	mv gc/src/*.[Ss] gc || die
-	sed -i "/^EXTRA_libgc_la_SOURCES/s|src/||g" gc/Makefile.am
-
-	default
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-slib="${EPREFIX}"/usr/share/slib
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install-pkg install-doc
-	dodoc AUTHORS ChangeLog HACKING README
-}
diff --git a/dev-scheme/gauche/gauche-0.9.5.ebuild b/dev-scheme/gauche/gauche-0.9.5.ebuild
index e30ab60aee5c..8cf193dcbceb 100644
--- a/dev-scheme/gauche/gauche-0.9.5.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P^g}"
 
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 libressl test"
 
 RDEPEND="sys-libs/gdbm"
@@ -34,10 +34,10 @@ PATCHES=(
 	"${FILESDIR}"/${P}-bsd.patch
 	"${FILESDIR}"/${P}-unicode.patch
 )
+DOCS=( AUTHORS ChangeLog HACKING README )
 
 src_prepare() {
 	default
-
 	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
 
 	eautoconf
@@ -56,5 +56,5 @@ src_test() {
 
 src_install() {
 	emake DESTDIR="${D}" install-pkg install-doc
-	dodoc AUTHORS ChangeLog HACKING README
+	einstalldocs
 }
diff --git a/dev-scheme/scm/Manifest b/dev-scheme/scm/Manifest
index d66b67174b65..2c44df92cae7 100644
--- a/dev-scheme/scm/Manifest
+++ b/dev-scheme/scm/Manifest
@@ -1,4 +1,6 @@
 AUX scm-5.5.6-multiplefixes.patch 3014 BLAKE2B 08891323ec487c703a04f72043b73edb0d8e697366f71910a4a728a8ad937c75db310cefdb96144a1af9334edd2da9fc5c720530c6cb0f741e310ee06277e6c1 SHA512 e746ebca91e26569354f09403cf1610c745281af3477d92587a8b52de704998a61d1aeac75bfadfed8aead84243aa01f626438399cfffe92c73bba9fa9564f22
+AUX scm-5.5.6-respect-ldflags.patch 395 BLAKE2B 1fec97642ad348678070df454bbc2c7e64e17907f986a95cf96a3ead621ebe6f22a2f5dbcccc4fe9f7a8b8b951d935bafc5a64ce5cc0b48a514d2cda6ecebfb3 SHA512 03f740acdde590dbdc67046795aa1bed609721cbf83e7c153f5d1d5524c4761e3025c808855bf5b56d44d917c4aefa7198b96d66729e565b277c1acac7c53356
 DIST scm-5e6.zip 912968 BLAKE2B c059b49364abd25bb2335ad11f82791b96ac95aa9529b914396d08592e46e5aa5cba178b791fc96e3ea3066670c48bdd728609463bea398300b81d979fb304cb SHA512 897370f043401a7961eb1c2e22c951e2144505a1670e328e2c3eab33d52da83f195b873fb7cf8486f412ae52316cfc437c9f2da1432ade70f82eb0da12c2f852
 EBUILD scm-5.5.6-r3.ebuild 3762 BLAKE2B 72bf6fea02e74443e8f449c193168c1db95db448f7702ff06b708c58fc0a3573afa47d29b1e46b6358d0ceb3a0879da0c181adf3a71b56442bd26ee40eaa46c8 SHA512 cc7b0a0e2e185a967bc0fb5a771f7344345f0b24fb6bc9df51971e043f0f717b49a93697ab0ab1018da341a42b2e44647b513b6aad91aaa6c77c310b8c6b159d
+EBUILD scm-5.5.6-r4.ebuild 3730 BLAKE2B 14768043556305926bdc25a5c446f8879e7ff51a9c9b2be5c6a1c9e8fadaa5de9c94daedfaa2810b8b1494f2bb771de5746b314f55c72bacc2a7e9544624eaf5 SHA512 d08819bf9939023757edd314dd486ed40c287cb5cceb3a38c8f994a0b97f2ae7373b56e77b6a742230652f768cd85a652147f9983ec9eb61fe424c49f764a7fe
 MISC metadata.xml 1636 BLAKE2B ad72069e26e5a229c33efa845450fe5991d4c6bb14c39ccf22ba1a2d7903b969354a244a09e6684af4f588b2196e12aa60d658a5f842b5b127396a250377b2b0 SHA512 f0936782a77db52a61d47c86f9d638c66ac9848e8b62fcef182b5346abd55e83a5f275b6a60c865551dd134dcb85a77906d4662f91ed505d167608f8901dc0d0
diff --git a/dev-scheme/scm/files/scm-5.5.6-respect-ldflags.patch b/dev-scheme/scm/files/scm-5.5.6-respect-ldflags.patch
new file mode 100644
index 000000000000..a78e7ddb5d75
--- /dev/null
+++ b/dev-scheme/scm/files/scm-5.5.6-respect-ldflags.patch
@@ -0,0 +1,12 @@
+diff -ur b/Makefile a/Makefile
+--- b/Makefile	2018-06-21 14:02:53.439716620 -0500
++++ a/Makefile	2018-06-21 14:03:33.900568504 -0500
+@@ -111,7 +111,7 @@
+ 
+ # SCMLIT -- try making this first!
+ scmlit:	$(ofiles) scmmain.o require.scm Makefile
+-	$(LD) -o scmlit $(ofiles) scmmain.o $(LIBS)
++	$(LD) $(LDFLAGS) -o scmlit $(ofiles) scmmain.o $(LIBS)
+ 	$(MAKE) checklit
+ scmflags.h:	scmflags
+ scmflags:
\ No newline at end of file
diff --git a/dev-scheme/scm/scm-5.5.6-r4.ebuild b/dev-scheme/scm/scm-5.5.6-r4.ebuild
new file mode 100644
index 000000000000..6496a36b4f9e
--- /dev/null
+++ b/dev-scheme/scm/scm-5.5.6-r4.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#version magic thanks to masterdriverz and UberLord using bash array instead of tr
+trarr="0abcdefghi"
+MY_PV="$(ver_cut 1)${trarr:$(ver_cut 2):1}$(ver_cut 3)"
+
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${PN}
+DESCRIPTION="SCM is a Scheme implementation from the author of slib"
+SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip"
+HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix"
+
+BDEPEND="app-arch/unzip"
+DEPEND=">=dev-scheme/slib-3.1.5
+	dev-util/cproto
+	ncurses? ( sys-libs/ncurses:0= )
+	readline? ( sys-libs/libtermcap-compat )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-multiplefixes.patch"
+	"${FILESDIR}/${P}-respect-ldflags.patch" )
+
+src_compile() {
+	# SLIB is required to build SCM.
+	local slibpath="${EPREFIX}/usr/share/slib/"
+	if [ -n "$SCHEME_LIBRARY_PATH" ]; then
+		einfo "using SLIB $SCHEME_LIBRARY_PATH"
+	elif [ -d ${slibpath} ]; then
+		export SCHEME_LIBRARY_PATH=${slibpath}
+	fi
+
+	einfo "Making scmlit"
+	emake -j1 scmlit clean
+
+	einfo "Building scm"
+	local features=""
+	use arrays && features+="arrays"
+	use bignums && features+=" bignums"
+	use cautious && features+=" cautious"
+	use engineering-notation && features+=" engineering-notation"
+	use inexact && features+=" inexact"
+	use macro && features+=" macro"
+
+	( use readline ||
+	  use ncurses ||
+	  use regex ||
+	  use posix ||
+	  use ioext ||
+	  use gsubr ||
+	  use sockets ||
+	  use unix ||
+	  use dynamic-linking ) && features+=" dynamic-linking"
+
+	./build \
+		--compiler-options="${CFLAGS}" \
+		--linker-options="${LDFLAGS} -L${EPREFIX}/$(get_libdir)" \
+		-s "${EPREFIX}"/usr/$(get_libdir)/scm \
+		-F ${features:="none"} \
+		-h system \
+		-o scm || die
+
+	einfo "Building DLLs"
+	if use readline; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-h system \
+			-F edit-line \
+			-t dll || die
+	fi
+	if use ncurses ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-F curses \
+			-h system \
+			-t dll || die
+	fi
+	if use regex ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c rgx.c \
+			-h system \
+			-t dll || die
+	fi
+	if use gsubr ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c gsubr.c \
+			-h system \
+			-t dll || die
+	fi
+	if use ioext ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c ioext.c \
+			-h system \
+			-t dll || die
+	fi
+	if use posix; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c posix.c \
+			-h system \
+			-t dll || die
+	fi
+	if use sockets ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c socket.c \
+			-h system \
+			-t dll || die
+	fi
+	if use unix ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c unix.c \
+			-h system \
+			-t dll || die
+	fi
+
+	if use libscm ; then
+		emake libscm.a
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" man1dir="${EPREFIX}"/usr/share/man/man1/ \
+		install
+
+	if use libscm; then
+		emake DESTDIR="${D}" libdir="${EPREFIX}"/usr/$(get_libdir)/ \
+			installlib
+	fi
+
+	doinfo scm.info
+	doinfo hobbit.info
+}
+
+regen_catalog() {
+	einfo "Regenerating catalog..."
+	scm -e "(require 'new-catalog)"
+}
+
+pkg_postinst() {
+	[[ -z ${ROOT%/} ]] && regen_catalog
+}
+
+pkg_config() {
+	regen_catalog
+}