gentoo auto-resync : 17:12:2022 - 03:37:59

34 files changed, 248 insertions, 28 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3f9eae7b94e1..58df54e6c2f8 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index da05f022949d..4effbd001d1c 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,5 @@
 DIST appstream-glib-0.8.1.tar.xz 2320596 BLAKE2B de8d68c541cd6700fff0bc22a71d59510ccf584ac1380e2aed3e5aa122825cb3087d65b42ac1dc35acbd4b171382d9560545cdeaffa9d6bda721784444bf7a36 SHA512 32462a32ea25c945abb8d9084af1c84850f264b3a2136c6f54444e0168acf0d74ee450f8cbf483a504e417dc29b85a2e9bbc0a5bb8a217296eccacaa02db5ef5
 DIST appstream-glib-0.8.2.tar.xz 2320880 BLAKE2B 6c3c90298ae8bf362caea8c46643afaaab0bb0071271f5244eeca9356ed96a6a956c1b2ffa4a8500201e4bc494a54a15b3db4937b81c6f5f8b80f83299ac58ee SHA512 c9c21049ab43f5da8595aa07a3c2e097163a05b5e0fc030e4e3326136cd18127f04ad9edf08c12aea823b89048b43808cc60759cc26fcf2541cd9c1acbb29e28
 EBUILD appstream-glib-0.8.1.ebuild 1605 BLAKE2B d55cffcb667106deac403387b10d8c2e73d24edebe82fe82f660d523956488cd0f1ec4463ad502f8b2650dd0ed344bad96c1d79a16edd531284416111ca3ab84 SHA512 530ce1b46428e187db62432028f987d17388c9d025051fd77c6ba27eb39a86aaa74f79dce7a9065440f272b1170cf21276ca31472dbb0e5f07999da58b42d778
-EBUILD appstream-glib-0.8.2.ebuild 1610 BLAKE2B ff433aaa98268baee44a9ffcb9350e025ddca29b9fff144af2a3b1474f74a1b62f40a508578df1e9d1ac7971348b5a8ada071d267cdae9520edee379aa445fdf SHA512 e9252b49963e87146c25e75ba53072280491dabecb0b48b9ff65f144131c937a9c07eaec61377d997284cf64a5f67386496e65d09dcdf1bac76480db1c7902cb
+EBUILD appstream-glib-0.8.2.ebuild 1608 BLAKE2B 65ad7b286f0fade575bb298441cf38da0bd84ea74cbeb6c729cbb813f4ebdbb98a38b6f7f1138e06d7e1400e8d36bd7f7ba71d8c3097358b81f4e75177ef6679 SHA512 8bf4d6b23f3e8566b401e58ccb0826bbc548cd7c4ca03d2928368e182ba00d54ac18189fdf70922216ef4b1d7850fb8d28b425dc8d44758b2df80ee67234c51b
 MISC metadata.xml 518 BLAKE2B 86626ba74aa4910c2c6148a1ccfbfa7239ee49dbd2ae570f033226a5b145eecdfe0fbb89381a33a7bd03f98176a009ac5d6a67a725b221f2a1005ae17de4907a SHA512 8dc91556a745b2fa694171daf8080a986a42040ce088c6c320a6287660f288522b77d701fae78bf1b16f3d9e0d20b03a8b27c849e561b6b48c5529c71bcce554
diff --git a/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild b/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild
index ad12f3fe634a..063f8e5e2dae 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 5c1a87073bcf..298eb2daa526 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -5,5 +5,5 @@ DIST elfutils-0.188.tar.bz2 9112977 BLAKE2B 6b0474f1436eaf6af73b735b9b2ddd5448ab
 DIST elfutils-0.188.tar.bz2.sig 310 BLAKE2B c8d9135cffde3b1dd337b692d5351855cf799915d3ebd553327febaac192bd2f108b3f45a6376d458e179390a1ceaf4809762cdc40ea1e05fed0214ac33ed56e SHA512 4cc8a7417d244e319a1650d71b1831660cfe41afc7c73e9c83d1f076f4013fe15247e8b4f5e12a5396d83c4f1c7663ca4be5ea42bff3dc23263f85331fd9d566
 EBUILD elfutils-0.187-r2.ebuild 3210 BLAKE2B b11ebaf01e5c1c0b4fe61b39e0e2c25ff20ed0574d202bd0bb93cfcb58f0c62549962ab7a7a8f7f856b1784e53ede960dec76fced1dea384658f73cf186748f3 SHA512 12c875059b00a58c232c83923bd3eebabfed45e120cd1572a4c9b1f6d28320a4fa95188a066e517751d4c05907303321144fe52416d31968c1a8252fb82c9ca1
 EBUILD elfutils-0.187.ebuild 3097 BLAKE2B e3373bbc80a9cf19ab318fa73ed1adba039ab235bc56b0cd22eddca98a486c8f4daa6768ae9fe5e13766c694534197dad6f41ef3701b8b158b90853913fe266e SHA512 b33cd29502adce7fab08ad3fe426d7232535d3a2a537cba558369869ba7cefe062e7005e9558160f8990373f568603f296b0b4f2f9754345f696e0e863dac323
-EBUILD elfutils-0.188.ebuild 3225 BLAKE2B d2e2a46a69513433ff9191f411c486d68ada8e0828bf45bc4e9c9236c9c4256143e8a5cccf0fedacbe2172c96b2109638a9866aa3f259de403ed7f54a95f8b08 SHA512 36d0f4e85c98cf0d06dfad2c805283cd593c0bc72dd135c422e9bce67ead241b17d4fc99d9583fcef5a2c84718ba34fa09ba4446dfdd984989588a492dfeb810
+EBUILD elfutils-0.188.ebuild 3223 BLAKE2B 6ad275a193f366f1c92281663aa41f47c8ced312291f0bee67f6d8d6395dccde112809d4c9628fd12bfc7ca5a37cd2480bf8d099560c8d0b0170b18058209c85 SHA512 cdca1bc4c4b4e317d5f162ce8ede8b2cbf01cb174b79b1bacf3396b0fadd7bf1108a0dae72602bdf0f77bec47bb047500a60c24fba9a1c444f71f431c28ca16b
 MISC metadata.xml 730 BLAKE2B 94e9585a2d765ee2a7c85a823c389453bcdbc29b90a5542333eef1253d4ebafb7c26e383dfe5c5e0fcccf61f60321e7a46b0ae8c5edf467937485d6c9867712a SHA512 663cb6d587113d21fc0d3c703731f4dcaed55fc1bc7e75e1ac465e21b161ba5c4b4cefe0fd838d28b1f890cc33008878996e1d117fcab6435f8ed49f7eb0bc73
