22 files changed, 346 insertions, 63 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 33afb9985d3d..8974df858008 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index a4c28f87898b..43d051acec2a 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -12,6 +12,6 @@ AUX boost-1.81.0-phoenix-multiple-definitions.patch 292 BLAKE2B d9bae6f053188f93
 DIST boost_1_80_0.tar.bz2 115869904 BLAKE2B 507e811be7659442c41bc2d99811bd02a236dc94932e1a7a8cf256243b479f2d2707819cd99e016a51c9dadc215713e803afdd9ea4c105af8d5d2d28d3d06a1f SHA512 829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f
 DIST boost_1_81_0.tar.bz2 118797750 BLAKE2B ae57247fb80ee5a952881a99bdbe9a1d5622690879ef59053716647dc1121e70fdd322251837387b43357f1cd63c6d1ba285cf35c0c40e4f5ee28a929d7eacf7 SHA512 a04201e73da59f68fa02761b333c864a96ebaf268247b6b10cb19ed3d70ee9ad3da4c53123f2a7a4a9b9e1408793b51e1adbcc6fd09f60fecef3ca9522bb6b36
 EBUILD boost-1.80.0-r1.ebuild 10947 BLAKE2B 8339355d97f004e8114d58c22ebe3a6c8a977a7475255806ef788cfacc42a18b099bcdec82838ee40140655b24f2dac9d41b95a4a010323e223496fc53772eae SHA512 c91f736e7c33afc5bccc5096f7a39eab65890623c6c25df0fe546867c66082e63245cfd71bae021e6e8d404839082bd5033695df98f2089fe403f11b683a874b
-EBUILD boost-1.81.0-r1.ebuild 10818 BLAKE2B 7df0c8e1af77c65f6cd735e540449d30fc5d06726c0c0178b9f795189eb17feb88ed12ba9ee082620458a40f269eb5a524a5fefc43bc698158edfc5ae50a6424 SHA512 3e33fefba7dbeb1bfa2cc549c902edac91feb39c66e7b33246ecce3d21635f9037f228e1bf8625f56bf6799f5aa44969a3167c0219d9f3d06c6f32d6825bc4f5
+EBUILD boost-1.81.0-r1.ebuild 10814 BLAKE2B 19a04444fbbdfc1268f74c10de59129dc2d9e835b7e53ea2fc71035614cd06f4d937a8ff3b72fd448958748696096495b87dce5b6b3d9fefbacc38ee5f8689d3 SHA512 e6f2c24255a220e8e2a9418773ecc628cc91ced1dc50a90e1c2a2eba8cdac8e8449606a1e188582d06d9d34983a01899e71cbed236563b506769743572073eec
 EBUILD boost-1.81.0.ebuild 10759 BLAKE2B a2a8ca3dd2c5fc3dbdd7c6a9537c3bbb9ade06079b2d3821269db789540d34dde954b1768351cae9615eaa8b324e8ffe60f5672c1a22d34d21b22c6888e57266 SHA512 d531d70fc304f8afb9fb96fc89bbcbad2a4e7c4344f593074ea94f94317c45c599395e7cbc69615a20f613cc5ab55ff669680e3a59fa6a322267412a8482e021
 MISC metadata.xml 9028 BLAKE2B 066cbb57ea9116c9aa13d5bd8e092eb1724e3501b29812fbe0ba46565de94404e96585068af9266fe3a66c556b960e3095b318b376e3689bdb8f11dadaa99d26 SHA512 b489dbb41686b252ad3632d276f9a469405126a81bc16ae5d62f5b6a90851f0438dd7cbf4bad5963a52e9b5037368ef674b0bd4cd8eaac24b22f796d80be56a9
diff --git a/dev-libs/boost/boost-1.81.0-r1.ebuild b/dev-libs/boost/boost-1.81.0-r1.ebuild
index 0e5e25e9bfab..a2dedb812859 100644
--- a/dev-libs/boost/boost-1.81.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.81.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # the tests will never fail because these are not intended as sanity
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index c2a832098749..d1f420e41ca4 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,8 +1,6 @@
 AUX dqlite-1.12.0-disable-werror.patch 515 BLAKE2B 3a2ed21d6d4b33f3f39789459754f3663ff03946c65a9660bb98a07bbc6b9b3bde7f800580f40b2e49f92744cbca719463226c60a8e98b8f41f689797b63a916 SHA512 af0a219f9ef5315fdb169f7f812059b6cadc251df5262de8d5574827afb23da64e9d0015ef38db0e5581dd9e6a992a72e3a54c2cbb5181ceddcc07082a98bfdb
