gentoo auto-resync : 28:06:2024 - 07:59:59

31 files changed, 545 insertions, 79 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 971b52fa6580..aea4a038f9f6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 379f6b5abea6..ddfb9e165956 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,4 +1,6 @@
 AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
 DIST intel-compute-runtime-24.17.29377.6.tar.gz 7038804 BLAKE2B feb09b6627b5dbd376a88705fca61514e5f60aa2014617a591451f0be493dedc87e228f8599fd2e2488623fcc827d831f4294fa4b34375a75e17438b76d4fd97 SHA512 9cda876ebdff1a17cb495f95b637c8aac82dc58433da67d1f312b74dd423ca9f536dcbd10454f1e0702e3181b4f5d4eeb2d31d6d99a756749321b128cf1e9cc2
+DIST intel-compute-runtime-24.22.29735.21.tar.gz 7083856 BLAKE2B dbb31259b3a4305e42d4dce685ce3f98b3b308451d2b1061c6fcba5cc2b2aaf6862eaa326619f8b073478c64fc45994adc261583c0070464b027fda46028afa5 SHA512 64cbfdab69c595c118e37526be744bad95cf11e1c9de34aaec308cead5346d802e98e67f155da03fd174e51e7f78a38b3b6f48ba6e004f3181b533c8d31e851e
 EBUILD intel-compute-runtime-24.17.29377.6.ebuild 1999 BLAKE2B 3f1163726e50d35f23bb4d6eb48c1729cca0091126a927ce6da38f8462e8c2f419d1e5b6788ab3fad5a1a5b8f57440f630d0b5c6602a2d18880769e9f42faa6f SHA512 7bcd3f7152438c8523dbd2de3bf1bc73b2fb4c8b82641b11ce4c06dea35af11e3a66489bf31e6090816abdf860050d6e233c9729a49c155834c5f3e66a96a08a