diff --git a/dev-libs/elfutils/elfutils-0.188.ebuild b/dev-libs/elfutils/elfutils-0.188.ebuild
index 6e466a84235d..8038c1e807cd 100644
--- a/dev-libs/elfutils/elfutils-0.188.ebuild
+++ b/dev-libs/elfutils/elfutils-0.188.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +utils valgrind zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 55ec5df0ba67..0633eb5eeb3e 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +1,5 @@
 DIST gjs-1.72.2.tar.xz 620380 BLAKE2B 5ea15bdf25c36fa0236f03adea5b2261db3923190005754119eacd070830e7baedfa842ab273219055f67f7af535d31d5844c76eddfb03a8ec1cab57297ec258 SHA512 0dd10f40e8811bbb79c541cf3dc4e3759c0e025485e4b8ad2870dc30ac8030573300bc178c78bf2d396b86733e36b33210bfbdeead6a314e592d5b3c250a16a2
 DIST gjs-1.74.1.tar.xz 638536 BLAKE2B 375abcaa20a538cfa271f7dcf6f3715e4324ff5a4a9482ce0dd7f78213598a715ebc034f701fe458876f841f72802db4ae2aabf0abc04dc4ac5bb39c917741fd SHA512 346667accb589df0e6a045e30782017eab928115f263d36d521b61b0af38fd268bc518b8ab5ec78e5d25e0194b744a2ee59e65668da679e138b2122858ce0614
 EBUILD gjs-1.72.2-r1.ebuild 1928 BLAKE2B dc02cffd8627c6d0c0a2f92e181699832ffb7516e72c73afe5063a1550f625f7d4071ce556647e0f9ed2f88c33cdea9404f0d0ebee73837cb16afd4efd0f3c6f SHA512 2b396a9d78a2043b04074e3de859cc854c01071971b346ed6521531c082c42b2fe9b034b0a298139e26e522cafb77c36051ac1449d7b10bf99ef842d55908420
-EBUILD gjs-1.74.1.ebuild 1965 BLAKE2B d9cb602895ce4a07c7e22cb01961c159dfedeae4384a9551cc319e3a1cca53b7287150302881ab3aa48cb1e3579e82b764041d111c1459b7a25655e7e2c82c7e SHA512 aa3ec0c6456924e91fb6e3b92dd61a2760d22c796d6c72344947ba1dab6886ce20b2c78e2625a9b7233bd96ac2e0f18f189a51b5e330e4b80c68feb7869147a8
+EBUILD gjs-1.74.1.ebuild 1963 BLAKE2B 6f4a0f771cbd4ab35ccc23ca3bb30f497dc09de9b7a52bd1eda18133f941af192ca7dea1ccb29dd30fd804870df0f5035165db28f891a2397c2830147ebc40be SHA512 44494597cf7c2728ce97b98595e40cbe7c355312262d26816bebf4c1f4e831dfd022b8c75826568e6e73c90f2c01af40981c11ba9d075a637b54f68a100848b1
 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2
diff --git a/dev-libs/gjs/gjs-1.74.1.ebuild b/dev-libs/gjs/gjs-1.74.1.ebuild
index b52f37d96dcb..a27ea5d33dee 100644
--- a/dev-libs/gjs/gjs-1.74.1.ebuild
+++ b/dev-libs/gjs/gjs-1.74.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples readline sysprof test"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 4088d41347e0..1b4a66371c8b 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,5 +5,5 @@ DIST glib-2.74.3-patches-2.tar.xz 23576 BLAKE2B f3746bdf961890d9f4e7ad20b107b83b
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
 EBUILD glib-2.74.1-r1.ebuild 10172 BLAKE2B 0920ab3c5ac1187ac6c31c6b9531fe7f5f0b4027a9f084f8620d4a0579b07baa10cf9f93fcc16bea2362bd7b43a25e67e77225702d1e2a35dc47b63e2bbe5b17 SHA512 1644fdff2f7031251b0f5b9e9d71f4ef522660fefcf9c963be73f911b9a283c7448657fc68f5dc679658861cb33c63ba5c0bd4785ecedee1429220e415e5fdb6
 EBUILD glib-2.74.3-r1.ebuild 10215 BLAKE2B b1ec264b5e77c633dc44348a27df0e5fcb6dc7d2fd01f2f37245f3033de46b176d7a1cc8992c17d39e91a497d7e3126d9e2231cfae1424544b64a2b26adde9fa SHA512 49b67bd553b6aecc82545a191add65276dff5aebf06915b5ad43baccd287d97ab3aa68f2cb280a0fc5f3079d70e9c2181d38ac725e4f1114c75f79048e07d637
-EBUILD glib-2.74.3-r3.ebuild 10427 BLAKE2B aaeee38b10e9134b4d7d31b7f6122d951ff59deb1d973a840075011d93b3ea18ff97f42beb544012cbbbb4419ca4b92f9edd3fe0d65f3500e637e9d1db9bf4f8 SHA512 f8092825a8fee142f75c20ca02f15023604a362d12d378ca04c1d330e23c028fbabd88622cf3b7b649433921f9c0babc1340cb60358b64b087544e7efba4c3cd
+EBUILD glib-2.74.3-r3.ebuild 10425 BLAKE2B a34ee773943a8c290e14d6672e3f562385f6186f78620df0b86269a9f864219d88d3b00015fc79315852642c42b8b5a5df512226bed57231a6462c910049bd09 SHA512 88f05babd1bccadd851f9825ee3b66b590ca7a0cf6247ee663e41514bfbc383814463734ce8bd7278699b9fa192d046118650229c793c6281a33645b42d53bc1
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
diff --git a/dev-libs/glib/glib-2.74.3-r3.ebuild b/dev-libs/glib/glib-2.74.3-r3.ebuild
index 2a8a72ab38ea..0a5e5929e688 100644
--- a/dev-libs/glib/glib-2.74.3-r3.ebuild
+++ b/dev-libs/glib/glib-2.74.3-r3.ebuild
@@ -18,7 +18,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u
 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"
+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
diff --git a/dev-libs/kirigami-addons/Manifest b/dev-libs/kirigami-addons/Manifest
index effa894e3f7c..0bf8bd040dbb 100644
--- a/dev-libs/kirigami-addons/Manifest
+++ b/dev-libs/kirigami-addons/Manifest
@@ -1,3 +1,3 @@
 DIST kirigami-addons-0.6.1.tar.xz 83396 BLAKE2B b40ff06f709484715bb560a3fb146deff0b2be13157524ebfe1d22e6ec9e5bfd699f9b51d170f13b18f68c73cc02710a4189cd367d7f1766336e381956e1c59a SHA512 472730551d952b623ef329c7a9615d26f36b0b5f8b55f5aecb3d9b315799713431aad6e87e402862746cd1cbea745a9042b10696479f54a0ce3773787718226b
