gentoo resync : 08.10.2021

13 files changed, 614 insertions, 31 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 6342def592eb..e0625fc39ec1 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 dcaf4dc8ecee..c53e6d9182ac 100644
--- a/dev-scheme/c-wrapper/Manifest
+++ b/dev-scheme/c-wrapper/Manifest
@@ -1,9 +1,13 @@
+AUX c-wrapper-clang.patch 3196 BLAKE2B f960f9008bb8114804ecc20cedbb0e8b46d1442317fb0e9376d741788c3d0c32bd4cf5058eba5d7f450f1ab49856b90857c6fe537b880afa524ed4ea434f981b SHA512 49326d99a9dccd72b7d2a6f3fa585c855aac82fd8e940e952a638b47e35378fa7883978084abfd0f5bfa0e8119e864fc18675edcf8444d64e6694b0e5a59940f
 AUX c-wrapper-closure.patch 205 BLAKE2B b633bbf97b3d76ab58b9a332ddc56f976b54f9eb3df0b235e7784e27141dda051e5d637839bf3be49c580845ad6898d9d526169abb14e6329642105dd5416c11 SHA512 284f08b6a8164d129dfe5e26500ca4946c037d0661614dfcab7caf4d5ce189ee299dbb70fa6a4d0f2ec5b0fdf9f1926891d07ce019fade329a0909c10586c790
-AUX c-wrapper-gcc-5.patch 2046 BLAKE2B 645b7ee67edd8e6d08fdf7f2dd591c745a420eb001cac6aede3f0393871bc538a96ee438ef8d66d5c49e16e493219a9f2607d242c79398e687b62aca22e7f1ee SHA512 174c8f364c1f9660ebb2034a7edbcd8ed640515c883b7cacd672286f70787df4314de2ad90aeca7c528f2522a8bd61c916b73fb06f4dd23e428c2dd55fb44fdd
+AUX c-wrapper-extend-parser.patch 4899 BLAKE2B f0ba1b3e6866e48b8546535c63ca71b9e3f219348ecda3cc9281bef1801a5e1731767b4456d4071b62e5b9da94b7280ab3fa33bc396089cb6e0dee529b853d88 SHA512 a7c3d1ce4ab53478ccb6621c94ce12e3dcd8a967ea1589b210e2dfc91b2a1a6e4fb9b00c0e8ac6a054a0d9d905e662c178682ad43971b46153c825efff9a7319
+AUX c-wrapper-float128.patch 2198 BLAKE2B 5a17b735f99cd2af99b161421102e2d8eb4f081b85b83645b9d3bd209f30706a9441d4222a3d8c863304f4c028ab0a53677a1c25e5f16221e1b24d7293eefa8f SHA512 29386dd077dcd2a88dcd2fe13064863a9a36a59d0a59f34be04adb06bb923d548bc1aff3df9a208f25285d91cf0c1470ece08b188f74ae6526f918c72447456a
+AUX c-wrapper-gcc-5.patch 1704 BLAKE2B 2f91221e5fad3c9871307c8da2f6650e02a6d645a56538359afad8cb817f02ec6eba407a76b852e854085d89650a6ff05ccd8e525e8be7b3ad57af87c4ac7a97 SHA512 96effd453715ca3725ff3288ceb237c9078499d43cb5be36dc2e15b9a4d274ff42d25bf212f47f2bfae2b79d9713addc12c0663f6fd8cc7c3229df8121f4b903
 AUX c-wrapper-gentoo.patch 2015 BLAKE2B fedf622537151079df07aaa1091fe377b1e1ee8ebf95a4c8b290ca983376211e6897ddb14c8d3c8f38fc1a23073d5282c447b8e8d66578235b17bb3cddce76f1 SHA512 4184d3a4953478ff19374ff230bd7376eb8a8d7d90e1e91b1903b30af49f124d18b816639024a9b54a7099965ea2c5c8244ca64a7ce4db8f3fde32cbc13578d3
 AUX c-wrapper-glibc-2.25.patch 727 BLAKE2B 0c0dce0bfb78a92ff4c2cf6176a7b7de129e143737be897a074f06f88b6923915ec36a9e3ddb5410010c662e8e11bb17b89742349c2a01a3066c1c49c08cc57a SHA512 769c92156395f121d8ba3776904c279c5b97f791f7606b74c682264430ed71f1af31ce8655286cae7dfebb75ea8addc2fb304a87eb5972314c5ab082700921ee
 AUX c-wrapper-info.patch 1920 BLAKE2B 62c60a2dd8783fc0a56d386e02faa8f04bdd570c7119999e51071414f8084f78d47acda9d916b576bea7ba35c65bd0d4c7519cbe52235a40c49e324139587df8 SHA512 1778eb0183e8f6e19fcb8071bb49e542d98f82b49932aeb5c8dc6638c50ea3b802efb5b92837f90854f47d4400b224e6895b3a6bea042b29a91f855fdf319de8