-DIST dqlite-1.12.0.tar.gz 181709 BLAKE2B efb35aa9d0c348cd55eb190e27ad155b7d748ccbcb80822f33ce4589d56bc0090f5c0703d769e7090bb8da1b8908cbd73d1076568108661d5b85e55103795a9f SHA512 2a3dc17fcaa0ec2fc5481d3ff57a7bee42c8930f0e6ac7030d51e1a61ae3ce4d7b24f47921b29602a65353c1a51931a82d9af302ee580b19bdce561e6547e940
 DIST dqlite-1.13.0.tar.gz 190627 BLAKE2B 02880a112a7b070ee19653b60f19dbb49030b1d0d1bd3671577137ce281fd1af9c135f138d692fcc1c14592972cc9321198b3a2003fa0e81829c8ae462604964 SHA512 da56c622c75dcdc1df814d2b7acfeb08cb046fa7b74691d63575ddb3d30f91b441b8f58cc72466872b4c5e0028706b6505846d8f3d06583be844baefdd85f8a9
 DIST dqlite-1.14.0.tar.gz 190757 BLAKE2B 5304ff10134c7775c4475f77bbe60cc6892cc35c3f2a7b4813743cd27fc1176a1d513d66ebf22b47ed7e83fa833be1408f44f781fbd8200bfd3f4465ea1d6011 SHA512 4305b289903766f00c26e278cce3f761c778b67105a6d7e51e66cc1cbf85564fd41f27689b6895c6f182968d851e10a40d052570d55e22007e9eb5c2929dabd9
-EBUILD dqlite-1.12.0.ebuild 938 BLAKE2B 60472923a3f7b2ec5c980f68e5e37af966fcf037e356aac92517dbb56d8f57833f83d572b55cdafb31f19efbc0f54bdcdb0925de3644a4e5ac4b3ee735aa010d SHA512 7c545c2a3b0e09fbe0858a5230a8fe4e1028617eb78d8d73ea27de6f7a4258c7d1f9aab80167361c7795307a6619a93a0dea1c06288cbd1aecff13d8a6fbd924
 EBUILD dqlite-1.13.0.ebuild 960 BLAKE2B 5bbfd3da9bdf47be5808612e893441b05b58bf504f39ec3a9cb8013ea5f6e720ebe93b0861c20894ddab8c7ac55b5563b3be766da4aa48db3da4c6c9979b83d3 SHA512 646f02663cc29f80b80cfd0cc086b9ebf43abcbe1e9b27538ba578d5d4010528f26f743a19f090c4708173046a6a52d9ef4881210682c6f4ffef4c79f8620b85
 EBUILD dqlite-1.14.0.ebuild 1031 BLAKE2B ae146e9235a531eb02af53c2ca228defb44c33b04b11dded9d1a03e26e9d4c2702f0943cf987a53db2c63d2898477e624a00bfc90590bd7259422ed84356a357 SHA512 27da91567b3a372df3f16a05d28e52f7d4d18f29b6d0d6cfe2a9d1bfdc86ac4ed19abfc4d6e5cb41c9806d572d14c0d7f422a0d520b493f8ffe6f6a8576006b2
 MISC metadata.xml 950 BLAKE2B 26822e40a2c719e8e3a03db6e513d869eef038fcca973ef049da1b6eeec29aefd0867d6bced049ad1dd0465a4d942982565ff0436a7744ffb127879987ea626a SHA512 bb07a8a87ae66e5b5a2aca695e9d5cd1e5a1d725d1d9200099f9d5b46adad83c2ca9ebfedc172ad01fe31aecc1fbbe5a4de7255a2e04d4462c03a106127c7221