+EBUILD intel-compute-runtime-24.22.29735.21.ebuild 1999 BLAKE2B 39999b7c6e30e5f738360fd4c5a7a79c373225d46d87527c813a4855de5436f271e965d6062c61a07b83828e1ad6d9ee18f9b58a7bebc0ffdd8ac2f38e909381 SHA512 ddc78a8098cb2d71f6fcd658245efdac4cf8cb9cba1240184fc7b0f94955838bdf2ee35f620bc626864a3d16e35a7a5d6c0da16684bd1769de077473bf88f6d1
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.22.29735.21.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.22.29735.21.ebuild
new file mode 100644
index 000000000000..e227bc0c7d57
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.22.29735.21.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	>=dev-util/intel-graphics-compiler-1.0.17193.2
+	>=media-libs/gmmlib-22.3.19:=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/intel-metrics-discovery:=
+	dev-libs/intel-metrics-library:=
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-system-controller-0.8.16:=
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.17.6:= )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		media-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch"
+)
+
+src_prepare() {
+	# Remove '-Werror' from default
+	sed -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# See https://github.com/intel/compute-runtime/issues/531
+	filter-lto
+
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+		-Wno-dev
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest
index ab8928f26ed6..f43506c781bb 100644
--- a/dev-libs/intel-metrics-discovery/Manifest
+++ b/dev-libs/intel-metrics-discovery/Manifest
@@ -1,4 +1,6 @@
 AUX intel-metrics-discovery-1.12.170-revert-definitions.patch 1410 BLAKE2B af7ef84fd1181bc10ee890d87121e78559dcfb7b561334e6041b5c20b183d4ebfdd94e6b773e4c604284b5368708b312a23f878a0df7d0b32fad7f1dfdce7044 SHA512 2a66efe9b1f4d78cb053d4621d063ed7bcca061b677ca9a68f589096c4ae1c32c463dd5a598912afd690a96fc3c52aaa8cdc2e7f684870b939a43cd40507eea2
 DIST metrics-discovery-1.12.171.tar.gz 5219784 BLAKE2B 3927ad270060543d3dbca9e32abfa83661597313a54bec591098c7f0b48443326d4bc3c13f600b8b53ba4ca2850c15c2c2bee7dc117ca38de9bad3c5b4f8d8b5 SHA512 7c08841e86af29465c2d09788d7230bd9401eb02c35eb0e582db68a389c6e867cbb2f9eb38876cd00ffa519633a16c804454d43efd8c32fb61e39bada202708f
+DIST metrics-discovery-1.12.172.tar.gz 5228787 BLAKE2B e6bc6ffd4390a8400de0917e3e68ca13e4ccab4d6732b418b5807acb629c522cce80a0a9207d287861ec4642137479003d0e0512f30dd3b9baabebf5ff9f35c3 SHA512 24df8497d858d33e2b464e33c158876a4642f0bff7afdb3e51a2a45969a4b9e6f9083ea15cb0a28b3a4c939b701c563d069c159b50430916009af023bd8ff6d2
 EBUILD intel-metrics-discovery-1.12.171.ebuild 691 BLAKE2B e562e3a6bcb819f50796babd59a3df56245dde150f218ee5c34937868a98ae85ba7a1c78a3cb8bfcd9225608620519a13f870cb0fa32e89acf5b1aedfbec6e73 SHA512 184d5e63a6f5c1679e2ba3387f4c8c49ca26e6c21f75ae9dabca286fd763f12adc84d144992a7826cd692b983250d23279846c758d91d9d756c055d964250361
+EBUILD intel-metrics-discovery-1.12.172.ebuild 692 BLAKE2B ce278418c6913765dc24fec23f9702912a7a1d48be33421c3918b5ec317c4abdbbcd310e1124c11641f403ee360eee1f74fe2c0aeef5dc1a2a9aae14890f59f5 SHA512 85e96b3889e151df8d38684057058373a3d25acde5ed36343022c4322fdf5d60df0be6add97954952025d76cffe9957534b27431a400c0d18b2f7be989e80717
 MISC metadata.xml 815 BLAKE2B 017d27f513969fab6dd984946f3105d8bf0f2c0f29251976016f3b4aff779a22d66ad876bf00553376314681c2ee33beb53c0537a37a80824692001710164c8f SHA512 76548770278fa9004b250a5e8e6b273e49a0aff112e3e1508653c8b4119ed7ec486191ab39f6d22c425b0b07d77b29fc299d36d8faa7167b8af564bb1418aa6c
diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.172.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.172.ebuild
new file mode 100644
index 000000000000..1aa1fe8dda1b
--- /dev/null
+++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.172.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="A user mode library that provides access to GPU performance data"
+HOMEPAGE="https://github.com/intel/metrics-discovery"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+DEPEND="x11-libs/libdrm"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.12.170-revert-definitions.patch" )
+
+src_configure() {
+	local mycmakeargs=( -DLINUX_DISTRO="Gentoo" )
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index 94fa6ff7fba2..de5685949993 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,3 +1,5 @@
 DIST metrics-library-1.0.161.tar.gz 250352 BLAKE2B 5b991aadd5ed477a478763111bdac96374b99dd657db58403753b4504214d703e26156fd65c1ce10eae98bd63f117d6e3e83b178aadc610948b3163b91d1cb7b SHA512 0a6b51bcdd24402b47823465739a64d264a24a17ccbbf950b71d3d3374a5a3cc31726cb5918ad67c16d693e21a2f8eba91f1f8815ed1c6d5ef89163cabeefdf9
+DIST metrics-library-1.0.166.tar.gz 250183 BLAKE2B d5d08840a3d359d8e7390f1381a7b6b69e944de231ebe28227c9427fc0d97fa2e9b7a9ca63d4e02d1421e2faac5e554cc13dca0538bb3d151cec2311d4922032 SHA512 95f8d97ff6eebfda45dfe596e692bf081c4b92214ae1e0c1fa1458b9e76d69b8b2851bd6e0bbcb89d81d72291ab59ec69dbd7f8c903fdd33be588927adaa1081
 EBUILD intel-metrics-library-1.0.161.ebuild 633 BLAKE2B 10d9fbdd4de30327faa87dd340f00ca339a4750910471a31b22da5281ee7d55603d7d503c170686a1775e963e861804e28bbdebee5f3c4d0cc09b3698db371ee SHA512 2b0e123ade3403b8efbc683830ff1c5e6f5e161ef3e7436aa11a697f1d9d4cb99280ac1e97df9cb6adeef5cf83c03e750b5699c9d8769f91e42eb256021056d8
+EBUILD intel-metrics-library-1.0.166.ebuild 634 BLAKE2B 572e75602397b4e39d6bccaf74764af3d822e1781177b9cccadf5b48e618142263d580de949db8ac5bc62023f4b95df27ce0bfe5c024c56c9b5ff601d4c99105 SHA512 5e230e144da1d7c55de3c019c775cfdafd01ac29e418267263ace05d78f49907368931bfd21ae61afb6b240bb6d1321a394c6cb9e0fc34f56578de4d11531a99
 MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.166.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.166.ebuild
new file mode 100644
index 000000000000..86657df2d0c0
--- /dev/null
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.166.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="User mode driver helper library that provides access to GPU performance counters"
+HOMEPAGE="https://github.com/intel/metrics-library"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+DEPEND="x11-libs/libdrm"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e '/-Werror/d' -i CMakeLists.txt || die
+	cmake_src_prepare
+}
diff --git a/dev-libs/kirigami-addons/Manifest b/dev-libs/kirigami-addons/Manifest
index e2bb60b50ed5..94190c94ee50 100644
--- a/dev-libs/kirigami-addons/Manifest
+++ b/dev-libs/kirigami-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami-addons-0.11.0.tar.xz 136692 BLAKE2B 26301176ddeaea3aec351207e82dc28a56e465aa6bc6d3bfd23b1feaa5d14cc0821a4c39fdf5eee3d134a8ed9bbcb5e503ee31d3864185c57bb0fcb788744f2d SHA512 f5a721eee6d0ebd37e67cdb5f89aba81136eb4ac23bc042b7d9bedd6a33f96f913353e1d83ec91e6997a8eea5e2834d9203eb7cd286eed1157149ecedeab6b89
 DIST kirigami-addons-1.2.1.tar.xz 1157936 BLAKE2B 0df5296ac7985d3dfda8c486275938282eee97d94b118be38714549958205d1d6515faa78e3a5347bd11db34535a6cc2f973ff955bd3e1e10c5bb4a96b1f313d SHA512 bdb635f147cb78d0b92bda2c72c72577682cbc3965c232d106113b5de4fb9193e1d18d409d6bc7af2b2aebc613d0c175a27b294e7259bf08e3c41db1ef0601f3
 EBUILD kirigami-addons-0.11.0-r1.ebuild 1301 BLAKE2B ee2397f463e16bb7e971ae127196d8b427bf9a5447be85bf840d788afc9fadec56be823bd2490b7487e40eedb141ead0022bf00fca96aee183e1f3928af84fc4 SHA512 4e4f3d3d24e92a1845fe2ffce7042da1b74077435474887ad5507b52e5dd0afff7926690c5e5235a8c8f7f891ce9edca1cfc2b4f66344d5e522728404e0f3d05
-EBUILD kirigami-addons-1.2.1-r1.ebuild 1066 BLAKE2B 04a3eed67c83f081dee6fa71313740367a0d4fd5357eabd4e551226ade3772ebdd56536714d7627039071382dcf5ff4c43ecf52ec6b3602800d3daf2d0de68c0 SHA512 44c59b0ffea299acc3416edc4efcfafc0d68067048cb14e4a08eed807a19433105150ebe05ef215dd60028ed03576446495c2574a65c15de1bd8d49c6efd2616
+EBUILD kirigami-addons-1.2.1-r1.ebuild 1073 BLAKE2B 7d53f6e50898fcb63461e3c15f4c60234c8b12f68fad9403850f45b193170303120ec9b1aa9fb4062e53441fb6db10ae9a14923715fd91048375165cfe86d37b SHA512 653ee9e9ce126d7697398c318af87b64296fcdffa9af4bd64d1187738daee77df035281e99d7a0448a3f0368e4e0199288f046235ea564ca91d9b54fe77cf42b
 MISC metadata.xml 387 BLAKE2B a3de5c7143c2fd60eeb5e9dc854c8d9dcae39be83d5bc345b2227e323844867628335ffb9bfbc3dd0c5dfd5358c28f5f99d8564891c8b44e3424083da75d1140 SHA512 2b3921a511147eb3f47f42541e80788e7432d6b4496537e8b919ed83b627c29ad2b268134a88fd4d0f7690eebf782bfc13d1a122b40f571dbadc9c9af9858cd3
diff --git a/dev-libs/kirigami-addons/kirigami-addons-1.2.1-r1.ebuild b/dev-libs/kirigami-addons/kirigami-addons-1.2.1-r1.ebuild
index 5fd798386ab8..c97bf82eef82 100644
--- a/dev-libs/kirigami-addons/kirigami-addons-1.2.1-r1.ebuild
+++ b/dev-libs/kirigami-addons/kirigami-addons-1.2.1-r1.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 DESCRIPTION="Visual end user components for Kirigami-based applications"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 5c5b3bf7f059..97c4a0d288ee 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -10,5 +10,5 @@ DIST pcre2-10.44.tar.bz2.sig 310 BLAKE2B a03943d4b04af319ca18992188c9fdd089fc20e
 EBUILD libpcre2-10.42-r1.ebuild 2554 BLAKE2B 029cb4de0eedb460178d31381099e357a9638b3e0832950209e5952b63d494f05ac9da2efb875c1c0887d8d97d862cce784e1309dd458adbcbddff8c961884dc SHA512 9225c0894edc026422e1769755aeb35bd6eaaad1e47a3a953345409d48d089319f03b6b19ec0de683ab5809f8a9e1034eca3694f067dd44835d29721160f59ad
 EBUILD libpcre2-10.42-r2.ebuild 2474 BLAKE2B 92c3764ff9df1054d0f34d3476e1dce2a11ea6046915ac302dabfd4b9e62d70cbe35df2691ced447601a490c3a273d77df607471bf547b277b156dd3a709c209 SHA512 13bf73ac1f7ec46702f976be073bd3989af92e35873ad582c868be5ff2ee4b91b67be7f41b51a944ff365e679624a58b406746175f2dcc475e3804ca64984144
 EBUILD libpcre2-10.43.ebuild 2407 BLAKE2B aa19c4252f61c60364e18595fd5486849c4a5b4904f07fe122c44be13f208a29dc3f4a6fb8d9883bfdc5f5242857a22b344ce9925055f328de838e340db746ee SHA512 99478576c69be84b57bcfcbffe334f9512076dd859449ab32b6df24c374631ff558300fc8ff9f77fd43e9280c844450ea790f2c59a08d2ee38d65d6253454e06
-EBUILD libpcre2-10.44.ebuild 2687 BLAKE2B 08ec02d6478515b968dc32d05b50f30c12f05b47ee338861ec2048bad333b02ef5fed79a89703218eee1aa0145f080c4a0beaff76ec2202bd3e63093d6b97cb6 SHA512 7c5fda69db234aa9770712c24115c4b607e03b93d62fa8c0fecb03dfd9eeee961434247129ca193a99d8633e85545034c84bc3c095631f66fba143cdb3309f83
+EBUILD libpcre2-10.44-r1.ebuild 3212 BLAKE2B 1d180d33b7d577d52d572cdbb3cf66a80a9821a0fd8c376e4d964d1cf6356a1709c171aa333e485a35a569bb31b1a8b98c2384902a1aac408603bb12734fb4b5 SHA512 d381af74cca8d0e83380bd4d024a9a32bd53942eb12ca5e1a36cddc4550825e1f952d58ae1d6c2dbe783418fce6e7caa6588a9bdfed67a4d418b191706e47617
 MISC metadata.xml 1088 BLAKE2B 4adc3d90d0a974c796b33195448d4a1ebaefef89f76137b3501fb2d35a05cbc78d2131742110737720d32ff239cc5c8a5df694330362a261cbbf5da3a0a285ef SHA512 d01ea4e26b1335c2fea7fb39c489411b72e777f6e4173adedb782387f34b6197fab65723071811fa9e69708909ae49091f7467cb0254b669a3d1a8320dccab16
diff --git a/dev-libs/libpcre2/libpcre2-10.44.ebuild b/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild
index 4d571ec14abb..720feb445c04 100644
--- a/dev-libs/libpcre2/libpcre2-10.44.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc
-inherit libtool multilib-minimal verify-sig
+inherit libtool multilib multilib-minimal toolchain-funcs verify-sig
 
 MY_P="pcre2-${PV/_rc/-RC}"
 
@@ -67,6 +67,10 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Workaround for bug #934977 (libtool-2.5.0), drop when dist tarball
+	# uses newer libtool with the fix.
+	export ac_cv_prog_ac_ct_FILECMD='file' FILECMD='file'
+
 	local myeconfargs=(
 		--enable-pcre2-8
 		--enable-shared
@@ -99,6 +103,13 @@ multilib_src_install() {
 		DESTDIR="${D}" \
 		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
 		install
+
+	# bug #934977
+	if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/libpcre2-8$(get_libname)" ]] ; then
+		eerror "Sanity check for libpcre2-8$(get_libname) failed."
+		eerror "Shared library wasn't built, possible libtool bug"
+		[[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "libpcre2-8$(get_libname) not found in build, aborting"
+	fi
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index e31964567ea5..c35b54083b9c 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,9 +1,13 @@
-AUX m17n-lib-configure.patch 3476 BLAKE2B 6e74f8e94de9d589b7a5054bee0e805f4fb1f031b82c9d532347d7a06005828b068cb6b350f41464e21682c056a2ac6470e8db4fcd9b16f258ddb8c6c958b6c7 SHA512 d66119495b0eb3a67964826540e9fb86d9b6bfd057dfa6f3156628659751f0b9f9a702e6c6f7eefed2a26ced2101087678ef6af0d1e2098f77c35521ef400a43
+AUX m17n-lib-1.8.0-configure.patch 3476 BLAKE2B 6e74f8e94de9d589b7a5054bee0e805f4fb1f031b82c9d532347d7a06005828b068cb6b350f41464e21682c056a2ac6470e8db4fcd9b16f258ddb8c6c958b6c7 SHA512 d66119495b0eb3a67964826540e9fb86d9b6bfd057dfa6f3156628659751f0b9f9a702e6c6f7eefed2a26ced2101087678ef6af0d1e2098f77c35521ef400a43
+AUX m17n-lib-clang.patch 720 BLAKE2B 6f5551d98aaba930488b932f07578ae7210f8aa464489ede65d561723dd706da8fcd2a734e0842e6885458ee00bdaab011f3f01267a1cf456359152def61384e SHA512 8430fc9299a903e62cabbbc938ff4643c37cc42217f91474bcae0d2a5547fd89ff1d9e9180c4e8c3aaad453c7bba9ceadcc8879c60a0ca6ccab2fb7437fd21ac
+AUX m17n-lib-configure.patch 3749 BLAKE2B ac35bb426ed9716b1bbeaeb89246dc78eccbc048748b1bc336af16cacb5f5390111b80d89dee19e5ea1639123f95a8505742b2f8b4df6cd557d2e979107214ab SHA512 53dae15aad722f207607ed13e2fbadcb468b4773d84d6e6936a88e21a9f111bb5e5bb89b4a8d3f11ecf3e30535473c15cbc527d8bb3fe9fe4d5c60c87fd11d80
 AUX m17n-lib-freetype.patch 1185 BLAKE2B 4056c1e6dffb6783151ca9e33668b76dd64fe59fe21585f433e2a484fb20ebb3e72707174f28993a98ef4d9c7f010e339e9c750dd62343dc8ed2de0fbcef9c04 SHA512 637e27602030cd1d690ad802e31cbf9802f442c690a9df554397db8ae069f3a67f87dffb486403c30f0c6769f8ecc255f4889691671ca073b51692ec295e9fb7
 AUX m17n-lib-ftconfig.patch 1200 BLAKE2B 8aea727469596923fba54ac98cde29719a09eaecdabde0ab5f02b491e0d86ed855689eeb92f536e420a75111d937fdb0941bc419c9d15ef4baf1e0a4f678bb81 SHA512 b03680b185dccf063ef01ce85bb1d252bd984a77e94e314e76482747af4ecd4f90c3b7dd03b5da88e1d75654526b22368c70c80df398044baa39bc80f5936ba3
 AUX m17n-lib-ispell.patch 458 BLAKE2B 745b7567421b475fad70e63c4a6c5e12606de89bd7add18cc269d0a18e294dd3c1fed542cf65aa776120989f63009bf95bfabaad1b795fd5316e1599dd66dbf7 SHA512 cbfbd70a1b6d7525627ad8d87c3b2d79f8bfbd74915da5b6f8646a5ab7cbb351abb7a1ea103320faaa4cf80fa0a58d0adf7d9b3a7cc0ee40e8bb4220dd92574c
 AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda768948e92f4fb0bdaa7d5316657bc48342232edc64c24ec4e7f7b1329fff8ba2b453e8211856168d6830218d6ebd48c SHA512 a1726270680ab0124764a092aca36369e89a21b0164b039d5663cb0af8352b316ed59bec049dc849201f046bcb7bbcf3dd8522bbc7ab20ef64c59d898274eef1
 AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987881c4cebe9fd0e0f6fc5ed49a36b602c61259acfedc0f7020258b4313595c45326bcfc65d9744b273a49e1ab11 SHA512 978d968bdfe590861ec078135db5afb7edf21e2d0bb73403926f5fb7d77566bbd51813849bcd97e1ae127721b886be1ad8216b47b53a82f5df6dec813b249e7f
 DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb SHA512 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
-EBUILD m17n-lib-1.8.0-r1.ebuild 1940 BLAKE2B ce610a079d6683eeddba0c2dcd1466b3b132f4c8ecb96b47befc32ab2ecd087dcb4aa94365e2ff5871a68903504abb669bd2a69fb11e1c05ddc44617ac014c33 SHA512 cd4e074aa1924593fae5224f3be7a2d283b0e312bb21d580ff56af1277e175878d0e31a42e252def3a70db07516b0d389c387de0166f73a14e411fbaeb420f67
-MISC metadata.xml 811 BLAKE2B 8c7cf04662ba154324c9f8f0e2df33e0c528bf2746e4e2fab929536daf7cb3e62cdeb699fa6377d5b2a33a489bd056755652cb23d25fa731ab306bb8fd50e67c SHA512 61820843ca86c19a35eec0590a18e2b4dd053e23a14dd97313663d1d01453d8d40290d5a0769349ae36343a567f4a418a77690cd8e3e31a72014a2bb35f866b1
+DIST m17n-lib-1.8.4.tar.gz 1119271 BLAKE2B 790a002e0abd66d7db0d61ab0240712b2810e698c73d507a5054ad83d4a7a7258c4407d5167ce92fc4c1f3acdfc9f8d3244634af801cde2a00762f09d5e1d823 SHA512 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6
+EBUILD m17n-lib-1.8.0-r1.ebuild 1905 BLAKE2B 9656dd865cc442e8bee1561af21db97fdc86b374ddcddca1b23659f5bf9ef6dc5a5eb54da6424d806d011dca5eaea56348bc796984675f5e28b5fa01d0e002e5 SHA512 aa18b9dd39f7b1068a9f51f4f0871799e26adfa6fb0f493302b9e000f6743da0378388aa9403b183e9ff5f58208d8b145617353bc259d88a3cda8f026c700cd9
+EBUILD m17n-lib-1.8.4.ebuild 1766 BLAKE2B f696d03704511c4f5aeafe0dbd07e841dfac444a135a28bf299a692bcdce2947b7107d91eaa54ffa6e0f9210b40264019acbffb7dca1ccca7e2dc09ebc5aab1f SHA512 e764844c208b9a4ff2f02c75df3670737cf2456e1944dcd680ce54f7c617bb80a0689f7d4e4e7f11291805c7286d7965feb258c6b50e0acded288431a3be461e
+MISC metadata.xml 889 BLAKE2B 4fdd373094410c6fac69020e36d1433b10eae0ff3530e666f1445819175e118c8266d6000145e1be27912c530162ed9a76e71014bb37998c11a1355b125d1665 SHA512 fcecdbf2fefbc637a023c3f3b03922dbb6708a6b540e5555242d415e4d70b5ef73df3f9cccc14536aa237a018b9b23e3a5a3d04141d93401fcc06984b542754b
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch
new file mode 100644
index 000000000000..04ffc7749a5b
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch
@@ -0,0 +1,91 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,8 +97,8 @@
+ 
+ dnl Checks which levels of APIs should be compiled.
+ 
+-AC_ARG_ENABLE(gui,
+-	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
++AC_ARG_WITH(gui,
++	      AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
+ 
+ AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
+ 
+@@ -125,7 +125,9 @@
+   X11_LD_FLAGS="-lXt -lX11"
+   M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
+ 
+-  if test "x$HAVE_XAW" = "xyes"; then
++  AC_ARG_WITH(athena, 
++	    AS_HELP_STRING([--with-athena],[with MIT Athena widget suport]))
++  if test "x$with_athena" != "xno" -a "x$HAVE_XAW" = "xyes"; then
+     AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
+ 	      [Define to 1 if you have the Xaw header files.])
+     XAW_LD_FLAGS="-lXaw -lXmu"
+@@ -149,7 +151,9 @@
+ fi
+ AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
+ AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
+-if test "x$HAVE_FRIBIDI" = "xyes"; then
++AC_ARG_WITH(fribidi, 
++	    AS_HELP_STRING([--with-fribidi],[with fribidi suport]))
++if test "x$with_fribidi" != "xno" -a "x$HAVE_FRIBIDI" = "xyes"; then
+   AC_DEFINE(HAVE_FRIBIDI, 1, 
+ 	    [Define to 1 if you have Fribidi library and header file.])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi"
+@@ -202,8 +206,10 @@
+ AC_SUBST(OTF_LD_FLAGS)
+ 
+ dnl Check for Freetype2 usability.
++AC_ARG_WITH(freetype,
++	    AS_HELP_STRING([--with-freetype],[enable Freetype support]))
+ AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
+-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
++if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+   FREETYPE_INC=`freetype-config --cflags`
+   save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
+@@ -255,7 +261,9 @@
+ #else
+ Version too old.  Compiling this line should fail.
+ #endif])
+-if test "x$HAVE_XFT2" = "xyes"; then
++AC_ARG_WITH(xft,
++	    AS_HELP_STRING([--with-xft],[enable Xft2 support]))
++if test "x$with_xft" != "xno" -a "x$HAVE_XFT2" = "xyes"; then
+   AC_DEFINE(HAVE_XFT2, 1,
+ 	    [Define to 1 if you have Xft2 library and header file.])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS xft2"
+@@ -330,7 +338,9 @@
+ fi
+ AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
+ AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
+-if test "x$HAVE_XML2" = "xyes"; then
++AC_ARG_WITH(libxml2, 
++	    AS_HELP_STRING([--with-libxml2],[with libxml2 suport]))
++if test "x$with_libxml2" != "xno" -a "x$HAVE_XML2" = "xyes"; then
+   AC_DEFINE(HAVE_XML2, 1,
+ 	    [Define to 1 if you have libxml2 library and header file])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS xml2"
+@@ -344,7 +354,9 @@
+ dnl Check for Anthy usability.
+ 
+ PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
+-if test "x$HAVE_ANTHY" = "xyes"; then
++AC_ARG_WITH(anthy, 
++	    AS_HELP_STRING([--with-anthy],[with anthy suport]))
++if test "x$with_anthy" != "xno" -a "x$HAVE_ANTHY" = "xyes"; then
+   AC_DEFINE(HAVE_ANTHY, 1,
+ 	   [Define to 1 if you have Anthy library and header file])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS anthy"
+@@ -355,7 +367,9 @@
+ 
+ dnl Check for Ispell usability.
+ AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
+-if test "x$HAVE_ISPELL" = "xyes"; then
++AC_ARG_WITH(ispell, 
++	    AS_HELP_STRING([--with-ispell],[with ispell suport]))
++if test "x$with_ispell" != "xno" -a "x$HAVE_ISPELL" = "xyes"; then
+   AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS ispell"
+   CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL"
diff --git a/dev-libs/m17n-lib/files/m17n-lib-clang.patch b/dev-libs/m17n-lib/files/m17n-lib-clang.patch
new file mode 100644
index 000000000000..fb5d303d01b9
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-clang.patch
@@ -0,0 +1,21 @@
+https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git/commit/?id=624b987e7b252e223de0bdbe148cd56aef0da28f
+
+From 624b987e7b252e223de0bdbe148cd56aef0da28f Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 4 May 2023 13:57:49 +0200
+Subject: Add missing int in example/medit.c
+
+Resolves: https://savannah.nongnu.org/bugs/index.php?64106
+
+--- a/example/medit.c
++++ b/example/medit.c
+@@ -662,7 +662,7 @@ static void MenuHelpProc (Widget, XEvent *, String *, Cardinal *);
+    off the current input method, otherwide turn on the input method
+    input_method_table[$IDX].  */
+ void
+-select_input_method (idx)
++select_input_method (int idx)
+ {
+   int previous_input_method = current_input_method;
+ 
+
diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
index 04ffc7749a5b..90cfc774b806 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-configure.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -1,91 +1,136 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -97,8 +97,8 @@
+@@ -96,8 +96,11 @@
  
  dnl Checks which levels of APIs should be compiled.
  
 -AC_ARG_ENABLE(gui,
 -	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
++PKG_PROG_PKG_CONFIG
++AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != x])
++
 +AC_ARG_WITH(gui,
-+	      AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
++	    AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
  
  AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
  
-@@ -125,7 +125,9 @@
+@@ -117,14 +120,14 @@
+ 
+ M17N_EXT_LIBS=
+ 
+-PKG_PROG_PKG_CONFIG
+-AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != x])
+-
+ if test "x$no_x" != "xyes"; then
+   AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
    X11_LD_FLAGS="-lXt -lX11"
    M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
  
--  if test "x$HAVE_XAW" = "xyes"; then
-+  AC_ARG_WITH(athena, 
-+	    AS_HELP_STRING([--with-athena],[with MIT Athena widget suport]))
-+  if test "x$with_athena" != "xno" -a "x$HAVE_XAW" = "xyes"; then
++  AC_ARG_WITH(athena,
++	      AS_HELP_STRING([--with-athena],[with X Athena Widget suport]))
++  if test "x$with_athena" != "xno"; then
+   if test "x$HAVE_XAW" = "xyes"; then
      AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
  	      [Define to 1 if you have the Xaw header files.])
-     XAW_LD_FLAGS="-lXaw -lXmu"
-@@ -149,7 +151,9 @@
+@@ -132,11 +135,15 @@
+     CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_X11_XAW_COMMAND_H"
+     M17N_EXT_LIBS="$M17N_EXT_LIBS Xaw"
+   fi
++  fi
+ fi
+ AC_SUBST(X11_LD_FLAGS)
+ AC_SUBST(XAW_LD_FLAGS)
+ 
+ dnl Check for fribidi library.
++AC_ARG_WITH(fribidi,
++	    AS_HELP_STRING([--with-fribidi],[with FriBidi suport]))
++if test "x$with_fribidi" != "xno"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ AC_CHECK_PROG(HAVE_FRIBIDI_CONFIG, fribidi-config, yes)
+@@ -158,6 +165,7 @@
+   FRIBIDI_LD_FLAGS=
  fi
- AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
- AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
--if test "x$HAVE_FRIBIDI" = "xyes"; then
-+AC_ARG_WITH(fribidi, 
-+	    AS_HELP_STRING([--with-fribidi],[with fribidi suport]))
-+if test "x$with_fribidi" != "xno" -a "x$HAVE_FRIBIDI" = "xyes"; then
-   AC_DEFINE(HAVE_FRIBIDI, 1, 
- 	    [Define to 1 if you have Fribidi library and header file.])
-   M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi"
-@@ -202,8 +206,10 @@
+ LIBS="$save_LIBS"
++fi
+ AC_SUBST(FRIBIDI_LD_FLAGS)
+ 
+ dnl Check for otflib usability.
+@@ -201,6 +209,9 @@
  AC_SUBST(OTF_LD_FLAGS)
  
  dnl Check for Freetype2 usability.
 +AC_ARG_WITH(freetype,
-+	    AS_HELP_STRING([--with-freetype],[enable Freetype support]))
- AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
--if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
-+if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
-   FREETYPE_INC=`freetype-config --cflags`
-   save_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
-@@ -255,7 +261,9 @@
- #else
- Version too old.  Compiling this line should fail.
- #endif])
--if test "x$HAVE_XFT2" = "xyes"; then
++	    AS_HELP_STRING([--with-freetype],[with FreeType support]))
++if test "x$with_freetype" != "xno"; then
+ PKG_CHECK_MODULES([FREETYPE], [freetype2], [HAVE_FREETYPE=yes],
+                                            [HAVE_FREETYPE=no])
+ AS_IF([test "x$HAVE_FREETYPE" = "xyes"],
+@@ -220,9 +231,13 @@
+   ],
+   []
+   )
++fi
+ AC_SUBST([FREETYPE_LD_FLAGS])
+ 
+ dnl Check for Xft2 usability.
 +AC_ARG_WITH(xft,
-+	    AS_HELP_STRING([--with-xft],[enable Xft2 support]))
-+if test "x$with_xft" != "xno" -a "x$HAVE_XFT2" = "xyes"; then
-   AC_DEFINE(HAVE_XFT2, 1,
- 	    [Define to 1 if you have Xft2 library and header file.])
-   M17N_EXT_LIBS="$M17N_EXT_LIBS xft2"
-@@ -330,7 +338,9 @@
++	    AS_HELP_STRING([--with-xft],[with Xft support]))
++if test "x$with_xft" != "xno"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ XFT2_LD_FLAGS="-lXft -lfreetype -lfontconfig -lXrender -lX11"
+@@ -253,6 +268,7 @@
+   CPPFLAGS="$save_CPPFLAGS"
+ fi
+ LIBS="$save_LIBS"
++fi
+ AC_SUBST(XFT2_LD_FLAGS)
+ 
+ dnl Check for fontconfig usability.
+@@ -306,6 +322,9 @@
  fi
- AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
- AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
--if test "x$HAVE_XML2" = "xyes"; then
-+AC_ARG_WITH(libxml2, 
+ 
+ dnl Check for libxml2 usability.
++AC_ARG_WITH(libxml2,
 +	    AS_HELP_STRING([--with-libxml2],[with libxml2 suport]))
-+if test "x$with_libxml2" != "xno" -a "x$HAVE_XML2" = "xyes"; then
-   AC_DEFINE(HAVE_XML2, 1,
- 	    [Define to 1 if you have libxml2 library and header file])
-   M17N_EXT_LIBS="$M17N_EXT_LIBS xml2"
-@@ -344,7 +354,9 @@
- dnl Check for Anthy usability.
++if test "x$with_libxml2" != "xno"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ AC_CHECK_PROG(HAVE_XML2_CONFIG, xml2-config, yes)
+@@ -328,10 +347,13 @@
+   CPPFLAGS="$save_CPPFLAGS"
+ fi
+ LIBS="$save_LIBS"
++fi
+ AC_SUBST(XML2_LD_FLAGS)
  
+ dnl Check for Anthy usability.
+-
++AC_ARG_WITH(anthy,
++	    AS_HELP_STRING([--with-anthy],[with Anthy suport]))
++if test "x$with_anthy" != "xno"; then
  PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
--if test "x$HAVE_ANTHY" = "xyes"; then
-+AC_ARG_WITH(anthy, 
-+	    AS_HELP_STRING([--with-anthy],[with anthy suport]))
-+if test "x$with_anthy" != "xno" -a "x$HAVE_ANTHY" = "xyes"; then
+ if test "x$HAVE_ANTHY" = "xyes"; then
    AC_DEFINE(HAVE_ANTHY, 1,
- 	   [Define to 1 if you have Anthy library and header file])
-   M17N_EXT_LIBS="$M17N_EXT_LIBS anthy"
-@@ -355,7 +367,9 @@
+@@ -340,15 +362,20 @@
+   ANTHY_LD_FLAGS="$ANTHY_LIBS"
+   CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ANTHY"
+ fi
++fi
+ AC_SUBST(ANTHY_LD_FLAGS)
  
  dnl Check for Ispell usability.
++AC_ARG_WITH(ispell,
++	    AS_HELP_STRING([--with-ispell],[with Ispell suport]))
++if test "x$with_ispell" != "xno"; then
  AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
--if test "x$HAVE_ISPELL" = "xyes"; then
-+AC_ARG_WITH(ispell, 
-+	    AS_HELP_STRING([--with-ispell],[with ispell suport]))
-+if test "x$with_ispell" != "xno" -a "x$HAVE_ISPELL" = "xyes"; then
+ if test "x$HAVE_ISPELL" = "xyes"; then
    AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.])
    M17N_EXT_LIBS="$M17N_EXT_LIBS ispell"
    CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL"