+AUX c-wrapper-local-typedef.patch 4576 BLAKE2B e128d6f1f5cc457b3968ed8b9c3cfe62ed94dc4c79a90d2b44226c525531daffb5fa2cfe5293ce0d1c7baaa947a0304a4c60c3046234ae957bf24162c4586de3 SHA512 bef1d6ab86473a440f6434aac257c41850f67443a0a5fbe83d139052509a855d594e18904a1e112989a9c8cbbc9d008e3f75a16a93e8c6d93cac370ffd5bf170
 AUX c-wrapper-texinfo-6.7.patch 1052 BLAKE2B 6c042ee1a386d611be9bd1155fe930995b026eac5722e2264d8b73dee29b2a0371916f7f087c8b8a2031e34e70a064c8396d1870e0f759898e39eaf97d55a068 SHA512 ca2f1697cb81ba7a0cdcccfdab8fde71e94dd8ef8be570bebf9b4cceda0723c178114fc0c713f3998eb102ad19c17889197a80e8f5410032da96e0788d1fc2c8
 DIST c-wrapper-0.6.1.tgz 843981 BLAKE2B af28cf60eebe0da32c90c030bfdae4457d20731c31220f7eaac33291ea1be104a7aab11fad0560fe6e3d36a5d3afafbd8795fddd633e0c26be226c29012afbc9 SHA512 a03a4d57d112d2c23dac3716bae081e3e6f02dcef261bd8dd518ed8519b43e28f9e61a36f7584b2bcb1762112c128d0b698cda422cc0c9d1190cbf7502ea04b0
-EBUILD c-wrapper-0.6.1-r1.ebuild 934 BLAKE2B 15453a8ac7702e0fab6bde100a6f1cfcdb7541d487b51d09c156ab84deff9589fc87518b3b14e916c1de6ae55a272aa6ea8d038ec0892f828f99ccd06fba196c SHA512 4d47e63118477a144b854be1761d384e0f82e0e362e4954b29396014af5eaf88b201a5276334c6ce13ffcd7280bb7872a8cdc812075d2ebfb0ca1e48fd060643
+EBUILD c-wrapper-0.6.1-r2.ebuild 1085 BLAKE2B 21d4b6838d8f8cf1fcfcbcf96110490e03a7d5825dce5cfcfbf9b51c6291f8ad150e65343d6b121c33a134f84c4155eddf17297c952755d5510cc21dc52a67c5 SHA512 56001852e10b64306397812af3d41b8e46021dc0514dc624f5acc192eddcd9bb9981b3af232faedb8d9dbcb46bcd12a2312d6d52b037769e9048d119821cbfc8
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild
index f0b7aece565f..3f8277774536 100644
--- a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -26,6 +26,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-glibc-2.25.patch
 	"${FILESDIR}"/${PN}-info.patch
 	"${FILESDIR}"/${PN}-texinfo-6.7.patch
