gentoo resync : 20.03.2022

3 files changed, 32 insertions, 2 deletions

diff --git a/dev-scheme/c-wrapper/Manifest b/dev-scheme/c-wrapper/Manifest
index 23b0b49713b6..266678f1f645 100644
--- a/dev-scheme/c-wrapper/Manifest
+++ b/dev-scheme/c-wrapper/Manifest
@@ -2,6 +2,7 @@ AUX c-wrapper-clang.patch 3196 BLAKE2B f960f9008bb8114804ecc20cedbb0e8b46d144231
 AUX c-wrapper-closure.patch 205 BLAKE2B b633bbf97b3d76ab58b9a332ddc56f976b54f9eb3df0b235e7784e27141dda051e5d637839bf3be49c580845ad6898d9d526169abb14e6329642105dd5416c11 SHA512 284f08b6a8164d129dfe5e26500ca4946c037d0661614dfcab7caf4d5ce189ee299dbb70fa6a4d0f2ec5b0fdf9f1926891d07ce019fade329a0909c10586c790
 AUX c-wrapper-extend-parser.patch 4899 BLAKE2B f0ba1b3e6866e48b8546535c63ca71b9e3f219348ecda3cc9281bef1801a5e1731767b4456d4071b62e5b9da94b7280ab3fa33bc396089cb6e0dee529b853d88 SHA512 a7c3d1ce4ab53478ccb6621c94ce12e3dcd8a967ea1589b210e2dfc91b2a1a6e4fb9b00c0e8ac6a054a0d9d905e662c178682ad43971b46153c825efff9a7319
 AUX c-wrapper-float128.patch 2198 BLAKE2B 5a17b735f99cd2af99b161421102e2d8eb4f081b85b83645b9d3bd209f30706a9441d4222a3d8c863304f4c028ab0a53677a1c25e5f16221e1b24d7293eefa8f SHA512 29386dd077dcd2a88dcd2fe13064863a9a36a59d0a59f34be04adb06bb923d548bc1aff3df9a208f25285d91cf0c1470ece08b188f74ae6526f918c72447456a
+AUX c-wrapper-gauche-abi-0.98.patch 912 BLAKE2B 265b37e9f4ea70e236a8c5e2060beb2ca1f2cc7188ba2576d7c76ef23a7987f3967815f0f8e54a419360989979a4f501147294fb9910527f8ed40775880f0b6f SHA512 585f5a8ef41402da098d2cd106ca9f721841349ff337b9234c15d3616188440d6311b94dd19a3a1422daf94b66e833ab2cbd9b863877149c70ca560041ce0e7e
 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
@@ -9,5 +10,5 @@ AUX c-wrapper-info.patch 1920 BLAKE2B 62c60a2dd8783fc0a56d386e02faa8f04bdd570c71
 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-r2.ebuild 1085 BLAKE2B 095d7c6723de816748d4ec861dab5fe995529f17a42ab8d8cf29fff125bd0f91e8271c824fed156456bbc5e240ee634b86f3d3238f86bfc15c87b549f5b1a9b0 SHA512 0f68154463fd6a7597bca07cc6afd7a2397dcd2856c937f5801c2bc851bdae76a23e4dd9e46beca21bddb917888be6d7779f755393401b5e2bd7fb6c78770a8b
+EBUILD c-wrapper-0.6.1-r2.ebuild 1128 BLAKE2B a14d6bfaadf755ecc5b883abe85ccb522422c820d7e52e6e2ab6ff074392975614e465e424346c3564d77e139d1095f0d82dd121d660850f440a52ca276dd583 SHA512 53627ee7e05b7f0050b6d69633d46ae8e75f507c79b887eb4839a8ca33231491492e1a5f1853af10af074b49abf73f7edc3606d4ea12a6dbf0ccdbdf24fed7cb
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild
index adbb32c8b4b9..f0e379406c0c 100644
--- a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -21,6 +21,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-closure.patch
+	"${FILESDIR}"/${PN}-gauche-abi-0.98.patch
 	"${FILESDIR}"/${PN}-gcc-5.patch
 	"${FILESDIR}"/${PN}-gentoo.patch
 	"${FILESDIR}"/${PN}-glibc-2.25.patch
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
new file mode 100644
index 000000000000..15e8b6990cc7
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
@@ -0,0 +1,28 @@
+--- a/src/c-ffi.c
++++ b/src/c-ffi.c
+@@ -347,7 +347,11 @@
+     }
+     sa = SCM_SLOT_ACCESSOR(SCM_CDR(p));
+     if (0 <= sa->slotNumber) {
++#if !defined(GAUCHE_API_VERSION) || GAUCHE_API_VERSION < 98
+         return SCM_FFI_TYPE_DATA(Scm_InstanceSlotRef(ctype, sa->slotNumber));
++#else
++        return SCM_FFI_TYPE_DATA(Scm_InstanceSlotRef(ctype, sa->slotNumber, SCM_UNBOUND));
++#endif
+     } else {
+         Scm_Error("wrong slot number: %d", sa->slotNumber);
+     }
+--- a/src/c-lexlib.stub
++++ b/src/c-lexlib.stub
+@@ -40,7 +40,11 @@
+         "if (nptr == endptr) {"
+         "    SCM_RETURN(SCM_FALSE);"
+         "} else {"
++        "#if !defined(GAUCHE_API_VERSION) || GAUCHE_API_VERSION < 98"
+         "    SCM_RETURN(Scm_MakeInteger64((ScmInt64) v));"
++        "#else"
++        "    SCM_RETURN(Scm_MakeInteger64((int64_t) v));"
++        "#endif"
+         "}"))
+ 
+ (define-cproc strtod (nptr::<const-cstring>)