diff --git a/dev-libs/dqlite/dqlite-1.12.0.ebuild b/dev-libs/dqlite/dqlite-1.12.0.ebuild
deleted file mode 100644
index 41df3ee6e01f..000000000000
--- a/dev-libs/dqlite/dqlite-1.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
-HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
-SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0/1.12.0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libuv:=
-	>=dev-libs/raft-0.14.0"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/raft-0.13.0[lz4,test] )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/dqlite-1.12.0-disable-werror.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-debug
-		--disable-sanitize
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 6af9c470c814..636c3691685b 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
 DIST ell-0.54.tar.xz 562496 BLAKE2B d5aa705d0a72068c18b4f7f2b40c80069fc4d8a746a4c8585140da5387e06a529019b4e8eb37d4caeb9fbb948100e86f78d678ca3a3c0964d03ec368f7a4be64 SHA512 dff507ced951a4919f6fe82b276446ee6a9bfb0b3b9fe7abb2c76a3c22cdccf92f97ebcb0a476946adef5b031fd0d86f5af934b052383bdd87b5a7962b021bac
 DIST ell-0.55.tar.xz 562716 BLAKE2B b49acda837e22dec8469423dd47b397471975acdb0df034f0d85163daf0eb393b9bb75b1dd81c6e8a395e271bb0b8da01939df3497983aae5b6d270a70dcd5fc SHA512 f71b7d20a37009842ae54b72463e4c34509d00f0c344ae3b39acabe784fee83027d04b3f272f51dbc519f82ab794837b9a24ca90da55b97c757725d030c1874e
 EBUILD ell-0.54.ebuild 1175 BLAKE2B 0725c7bec06368247ba9f365c8d6e6f9ea7649d0348d458158b0547c5fb1993789e2465bf2fc2c1c407a0c88488309e27210f3a59f7c7e0e15222fc96d0e8046 SHA512 4a7387f689ef514e39a78b7a323c4cc1096c183df9c1ee1d8ca04efea946f1ab21460faa6c4928d1a6166a8da00c86209b2416eb3adfc37b23a53b9e07aa0861
-EBUILD ell-0.55.ebuild 1181 BLAKE2B bcebe8f38618d85d8fddd3c401b76096bdbcb7f2798540f6582c1e56af78cdebf02f4295d60208254a6d2232bb6061372b6eb2dc12331b8384c668012da91430 SHA512 76571ec809fa9584c1d72dbae3f859db318ce061751a1e7d72e05febd9c715c918da5c30637c8dcfbca81ab038c54401b6f49f0e4cce2a720a24185c6915699a
+EBUILD ell-0.55.ebuild 1180 BLAKE2B 351ae07da61d4a666e5f5522edb9010336573cd7100034fc2b0f5095222a7daff1e5cdcf58d04e755490295cdf96a3fcc7e3864849c56a7f91e1b4957ffd470d SHA512 9d209337f13eea7abf13887b498a4773e1c30bed364cd554f2ad832d40f51991a95fade2ef2d60aeecc9674e1394a892fe529ed1027577bc7170a9abbf5b761b
 EBUILD ell-9999.ebuild 1181 BLAKE2B bcebe8f38618d85d8fddd3c401b76096bdbcb7f2798540f6582c1e56af78cdebf02f4295d60208254a6d2232bb6061372b6eb2dc12331b8384c668012da91430 SHA512 76571ec809fa9584c1d72dbae3f859db318ce061751a1e7d72e05febd9c715c918da5c30637c8dcfbca81ab038c54401b6f49f0e4cce2a720a24185c6915699a
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.55.ebuild b/dev-libs/ell/ell-0.55.ebuild
index 5f049ed30b76..4da7b55b77e4 100644
--- a/dev-libs/ell/ell-0.55.ebuild
+++ b/dev-libs/ell/ell-0.55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 30090d161a81..15121e5d658c 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,8 +1,10 @@
 AUX flatbuffers-2.0.6-locales-detection-fixup.patch 1183 BLAKE2B ab4612ff9cfd3a9c96b71d349a801bd359c62588946053dcc3dbfb32345d352d60d08778b998f32cea33aa3a20e74a29602afb4721d21b2a3dffaade8d473658 SHA512 d9b5ad550a363ab73025179c416cbb0d613e4be8a6307e3bf4fe40c64fd6757168c49b12a073351bc5d041c6bf0ccc4d297db87575215de0b3abdb1a21213975
 DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
 DIST flatbuffers-22.12.06.gh.tar.gz 2172096 BLAKE2B 92bf0c56c10fa369e7a8a53a7f903af6b5f17560a3558587914c29ab8a655f3ee078c3e261426ca5d9ad0587419d4f0049459edc552e25958f80b80ba9539d59 SHA512 1b2c8eaa2ebeb92c3ebc363888b34b817d7b62a568e40bce2b037814f1f0103d4cb7db8507ec9ca05421be61b0b2be3edd6c4d564f75d1ce39278d73f8442ac1