-EBUILD kirigami-addons-0.6.1.ebuild 1075 BLAKE2B d5ac777d176ad9749458158179304e2d1461cf5ca3d685c2c7970f23e7dbfbaab4dee17fa296fd5947998602b10b1b96714bf856f62832bfb3f1acf4e15b4555 SHA512 3c28113a7c5eccb5842826ceec8d3d3e6bb715807fec7198cd32cf775c72e21a47d596f4db04e285f605aa64890bec07901f1afa2340a3a1971efd896a91522a
+EBUILD kirigami-addons-0.6.1.ebuild 1082 BLAKE2B 9b40567ed9ef101c79bad261d4e462419c79992818c29bede38ba2b95053ee68c724c3a2ee66c58dbc4220ee631250e6779961b2e0d1a8dac58e0fa33cceabc6 SHA512 94af4cd455b204e3a0133f1afbf3ce6e8f166941b137dc436b4078e1d8d9c3f726579dce7a024693ef058114e0d317484060d1275f3f68b2e6fcdfefbabd3dee
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kirigami-addons/kirigami-addons-0.6.1.ebuild b/dev-libs/kirigami-addons/kirigami-addons-0.6.1.ebuild
index 607cd168e1ce..eb279c4a9b99 100644
--- a/dev-libs/kirigami-addons/kirigami-addons-0.6.1.ebuild
+++ b/dev-libs/kirigami-addons/kirigami-addons-0.6.1.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 DESCRIPTION="Visual end user components for Kirigami-based applications"
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 88f390b6c8fa..97fdba8fec01 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -3,5 +3,5 @@ AUX 4.0.0-vapigen.patch 1153 BLAKE2B 1462b72ad3d25d4d5eac255d49217d74ef2cab67c74
 DIST libgweather-4.0.0.tar.xz 4722620 BLAKE2B f2500d065fe9607b740c2f6c87378d5fc86c15951b2880f89c3ac22021d085eed601b645dcf1c9864fe1fa47860aa14ed1ab858263a7634c3b7615231d3ee6d1 SHA512 1441b8996a53b277e9453d3fcf32448800c963f40c32542f9055362bc3188dcf2e706466133d53b3f1b6343dc97b15cf5eabe16b950e7c9451cb79eeef87a9c3
 DIST libgweather-4.2.0.tar.xz 2752164 BLAKE2B 9cc51363d6a2a09497269760701e0e0c1beb68c0096262fb6e2885414f838b41c151df7b057def457fdd49f9036d853ab624a9683a5cf57bbdefaed5376fe69f SHA512 cd95c6714575c0afc52455bb99c9116af27716868648debe0e5309904cfaf7516cf2379e415b3d9dd57b5dd223bae8e8acbaf705a3867dad8f75aec22eea908e
 EBUILD libgweather-4.0.0-r1.ebuild 1713 BLAKE2B 8e879bfee3e337eb3e6967e1e1d015db133319268a4b9ac07d1b8c8cff67563f685142f2888eaab92ab1230b5da8a8559abbe701f670abb0794c5b830bdac24a SHA512 02adc00aff1fefeb298f1f31e0a8638cbe3ad0b594e9411a555afad824da294c74754075ee79c94e4220a581fdb3edf628400ecd5ebbc93f55ac6371d530fb4c
-EBUILD libgweather-4.2.0.ebuild 1986 BLAKE2B 6de130b5ce8fd7046ec0b4feee848dae453357cfb2bb97f2280cab93f0d9ec4ec3a9cdd4d9d96074edfae882d8464d91e4bab47e92f1e0f83d327b8a84584d21 SHA512 b6591b0e3acaa4c027dac34c0fbdb04eec819ded7e91776df45f4ecdb0eb579cce2107168851d78c524ec26bddf22def7fcb02274bf946a1c5a45801dd8f5f12
+EBUILD libgweather-4.2.0.ebuild 1985 BLAKE2B f68a9751eb8e24c8e0b8b16fa1cdc6b77f3638348e8c2ececd244a99f59436290c9f921587389c1e71820652312bb28fd27937265c5cc0a49d762374cbd541ce SHA512 8289332d7f31fce448154d798fcadc2277dbe2fd4993c72e6901039344671cc299a35c7bd35b281882be2bd26f7658240ff45ff2a94bcf70f3c5cab25f745e4a
 MISC metadata.xml 352 BLAKE2B 3726dfdf7269138db7992dbab72db960ed2362a8c753362376f28fa37e0849ef89f74b132dea4c63120dfb777f27566aea12f5dc92ddbeeb5a3b8139d4feeb9c SHA512 06dcfdd1ba301e34b2b9a23f3cdb5a686daa8fcc7a2caa8ac921eade3e805589ba2bb148da5f64f95f93d62dda71b5e19f37b33f1e35201c61bd8e0bb996bbf4
diff --git a/dev-libs/libgweather/libgweather-4.2.0.ebuild b/dev-libs/libgweather/libgweather-4.2.0.ebuild
index 5a6a351f7a04..1c68ab8ea178 100644
--- a/dev-libs/libgweather/libgweather-4.2.0.ebuild
+++ b/dev-libs/libgweather/libgweather-4.2.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	gtk-doc? ( introspection )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index e22ec557d5f6..b3616ee4bc67 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,5 +1,5 @@
 DIST libmateweather-1.24.1.tar.xz 2223880 BLAKE2B e9d86e66755760937e71b983adbd61a5d71a311b1550e7ed445e94d4f74efc4f5d4cf1af17558035c74a0c56b598cc7f464f4a011a873a2d00a26ad4c37c8209 SHA512 1e653a167b12593171bb3dcfae3a5e57b3f874b220c34ca4ad2e575da7df424ce8a71f88088f53ec53cf9614d40ecda48b088ef6bede680c0ce81dca35ee1156
 DIST libmateweather-1.26.0.tar.xz 2213064 BLAKE2B ae6670f60694627491890e3ff35550937f9b30431e3d6c48780e38c15a13d2a5812129e13c228f6a81004787e078ccc6c7410b75e17112f3afe993e5a7e061bd SHA512 e786071d8c9393abc6d8f0733bd213305ace50698066ba7913ac254d8944e6db94296de5ecf91c0d5a8babd38f0cc35cb3bcee046f1eb0339ec5429a66d062d1
 EBUILD libmateweather-1.24.1.ebuild 859 BLAKE2B 04ea5f4c4fb62fb7e842c7096244527dd65e42f4aac37c783f4f49321a51c5bac1cd434582595ddc934e501c654ca7c07d3c46a3af8643096d4c9c2cbac91745 SHA512 9c74d963ecc88bf7527ae03d36b884be5c00df7a7c1a58120d8d149ad111942f341a9b9a5430c48b3f77e30f9010fcb739d3a1dc9bfd8a913ae4f0814a4961e6
-EBUILD libmateweather-1.26.0.ebuild 874 BLAKE2B 4dd9fc08652c30fa0c29d7ee9cd22711e4fd51d8e8085db0b2103d7d3b21a6d78296df975b7dea8af519b457bae4d382f9ccbf33f5ddf35a4c765e29bcf377c4 SHA512 add7875085273476706d09bb507dec2d6c560b85ce6dfb9dbf56a564013a05ade4d54fd1adc8b22adb0b1ac1195e996a09a2ca8ab33108589c1d36084282b5d8
+EBUILD libmateweather-1.26.0.ebuild 872 BLAKE2B 1ff551e3ac1b65dc2f8f78ee16280f15baaf33e98894cb9f385f09083499da8e22d5fd6f3c03fea5a07161f47193b6b777eac057b938a8ad91dfd7abfbad5571 SHA512 2b4d0a5cbde2380684a1b8d8f1822861f2ee7a8eb18f6d9aa4caba120b6f39ee8df5817c1deb7e733c760439d5dbb6b00b688fe6c5cb34609ab5c4238e1228d4
 MISC metadata.xml 344 BLAKE2B 22c27ee3ff244e6b566cf5d1be3fb5757880babf1a3c49a0e5227f6680266767773a367a0993282b8346bb561a8f049902a11c27cd940ea89451566e9a673bf3 SHA512 33567703bc6148dcc9ecffda3bf777bbaa319224868a03cedb580805866524f8bbc5027828db9aa3694c9c53f57150a4859ca59b59828a49970f019c53d2b10c
