gentoo resync : 29.12.2022

4 files changed, 37 insertions, 10 deletions

diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 7d3a5a8018f5..9fbcb1b8a565 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,6 @@
+AUX flatbuffers-2.0.6-locales-detection-fixup.patch 1183 BLAKE2B ab4612ff9cfd3a9c96b71d349a801bd359c62588946053dcc3dbfb32345d352d60d08778b998f32cea33aa3a20e74a29602afb4721d21b2a3dffaade8d473658 SHA512 d9b5ad550a363ab73025179c416cbb0d613e4be8a6307e3bf4fe40c64fd6757168c49b12a073351bc5d041c6bf0ccc4d297db87575215de0b3abdb1a21213975
 DIST flatbuffers-2.0.0.tar.gz 1538022 BLAKE2B ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
 DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
 EBUILD flatbuffers-2.0.0-r1.ebuild 831 BLAKE2B 68d76c63ca1b7e7952029c697401b27d3d16917a1bace1b98df7ca5a4751f4e6d0c9be6f85a655c517add23d13b60c804004f243854a46cd2bf9feef71bc956a SHA512 dd77a7b4ede065ae9e6e8494a85f47f7350cb31cf5d861369f0e0f1f233b3e05847ab03ab528f52134caccae90b63dd8bf02f6e4672785592044eef5229d9435
-EBUILD flatbuffers-2.0.6.ebuild 871 BLAKE2B 65425f3bbbf321476bbe9193e95797db0924b364cb9bc292f88bf05bc2c5b535b6c51a63edd31504b5c7a04f641a94b5d304a916d1766a09b10b3b645aebdfdb SHA512 c590eaa4db455758e519c4307992a5b7c24032f28ca1b461fa96c6265001775001d53b976818909850fdcf0ee942e4d79a16255a1c6a9225f066230b2d4acf1e
-MISC metadata.xml 333 BLAKE2B 406420eb792181bdf5e8c93153e9306c84fd6f3fd1148454ec57e858b411b698cff132f5ee4695866ab8984d665201a8ebc942ae425545bd67641e9c1d364b21 SHA512 b9d41f9dc12a72fe220b3b9673fac2656d060be1ed80b1935142e4706e6dc0663dc2667e84245328c8968b5a534fe48800b9b2e8e2b2635365ae741c126f757e
+EBUILD flatbuffers-2.0.6-r1.ebuild 913 BLAKE2B a64d7b9da3088b1a85f5f24dcda193fb3a3fbb99d81ef29fd1669548b886f05b6c19212be989ad4b621449ffd62a6eafbe859f62209da8eb7f4693ba1701968f SHA512 001cadd5e252acd90c62552f1ecb2f2125025b4edd3eec704b54b38c10c0ab46199b9f587412843ae02ddc63da894bddd0e855ff66ac0c1397893f3130593f4c
+MISC metadata.xml 251 BLAKE2B 8c4605abcff76ecc7c92d7d244e5c208caadc7377eaacab5b1e438d539bc5723245f007fb2b18150c3653ac9e510d4a25f8d7c195a29297381465b776af163d7 SHA512 31e9a32153945f50c11f05ac1df14992790328d134573bfa1bfd76a7f8dcc844e81b83257d87db8290f8b8035cf814906f84715edf4df04a23e980c06daa332a
diff --git a/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch b/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch
new file mode 100644
index 000000000000..6ab1b085876c
--- /dev/null
+++ b/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch
@@ -0,0 +1,26 @@
+From f10f1fdeab9dedf8206965b73a52e02e3de3bc41 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Wed, 22 Jun 2022 13:09:43 -0500
+Subject: [PATCH] Fix base.h to only include locale support for glibc users
+
+Signed-off-by: Jory Pratt <anarchy@gentoo.org>
+---
+ include/flatbuffers/base.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
+index 458ac3f..46d6d80 100644
+--- a/include/flatbuffers/base.h
++++ b/include/flatbuffers/base.h
+@@ -262,7 +262,7 @@ namespace flatbuffers {
+ #ifndef FLATBUFFERS_LOCALE_INDEPENDENT
+   // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}.
+   #if ((defined(_MSC_VER) && _MSC_VER >= 1800)            || \
+-       (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
++       (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
+     #define FLATBUFFERS_LOCALE_INDEPENDENT 1
+   #else
+     #define FLATBUFFERS_LOCALE_INDEPENDENT 0
+-- 
+2.35.1
+
diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
index 6750da452422..85b401a3de3a 100644
--- a/dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
@@ -13,13 +13,18 @@ LICENSE="Apache-2.0"
 # From 1.2.0->2.0.0, incremented SONAME, although the interface didn't actually change.
 # (Apparently to adopt semver.)
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="static-libs test"
 
-RESTRICT="!test? ( test )"
+# out-of-source build broken, bug #842060
+RESTRICT="test !test? ( test )"
 
 DOCS=( readme.md )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.6-locales-detection-fixup.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
@@ -28,7 +33,5 @@ src_configure() {
 		-DFLATBUFFERS_BUILD_BENCHMARKS=OFF
 	)
 
-	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
-
 	cmake_src_configure
 }
diff --git a/dev-libs/flatbuffers/metadata.xml b/dev-libs/flatbuffers/metadata.xml
index 7351ad7bcae6..8647ed292165 100644
--- a/dev-libs/flatbuffers/metadata.xml
+++ b/dev-libs/flatbuffers/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">google/flatbuffers</remote-id>
 	</upstream>