+DIST flatbuffers-23.1.21.gh.tar.gz 2181861 BLAKE2B 6368358c21e677feb466245a746b86cebb6d6a4058bb6d593de81bf3c32ddfb9fd475e4bb225d4529ea106253456a5ed1ee6d024b1e2521e02efef171750f428 SHA512 fa62188f773ad044644a58caf1e25bef417dfdea47c9da8a2ea7f997154b4f3976019e32e73cc533696a3d4e45ec4a8402b6df140878dfa2ff078740d61b4b0f
 DIST flatbuffers-23.1.4.gh.tar.gz 2178791 BLAKE2B 8c354c539378f7d8e05307f7ba0f5393265a6183fc8868d48b8da5ab7d39a3e7a7f85631db00f0dc57bf396d20652049303a79fbf31f07639d80596d300a7701 SHA512 8b3e1b9596a76548faca529fe5070e775be50bfdea079ba4f66014f5a1bfb93f8edd7e56f97363c897d2db8391277a9099a61d14e4298c3669ab7068bbf07865
 EBUILD flatbuffers-2.0.6-r1.ebuild 920 BLAKE2B e8c13808ce448b216769c24434f84a9d4a0ff22e0c2399b7e42ae5b8a76ce96225c937b15e733821ff2d93a56759ce7a33b8ec24409e5df73ce4c21ddded859c SHA512 6bd3bbbe3f2cf3ac988193ce8aef16627dd78fcc19e1faf0aff1aeea5c2fd0cb17d4cdd97043f5ab1aacac401829fd44337be33b71f2ded846a089cd604c3af2
 EBUILD flatbuffers-22.12.06.ebuild 742 BLAKE2B b0de01e3b69a08eb7cc1c55e1a3186bd9164608526a944a1afc3240ac12270bebf641590cdb340b35793dbb44915723516e68c0fdf78b5eb7a2471674e8bfb0b SHA512 62514b164c3c685d465cab33c3a5fa88179b32bc7e4ba9a9fa88e7ee2e9c99a139e5974e7ffefcf29d2f2d24ffe4fe0e9fbbf0a421ab6d556fddad70f5b04f6f
+EBUILD flatbuffers-23.1.21.ebuild 746 BLAKE2B 3ff1f76891e9cba8b14446b3834e3ffeb57dfbac6829cdf9b90ba2c3eba249539e27f361c85538802c45a1eec37b225e3f3a19f5b13d066095268219b58bdddc SHA512 a9320e916fbb8b26ce17c02de5353bf022c5bf1b1b2b5cde336ed27cac8fa2bd09a770f87283ca75340a39b1d4f725522bc5d8e5d9781f64c23a21f621584b8c
 EBUILD flatbuffers-23.1.4.ebuild 750 BLAKE2B 013f70a5bea33c9f21ada909bf0f1c4d3b5d0f2672fff38326113c7185a974f4f91d2aebb15708c55c1e90e885a4ae5acd080a7b30063758743ffdc980125e71 SHA512 fb9a0d0b1e1a6785da0ad92ec123f0d7c1757523e4f570dec814cca818144ffd8f1573555215d011dd513ddafd0bb23a054e04072cfef362b98f1698a7733a8b
 MISC metadata.xml 331 BLAKE2B 6808287f0f9c9f882f52d65ed13a634ddb184341a565d561c120ec451e5414e9ff48c3d7aebe0c240671e514af83cb5e8ee7bdb8b47f57fb323dc5bc5fe37b5c SHA512 bc40060a61a79ffc86bf6d1bc6a058bd05f35c765a530e5153ffe6213ef486235aa6caf4eb43c36a66b995ea35e43f4c3bbf6a3b4591b73bd7f8b6511b962d23
diff --git a/dev-libs/flatbuffers/flatbuffers-23.1.21.ebuild b/dev-libs/flatbuffers/flatbuffers-23.1.21.ebuild
new file mode 100644
index 000000000000..7b43c4bca4fb
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-23.1.21.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Memory efficient serialization library"
+HOMEPAGE="
+	https://google.github.io/flatbuffers/
+	https://github.com/google/flatbuffers/
+"
+SRC_URI="
+	https://github.com/google/flatbuffers/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~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)
+		-DFLATBUFFERS_BUILD_BENCHMARKS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 1036b6974951..3d1653914bba 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,6 +3,8 @@ AUX glib-2.74.4-implicit-func-decl.patch 755 BLAKE2B cfe3d3950d30c2ff0e4f21803bd
 DIST glib-2.74.3-patches-2.tar.xz 23576 BLAKE2B f3746bdf961890d9f4e7ad20b107b83b7ceb8dcc36e288c1d526bac31a0e1dd9d1f13323f512355085c77d186ad66c3f52c1154f34c1d6fd6a5e64a074b2920c SHA512 945c131c27f02044db6154f0a63f458d6317c8a4e841fb392947b16756e25d92adeb2b34d793c9e19441b825d1aee71ae9b08fdcbefa1bc9de1d5af9e903e82c
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
 DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
+DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614
 EBUILD glib-2.74.3-r3.ebuild 10421 BLAKE2B 7f43ab0052a6799e821eca3ce82ad54e375d929696847648beaf15102a776b87649246686086a5724f23ef3087ac4b315f8483e19c27288059ae65f6be2ad70d SHA512 ed7fd984a22942e75d751f89169aced0af4dacbe4c4acfa7278226e38a6ea71710f79f5cae8e713ca4567cbccd1e5f8bd6fa9b3b527aa01bd4e2ba42a91d8dd6
 EBUILD glib-2.74.4.ebuild 10257 BLAKE2B eb489d1c77bc567a4bcc8fe3ebdfc8b12c640dff78aa9a0709a33f369115009344935a3788ba36d0d20fe877baf57663f1c757329e2b4922a7985f448fee8ca0 SHA512 93eb5acfedec7c4d298f28b6b3874bc1f8b0e274162a9eabe76e7b1278400a9bcb546aca44b2fadd49179f7bb0a8fd1faf48f7438cdbe955c00280c3c70030c6
+EBUILD glib-2.74.5.ebuild 10215 BLAKE2B a771708382538aad6fce9c6ff14183e505b3d5c7e2d836dc5491484af9109a723278bc720edc55a76e64ceb57aa947a1020dc7479401accba2fb994b4af76e1a SHA512 a2ed96db33cefa8bad4096b1307ba0fc02e09532010e4263ec7f5786f2468612473870d76aca67bbf49af13d654cd3af860b5cd6559177ed67774a3d4153bf15
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
diff --git a/dev-libs/glib/glib-2.74.5.ebuild b/dev-libs/glib/glib-2.74.5.ebuild
new file mode 100644
index 000000000000..7924f656d5e2
--- /dev/null
+++ b/dev-libs/glib/glib-2.74.5.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	elf? ( virtual/libelf:0= )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	default
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		$(meson_native_use_feature elf libelf)
+		-Dmultiarch=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	export TZ=UTC
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# https://bugs.gentoo.org/839807
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /usr/b
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 966a92c53453..2d090913c213 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,5 @@
 DIST libgit2-1.5.0.tar.gz 5893437 BLAKE2B 4108de0e8fc6a02e4172f47cb69cdfe8c85a0a72235432ca58b02d94e0bcb8390caf0c710060772551cc3a392291778ae14b561256c6d88058d0ae5a277f2fbf SHA512 7a32b27cd32bd03ce7be6c127317f82a4ac6f16615c3234699676781f4858d057edb0410b2fe36fd2e634b00748a8b0be17f23809e09a7602ba48185134300f7
 DIST libgit2-1.5.1.tar.gz 5895483 BLAKE2B 4df80216523f4065e46c1ce99fd0747d2f8516571691c8c2b5638e32c805f5ce08d3add769e6d5ce29ac69b35419db82ce56c6b3019e70573c4ad63aca2e440d SHA512 04cf389e30cd9fb787704e3c8997acaaeea5c13e1e2f9eaf9f5598d35c2e85f3cf04b47312cae9e7278236ecb089c2d33addd852e38d3c7d2daa87929b077f39
 EBUILD libgit2-1.5.0.ebuild 1686 BLAKE2B 4ae895e2af20af5b8af29d7b62f2638ef4a804254d185e1416b9661593e97922d1c92e39de13f1c1e48be244b1603092251d4924004a91fce75c88250763aede SHA512 3bc83d51903b44085685b6c284c44d8c0590eb71db919f1bdb8b7f41daba68a56e8978c51e5b2b861d51df84f603a366526abf7127fb05b14c4ab50c6745b7e9