diff --git a/dev-libs/libmateweather/libmateweather-1.26.0.ebuild b/dev-libs/libmateweather/libmateweather-1.26.0.ebuild
index fc4f10fbec29..ab585932f04d 100644
--- a/dev-libs/libmateweather/libmateweather-1.26.0.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.26.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="MATE library to access weather information from online services"
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index f69e5f7e793a..75b0894965a7 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -5,6 +5,6 @@ DIST libnl-3.6.0.tar.gz 981921 BLAKE2B 4fbc1f6284dfbf0aaa855dfc3bb97743272547182
 DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041
 EBUILD libnl-3.5.0.ebuild 2381 BLAKE2B e054756ad522c3cfe593baf45854e6e4a8e669d26ec2027adf30cb537442f14d77b06493fdab911503d4e08045b1c2c9c4302ce9f892e17e221e77d82eabf2b5 SHA512 c99854fbf768e9e5f140fa8f4c88a1549272ba3c9a8200318016b1dbcaa03502527caeb1d26ed917c38958216eb0f3141a722bfc543c9a969e477fc7febd68a1
 EBUILD libnl-3.6.0-r1.ebuild 2637 BLAKE2B 147ee4f4e9e1aa98757c25118761bb2ca9910ee0b07c3452c026d177c0e4a71ac70a55fca49fe77b6d3ff6d1c9074277e1116593ce4a9bc9d349ab58da0111c5 SHA512 e926f00e85bdfa2f115a55ec22f8de09f842dad726c8b0298c445258fb173f2e66c3d54bd7ede5266f248b33037c9b19c0a08ad01fb2a0d61ba3947d78bd1d7c
-EBUILD libnl-3.7.0.ebuild 2601 BLAKE2B 00d039db0c7b4e204a36fcf37946490bbe0f865e1545d7774f68572dd8422e5d9c00ac459eba726f10a145db5c5ef5342dcf232498d38e737f4b7ac4245a9625 SHA512 7101737bcab70017faec3d4b684397532dfb27db2d41e8c3d07829ae22a1cd9a13259f07adf227cd80d3da9a9b89f6de775e7eec6046efbb836e5292874cea71
+EBUILD libnl-3.7.0.ebuild 2599 BLAKE2B 304a52e251f6d072346272151ec761a7ed999b47fbe801038b90df2a84713f8713265e224b88455e4170017483db350b0defd59ac96a9c75cf1b09ef462c2f8b SHA512 7b8d3b257b5a5d1bfa73992843189921dc6e95e62f7975e47d1d80388ea4082bc26ce2c2030125def635c9eddf86ed2e504d709b275fd9ab433b04ba61926a1c
 EBUILD libnl-9999.ebuild 2607 BLAKE2B f4d5f69c8af1a98fea70bb64e5e425471beef0c656bf24d81610c85273884eeb7eabed8b4c223947d3c7fb7576085003d7585e208dc9b61af5653ffc454f29ba SHA512 dd742d30232c0c2937d971ad6bbcb02ae2a27c93bc48067dfa9b2aa2ad6ff13ec48d0a26c36c31f946615d1d1b0eebccf9130d25603b92947944d5b3a0354569
 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/libnl-3.7.0.ebuild b/dev-libs/libnl/libnl-3.7.0.ebuild
index 1d0a346ecb01..3dd56029f10f 100644
--- a/dev-libs/libnl/libnl-3.7.0.ebuild
+++ b/dev-libs/libnl/libnl-3.7.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 	S="${WORKDIR}/${LIBNL_P}"
 fi
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 363f172d0013..b30bd5cdf253 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -5,7 +5,7 @@ DIST pcre2-10.40.tar.bz2 1765440 BLAKE2B 627a204585b92238eda81b4befc88757a81d75b
 DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc30b9288e52753785ddcab37cc3e169d0f117d94e4ad7d7ff897a6ba0a574c9a2e529c3c7e171f5a1bc6f64fe23 SHA512 faa4b47fdac1543cd323651f251b8abb94b31b5966b42d445b8cbb38c441df4742e3c3517c2bc6c0a4464e9fb5feab5d5beda1250a03d56bec2d8383be2f63ab
 DIST pcre2-10.42.tar.bz2 1799866 BLAKE2B 40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0 SHA512 72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3
 DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df3d166bf8b638b998aebacaefb4e88df7e813d6977af2dc7d82c93b7179ad0043c4f46fc4e06d99d214b0b7fcf SHA512 22ce3c7903835b1cf835ac6cfa725badecc982f1504382e62525c88307b2e3bd8951f2221fdd3d73920843e69f714b6df99fe741069e610f1f809087512a31f7
-EBUILD libpcre2-10.40-r1.ebuild 3011 BLAKE2B d2fe79c5ebc125e6bd08d3a24a9d27684de24323a303440bc5b545775f1504db02057ee735594564d66ad0218b37afd11420159752e7ecd83c90c39b8575fd5f SHA512 fafe9e377d2b4ccc6fc71f8b266b9a401a421ccd5bd37ad3a4134ce73e00f8fe62ac9d3e61a402acd4a42cde2f6560e69f1a5cf79c171d2311bf1a52d81c93b1
+EBUILD libpcre2-10.40-r1.ebuild 3010 BLAKE2B 7391fc976105cb55cc07d8c093828e7cddd9f74d3f2b02748a76e87f96fbd7c2a7a7b8e768a854d954c5a397b52e8622c11f6e67686236603442fc0089d0faf5 SHA512 89bc748ae8b671f84bd36a092a45d37a1d3dd592b50fb5d6c14e917b3082c33fc2706c6114e822e796da400888dbc9814faf8529a101fd62a8a29cd3eac94497
 EBUILD libpcre2-10.40.ebuild 2978 BLAKE2B 689d60aabd0b0278816571add95ddfe47b914d1bf7d55736ae8d0db8a46d7db788c3c61df5eae827f1eaec54389cb5d6dd0ff6e0bd2941f4a2405cb76b422cc4 SHA512 375fca4b0b11d8aba628e0ce86d87c3f7bb3b99faf63b63364eb9efc6a04910db2f11b216368456aaeb0143f0fbd64ea1e59f8061e12dfd53260172f9f6b169d
 EBUILD libpcre2-10.42.ebuild 2519 BLAKE2B ac1d2b94be05e75900ada4cf0699bc337c088b0c957f73a3153d8981d07845d42c980dedd667b690ab98d8337c4d96d4242df113f2aab32040255cef59cf39ca SHA512 ba0a5b627e13952de6eb996e7b56057b48d89403c25488af841cf8aa61760ede3a3f91428fb72a2c6dde89cabfea8cc930564675121376f07c59d36edc6ae553
 MISC metadata.xml 1087 BLAKE2B 693e7f9a4d9cac7b2aa5f24804826f79135a0475770b8ef5058b09542c3b19d30ddef438029dc0358b997ebc032ab103432b1274723c81882f1b5359455c765a SHA512 74dcb822827b8cc3e86c525ab3e2ee302d39ee00d5b4515f9fd6f4a157ae1522a2edbd08b97c2950d9370878f41eb59e414a145d6beae430dab57ea10df68460
diff --git a/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
index ade92b68ce88..12a35ecd32b3 100644
--- a/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 3e5a419f94fb..da0dd9058442 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -3,5 +3,5 @@ AUX libpwquality-1.4.4-pam_pwquality-include.patch 1208 BLAKE2B d7899e6caeb8a1f4
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
 DIST libpwquality-1.4.5.tar.bz2 433961 BLAKE2B f5326996ab607bf9d24de446d9714987ad259fd2222bc54983769abc298969e2e9a4cee78f2a5c5d963bd0e5f57ea3aa346b0ce108b465a8da82810486b37e36 SHA512 91a6febbf40047e553b6051df727857df7932c816638f15118a46b8286527a80446ca4f6a050d2b1f4e33335bf4b75290751ce358fa477cb9d06fe89a450d647
 EBUILD libpwquality-1.4.4-r2.ebuild 2270 BLAKE2B 71cf75507263df789ca13a713a71d2f1e716e9be9e3a2da76d45dcff65b57ce0382c63518d33cdab866d9d42f374f5970e7316b6bb0d4377311e248ac96a5bd1 SHA512 302c531cb70e24bb615d40a37bdb076a8a3406462a21d40493f85c82224657292b1b52520012f9d37878c1c27c1bc14e958916d60f03485c5ecb47885c966a07