+	"${FILESDIR}"/${PN}-clang.patch
+	"${FILESDIR}"/${PN}-float128.patch
+	"${FILESDIR}"/${PN}-local-typedef.patch
+	"${FILESDIR}"/${PN}-extend-parser.patch
 )
 HTML_DOCS=( doc/${PN}-ref{e,j}.html )
 
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-clang.patch b/dev-scheme/c-wrapper/files/c-wrapper-clang.patch
new file mode 100644
index 000000000000..ba39e74df9cf
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-clang.patch
@@ -0,0 +1,71 @@
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -1667,14 +1667,25 @@
+ ScmObj Scm_ParseMacroCode(ScmObj in, ScmObj macro_list)
+ {
+     static ScmObj trigger_line = SCM_FALSE;
++    static ScmObj is_gcc = SCM_TRUE;
+     ScmObj line_str;
+     ScmObj rx;
++    int n = 0;
++    int i;
+ 
+     /* skip the first line '# 1 "<stdin>"' */
+     Scm_ReadLineUnsafe(SCM_PORT(in));
+ 
+     if (SCM_FALSEP(trigger_line)) {
+-        trigger_line = SCM_MAKE_STR_IMMUTABLE("# 1 \"<stdin>\"");
++        ScmObj gcc = Scm_GlobalVariableRef(SCM_FIND_MODULE(CPARSER_MODULE_NAME, TRUE), SCM_SYMBOL(SCM_INTERN("GCC")), 0);
++        if (SCM_INTP(Scm_StringScanRight(SCM_STRING(gcc), SCM_STRING(SCM_MAKE_STR_IMMUTABLE("gcc")), SCM_STRING_SCAN_INDEX))) {
++            trigger_line = SCM_MAKE_STR_IMMUTABLE("# 1 \"<stdin>\"");
++        } else if (SCM_INTP(Scm_StringScanRight(SCM_STRING(gcc), SCM_STRING(SCM_MAKE_STR_IMMUTABLE("clang")), SCM_STRING_SCAN_INDEX))) {
++            trigger_line = SCM_MAKE_STR_IMMUTABLE("# 1 \"<stdin>\" 2");
++            is_gcc = SCM_FALSE;
++        } else {
++            Scm_Error("unknown compiler");
++        }
+     }
+     
+     while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+@@ -1683,22 +1694,33 @@
+         }
+     }
+ 
+-    rx = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
++    rx = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+(\\d+)\\s+\"<stdin>\"")), 0);
+     line_str = Scm_ReadLineUnsafe(SCM_PORT(in));
+-    while (!SCM_EOFP(line_str)) {
+-        ScmObj body_str = line_str;
++    for (i = 1; !SCM_EOFP(line_str); i++) {
++        ScmObj body_str;
++        ScmObj rm;
++        if (i < n) {
++            body_str = SCM_MAKE_STR_IMMUTABLE("");
++            goto parse;
++        }
++        body_str = line_str;
+         while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))
+                && SCM_STRING_LENGTH(line_str) >= 13
+ #ifdef SCM_REGEXP_MULTI_LINE
+-               && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
++               && SCM_REGMATCHP(rm = Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
+ #else
+-               && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str)))) {
++               && SCM_REGMATCHP(rm = Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str)))) {
+ #endif
+-            if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+-                Scm_Error("[bug] unexpected EOF while parsing macro body");
++            if (SCM_TRUEP(is_gcc)) {
++                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));
++            } else {
++                n = SCM_INT_VALUE(Scm_StringToNumber(SCM_STRING(Scm_RegMatchSubstr(SCM_REGMATCH(rm), SCM_MAKE_INT(1))), 10, 0));
+             }
+-            body_str = Scm_StringAppend2(SCM_STRING(body_str), SCM_STRING(line_str));
+         }
++parse:
+         if (SCM_NULLP(macro_list)) {
+             Scm_Error("[bug] lost macro body");
+         } else {
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-extend-parser.patch b/dev-scheme/c-wrapper/files/c-wrapper-extend-parser.patch
new file mode 100644
index 000000000000..998938a2c428
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-extend-parser.patch
@@ -0,0 +1,142 @@
+https://aur.archlinux.org/cgit/aur.git/tree/14_extend_parser.patch?h=gauche-c-wrapper
+
+Description: Include __int128, make statements before delcarations in functions possible and add some workaround to load x86intrin.h successfully.
+Author: Fabian Brosda <fabi3141@gmx.de>
+Last-Update: 2020-07-10
+
+--- a/lib/c-wrapper/c-parser.scm
++++ b/lib/c-wrapper/c-parser.scm
+@@ -181,6 +181,26 @@
+        ,@(reverse init-list)
+        ,@statements)))
+ 
++(define-maybe (%COMPOUND-STATEMENT-WITH-DECLARATION-EXT statements-before declaration-list statements)
++  (let ((var-list '())
++        (init-list '()))
++    (for-each (lambda (declaration)
++                (let* ((type (type-of declaration))
++                       (identifier (name-of declaration))
++                       (init-val (value-of declaration)))
++                  ;; TODO: typedef in compound_statement is not supported
++                  (push! var-list `(,identifier (make ,type)))
++                  (when init-val
++                    (push! init-list
++                           `(set! ((with-module c-wrapper.c-ffi ref) ,identifier)
++                                  ,init-val)))))
++              declaration-list)
++    `(begin
++       ,@statements-before
++       (let* ,(reverse var-list)
++       ,@(reverse init-list)
++       ,@statements))))
++
+ (define-maybe (%REF-ARRAY v index)
+   `((with-module c-wrapper.c-ffi ref) ,v ,(%INT index)))
+ 
+--- a/src/c-grammar.scm
++++ b/src/c-grammar.scm
+@@ -122,6 +122,7 @@
+   (LPAREN expr RPAREN) : (%EXPR-IN-PARENS $2)
+   (LPAREN compound_statement RPAREN) : (%COMPOUND-STATEMENT $2)
+   (LPAREN type_name RPAREN LCBRA initializer_list RCBRA) : #f
++  (LPAREN type_name RPAREN LCBRA initializer_list COMMA RCBRA) : #f
+   (objc_message_expr) : $1
+   (objc_selector_expr) : $1
+   (objc_protocol_expr) : #f
+@@ -474,8 +475,8 @@
+   (LCBRA RCBRA) : (%COMPOUND-STATEMENT '(0))
+   (LCBRA statement_list RCBRA) : (%COMPOUND-STATEMENT $2)
+   (LCBRA declaration_list RCBRA) : (%COMPOUND-STATEMENT '(0))
+-  (LCBRA declaration_list statement_list RCBRA)
+-  : (%COMPOUND-STATEMENT-WITH-DECLARATION $2 $3)
++  (LCBRA declaration_list statement_list RCBRA) : (%COMPOUND-STATEMENT-WITH-DECLARATION $2 $3)
++  (LCBRA statement_list declaration_list statement_list RCBRA) : (%COMPOUND-STATEMENT-WITH-DECLARATION-EXT $2 $3 $4)
+   (error RCBRA) : #f
+   )
+ 
+--- a/src/c-lex.c
++++ b/src/c-lex.c
+@@ -361,6 +361,7 @@
+         "void",
+         "_Bool",
+         "_Float128",
++        "__int128",
+         NULL,
+     };
+     int i;
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -104,6 +104,7 @@
+ DEFINE_SYM(void);
+ DEFINE_SYM(_Bool);
+ DEFINE_SYM(_Float128);
++DEFINE_SYM(__int128);
+ DEFINE_SYM(__builtin_va_list);
+ DEFINE_SYM(U_struct);
+ DEFINE_SYM(U_union);
+@@ -472,7 +473,9 @@
+     } else if (SCM_EQ(car, SYM(_Bool))) {
+         SCM_RETURN(SYM(c_int));
+     } else if (SCM_EQ(car, SYM(_Float128))) {
+         SCM_RETURN(SYM(c_double));
++    } else if (SCM_EQ(car, SYM(__int128))) {
++        SCM_RETURN(SYM(c_longlong));
+     } else if (SCM_EQ(car, SYM(__builtin_va_list))) {
+         SCM_RETURN(SCM_LIST2(SCM_LIST3(SYM(with_module), SYM(c_wrapper_c_ffi), SYM(ptr)), SYM(c_void)));
+     } else if (SCM_PAIRP(car) && SCM_EQ(SCM_CAR(car), SYM(U_struct))) {
+@@ -1024,7 +1027,11 @@
+     Scm_ParserAttributeClear();
+     td_list = Scm_MakeTypeDeclList(type_spec_list, declarator_list);
+     SCM_FOR_EACH(pair, td_list) {
+-        Scm_ArgPoolAdd(SCM_TYPE_DECL_NAME(SCM_CAR(pair)));
++        // hack to avoid segfault when loading x86intrin.h
++        // TODO: why is this necessary?
++        if (!SCM_EQ(SCM_CAR(pair), SCM_FALSE)) {
++            Scm_ArgPoolAdd(SCM_TYPE_DECL_NAME(SCM_CAR(pair)));
++        }
+     }
+ 
+     SCM_RETURN(td_list);
+@@ -1865,6 +1872,7 @@
+     INIT_SYM(void, "void");
+     INIT_SYM(_Bool, "_Bool");
+     INIT_SYM(_Float128, "_Float128");
++    INIT_SYM(__int128, "__int128");
+     INIT_SYM(__builtin_va_list, "__builtin_va_list");
+     INIT_SYM(U_struct, "STRUCT");
+     INIT_SYM(U_union, "UNION");
+--- a/testsuite/Makefile.in
++++ b/testsuite/Makefile.in
+@@ -78,6 +78,7 @@
+ 	$(GOSH) -I../src -I../lib stdio-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib math-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib local-typedef.scm >> test.log
++	$(GOSH) -I../src -I../lib stmt-decl.scm >> test.log
+ 	$(GOSH) -I../src -I../lib inline-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib fptr_array-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib array_qualifier-test.scm >> test.log
+--- a/testsuite/stmt_decl.h
++++ b/testsuite/stmt_decl.h
+@@ -0,0 +1,6 @@
++void f(int arg1)
++{
++  arg1 = 3;
++  double tmp = arg1;
++  return tmp;
++}
+--- a/testsuite/stmt-decl.scm
++++ b/testsuite/stmt-decl.scm
+@@ -0,0 +1,13 @@
++;;;
++;;; Test include math.h
++;;;
++
++(use gauche.test)
++
++(test-start "test for statement before and after declaration in c function")
++(use c-wrapper)
++
++(c-include "stmt_decl.h")
++
++;; epilogue
++(test-end)
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-float128.patch b/dev-scheme/c-wrapper/files/c-wrapper-float128.patch
new file mode 100644
index 000000000000..acd2f04407dd
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-float128.patch
@@ -0,0 +1,79 @@
+https://aur.archlinux.org/cgit/aur.git/tree/12_float128.patch?h=gauche-c-wrapper
+
+Description: Workaround for usage of math.h including type _Float128
+Author: Fabian Brosda <fabi3141@gmx.de>
+Last-Update: 2020-07-10
+
+--- a/src/c-lex.c
++++ b/src/c-lex.c
+@@ -360,6 +360,7 @@
+         "double",
+         "void",
+         "_Bool",
++        "_Float128",
+         NULL,
+     };
+     int i;
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -103,6 +103,7 @@
+ DEFINE_SYM(double);
+ DEFINE_SYM(void);
+ DEFINE_SYM(_Bool);
++DEFINE_SYM(_Float128);
+ DEFINE_SYM(__builtin_va_list);
+ DEFINE_SYM(U_struct);
+ DEFINE_SYM(U_union);
+@@ -470,6 +471,8 @@
+         SCM_RETURN(SYM(c_void));
+     } else if (SCM_EQ(car, SYM(_Bool))) {
+         SCM_RETURN(SYM(c_int));
++    } else if (SCM_EQ(car, SYM(_Float128))) {
++        SCM_RETURN(SYM(c_double));
+     } else if (SCM_EQ(car, SYM(__builtin_va_list))) {
+         SCM_RETURN(SCM_LIST2(SCM_LIST3(SYM(with_module), SYM(c_wrapper_c_ffi), SYM(ptr)), SYM(c_void)));
+     } else if (SCM_PAIRP(car) && SCM_EQ(SCM_CAR(car), SYM(U_struct))) {
+@@ -1859,6 +1862,7 @@
+     INIT_SYM(double, "double");
+     INIT_SYM(void, "void");
+     INIT_SYM(_Bool, "_Bool");
++    INIT_SYM(_Float128, "_Float128");
+     INIT_SYM(__builtin_va_list, "__builtin_va_list");
+     INIT_SYM(U_struct, "STRUCT");
+     INIT_SYM(U_union, "UNION");
+--- a/testsuite/Makefile.in
++++ b/testsuite/Makefile.in
+@@ -73,6 +73,7 @@
+ 	$(GOSH) -I../src -I../lib cwrappertest.scm >> test.log
+ 	$(GOSH) -I../src -I../lib struct_in_union-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib stdio-test.scm >> test.log
++	$(GOSH) -I../src -I../lib math-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib inline-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib fptr_array-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib array_qualifier-test.scm >> test.log
+--- a/testsuite/math-test.scm
++++ b/testsuite/math-test.scm
+@@ -0,0 +1,23 @@
++;;;
++;;; Test include math.h
++;;;
++
++(use gauche.test)
++
++(test-start "c-wrapper (include math.h)")
++(use c-wrapper)
++
++(c-include "math.h")
++
++(test "trunc"
++      1.0
++      (lambda ()
++        (trunc 1.9)))
++
++(test "pow"
++      625.0
++      (lambda ()
++        (pow 5 4)))
++
++;; epilogue
++(test-end)
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
index 98dfaa2f945c..46ab531b389a 100644
--- a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
@@ -4,46 +4,40 @@
  {
      static ScmObj trigger_line = SCM_FALSE;
      ScmObj line_str;
-+    ScmObj regexp = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
++    ScmObj rx;
  
      /* skip the first line '# 1 "<stdin>"' */
      Scm_ReadLineUnsafe(SCM_PORT(in));
-@@ -1682,16 +1683,30 @@
+@@ -1682,7 +1683,22 @@
          }
      }
  
 -    while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
--        if (SCM_NULLP(macro_list)) {
-+    line_str = SCM_NIL;
-+    while (!SCM_NULLP(macro_list)) {
++    rx = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
++    line_str = Scm_ReadLineUnsafe(SCM_PORT(in));
++    while (!SCM_EOFP(line_str)) {
 +        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_STRING_LENGTH(line_str) >= 13
 +#ifdef SCM_REGEXP_MULTI_LINE
-+            && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
++               && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
 +#else
-+            && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) {
++               && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str)))) {
 +#endif
 +            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);