-EBUILD libgit2-1.5.1.ebuild 1688 BLAKE2B 75549db5d79c5fb5dc78626329aadb46401907467a9b2b7251d85a6eedb72a5e701a3293726b22ff147f4f7d169512b3a7801055b05d65984c0b1431ffa220e4 SHA512 43bb9a3c6aaf2bf58c4b8a51b6931abef1c15b848efd6347192803ed769e875cbe0663cb6712ab9ffe09f50678316396aeb12046ea71ded6fe1a2019dfd55194
+EBUILD libgit2-1.5.1.ebuild 1687 BLAKE2B 89390e28a4964bd07c9bbad9bb4a3a44636c9ae0aaa464a68bcbd6dda407dbb2a1a9dd2089aff96845a864d42004833da20a3a59fc91054d59a0d3352d7e49a8 SHA512 8610b01f7345b9b7f9a24bfefd64f41ce66169e44a7b24ecc3e5fc43ffe38373411362da46383d68cfed0063f143041ab8408318410b845035f435d16dae99bf
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.5.1.ebuild b/dev-libs/libgit2/libgit2-1.5.1.ebuild
index 7995816fd11d..7b3c06155237 100644
--- a/dev-libs/libgit2/libgit2-1.5.1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.5.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/librevenge/Manifest b/dev-libs/librevenge/Manifest
index 8ed2f1d7c571..becb39e0dd0a 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,6 +1,6 @@
 DIST librevenge-0.0.4.tar.xz 421604 BLAKE2B 414674e4313f3062dac20a1ad7f1cf1c0a1681bb486f4edef109558fa70aaf8ee407fec8dfa93014db8c8746804e0a2bfec9636d75066b93d84e9bcbdc3f4dc4 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712
 DIST librevenge-0.0.5.tar.xz 437400 BLAKE2B d4135e515a3f9e5d884c3d15b4dcd5cc0338aa5bca1449bacb81461a313f6704a605594c68635ac9d0eb437426560cbd98de23ab80538400d68e5adcb895557e SHA512 24f7fceedf45e4907782d36c4cc9e9bad6bfbef97a16487e41ab3ceaa47c8f464826833be9831455f4a7c1567b9307a93e1c85b80cb3b40447be130e0d2d365b
 EBUILD librevenge-0.0.4-r2.ebuild 1120 BLAKE2B 76ab8a1d57db1f457c9f80ccc6d62c82644fabf6aadd85a4f47ab01354efcf7cac2829205b7ccc014ef6fb07a85b9144c5e2097ff563ae0668640b190e37713e SHA512 44d5c04166dd7bf1fc297b21482a7a1d1d93d684bf8cde9f127408798848e7227b488297706837b1c68a04cf92149e5eb682f95e83dc3358a155fd084878a52e