-EBUILD libpwquality-1.4.5.ebuild 2162 BLAKE2B a3fedad8ed7a0d71dd8b9d0f2ed40ce41f7aec0bf78f0cf4a6da5afc266e4d654cd3c0d1013da66f575e58e6c05870019ea0753c058cc68babefad55ceb0f632 SHA512 0358046424ae7877a47b27dc7dca3d1c2e15f04c2324a367d86e422a352c92d8e3d2fc482122715d10f4ea83b4c650e7c4d6503af67ce7e2d8272eaee06d74cc
+EBUILD libpwquality-1.4.5.ebuild 2160 BLAKE2B 932677953e7e4e2bd7885763bb064f2b28617492ef13b578f882138e79fd70d5fcedd59bb97fd6b0a68d3f629b9df03b7b5fc527cf1b6b2f07741a265e030e76 SHA512 50a8dd66dbc7679a9366dcb9f049f0ee96f948cff8637def1a9384f1c1d61eb532cfc7f25f9cb1bfdd1c06273c01cbd3b3a5229dcf8ac655b7cd72baa2551cf6
 MISC metadata.xml 354 BLAKE2B c7c1c6aad6af351f12d42c720fe4372aa0966601624454febad3d0ac2c40b069acfaae7f1c77c41546c701a8ad1e242bd715f421ed2103e9c48cc5a63d7e44fa SHA512 41ecf39d00ced11f91831aa04bbca66d0a409367ae87aab765c94dbcdfc4dd8900f707b767e2fe76ad1eaa62c33e2e571027c7e5112e799104029bb773d812df
diff --git a/dev-libs/libpwquality/libpwquality-1.4.5.ebuild b/dev-libs/libpwquality/libpwquality-1.4.5.ebuild
index a3b1e99bdb4b..15c8254436c6 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.5.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 22cf7bc40d91..f106db40be5b 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,5 @@
 DIST libqtxdg-3.10.0.tar.xz 71656 BLAKE2B 345fd1c3b3b117521220fe70487a9e934800031b7c8c6973b360c0817fd1635118a65bac90bb16818bfb035db55b1b23b5cbfd350583be34f49373c50551f5c0 SHA512 c5c3b91684fca5a288d7097b1d9f94c6cb80d7aaca46d861b9aba3efc625ac8b109513fd56e337615d1700d56af0c945ac6c8977cb9b0e88737ee490244d0ad5
 DIST libqtxdg-3.9.1.tar.xz 71604 BLAKE2B 73db84890afa5b7177447a01ae2eb92db4bf13c6e3377a0ac7bdda192b15f8cd068db2875c13ba37d7d27a2c28e48d435801625b11ec8f7eb602fa02b5eca841 SHA512 1b05a10649229a34e3b653c37abefbb02c8b456d77aaabed0e47668818ee29730ea049d96bc5c71c9ad83d1c9c87888195bf228dc9817fd27053f0286752978c
-EBUILD libqtxdg-3.10.0.ebuild 1195 BLAKE2B 13dc47cec2e2392db217751f2ee37f22f8e69c55dd53c4cb82714a8c7a725d602fedbc03caedef5f441a14c9217b2f82c1ae8939fb64c5bb9b05ec0841516ae2 SHA512 00473652d5528a10dba23fdd0a95ff1fe6fe4c0f9cd716225dc95b66c389cebf9c655a3646415d8a744d4c083d6b8723a28d41859ee7add050f3ee9e1cd15f70
+EBUILD libqtxdg-3.10.0.ebuild 1194 BLAKE2B 31811ed23310a046d8c0a8a162f9efcce857b1e7f9b652b3cf14b611d39bbb21c9d84374dc14d73b292fcb6a14a937548558d916e0cda1e33bcdce0e2378a68b SHA512 43c777be05e00f6c58101f7d1ce958834741b63254ed545584643506b4df46daa23b2140f38d9ec32acfa7d9b3e7ebdae3c2bd0e71a40f9a47083daf9d287d96
 EBUILD libqtxdg-3.9.1.ebuild 1193 BLAKE2B faa12232e69adbe452b2d222a9a8e59dae921a28514316acedd7935d8a09bcc390737df5ff354bf3722ecef3bf7f4c6d42da4001494068f7e70539ca93c34964 SHA512 c78ab7951f761a5eb56ecc7a38f3724955babceac42f732a8adfa22cd549148946317ee466badc68c5e77b263ebcbdb7a3470e0e15189002ea37c99f95aad80a
 MISC metadata.xml 423 BLAKE2B 6205fdbb66e8286d35f33cd497befee8128750eecf8ca674c578937ae1fdd34f4036e91c7719e9333c78a4a5a6fdd3082b7ffc6fcfb839f2d7cb9218ba92a837 SHA512 0097795563b8aba727267461be9ff727fc738c1efa182ba9c8d9e15c7d334efc41fae1c402b09315ad41c8af179f9ad1dfa1d0b055cfd072b2e013227c36edc4
diff --git a/dev-libs/libqtxdg/libqtxdg-3.10.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.10.0.ebuild
index 964500de6a13..9b343b1f33e9 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.10.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.10.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 7a8758a5a51d..29fba8f95a2c 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,6 +1,6 @@
 AUX mpc-1.3.0-header.patch 1337 BLAKE2B 4a4f5b73bac8432f3f350961c6b1be53da097b45c82c8709cf4d13ba74bdac88468cc59208dc68bb0369d31434e691a546849caf7e30ed9eda92dda33a93bd2c SHA512 acefc37e97ae5bac38f71040d55a67ea352956efcd0b60ef2be1bb5e82cfecee0338b21ace185ef046280d3f1481a17ff22f665b4d7070725870036ed3773571
 DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
-DIST mpc-1.3.1rc2.tar.gz 773573 BLAKE2B 76434e6f8830af3571836d51576bfebbc9701e9bbb5c4686f134081cd96cd90ae02f7ff42bf9e3957c7a7ba92b6b2d9cdabe18f0269271147521cd7f6a2d551c SHA512 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97
+DIST mpc-1.3.1.tar.gz 773573 BLAKE2B 76434e6f8830af3571836d51576bfebbc9701e9bbb5c4686f134081cd96cd90ae02f7ff42bf9e3957c7a7ba92b6b2d9cdabe18f0269271147521cd7f6a2d551c SHA512 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97
 EBUILD mpc-1.2.1.ebuild 939 BLAKE2B 7af59b1cc4ede3496d708bf774dba385dd88ae88d1935f51b342f93f7cd02686687176f6a5723c73fbcbbc945b8ec07bf38b43ab94082c9fca41a62b01e9901c SHA512 59e817cb235cce2ada39eb88c9856e329325833e898ca6e5a779c7cebb4b1b9ba0d9ad374e39667b9056ee665768651c493db4c3c2e902ec176a59384828f211