+         if (SCM_NULLP(macro_list)) {
+             Scm_Error("[bug] lost macro body");
+         } else {
+@@ -1690,7 +1706,7 @@
+             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);
++            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-local-typedef.patch b/dev-scheme/c-wrapper/files/c-wrapper-local-typedef.patch
new file mode 100644
index 000000000000..70f4ffcf4cd4
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-local-typedef.patch
@@ -0,0 +1,149 @@
+https://aur.archlinux.org/cgit/aur.git/plain/13_local_typedef.patch?h=gauche-c-wrapper
+
+Description: Basic support for typedefs inside functions
+Author: Fabian Brosda <fabi3141@gmx.de>
+Last-Update: 2020-07-10
+
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -594,6 +594,26 @@
+     }
+ }
+ 
++static void emit_typedef(ScmObj type_decl_list)
++{
++    ScmObj p;
++
++    SCM_FOR_EACH(p, type_decl_list) {
++        ScmObj v = SCM_CAR(p);
++        ScmObj ctype = SCM_TYPE_DECL_CTYPE(v);
++        ScmObj new_ctype = SCM_TYPE_DECL_NAME(v);
++        ScmObj sym = CParser_ctype2class_symbol(new_ctype);
++
++        Scm_DefChunkDictSetTypename(new_ctype,
++                                    Scm_MakeDefChunk(SYM(S_typedef),
++                                                     new_ctype,
++                                                     SCM_LIST1(sym),
++                                                     SCM_LIST3(SYM(S_define), sym, ctype)));
++        Scm_InstallType(new_ctype);
++    }
++}
++
++
+ ScmObj Scm_MakeTypeDecl(ScmObj type_spec_list, ScmObj declarator)
+ {
+     ScmObj lst = SCM_NIL;
+@@ -612,6 +632,7 @@
+     
+     SCM_FOR_EACH(pair, type_spec_list) {
+         if (SCM_EQ(SCM_CAR(pair), SYM(U_typedef))) {
++            emit_typedef(Scm_Cons(Scm_MakeTypeDecl(SCM_CDR(pair), declarator), lst));
+             continue;
+         }
+         lst = Scm_Cons(SCM_CAR(pair), lst);
+@@ -1542,25 +1563,6 @@
+     SCM_RETURN(SCM_UNDEFINED);
+ }
+                                                              
+-static void emit_typedef(ScmObj type_decl_list)
+-{
+-    ScmObj p;
+-
+-    SCM_FOR_EACH(p, type_decl_list) {
+-        ScmObj v = SCM_CAR(p);
+-        ScmObj ctype = SCM_TYPE_DECL_CTYPE(v);
+-        ScmObj new_ctype = SCM_TYPE_DECL_NAME(v);
+-        ScmObj sym = CParser_ctype2class_symbol(new_ctype);
+-
+-        Scm_DefChunkDictSetTypename(new_ctype,
+-                                    Scm_MakeDefChunk(SYM(S_typedef),
+-                                                     new_ctype,
+-                                                     SCM_LIST1(sym),
+-                                                     SCM_LIST3(SYM(S_define), sym, ctype)));
+-        Scm_InstallType(new_ctype);
+-    }
+-}
+-
+ static void emit_define_extern(ScmObj declaration)
+ {
+     ScmObj ctype = SCM_TYPE_DECL_CTYPE(declaration);
+--- a/testsuite/local_typedef.c
++++ b/testsuite/local_typedef.c
+@@ -0,0 +1,6 @@
++#include "local_typedef.h"
++
++int local_typedef(void)
++{
++    return helper();
++}
+--- a/testsuite/local_typedef.h
++++ b/testsuite/local_typedef.h
+@@ -0,0 +1,8 @@
++extern int local_typedef(void);
++
++int helper(void)
++{
++    typedef int _my_type;
++    _my_type ret = 1;
++    return ret;
++}
+--- a/testsuite/local-typedef.scm
++++ b/testsuite/local-typedef.scm
+@@ -0,0 +1,19 @@
++;;;
++;;; Test local typedefs
++;;;
++
++(use gauche.test)
++
++(test-start "c-wrapper (local typedefs)")
++(use c-wrapper)
++
++(c-load-library "./local_typedef")
++(c-include "./local_typedef.h")
++
++(test "local_typedef"
++      1
++      (lambda ()
++        (local_typedef)))
++
++;; epilogue
++(test-end)
+--- a/testsuite/Makefile.in
++++ b/testsuite/Makefile.in
+@@ -57,6 +57,9 @@
+ fptr_array.$(DYLIBEXT): fptr_array.o
+ 	$(CC) $(LDFLAGS) $@ $<
+ 
++local_typedef.$(DYLIBEXT): local_typedef.o
++	$(CC) $(LDFLAGS) $@ $<
++
+ gcc_extension.$(DYLIBEXT): gcc_extension.o
+ 	$(CC) $(LDFLAGS) $@ $<
+ 
+@@ -65,7 +68,7 @@
+ 
+ check: $(CHECK_TARGET)
+ 
+-check-c: ffitest.$(DYLIBEXT) fptr_array.$(DYLIBEXT) gcc_extension.$(DYLIBEXT)
++check-c: ffitest.$(DYLIBEXT) fptr_array.$(DYLIBEXT) gcc_extension.$(DYLIBEXT) local_typedef.$(DYLIBEXT)
+ 	@rm -f test.log
+ 	$(GOSH) -I../src -I../lib attr-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib ffitest.scm >> test.log
+@@ -74,6 +77,7 @@
+ 	$(GOSH) -I../src -I../lib struct_in_union-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib stdio-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib math-test.scm >> test.log
++	$(GOSH) -I../src -I../lib local-typedef.scm >> test.log
+ 	$(GOSH) -I../src -I../lib inline-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib fptr_array-test.scm >> test.log
+ 	$(GOSH) -I../src -I../lib array_qualifier-test.scm >> test.log
+@@ -83,7 +87,7 @@
+ 	$(GOSH) -I../src -I../lib -I../objc objc-test.scm >> test.log
+ 
+ clean :
+-	rm -rf core ffitest.$(DYLIBEXT) objc-test.$(DYLIBEXT) fptr_array.$(DYLIBEXT) gcc_extension.$(DYLIBEXT) *.o $(GENERATED) *~ test.log so_locations
++	rm -rf core ffitest.$(DYLIBEXT) objc-test.$(DYLIBEXT) fptr_array.$(DYLIBEXT) gcc_extension.$(DYLIBEXT) local_typedef.$(DYLIBEXT) *.o $(GENERATED) *~ test.log so_locations
+ 
+ distclean : clean
+ 	rm -rf $(CONFIG_GENERATED)
diff --git a/dev-scheme/gauche-gl/Manifest b/dev-scheme/gauche-gl/Manifest
index f9514b2ab6bc..b14a1466cdf3 100644
--- a/dev-scheme/gauche-gl/Manifest
+++ b/dev-scheme/gauche-gl/Manifest
@@ -1,4 +1,7 @@
+AUX gauche-gl-0.6-cflags.patch 411 BLAKE2B 2f480dd9da923449b5fcf57c17739302081692579ac286e6057db8c2f6f7158809e23757f54e238d1ccc81285a314929192b8f0d397d8fde0a342d05a07dbea0 SHA512 94e5c22c28da7e2c8dea5e9945ef3e6a8770307a4a25f42e6b4700d8b6e69104557efce15e7b868b3eb684b7573c298b61b21c5104e6f970d01abcd21529330a
+AUX gauche-gl-0.6-cg.patch 1168 BLAKE2B 27a0e4957e9148b97e95994fa037cb28bb5eaccaf27816dfbeed9b9a88640ec09c097f1981dd1633b68920164f6f9b5953c9de329b27e8bb3acee73224b7a0bc SHA512 2ae4aa08b9c542681a0a64478bf3c0a85ffd625cd40e5591822014743aab7a9d33f17c0b684968bbd13d40e321edd274e1d8cc113179d932c38c18803508788e
+AUX gauche-gl-0.6-info.patch 1954 BLAKE2B ed038d5214d8705901e4902848156084138c5ccfa75a40d12b8f473e2c77222271b954c0cb64ed0d973b0750b72dbd65a295dc3eb5e52985b67206273ecf6fb0 SHA512 de74c7bd0abf861c8b24b9166037543b6389d2ddf2118829e028aed8f511e23f90427e129e95b46145a2c4449d21d18ce060fd75f8d76df1244e6eac16ff5b3b
 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 984 BLAKE2B b84e05cf811681ae0785f602a16bb5eccb91f94d13d1cf22a2ae7175f0f45a7f1503d2c87cd04e11ab4b61af718b129a1d503ff27fd731d67fc9ab8cb28299f5 SHA512 20967e29a9c84c2322f222c3fd90d375d9868722eb90ecc61f072e24a5f9f38ec76f31bc7fc4445d3c405f17b6f0e4add501b3f01a953a0ebb4d65142ee48b16
+EBUILD gauche-gl-0.6.ebuild 1163 BLAKE2B 9b042c5657a152ffc589115c3068136b7e8ba45bdabb28361002f27d9ce3fac9db72de943236c8397c6e0a907bc31d9aa28119df8e9e2ecdd5ee28b61532ffce SHA512 572ca8b0293d53b2ba9e1b3488b92e8fb77ccffd9ff3f346ac5aa2691013328062f8369089c57954f3e69fd307b37ad7e16f06f0ef0cb50196eca6f913bddc65
 MISC metadata.xml 446 BLAKE2B 42e47b27a9698630c02789c6efcf119ff88e96da02f71733fc2c5b03d81c49d44452aaceaf9e593a1017ab3cbd4fb3d4de379c4131b96590bf4082bc977a6975 SHA512 ee955f6fb7eeca1e69f6fc70029f0cc06b3529015d03a67fba3614c4ed5308e3d9721a20eb2c4e421e2045031a56635cfaa3741e736b694393b7ea2a3f7d83e7
diff --git a/dev-scheme/gauche-gl/files/gauche-gl-0.6-cflags.patch b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cflags.patch
new file mode 100644
index 000000000000..c5c12f97f06f
--- /dev/null
+++ b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -17,7 +17,7 @@
+ # These are set by configure
+ # NB: cc and various flags must match the ones used to compile Gauche,
+ # so the make invocator shouldn't casually override them.
+-CFLAGS   = @DEFS@ @X_CFLAGS@ @GLUT_INCDIR@ @GLEW_INCDIR@
++CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ @GLEW_INCDIR@
+ LDFLAGS  = @LDFLAGS@
+ OBJEXT   = @OBJEXT@
+ SOEXT    = @SOEXT@
diff --git a/dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch
new file mode 100644
index 000000000000..3c2b6014a804
--- /dev/null
+++ b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch
@@ -0,0 +1,47 @@
+--- a/cg/Makefile.in
++++ b/cg/Makefile.in
+@@ -17,8 +17,8 @@
+ # These are set by configure
+ # NB: cc and various flags must match the ones used to compile Gauche,
+ # so the make invocator shouldn't casually override them.
+-CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ -I../src
+-LDFLAGS  = -I../src @LDFLAGS@ 
++CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ @CG_CFLAGS@ -I../src
++LDFLAGS  = @LDFLAGS@
+ OBJEXT   = @OBJEXT@
+ SOEXT    = @SOEXT@
+ OLIBS    = @LIBS@
+--- a/cg/cg-lib.stub
++++ b/cg/cg-lib.stub
+@@ -430,7 +430,6 @@
+ ;;
+ ;; Cg/cg_profiles.h
+ ;;
+-(define-enum CG_PROFILE_START)
+ (define-enum CG_PROFILE_UNKNOWN)
+ 
+ (define-enum CG_PROFILE_VS_1_1)
+@@ -443,8 +442,6 @@
+ (define-enum CG_PROFILE_PS_2_0)
+ (define-enum CG_PROFILE_PS_2_X)
+ 
+-(define-enum CG_PROFILE_MAX)
+-
+ ;;
+ ;; Cg/cg_errors.h
+ ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,10 +46,11 @@
+    AC_HELP_STRING([--enable-cg], [Enable NVidia's Cg binding.]), [
+    AC_DEFINE(HAVE_CG, 1)
+    ENABLE_CG=1
+-   CG_LIBS="-lCgGL -lCg"
++   PKG_CHECK_MODULES([CG], [nvidia-cg-toolkit-gl])
+    CG_SCM="cg/gl/cg.scm";
+ ])
+ AC_SUBST(ENABLE_CG)
++AC_SUBST(CG_CFLAGS)
+ AC_SUBST(CG_LIBS)
+ AC_SUBST(CG_SCM)
+ 
diff --git a/dev-scheme/gauche-gl/files/gauche-gl-0.6-info.patch b/dev-scheme/gauche-gl/files/gauche-gl-0.6-info.patch
new file mode 100644
index 000000000000..663d6c17982c
--- /dev/null
+++ b/dev-scheme/gauche-gl/files/gauche-gl-0.6-info.patch
@@ -0,0 +1,66 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,6 @@
+ 
+ # Check for other programs.
+ AC_CHECK_PROGS(MAKEINFO, makeinfo)
+-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
+ 
+ # Check for libraries
+ 
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -12,7 +12,6 @@
+ GAUCHE_CONFIG = "@GAUCHE_CONFIG@"
+ INSTALL       = "@GAUCHE_INSTALL@"
+ MAKEINFO      = "@MAKEINFO@"
+-GZIP_PROGRAM  = "@GZIP_PROGRAM@"
+ 
+ # Manual page destination.
+ mandir  = "$(DESTDIR)`$(GAUCHE_CONFIG) --mandir`"
+@@ -21,7 +20,7 @@
+ all: info
+ 
+ install: all
+-	if test -f gauche-gl-refe.info.gz -o -f gauche-gl-refj.info.gz; then \
++	if test -f gauche-gl-refe.info -o -f gauche-gl-refj.info; then \
+ 	  for info in *.info*; do \
+ 	    $(INSTALL) -m 444 -T $(infodir) $$info; \
+ 	  done; \
+@@ -46,7 +45,7 @@
+ 
+ pdf : gauche-gl-refe.pdf
+ 
+-info : gauche-gl-refe.info.gz gauche-gl-refj.info.gz
++info : gauche-gl-refe.info gauche-gl-refj.info
+ 
+ gauche-gl-refe.html : gauche-gl-refe.texi
+ 	texi2html -number gauche-gl-refe.texi
+@@ -63,11 +62,9 @@
+ gauche-gl-refe.texi : gauche-gl-ref.texi extract
+ 	gosh ./extract -en -o gauche-gl-refe.texi gauche-gl-ref.texi
+ 
+-gauche-gl-refe.info.gz : gauche-gl-refe.texi
+-	if test "X$(MAKEINFO)" != X -a "X$(GZIP_PROGRAM)" != X; then \
++gauche-gl-refe.info : gauche-gl-refe.texi
++	if test "X$(MAKEINFO)" != X; then \
+ 	  $(MAKEINFO) --no-warn gauche-gl-refe.texi; \
+-	  rm -rf gauche-gl-refe.info*.gz; \
+-	  $(GZIP_PROGRAM) gauche-gl-refe.info; \
+ 	fi
+ 
+ gauche-gl-refj.html : gauche-gl-refj.texi
+@@ -85,11 +82,9 @@
+ gauche-gl-refj.texi : gauche-gl-ref.texi extract
+ 	gosh ./extract -jp -o gauche-gl-refj.texi gauche-gl-ref.texi
+ 
+-gauche-gl-refj.info.gz : gauche-gl-refj.texi
+-	if test "X$(MAKEINFO)" != X -a "X$(GZIP_PROGRAM)" != X; then \
++gauche-gl-refj.info : gauche-gl-refj.texi
++	if test "X$(MAKEINFO)" != X; then \
+ 	  $(MAKEINFO) --no-warn gauche-gl-refj.texi; \
+-	  rm -rf gauche-gl-refj.info*.gz; \
+-	  $(GZIP_PROGRAM) gauche-gl-refj.info ; \
+ 	fi
+ 
+ clean:
diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
index 3d8aac3c5ebe..840d7c958120 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
+
+inherit autotools
 
 MY_P="${P^g}"
 
@@ -20,9 +22,20 @@ RDEPEND=">=dev-scheme/gauche-0.9.4
 	x11-libs/libXmu
 	cg? ( media-gfx/nvidia-cg-toolkit )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${P}-simple.viewer.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-simple.viewer.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-cg.patch
+	"${FILESDIR}"/${P}-info.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf $(usex cg --enable-cg "")