-EBUILD librevenge-0.0.5.ebuild 1128 BLAKE2B 6153c716d1c3a954fe6c5b960e36542078e13b4a581601be031f1c8691fc1d2dd051a8df108f44f560425f9d68533cafd03e1658d3001acafedf167eeaa9de5c SHA512 df6a44760f45490779ff96bc3c822da0731879dee9ea158a800c24e0d76c4d7663d3f95e68e873c76d8a3f42c56f91da48bd2d2cc782e8c490715b813cf33325
+EBUILD librevenge-0.0.5.ebuild 1126 BLAKE2B 2ebcb844df8061df04785bdc5abbb4cbc6601e25ced8aee8133ffd01b47969dd4594cff7f958df40cfd89180a9534f887381e8142f23cde375f884cd54d2574d SHA512 772142767d350922b0ae447811a68bcefab62d56ae65179fc7bab7c0baa74f5c6cea2abffb9cbbc894f61c837c4299a27e6e7e1e9bec0458fae89c19e30bec6b
 EBUILD librevenge-9999.ebuild 1131 BLAKE2B 28fc6a0eecaf6746ca7ab2f41356122cc87c15438766b2da9e96447abb0a83d4c11e52d4f08977febc00619f2aeb8b17dafe6621a8a1c803a2a2ba71d9b7c2c8 SHA512 20213155ced3a009fdf1ca2b88f88414c7408d124dd27a751cbfc73e8745e5d67ae17abb866152a28618f544b741a7e570a7a8f8235eb057e20a70b6560bc1f4
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/dev-libs/librevenge/librevenge-0.0.5.ebuild b/dev-libs/librevenge/librevenge-0.0.5.ebuild
index 1f02ed0e0d44..9d58f31efb91 100644
--- a/dev-libs/librevenge/librevenge-0.0.5.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Helper library for REVerse ENGineered formats filters"
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 9cf9520b96b2..61482a957ebb 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -6,6 +6,6 @@ AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.35.tar.gz 1096974 BLAKE2B c80402d7be9e69ab6d1e768a18d271a8d28900f4cae7df2709d1ab26e100d908f508762bb771d4042aa7152934ce83d495e2102e894c56574187be8040d65629 SHA512 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f
-EBUILD nspr-4.35-r1.ebuild 5069 BLAKE2B 00caca332cc0207235b0418b294cb4f870daef13ae917603d82076d04cc2f2bcf6b16f3740d8d2a15a1237f6e29e0b17dc519b16b3962715855670bfc2352ddd SHA512 0b66395ddccf0cb438de8c2ccf9a69229c5a5029250eb10748d21d6b3e20000b0efcc9a5fbfd06cb23e7eaa687738838ed1af6d87a0a8e1690f2c6ed009341d3
+EBUILD nspr-4.35-r1.ebuild 5099 BLAKE2B fb3b4a4fefaae746bb772d50262add8a739816fc2ff2aacc924c5bab73f401e6f9b24707110f50fc5ca88143316e633b3d15ae4eb347c500a6e1a8af1bc354af SHA512 38daf259b6bce66b7a4f1da53e9339b7b9389da794e425cbef23e57c5eec353c994cfe36fb37e4532b3fa0fbf455cff744b8db92279be678967c02deb66991d6
 EBUILD nspr-4.35.ebuild 4822 BLAKE2B 7863462df59006ed06bc41a867178cbe217a36ba029ebbc1441e08e40614c9e7228d24caddeb096d5a679cd150243eba47a1268e06189cc5361c1c0f0799972e SHA512 386e6440fde6ea1607e9a2d6a024f0d8a5fec6160c90de4e7fb5f4db5aa53b9f7750e30aebf0098161b99da31b8ec14e3a2f4d4433d144a3dec6d42b50bf9b3a
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.35-r1.ebuild b/dev-libs/nspr/nspr-4.35-r1.ebuild
index 3dc60399c257..10c3079649f8 100644
--- a/dev-libs/nspr/nspr-4.35-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.35-r1.ebuild
@@ -76,6 +76,7 @@ multilib_src_configure() {
 	if use debug; then
 		myconf+=( --enable-debug )
 	else
+		myconf+=( --disable-debug )
 		myconf+=( --enable-optimize="${my_optlvl}" )
 	fi
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 898b13574e58..7cef1085eb6c 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,5 +1,5 @@
 DIST re2-2022-06-01.tar.gz 381032 BLAKE2B a4cf937e0341102a3151cd1741d51cae1bdd8ab589dcd4c9ee2f51ca43b325f7604fd5e6ae85db8ddd8fcca615ade6817a45664a037baf9cd14023ae4c4a46ac SHA512 f3d5f2a3aa5eda74bc8f434d7b000eed8e107c894307a889466a4cb16a15b352a0332e10d80ed603c9e2e38bbcbdf11f15b6953cbdf461cc9fb0560e89a8ceb8
 DIST re2-2022-12-01.tar.gz 382554 BLAKE2B f3b3f00e4a991db90695510a8820493c42605ce91278c3e7e5de9f0736b8d7b627921672905d4404a252425f619c8d27f81b05f4d69f33d4c23225ac0c44fe2e SHA512 783f856e6556ce60f0e9a15b2366cb4df21ca019cdc85ef7ad47a11d0345935300dede5da61892bdc77d2642da82ddc81b6670049eb87f357a64a9c684140ec9
 EBUILD re2-0.2022.06.01.ebuild 1359 BLAKE2B af48e1e56a5487555f37b856ef8a8ef162e1a5cd3dcaf548a51bd85cd1e3297a008a59273cd45456c02de3b0d168dd45b2001c2702be4d23ba95a42113cb5ae8 SHA512 6cbdaa2909149f7e0a503d6f67a32d23e6036df2f253bd82959a06f1031298ca5ff1659f43af81f4ca211b41a355c4f30625afa651241a0c99d095c8ba4b0f02
-EBUILD re2-0.2022.12.01.ebuild 1361 BLAKE2B 6fd4ff16b9c4a4369dc2244a32e46a43f0918d455175978a3e3ea3c6d950cb94bfdad7fc876dd9ae33e0448d9f9eb3270bd83bea9f074f0edbd54896aa432b74 SHA512 fcd48d55bb22dc0b33833f8c6d449efa3ec4552435dadc2d17882ef7e4a1de8ce093e934bd4c62e3b53c70fe5d37b0cfe54ebef180910466baf1601804b8a365
+EBUILD re2-0.2022.12.01.ebuild 1360 BLAKE2B d2ad80ad560ad8c9c176ff5e78574b4e000483c562fcd4771b88c64b33601df92d363496a2eab0e5ee07a32ccd6fa99d9445db426b7ec96429b1e2fe5806f200 SHA512 fb4db0d359985a5e8ea8bb358cd90c6783e91b778ba5f7af317ac7f8d64baef156c7f805323a7a261747a7f9f600a9cb3a0e81556320f0202b9fd527c02ffa2a
 MISC metadata.xml 486 BLAKE2B d99b0956f406a1e5fbfaf9a8516aaa86c328829bbfd6b4c3cfc2e925d2862e08dd31cebb730c957ea38a9b5aa84a3010ddd51760e2db8385f9b5d608b40b4d37 SHA512 e882f04350157da3e0ad7438f2c6a340853f6b589996041931f6686860d61c861e003692f5df616282e498c18266ded4803fd63760c2457dfbd04ca1b5d93391
diff --git a/dev-libs/re2/re2-0.2022.12.01.ebuild b/dev-libs/re2/re2-0.2022.12.01.ebuild
index b6bc74beedef..403353b017ac 100644
--- a/dev-libs/re2/re2-0.2022.12.01.ebuild
+++ b/dev-libs/re2/re2-0.2022.12.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="10"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 26d1339df12f..28b0097d901e 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,4 +1,4 @@
 DIST sord-0.16.14.tar.xz 112748 BLAKE2B 399f4bf5d1b8ae557fa7e2d2e92e74ed646d0554235f4527a4b9ad53aa6beb0e90e2d80c9e65ab3c872b5c8d45a7948b7746284bb1fd2352320a0aa33e97e305 SHA512 f6f254518d5dccece7975529b1fcfd552fd9c37e49dc7e9f8a46756b85e476dac064a39af42bfb3078e999e75d1aa75dcc30ec91e08753defa9363adafdfd3bd
-EBUILD sord-0.16.14.ebuild 1052 BLAKE2B 5b67fdb35412fda8ffc2a36f9274b0fb74cda153d81967c8d525a208e708e15369da45c5bfce3a2361e1fb0f1c0403508409cf8e532940664e04b2cb74bdf410 SHA512 81fdc1e5ef3e34b5e6750e17cb20d8dab726a0045a8e0302e46cf180a92307e91b1faaa2e297305b103b81ee02179327a79ed55ff75d1b58ad988669f482520e
+EBUILD sord-0.16.14-r1.ebuild 1062 BLAKE2B f108527e64f3cc6b02cc8b45705146244de012abb9295ddd7a928193c127c0748aabce9b392c662ec6d8519dd19ee2e5f840b4c74ca1348527122278c38bf0ad SHA512 c764d13737cdb6681c46777518ff80cab5b58dc76ca55dc4db6e1c7eb18be5688676a67958da352e6360c0b9f9556d3e9c656c3be6568bcfe78dd07995aa585a
 EBUILD sord-9999.ebuild 1051 BLAKE2B 4d102297d84c3b7762770a944d5eb6a4ddd425a5103c1e9705c1c7827be98d96fc0e7aa7db18484454bdd6ad4749dac30fe9571cf9a6babbb8d410b0fea43c38 SHA512 b131c46b8dcb4d2d7f16f3969e94b8a64af6d77a2c8dd414ecfc92f093cf2410c83b3d81b900b8dd8b1262e3f85fb51c0cfdc7bf9c6b964b950342e046ea2c36
-MISC metadata.xml 332 BLAKE2B 8b6ced42cb1806732db75f2163ec786301af6fe535da27127ea4fff4cd08c354b5881551574952e3d192fe2191331765f7a3356c2e48f9ad93b6341d467fa9c3 SHA512 96f38c83f6692b5598c94ee3e72a0ecd26706b532ada45420e5517f39be2f608eb1de7090e4d7df025404f6474739913fbefda39f5be227ffefd02da61a288ae
+MISC metadata.xml 410 BLAKE2B bc5ce38abe6276b92594039e5264603382ca4ceb88d4acf9d34e663d97edf5a04997f614d44f4422709f9dd3794803ddf883ced9908c4c3cdad3e810eb3531ab SHA512 a07cc2e3a7d131e6823bc2955c433b6fd2af1d395a1730e9a89be10f19b60a6192702ea0e6959de15a7b6aa1eb3ff478f590daba3917a58f92c9ee66bafbda79
diff --git a/dev-libs/sord/metadata.xml b/dev-libs/sord/metadata.xml
index 6edf5b9eef03..c0ad8befb5cf 100644
--- a/dev-libs/sord/metadata.xml
+++ b/dev-libs/sord/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="tools">Build command line utilities</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">drobilla/sord</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/sord/sord-0.16.14.ebuild b/dev-libs/sord/sord-0.16.14-r1.ebuild
index b5209ac05354..cc25549376cd 100644
--- a/dev-libs/sord/sord-0.16.14.ebuild
+++ b/dev-libs/sord/sord-0.16.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ BDEPEND="
 "
 RDEPEND="
 	dev-libs/libpcre
-	dev-libs/serd
+	>=dev-libs/serd-0.30.10
 "
 DEPEND="${RDEPEND}"