-EBUILD mpc-1.3.1_rc2.ebuild 1458 BLAKE2B 92922d69e7fb75d05b50023dba8a7985ab75cc3921c5b01395255c0aab613395feb6b55c8e337eb194255149d200a469781f166e2bc3a476d224f9a93f10af1c SHA512 d8ef91266a9340c6ce317842e17d2a96aeda96ddd72631056b2853ce0d2e00d394db006362f18bebbe14cf6c42233d4ba6004534a0369eb5806b9a7f6f5736d7
+EBUILD mpc-1.3.1.ebuild 1458 BLAKE2B 92922d69e7fb75d05b50023dba8a7985ab75cc3921c5b01395255c0aab613395feb6b55c8e337eb194255149d200a469781f166e2bc3a476d224f9a93f10af1c SHA512 d8ef91266a9340c6ce317842e17d2a96aeda96ddd72631056b2853ce0d2e00d394db006362f18bebbe14cf6c42233d4ba6004534a0369eb5806b9a7f6f5736d7
 MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/dev-libs/mpc/mpc-1.3.1_rc2.ebuild b/dev-libs/mpc/mpc-1.3.1.ebuild
index f9590eb62d78..f9590eb62d78 100644
--- a/dev-libs/mpc/mpc-1.3.1_rc2.ebuild
+++ b/dev-libs/mpc/mpc-1.3.1.ebuild
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 16da6b6aefcd..6bcfab4fd55d 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,5 +1,6 @@
 AUX gentoo.config-1.0.2 5302 BLAKE2B b699533ed86c48c0d033092b4d901de837a6a495113925099d82cd2f768b521073a3caad06921e2f8d3ecdf4c4ef617ed9b9aba119d4a910b72f9c086b9fd21f SHA512 f8653c57ef8e3a3b3b762f66ef556c0012dfc8b997f0bdbe504f92d0901c0dc9fefa2c3e8244175d802fb83437533b7928b6db38b93fdd5a8ffefa79414106a1
 AUX gentoo.config-1.0.3 5300 BLAKE2B c2788ef1b790bdf2cadaf302e9576984f4536c7cf6e48610f986468ee712cf6fc3fed3bce1e0d2eea296811edc3266a6a248b2faa48557cb430e101ea2cea6ff SHA512 6609e9180bfbc6b9e365b53115da4f83e837aac4edc24e18cd09a2c4595d478c14476d0a1f5387ce5130bcf3effeeac605859f69ac7923408a1809e9c8b13489
+AUX gentoo.config-1.0.4 5508 BLAKE2B d0207083dcb50fc14468a230236cd80f5d685ca7f62ef39944bbb8fcea67debeab883f7848455f85d3d4d9fb4494ceceadb52a5f96b81ce2eaada81c4fd66fa5 SHA512 8ca9d2620b9095e126871a8796df0e9b5812ec64ce2b5a9e1994021b8d9d12ec84285e1016c2c880afb4f4f26cca0fc1d37cd0f6364c8a2a116774d9cac1f1bb
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021dcbb3efa421866f6e09bbee6287aae95c6f5d9498bd9d8974b0de747ef696242691cfebec90b31dc9e2cc31b41b81ec SHA512 f75ae1034bb9dda7f4959e8a5d6d0dae21200723d82aebfbea58bd1d7775ef4042e49fdf49d5738771d79d764e44a1b6e0da341d210ea51d21516bb3874b626a
 AUX openssl-3.0.5-test-memcmp.patch 581 BLAKE2B 83dd0d05c73185f759e06dc352d196c22cd2359111170523a56f2a1f2b92c769245cda126fc44604f00060995ac4d35d8f573e0c841c8ef23f8d85b598ad08ee SHA512 9e9adde007e48f8af696af82bfeab56bc97a86204efd5fd27f92608afc521cd72f3cb5358b981a35e190b9fd2e02bd6eb499354549300de01fed69ee4f122093
@@ -15,7 +16,7 @@ DIST openssl-3.0.7.tar.gz 15107575 BLAKE2B 141881071fa62f056c514e7c653a61c59cc45
 DIST openssl-3.0.7.tar.gz.asc 858 BLAKE2B bd07a6f656cce817038743caf1131ef8d7a21bf587e706e32771ad9e09cb4821d21b71171a7fe7bb6bece95e9b06cea6d723aae9de8b62049b5a8316578500be SHA512 9093a8a5a990f5f37bd95e7ca55f2371e59242be408ea7d9403bcfc9c8873c022237e13c0ec81881a20607ea46927887a895a82b6f50c6f423b4c54f9ef0cde1
 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9
 EBUILD openssl-1.1.1q.ebuild 10190 BLAKE2B d43cbde3d6b34a33f7937b59d0a2770290cc342ff664796bca1c546d2a70ba609d0d8f035c1cf2d8f339bcd82ab651e970a5d9ee55a2a6734a2e17b7187aff59 SHA512 47e480e4344753939cd8f64c1e7dd36eed12b8568cc18dd9691bb4d231088d2f77d1ba5fb79f2f9f3ec18b3bb8fb9c118bbb716af91d0023fe920fc968f081ee
-EBUILD openssl-1.1.1s.ebuild 10158 BLAKE2B 37c2c20d232c239ba52bdd60b225162c4c14022bc10fb2e8e43a2db301d839cb2479dcfbbf640525a40fe8d2767941459a6bb4cd95e35324cc2bbb21d73870f2 SHA512 548b0b19fb692ff69409aed3acea87ab6146977175b43017524dfb4dcc77b911deef94ef29b480a911a712191a9116047ff66aef5ec7de57d796902a6c2f3de3
+EBUILD openssl-1.1.1s.ebuild 10156 BLAKE2B 1748ebcd3c309783f794c7edebc8e1ba4d815f7381689c6d38c7dd3c740c3e6cb8298695df5873c075e987d3cfd7f2b5af42103304121392ec3bbdfd6e44976d SHA512 1dcbaac82562127fbaacd5afad73970474fdf90d4bc9d248ef41a703764a402d55f6919b67e860b179eda35642c4553e575f4af89f1dab3781e401205e39f071
 EBUILD openssl-3.0.7-r1.ebuild 9867 BLAKE2B cf5c11fb8f3629e708fe973ce4a8347ab8d04901e625e34ff55be93307ce3f5c3214a2efaaf7d475638007ab6bc21ea7b895d701a8574f877e285cc87fe020a4 SHA512 df9cc24b08cab21f607eed16aed95a82ba491d5368f29fa74296082955a612900fd3284a7bece408a95a3346a5aeb0bbb162a6d64bbd01abc8ebde75395b4f47