+ fi
++fi
+ 
+ dnl Check for Thai word-segmentation library.
+ dnl If we have one, define HAVE_THAI_WORDSEG and one of these:
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
index fb133523ef66..e3a2db9f3487 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
@@ -6,10 +6,10 @@ EAPI="8"
 inherit autotools
 
 DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git"
+HOMEPAGE="https://www.nongnu.org/m17n/"
 SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${PN}-clang.patch
 	"${FILESDIR}"/${PN}-freetype.patch
 	"${FILESDIR}"/${PN}-ftconfig.patch
 	"${FILESDIR}"/${PN}-ispell.patch
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild
new file mode 100644
index 000000000000..9d9d1f79ba11
--- /dev/null
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="Multilingual Library for Unix/Linux"
+HOMEPAGE="https://www.nongnu.org/m17n/"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
+
+RDEPEND=">=dev-db/m17n-db-${PV}
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		athena? ( x11-libs/libXaw )
+		bidi? ( dev-libs/fribidi )
+		fontconfig? ( media-libs/fontconfig )
+		gd? ( media-libs/gd[png] )
+		libotf? ( dev-libs/libotf )
+		xft? (
+			media-libs/freetype
+			x11-libs/libXft
+		)
+	)
+	anthy? ( app-i18n/anthy )
+	libxml2? ( dev-libs/libxml2 )
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-freetype.patch
+	"${FILESDIR}"/${PN}-ispell.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	# workaround for parallel install
+	sed -i "/^install-module/s/:/: install-libLTLIBRARIES/" src/Makefile.in
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with anthy)
+		$(use_with libxml2)
+		$(use_with spell ispell)
+	)
+	if use X; then
+		myconf+=(
+			$(use_with athena)
+			$(use_with bidi fribidi)
+			$(use_with fontconfig)
+			$(use_with xft freetype)
+			$(use_with gd)
+			--with-gui
+			$(use_with libotf)
+			--with-x
+			$(use_with xft)
+		)
+	else
+		myconf+=(
+			--without-athena
+			--without-fontconfig
+			--without-freetype
+			--without-fribidi
+			--without-gd
+			--without-gui
+			--without-libotf
+			--without-x
+			--without-xft
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml
index b4b71f49542e..2803edba8c37 100644
--- a/dev-libs/m17n-lib/metadata.xml
+++ b/dev-libs/m17n-lib/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name="libotf">Use <pkg>dev-libs/libotf</pkg> to handle OpenType fonts</flag>
 		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
 	</use>
+	<upstream>
+		<remote-id type="savannah-nongnu">m17n</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
index 988d3ffa6dd6..42d16ab13127 100644
--- a/dev-libs/metee/Manifest
+++ b/dev-libs/metee/Manifest
@@ -1,3 +1,5 @@
 DIST metee-3.2.4.tar.gz 77148 BLAKE2B 9539178deb97465bfcb1c226fadd50a81d5923a5b4b433c60fd35e7f4dd5c6042d281d4bf44c68598bd62f963a893e5b1278fd464055fa7cf7f52d97f3891c6d SHA512 ed611fedbde9719c385b015504798af89ec2f59213573cfdb4b6af01febd0956f2fd7ce3c136481dee5b5e195fbb9c2fc71a2362c87b8b94f31a7d35bc732b96
+DIST metee-4.1.0.tar.gz 84498 BLAKE2B 321c56dff18c649ae171409ee2caa4d2e59a337495b07d540ec2c873d08a002ce006834e0f6c9e6e76d666c67a11d6a5ac04e43f623fde9544cb474972e62e34 SHA512 700c6b4fa40ba88f73b3117b4ba81a5a0856266c25f5b3dcc0d3e1f07f7beede2cf6da543d925b97a49c620d86d837e6793e2bcee32a5c9715ac8f9a10a65fb1
 EBUILD metee-3.2.4.ebuild 773 BLAKE2B e54aab5132f4df48ac9f7ced4588d5689db3d77b93e058c9ffce2284529d9c4867b63d232b15f93b9d481ccbd1566e393974fe542fc93730bd12752e49cfa725 SHA512 2dcdaff2195ec878c0acea9ce23d58c9020ce6af58df4d6493a79887f7403aa26666b0e116c975b6907e5eb806b958a4d64c87027a0eedc93e7d9d47a1336d93
+EBUILD metee-4.1.0.ebuild 774 BLAKE2B 44b3c51b84bf470ea9a3b5cf7a46ac6e2a4a6aec43d636c55678f1f955de77e1cb32cb0202251c49f9acfc42e0a3b70e3dbb532ee801c6daa2b3c09423779b85 SHA512 67297c660dc29006ee939e1770739847970456485b22475ab3042e479a867561c59a77c075451facc702d7d69fb207489a374ac95fb840546e59f38d9fe41864
 MISC metadata.xml 576 BLAKE2B 9e2b068fa33c961eabea553ea1f9fe539f1429467ea52baefbc7cff84bcd3bc802ba5024ed71ae96ef9e810636aaeb1d711f9bd294215bf6cab5e122eda03d7d SHA512 c529229f880fd0f02881265c26a2e7e2841ec02b719a67887423a874253a9414f68614399dbb0cd433b7e9fe5b7ba6785c8fb789795f3b1a8f6c8597949aede1
diff --git a/dev-libs/metee/metee-4.1.0.ebuild b/dev-libs/metee/metee-4.1.0.ebuild
new file mode 100644
index 000000000000..eb83679eaa02
--- /dev/null
+++ b/dev-libs/metee/metee-4.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
+HOMEPAGE="https://github.com/intel/metee"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+BDEPEND="doc? ( app-text/doxygen )"
+
+src_prepare() {
+	default
+	cmake_src_prepare
+
+	# Respect users CFLAGS
+	sed -e 's/-D_FORTIFY_SOURCE=2 -O2//' -e 's/-Werror//' -i linux.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS="$(usex doc)"
+		-DBUILD_SAMPLES="NO"
+		-DBUILD_SHARED_LIBS="YES"
+		-DBUILD_TEST="NO"
+		-DCONSOLE_OUTPUT="NO"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index 8860b6c04905..6a69633c79aa 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-wayland-protocols-1.12.0.tar.xz 44272 BLAKE2B 05f6c7e496d8be7d215ceeed6059230bb609c43c81eba363fc85e49279f2322a5c7c6cedebd9987d1f6d4edefad01eb84039cd949de730607e9ee4bb9a9c2c01 SHA512 4894493e117669d7ab54b385e2a40d69ddce7cb860b68d9a28f9032d63cad6004858f984ad8ece34567e0e806ccb3f973852596b905d2618b60115ccf9c82886
 DIST plasma-wayland-protocols-1.13.0.tar.xz 45016 BLAKE2B 179bc29e79c210008e9f0b54cd50ce6350b0e575f746dbb6d2fe0dc0db4c4c1b98e29cd2b2faa98ce2049b001f2b2e8cbef9cded64db6823f8f56973e92cea8e SHA512 7e335df79a9b614701330d1dd4aa37803a35a5fa409f4d9456f487383c9c3c02414f74551363b22694e7fea9c4c2427ead3213d984c3673c90348e7f890826af
 EBUILD plasma-wayland-protocols-1.12.0-r1.ebuild 751 BLAKE2B a10b4e5619dc01411ca3206ddfe8c5e288136e9ee3d9d7ad94bd5ee3a84dd91efcf84fdc89f821b7037f4b13e48bf900d5c5409e9fa32bcceebbf21a270b8b90 SHA512 64b868b0a561e1a0129f1d466faf852f6dbaf0828333e3fe78f14b48f927e33e7dce9f52e3ad4737cc25ccf35eb3a1823c7779082b04decca263a95f04e0f5d1
-EBUILD plasma-wayland-protocols-1.13.0.ebuild 756 BLAKE2B c45302adaee1124c8a7cfa785c0c2122ae3210c8c3cb579cbf6367c47d3805c6580d2973ddffc1af201355c499e805ca26b5d5e4bd90e43510462187864ffb05 SHA512 2ce0c0f6056ac3234c2c5a61e107a667cf171244394e93e2589070778e200dfc192876b2f9b4942290a0fc31b79a3678460153f97dc777c35a054f589ced81d5
+EBUILD plasma-wayland-protocols-1.13.0.ebuild 751 BLAKE2B a10b4e5619dc01411ca3206ddfe8c5e288136e9ee3d9d7ad94bd5ee3a84dd91efcf84fdc89f821b7037f4b13e48bf900d5c5409e9fa32bcceebbf21a270b8b90 SHA512 64b868b0a561e1a0129f1d466faf852f6dbaf0828333e3fe78f14b48f927e33e7dce9f52e3ad4737cc25ccf35eb3a1823c7779082b04decca263a95f04e0f5d1
 MISC metadata.xml 396 BLAKE2B 6294f1b003e4b05cd62b0c8697b59d385166c6ea4acbe5f68d9efac7cfb9a6afa2502bbb339dd44459fb94ffcff7a03404fdf86f4db5afb711d34986e4e7bed5 SHA512 67f21a439977f1f939fdc5fd94ac9e8e8861d17640e823157fe51474e78fbae372c01617aceb0e7cea15de35694609f37bb7c68d33a5c0fea1d0733ce2c41e2f
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.13.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.13.0.ebuild
index 05f74e583c2b..ad0d538fed5b 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.13.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/qcoro/Manifest b/dev-libs/qcoro/Manifest
index b76a4d14b67e..3b11277b9684 100644
--- a/dev-libs/qcoro/Manifest
+++ b/dev-libs/qcoro/Manifest
@@ -1,3 +1,3 @@
 DIST qcoro-0.10.0.tar.gz 150114 BLAKE2B 8a552dc3a0e4a5963c7c9fd0638f336e6ad99491a54df3bb8ddaa6b0ee1fe8e4c6b7ffc26c25cef543e796c54bc4c625a0915755f4b538f489bc61fcd8310a6a SHA512 de2e55256d3c9d35fec3ef6dc78128801b70a5e5b8ff0f3a6f235dac17f349ea44207a7c9f35375215dbeea04cb67c3412d505d0a8a95f2b926775f804a02649
-EBUILD qcoro-0.10.0-r1.ebuild 1346 BLAKE2B d6550dd2be210da19d99bca6c48fb1a2b2dfb0a1e878dc76f4bfbc1c70461981163b1bdce6afb9b51f921ff6d9c678f240eccc3dc30c3cd8d583992e7f684dfe SHA512 fff2378dabbf5f591363491683d267bbe7b5f14ad272add37671399853d3d224dfa970b845177305c4b36ececba85546d7a92542a1d2babb36ae195a5e641a77
+EBUILD qcoro-0.10.0-r1.ebuild 1353 BLAKE2B b5331536852090406bacffcdaff4516641bafa2e74b31b58687d73d30af8b43814f80e7eb5ada97d24643de52d948092877a2ffc5d23ea97bb06c1dd26268949 SHA512 0722eb134350e57e26a4cecdaacb8084157412e85b042eab5eb74506968aa0cfbe0b53710fb6851259e2d6c2ac7392c8969f7249d5d61ef5f052ad76051db5c0
 MISC metadata.xml 652 BLAKE2B da89b36ab1d771a7dfe49965486249d246dde4345c1c1ad9bc44c5c8df5e2fe35ce15e958a50d3ac18d3fee3522a2a55aacff1bd83813a6366b610a8380ae9ac SHA512 2ac22873e29deffa7240ee98cc8e7e823bc1cea6fe2af03cc69dd5e5ec3faaaf69b61fadb4c1764dbf67815c62798487c03d01787a4d01eda26083f8eea72256
diff --git a/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild b/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild
index 6b49855d6997..ac2870090d4a 100644
--- a/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild
+++ b/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/danvratil/${PN}"
 else
 	SRC_URI="https://github.com/danvratil/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 DESCRIPTION="C++ Coroutine Library for Qt"
diff --git a/dev-libs/tree-sitter-julia/Manifest b/dev-libs/tree-sitter-julia/Manifest
index b622de8b4f99..71b092c35142 100644
--- a/dev-libs/tree-sitter-julia/Manifest
+++ b/dev-libs/tree-sitter-julia/Manifest
@@ -3,5 +3,5 @@ DIST tree-sitter-julia-0.20.0.tar.gz 4032821 BLAKE2B eac1ec80509c8dfb75a68f507a6
 DIST tree-sitter-julia-0.22.0.tar.gz 2792109 BLAKE2B d661b9d84b9d1903d7fae9e4073fcc1fd52030e7a264929cf6eb3aa33745cc51c094beb6e4ddcfd11725989fc82a5e21b20a66b01bc60c8f06c522f732bcff6a SHA512 9687875f641eb0f599a15a5c9ced0a873c81a2d6ad36528f2c29120126a92ca5d6a51c97f736c1c1e46cd8af32e7c5739c694b0372fa62ca840f39f0fbd6a387
 EBUILD tree-sitter-julia-0.19.0.ebuild 287 BLAKE2B 764e14d71f85527f67daf0c4de9169f9c2fc564b6dbbc3c1017f3aa7e9eedfa33c3d89be49eecead18c22d2248680add12625512992762b3913f9dda0a901e2a SHA512 3f3a119aa3508193dc4fc0b6d9ffb2b27f1d4b2e87bdc20d95d93ea649da0457c0343045b1312613e853f5dfd0c658e5763b73a521022c78db5be0136b0f6758
 EBUILD tree-sitter-julia-0.20.0.ebuild 287 BLAKE2B c96a852746642c569b725dbcf67e3a08b788a1b173a9c7ed6c0581ecce0d9428d3ef57b07f22685f1c434225ef4825d53b71a086d59fc7801edff0587d36d1d5 SHA512 018cc7f804854ca347b22fb48d43630bb50d797bef379c91ef312520ab5312c8d33b3b67e1ed0f2aa601be2e5bf9a59e8a083c4c7f8530ac986eadcd45ef12ad
-EBUILD tree-sitter-julia-0.22.0.ebuild 288 BLAKE2B b0d187c38d6c181e00f2c90e37adffbcacd3d891ffa5cd1d06828a86c43b623304685fb8bf9164e717e2cc93350f6a3a0e02d4679411968d21db4d991a0d5d89 SHA512 386186e2beb2c8dd96a67dd2526e22c18d3e44221e6efef40f019a672ec0f1479c3ed6e936cb5b76e7abd0f23789765a8864370a2f1e42c6a7771e29680b785f
+EBUILD tree-sitter-julia-0.22.0.ebuild 287 BLAKE2B c96a852746642c569b725dbcf67e3a08b788a1b173a9c7ed6c0581ecce0d9428d3ef57b07f22685f1c434225ef4825d53b71a086d59fc7801edff0587d36d1d5 SHA512 018cc7f804854ca347b22fb48d43630bb50d797bef379c91ef312520ab5312c8d33b3b67e1ed0f2aa601be2e5bf9a59e8a083c4c7f8530ac986eadcd45ef12ad
 MISC metadata.xml 455 BLAKE2B 676a32b8ebda870753628532dc311d20c5ea54c544d24e7600611d9d69b9e541d0caa2c164dc8eeee12519fae4e607809cb4da5db48ef647ac6065ed5e10fa5a SHA512 23e5e6af7fd8e1b1a1c96153e26ece1f2670bba9d5500d4ecea21f969f3924f90e133adf32d0166a801ac01189eb56eeff8343ae9d2d732349382b4894f53719
diff --git a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild
index c0b00dfcb6a3..bdfad03a9860 100644
--- a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild
+++ b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.22.0.ebuild
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-julia"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-php/Manifest b/dev-libs/tree-sitter-php/Manifest
index 863556474b82..f731255f304c 100644
--- a/dev-libs/tree-sitter-php/Manifest
+++ b/dev-libs/tree-sitter-php/Manifest
@@ -1,7 +1,9 @@
 DIST tree-sitter-php-0.20.0.tar.gz 290518 BLAKE2B 5ba7dabf79665ceb2be737906493bf774e51a0233a62bdb89d84a6a9204745a99679322e047a9115d95e92c3dbb34c5da591497223bb580522b587bedc933d10 SHA512 0ce3e8b2a7cb26b8fa2210e2ac8b133c0ea8450b7504f93422a7baa0ee6f5217c72b9ce0cbdc5ac1e85deb2ab08fc6b968e74f124dce13ebfb8ad9b0af2afb8f
 DIST tree-sitter-php-0.22.2.tar.gz 541599 BLAKE2B 5e98d7d9226900c16b8681ec408bafb6a4c4c281fa0d97b3b9c06b58657f69166df6700ecd127406efff430c0f79a56ff08cc45ca48b483ecd6579cfe7263a05 SHA512 0592d145f92f9f93524b5d6b341b8141234784c03d9e0384311cd735f4b8216e0dd3d5ff27daef6127d3a079b16043b3957e7fd0f8759e90924539bb42f4f306
 DIST tree-sitter-php-0.22.4.tar.gz 555466 BLAKE2B c95870d3079053cf8ff0ce07ce3019a4c33712f1be21734ddf52b9c47f2721387c4c024c4e53855c7449cff386fd46924a5fccf149437a06263e732378e8b0d7 SHA512 5baf5f454769407789ad2e84065088da2aa4a404ac518ba77078d421c38a08a622884c6c6a8e2e77d38c441de36d6e778a5073cb575fe649ab92e9f7420a32b3
+DIST tree-sitter-php-0.22.5.tar.gz 553995 BLAKE2B 63d786c34d5629181dd3a32a3f76a4fcb0c82f2c104e080e35f6f8241dcb6c35cb782510f0b09d7ef0dae295879675ee3e0a82557dd1ed4271b20aaff14079b9 SHA512 ad8492e9e371d21aa00f0a0cfa3f704042661d7f96e736dbcd44b8a1f738d9de2eed14d5be4c7fdfdea9a82256339f5e0b03bdc3f77cb185dd6c660aa8a394df
 EBUILD tree-sitter-php-0.20.0.ebuild 283 BLAKE2B 18f47a9336e24639c5a4041aa31ed0eabadba61ae9e617e05441b4490a877ee3f4315ac9211cacf13a9e99e7749711b5b385b4b5411680bd5ecdabad9f7ebc7f SHA512 69cb5ea6c7cc0987d1ccef4539b798ca90334c25a17e8973bccbcc80483f0c061187220c3c85997e96a1aa4894daa5199e49d0ecc49c3e1bafdaaf694c74a469
 EBUILD tree-sitter-php-0.22.2.ebuild 307 BLAKE2B a7c616c24d4231e3f9270a455e5583fa8020bbf6c8c7b88f48b91ccc6dfbb0a43f45d94891f3ae714fbce7ef5bc039d16d0548f0a5731e02a878849b8fe99bb7 SHA512 69a963c34d0f89a86a63c2cee7ee1f94f6eb451ae9e892fa09b0d2e6bc864afefe6fb055d33d27326fb4927bd355f7954138a7b24e1b2438a2c3629df541a573
-EBUILD tree-sitter-php-0.22.4.ebuild 308 BLAKE2B e218d14f0453ce7f4435094806d82c499e3434b27479cab67f2fa7ec1120f1eae7c58426766e4a7afc31969e92ced3a47d95d75e23f755c9224888a8e0a07c90 SHA512 85ac60f1cd94db9d3221263f22a02dde1a9c4e355f6338b6ce32a1d2fd68c3935569851ad768f11cb5232db444d4e98d64501edd66d5cf1182bd2c587450b7a0
+EBUILD tree-sitter-php-0.22.4.ebuild 307 BLAKE2B a7c616c24d4231e3f9270a455e5583fa8020bbf6c8c7b88f48b91ccc6dfbb0a43f45d94891f3ae714fbce7ef5bc039d16d0548f0a5731e02a878849b8fe99bb7 SHA512 69a963c34d0f89a86a63c2cee7ee1f94f6eb451ae9e892fa09b0d2e6bc864afefe6fb055d33d27326fb4927bd355f7954138a7b24e1b2438a2c3629df541a573
+EBUILD tree-sitter-php-0.22.5.ebuild 308 BLAKE2B e218d14f0453ce7f4435094806d82c499e3434b27479cab67f2fa7ec1120f1eae7c58426766e4a7afc31969e92ced3a47d95d75e23f755c9224888a8e0a07c90 SHA512 85ac60f1cd94db9d3221263f22a02dde1a9c4e355f6338b6ce32a1d2fd68c3935569851ad768f11cb5232db444d4e98d64501edd66d5cf1182bd2c587450b7a0
 MISC metadata.xml 340 BLAKE2B e675d30a1059e7529f8fbb59734b3d9e607a7241597d2630647061a2b830a2ea82984d2ab3612a42935f7182d73432c66580475335e78c645438a03f3cab9f10 SHA512 247d85ee81240a6196b9087a610c9ec325ffecef70d4e23ffdb2d81d4e79548eafbef6e97b3bb543d123f09b86fd27936925f4f1548b21dcf613804fccd10f0c
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild
index 13dc08afbb50..75450e8ef333 100644
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild
+++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild
@@ -11,4 +11,4 @@ S="${WORKDIR}"/${P}/php
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.5.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.5.ebuild
new file mode 100644
index 000000000000..13dc08afbb50
--- /dev/null
+++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="PHP grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
+S="${WORKDIR}"/${P}/php
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
index f7253132540d..3a439c5e3084 100644
--- a/dev-libs/tree-sitter-rust/Manifest
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -7,5 +7,5 @@ EBUILD tree-sitter-rust-0.20.1.ebuild 286 BLAKE2B f5d762c771e3fe9e2be49e58a45d3d
 EBUILD tree-sitter-rust-0.20.3.ebuild 285 BLAKE2B ab14276d41be429383d5bd7991339b42a4cddaba5f092b5b6e38e610b2bf3a3f1f93c7d2e2dcfcd625224a125f8dce14ad2e8db285c6a7e18ecee1fc3d7af41e SHA512 7e210db8e4834c21cf1600691a534234c513564ff0a5d459aff9994548d0dd20409bc8e5a203117226249021262a2d1d876c058a647c5a6c99c1f3b7dd2be125
 EBUILD tree-sitter-rust-0.20.4.ebuild 292 BLAKE2B 6d64269dd86995fc6b4b59f51af2b2e490fc77091a706f1b496d7db18e63ac62bdddefee7ed3a36fe41c8fa3c047923d4b39029d40cdf127b5ddde713f393b6e SHA512 98675c8a77ec97392626ecfa1c7ad36167e257f9e4941268f187d28b31d21e546fc15a77b56485df1c9f44c61acec9660bf15609d98d8aeff9466d6bf6e89bf1
 EBUILD tree-sitter-rust-0.21.0.ebuild 316 BLAKE2B 0def3279f955501e0e9869e616337dedc35dbf792df42dab4c35458b8f5a9286b48dfe0df2ef2385f5629581cd6206c53279425ce204c3532381b059d7661002 SHA512 7a146210afcff000a4fb7a475baa28d91de162e18681f7baedd8b9d579321ba1228e05e186c0b1c4d352bdbcf0d253c5054a644c03ba9493d4728f201786429a
-EBUILD tree-sitter-rust-0.21.2.ebuild 378 BLAKE2B cf1d90694c231e71dc3c62afffa6ed392815e02c134ed9a7d1539c072f0123875d4e2f787aa2c54a2bb893926b649388ebf3453b9f08bfb3470996fcf7ee6acf SHA512 d91acb416f1839fea0097215db140cc74467602c8caef34c68b7f57d1d7b4b8e0e488bc6bd15520381e42cec5d01bf7aa3181af498ed21db92f91778a2d7a99d
+EBUILD tree-sitter-rust-0.21.2.ebuild 377 BLAKE2B 5e5e05c2e1c0a7287273fc207441fabf69b313db01ff652a9464b3c4ba1f449c8e9cba3af046535d65a66ce484f1e3b257e579971b60d45a3820f3f8d5c9b48a SHA512 1e9a17909318867f4912161795823b1fd4256c76b2ae1117c90e635dcc629df9b354e6267b0c52061ba40c6130acf9d1ef619ac8647111b3399f914810875dd5
 MISC metadata.xml 454 BLAKE2B df4600703910499937c219b24c9cff15d08277d6e88253c31ff1a2ab42f52e0e20654cdea17696f2f05194276e8255900b24af6143fa8a7b206604405784e49d SHA512 d67191b96b3a146610dcb62dd037e9ab3b85933a788ecd23c8cba02fc53e7c87cf0d47bdcaf3893931bee3723d50983567941ccdb1885cc12fa8018cc0937244
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild
index 190637959fdf..4c5a0a91fb1a 100644
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild
+++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.2.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"