gentoo resync : 22.12.2021

3 files changed, 2 insertions, 35 deletions

diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index f6c1a727f898..b104523fe3b2 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,3 @@
-DIST flatbuffers-1.12.0.tar.gz 1145348 BLAKE2B 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6 SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063
 DIST flatbuffers-2.0.0.tar.gz 1538022 BLAKE2B ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
-EBUILD flatbuffers-1.12.0.ebuild 709 BLAKE2B 570b8680fe48220728539d9bee3d5bc2c851e4105b4f2d8926d5564359c32dbafee39aed662c311621610f75f64bc4464ded9ecd0571f541eed883d053cb9b8a SHA512 fd7652dc1a6a721965027ffcbfcee9826e2c1728fcc94e69735d14487be1b073c388baa1c56c98de6e5989e7feed3b908ed73fb4941365a9e5aff4a23ca69c0b
-EBUILD flatbuffers-2.0.0-r1.ebuild 834 BLAKE2B 97b108f7f9f030dcff0cf2af923fdea9fc138c57923cd561edef30410bf01042c4752a75dfd7f00e8e949c59ad7756ef2662b79ea8f0dac76dee5c75f1a76f05 SHA512 334f557e992f5c475f29d03cd0089a4845b72eaf6612e1814bb3c1cfa4493b200c7237ce2f50672494a60851132bfab40fec359d7d7ef285aedebc67a519322a
+EBUILD flatbuffers-2.0.0-r1.ebuild 831 BLAKE2B 68d76c63ca1b7e7952029c697401b27d3d16917a1bace1b98df7ca5a4751f4e6d0c9be6f85a655c517add23d13b60c804004f243854a46cd2bf9feef71bc956a SHA512 dd77a7b4ede065ae9e6e8494a85f47f7350cb31cf5d861369f0e0f1f233b3e05847ab03ab528f52134caccae90b63dd8bf02f6e4672785592044eef5229d9435
 MISC metadata.xml 333 BLAKE2B 406420eb792181bdf5e8c93153e9306c84fd6f3fd1148454ec57e858b411b698cff132f5ee4695866ab8984d665201a8ebc942ae425545bd67641e9c1d364b21 SHA512 b9d41f9dc12a72fe220b3b9673fac2656d060be1ed80b1935142e4706e6dc0663dc2667e84245328c8968b5a534fe48800b9b2e8e2b2635365ae741c126f757e
diff --git a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
deleted file mode 100644
index 5bb8e0e5a754..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( readme.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-	)
-
-	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
-
-	cmake_src_configure
-}
diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
index 4be03e4e789d..66d76389cfc2 100644
--- a/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
@@ -13,7 +13,7 @@ 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 )"