-EBUILD openssl-3.0.7-r2.ebuild 10007 BLAKE2B 34cba5442d848311046235550e85a14a9f9fe270f8212e6692bb7311f6e2241cb41cb992284da4e8547010a167771205b5a281440c1f9140fce1e45bac7456f9 SHA512 fb4d621111b6559ae537136ddbba8e502e1a6f53999f4ff4457d1f960504ec0465179dee98f75bec0c10d47fae9c78b157050aa4805ef3e0019cee03a342c421
+EBUILD openssl-3.0.7-r2.ebuild 10007 BLAKE2B cbb202b750078e8bde4181031f9e86d3feb58ba5dc622fdf299c8f5ccd74e32368c972f28c14447d6cb39a347aad0e25be46e9b8a8413be48e6396dea4989d9f SHA512 252f2f747f108e97ac250502d5c11a2d167bd1fbd37e38773a987576bbf830952ea7a63c7d9895fad4ca7f13487d8e1f002c1f7ae4ae3f671b8288c9d11cc438
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.4 b/dev-libs/openssl/files/gentoo.config-1.0.4
new file mode 100644
index 000000000000..edbf22a56dff
--- /dev/null
+++ b/dev-libs/openssl/files/gentoo.config-1.0.4
@@ -0,0 +1,176 @@
+#!/usr/bin/env bash
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# Openssl doesn't play along nicely with cross-compiling
+# like autotools based projects, so let's teach it new tricks.
+#
+# Review the bundled 'config' script to see why kind of targets
+# we can pass to the 'Configure' script.
+
+
+# Testing routines
+if [[ $1 == "test" ]] ; then
+	for c in \
+		"arm-gentoo-linux-uclibc      |linux-generic32 -DL_ENDIAN" \
+		"armv5b-linux-gnu             |linux-armv4 -DB_ENDIAN" \
+		"x86_64-pc-linux-gnu          |linux-x86_64" \
+		"alpha-linux-gnu              |linux-alpha-gcc" \
+		"alphaev56-unknown-linux-gnu  |linux-alpha+bwx-gcc" \
+		"i686-pc-linux-gnu            |linux-elf" \
+		"whatever-gentoo-freebsdX.Y   |BSD-generic32" \
+		"i686-gentoo-freebsdX.Y       |BSD-x86-elf" \
+		"sparc64-alpha-freebsdX.Y     |BSD-sparc64" \
+		"ia64-gentoo-freebsd5.99234   |BSD-ia64" \
+		"x86_64-gentoo-freebsdX.Y     |BSD-x86_64" \
+		"hppa64-aldsF-linux-gnu5.3    |linux-generic32 -DB_ENDIAN" \
+		"powerpc-gentOO-linux-uclibc  |linux-ppc" \
+		"powerpc64-unk-linux-gnu      |linux-ppc64" \
+		"powerpc64le-linux-gnu        |linux-ppc64le" \
+		"x86_64-apple-darwinX         |darwin64-x86_64-cc" \
+		"powerpc64-apple-darwinX      |darwin64-ppc-cc" \
+		"i686-apple-darwinX           |darwin-i386-cc" \
+		"i386-apple-darwinX           |darwin-i386-cc" \
+		"powerpc-apple-darwinX        |darwin-ppc-cc" \
+		"i586-pc-winnt                |winnt-parity" \
+		"s390-ibm-linux-gnu           |linux-generic32 -DB_ENDIAN" \
+		"s390x-linux-gnu              |linux64-s390x" \
+	;do
+		CHOST=${c/|*}
+		ret_want=${c/*|}
+		ret_got=$(CHOST=${CHOST} "$0")
+
+		if [[ ${ret_want} == "${ret_got}" ]] ; then
+			echo "PASS: ${CHOST}"
+		else
+			echo "FAIL: ${CHOST}"
+			echo -e "\twanted: ${ret_want}"
+			echo -e "\twe got: ${ret_got}"
+		fi
+	done
+	exit 0
+fi
+[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
+
+
+# Detect the operating system
+case ${CHOST} in
+	*-aix*)          system="aix";;
+	*-darwin*)       system="darwin";;
+	*-freebsd*)      system="BSD";;
+	*-hpux*)         system="hpux";;
+	*-linux*)        system="linux";;
+	*-solaris*)      system="solaris";;
+	*-winnt*)        system="winnt";;
+	x86_64-*-mingw*) system="mingw64";;
+	*mingw*)         system="mingw";;
+	*)               exit 0;;
+esac
+
+
+# Compiler munging
+compiler="gcc"
+if [[ ${CC} == "ccc" ]] ; then
+	compiler=${CC}
+fi
+
+
+# Detect target arch
+machine=""
+chost_machine=${CHOST%%-*}
+case ${system} in
+linux)
+	case ${chost_machine}:${ABI} in
+		aarch64*be*)  machine="aarch64 -DB_ENDIAN";;
+		aarch64*)     machine="aarch64 -DL_ENDIAN";;
+		alphaev56*|\
+		alphaev[678]*)machine=alpha+bwx-${compiler};;
+		alpha*)       machine=alpha-${compiler};;
+		armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
+		armv[4-9]*)   machine="armv4 -DL_ENDIAN";;
+		arm*b*)       machine="generic32 -DB_ENDIAN";;
+		arm*)         machine="generic32 -DL_ENDIAN";;
+		avr*)         machine="generic32 -DL_ENDIAN";;
+		bfin*)        machine="generic32 -DL_ENDIAN";;
+	#	hppa64*)      machine=parisc64;;
+		hppa*)        machine="generic32 -DB_ENDIAN";;
+		i[0-9]86*|\
+		x86_64*:x86)  machine=elf;;
+		ia64*)        machine=ia64;;
+		loongarch64*) machine="generic64 -DL_ENDIAN";;
+		m68*)         machine="latomic -DB_ENDIAN";;
+		mips*el*:o32) machine="mips32 -DL_ENDIAN";;
+		mips*:o32)    machine="mips32 -DB_ENDIAN";;
+		mips*el*:n32) machine="mips64 -DL_ENDIAN";;
+		mips*:n32)    machine="mips64 -DB_ENDIAN";;
+		mips*el*:n64) machine="mips64 -DL_ENDIAN" system=linux64;;
+		mips*:n64)    machine="mips64 -DB_ENDIAN" system=linux64;;
+		powerpc64*le*)machine=ppc64le;;
+		powerpc64*)   machine=ppc64;;
+		powerpc*le*)  machine="generic32 -DL_ENDIAN";;
+		powerpc*)     machine=ppc;;
+		riscv32*)     machine="generic32 -DL_ENDIAN";;
+		riscv64*)     machine="generic64 -DL_ENDIAN";;
+	#	sh64*)        machine=elf;;
+		sh*b*)        machine="generic32 -DB_ENDIAN";;
+		sh*)          machine="generic32 -DL_ENDIAN";;
+		# TODO: Might want to do -mcpu probing like glibc to determine a
+		# better default for sparc-linux-gnu targets.  This logic will
+		# break v7 and older systems when they use it.
+		sparc*v7*)    machine="generic32 -DB_ENDIAN";;
+		sparc64*)     machine=sparcv9 system=linux64;;
+		sparc*v9*)    machine=sparcv9;;
+		sparc*v8*)    machine=sparcv8;;
+		sparc*)       machine=sparcv8;;
+		s390x*)       machine=s390x system=linux64;;
+		s390*)        machine="generic32 -DB_ENDIAN";;
+		x86_64*:x32)  machine=x32;;
+		x86_64*)      machine=x86_64;;
+	esac
+	;;
+BSD)
+	case ${chost_machine} in
+		alpha*)       machine=generic64;;
+		i[6-9]86*)    machine=x86-elf;;
+		ia64*)        machine=ia64;;
+		sparc64*)     machine=sparc64;;
+		x86_64*)      machine=x86_64;;
+		*)            machine=generic32;;
+	esac
+	;;
+aix)
+	machine=${compiler}
+	;;
+darwin)
+	case ${chost_machine} in
+		powerpc64)    machine=ppc-cc; system=${system}64;;
+		powerpc)      machine=ppc-cc;;
+		i?86*)        machine=i386-cc;;
+		x86_64)       machine=x86_64-cc; system=${system}64;;
+	esac
+	;;
+hpux)
+	case ${chost_machine} in
+		ia64)	machine=ia64-${compiler} ;;
+	esac
+	;;
+solaris)
+	case ${chost_machine} in
+		i386)         machine=x86-${compiler} ;;
+		x86_64*)      machine=x86_64-${compiler}; system=${system}64;;
+		sparcv9*)     machine=sparcv9-${compiler}; system=${system}64;;
+		sparc*)       machine=sparcv8-${compiler};;
+	esac
+	;;
+winnt)
+	machine=parity
+	;;
+mingw*)
+	# special case ... no xxx-yyy style name
+	echo ${system}
+	;;
+esac
+
+
+# If we have something, show it
+[[ -n ${machine} ]] && echo ${system}-${machine}
diff --git a/dev-libs/openssl/openssl-1.1.1s.ebuild b/dev-libs/openssl/openssl-1.1.1s.ebuild
index 52f934c66d45..3bfa37a91882 100644
--- a/dev-libs/openssl/openssl-1.1.1s.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1s.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl/openssl-3.0.7-r2.ebuild b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
index 5ec2da26dfd6..4cbd0bd5374b 100644
--- a/dev-libs/openssl/openssl-3.0.7-r2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
@@ -93,7 +93,7 @@ src_unpack() {
 
 src_prepare() {
 	# Allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.3 gentoo.config || die
+	cp "${FILESDIR}"/gentoo.config-1.0.4 gentoo.config || die
 	chmod a+rx gentoo.config || die
 
 	# Keep this in sync with app-misc/c_rehash
diff --git a/dev-libs/tree-sitter-cmake/Manifest b/dev-libs/tree-sitter-cmake/Manifest
new file mode 100644
index 000000000000..153bbb2fe9a4
--- /dev/null
+++ b/dev-libs/tree-sitter-cmake/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-cmake-0.1.0.tar.gz 42425 BLAKE2B a6d609b9baf297265bee4355c2f8d11853d393461e708475c53ce8ee067f668550a31cc75142d5ddd8e34160a03308388f01661b13fdb8a22a0c3cf95a0105a6 SHA512 5d228fde691b7ef9f4043ad41a852541551c31392ad5beb21580e6902039c5fa1adc2a42642644603871e373011ef3c9f4264bfc40e33fd0d3071a716b5d61cf
+EBUILD tree-sitter-cmake-0.1.0.ebuild 365 BLAKE2B 916a1f6f49d3e672e745611bc2d2237bbba2ace9707524e94b5f073742df49068a71d4f0aaf6882840ec672ef9d9bb91a26c43aad13abef98cfcc3a649c1e996 SHA512 f80d413e1b4e3181721215658bcd86d0b03c8ffda451879c3717fbb6f121904a45dc0e0a5bbfbd41255cd8e3616d90fba5b1074308071a2dad59c3ca794a93c4
+MISC metadata.xml 335 BLAKE2B 2c8a5ca17bc26e1c3ba8ed381ac080dbaa4720e2584c47507fcdc261de207fccce5abc14874fea0f49009cb5932f521ed927c9a3dee871df88a2ffacc6df2b41 SHA512 5ddea708b1a74c670ee79c9b2223fb0a664a609eca2891f355e25b36cf97f21b88e8a9e6b6cf34cdbc051a0253a5a3e9e756b0c8daf6af7910f0c6ce9a9693a6
diff --git a/dev-libs/tree-sitter-cmake/metadata.xml b/dev-libs/tree-sitter-cmake/metadata.xml
new file mode 100644
index 000000000000..bd9592745aac
--- /dev/null
+++ b/dev-libs/tree-sitter-cmake/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">uyha/tree-sitter-cmake</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.1.0.ebuild b/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.1.0.ebuild
new file mode 100644
index 000000000000..1790729ab938
--- /dev/null
+++ b/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.1.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="C grammar for Tree-sitter"
+HOMEPAGE="https://github.com/uyha/tree-sitter-cmake"
+SRC_URI="https://github.com/uyha/tree-sitter-cmake/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-java/Manifest b/dev-libs/tree-sitter-java/Manifest
index b9d4a45c8591..e14ffc805d12 100644
--- a/dev-libs/tree-sitter-java/Manifest
+++ b/dev-libs/tree-sitter-java/Manifest
@@ -1,5 +1,7 @@
 DIST tree-sitter-java-0.19.1.tar.gz 134115 BLAKE2B 92b2388d644659fa84646deeff06cda9c1c3bf3dbf6d06bda8e8dea14c2e748813cbaec440a458f98e0f1182e7543ca6a1d4c30ecbd2ba7733e09acf3aeff623 SHA512 71bd34132785f1b95538ce321eba4d6258fff309abf6150852b749336d7ffa5e4bd06f52fb5b6db2e2845592e6faf2ad4cac226289a0078f06cf2fc2f74152bb
 DIST tree-sitter-java-0.20.0.tar.gz 166695 BLAKE2B 6a618894746f113692997ba683fd3185e0f321f82bef3a7a11226a81f28e40b9973f74cc7010035983da1f5a6f2cbc493688c8bac47381fcd1d1010d03d4db5c SHA512 e6a341879e0eb889be7ff26a7f675e8bcb6f85de040f7d09029421b43bf4069a62889fdc7bd6b8e4afabd2b93df1bdfd86853b1cc6c2daf69f84ea68ede217d5
+DIST tree-sitter-java-0.20.1.tar.gz 176841 BLAKE2B eda966d8c648fc0192ab34b6ed8f2b87a6eff4dd05f47d54ec87659f62e497f7793d6949452504102fefe41c38bea4f51051484cd338b8a407030a3f7c888907 SHA512 07179852060198989c980462e2006083440895f37feb29b639d3c8ce8cb6a84a1b826e11d136821d398c34b0f989a23fce2ddf4ef0391b6f1ebb611b3004d1fc
 EBUILD tree-sitter-java-0.19.1.ebuild 286 BLAKE2B 68e4ac588efafbd6712ced67283f4b1173e5c3e372764e67832fd17bfb5933c3aec53d7d48bf006fc814af230f08128888519d4e5420a7a1feac615c0e7952f2 SHA512 ed6cf11b1f47cb45e92bae6ab85f26d2ff806470c4c73993884b5aee4c2b9b95110aea0420e52d60b7dd8b43c150279daf3bd1b501a4844f9a373a22ba525d93
 EBUILD tree-sitter-java-0.20.0.ebuild 285 BLAKE2B 704c96bd866def1093110b5c937a0593f359186e7db1bca2a0f18ddebc35ca69b2a7c2d30be4881c22848d049335a674609fb479858db4f27cec0e18fc0f5acd SHA512 cab186d1c6a63bed9d3c13ad2d6447efcb166376727499df20720830efe5df49e3b04ddf5f547df6f1d5a1f33133f2c793cbc343030a5f21f8b159f265c9f364
+EBUILD tree-sitter-java-0.20.1.ebuild 286 BLAKE2B 7b3d6976c11d189c59e8431b4ceeac0ebdf0ab28148889fb8022bcb740088fc3cf62d5615ab074e0d8986ab013d486015e6eb5a6576cb15ecd0d2691b6999344 SHA512 bddd3f7f6c1e28c879f2ba263f2afde41d815316842b99605a6086e3c0fb4bb4ceb9d003714f57a1bec15ec7c6ec6f6c8714c7f30c4b059cbb80a71ec99a12ef
 MISC metadata.xml 559 BLAKE2B 2a33b73a90591c3af8e0023e8cc6ad0be46b007255e7c3137fb5e2a0763f22493d89f70463ba59c9250a62aaef680271bb8a876926a2b967a3f9fec3647c3e25 SHA512 22e3de0937611b46f49706bbefc34fe902a0ab284ec41e04e0312859cf20e51168a49564d6a4c4ac8959312a1e5755b03f9f88885ee14d5e0ffc3569f4663ad7
diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.1.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.20.1.ebuild
new file mode 100644
index 000000000000..a6f428b51f5e
--- /dev/null
+++ b/dev-libs/tree-sitter-java/tree-sitter-java-0.20.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Java grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"