gentoo auto-resync : 25:06:2024 - 00:12:20

17 files changed, 213 insertions, 111 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3c540655f674..168e0211774f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 5823cc587dff..604b6fbb2433 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -6,6 +6,8 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
 DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
+DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
+DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
 DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
 DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
@@ -13,6 +15,7 @@ EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce
 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80
 EBUILD libclc-17.0.6.ebuild 1749 BLAKE2B 0b083103fc48654357f621bd3c40002fe9030598a4873519b186b601cd75cc1555a3930f26fe884c1970ddf5728c9a7dffc08e97ebdb151e55b80b204d327a4e SHA512 2509e6ff63a86ba1ceef095fab34b49642b7e6866111c289c124bb7ef9d4bad8f07c4927b45994555386536975c8a4c56401860dca25f2ef2014d9153abb4c8f
 EBUILD libclc-18.1.7.ebuild 1305 BLAKE2B 1fbb9db126a81d0cea598e600f7d29fd6a717fed77b09d10a475930e59717f36368588db190e1d56f33c81e7e4336b58725e9da910ef4c51c5f39a7d34bc0a90 SHA512 a90b45f9d8a039781f4d740dc8f6c3bc55187d97e59a97121101a7456a152cc287990207b1b3e690f1009cff65becb12348a0b2d36a33a981a72ad63cf64a217
+EBUILD libclc-18.1.8.ebuild 1305 BLAKE2B 1fbb9db126a81d0cea598e600f7d29fd6a717fed77b09d10a475930e59717f36368588db190e1d56f33c81e7e4336b58725e9da910ef4c51c5f39a7d34bc0a90 SHA512 a90b45f9d8a039781f4d740dc8f6c3bc55187d97e59a97121101a7456a152cc287990207b1b3e690f1009cff65becb12348a0b2d36a33a981a72ad63cf64a217
 EBUILD libclc-19.0.0.9999.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
 EBUILD libclc-19.0.0_pre20240608.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
 EBUILD libclc-19.0.0_pre20240615.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
diff --git a/dev-libs/libclc/libclc-18.1.8.ebuild b/dev-libs/libclc/libclc-18.1.8.ebuild
new file mode 100644
index 000000000000..369d04fb2877
--- /dev/null
+++ b/dev-libs/libclc/libclc-18.1.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {17..18} )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org llvm-r1 python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
+	')
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 6548b5ca209b..7aea595e77b5 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,7 +1,5 @@
 DIST libgit2-1.7.2.tar.gz 7548186 BLAKE2B c27870124c7e63a37794014a802a6fce46c577313f3b6081580f920fa842a65305b5bc56aa6ab02cf87c533d6052afdc37317f96aa1fd67387b07f52415ccbe3 SHA512 825737e4a1991fba50ea535f15b0e560ebe76ead752e04aeba36925b944d0da77fe9826a70980a1aa3d0bf9afbedfab79dd92e799c9252931384c89ebec9b012
-DIST libgit2-1.8.0.tar.gz 7590126 BLAKE2B f3cc5259a5804bb1e319633269a8c488d7195683e39c178fbe5dc43278736bf15f706c1ca8f72b519ef647033ed11426ea40ceb0dd3ffddae3a35839493d6c54 SHA512 e5634267bd9c6a594c9a954d09c657e7b8aadf213609bf7dd83b99863d0d0c7109a5277617dd508abc2da54ea3f12c2af1908d1aeb73c000e94056e2f3653144
 DIST libgit2-1.8.1.tar.gz 7608949 BLAKE2B 14558400d092dd963becfd3d4966a8d0799811be15fea8c5bc1e91be24f14bb81d33d82b2fb8dd8895e167f634a5d532d62a4609167bcb1d93143275207bbf6d SHA512 7429fbdc46ae44fd359e9260cbe33d9ce9276db810c096f12c43e5d302d01011463cdfd98d604e59780187e020e216e839823a77479dc12f952a37628516af78
 EBUILD libgit2-1.7.2.ebuild 1649 BLAKE2B 0eae55b662f2f6bf26d51032e67da956b43aa32411ed9ef6fda13bff21f259218625df41482fb52057382280e8f70e4ef93b225db00319b27f0d825ad96cde1d SHA512 8badba9710a974eada587d36a16939e0027bcb6d05435ae1d5fa4336c0955e0c721e39ac0bc40b5e798237535f1446c1c13f272f81ec5b973696a3a3f85efd2a
-EBUILD libgit2-1.8.0-r1.ebuild 1656 BLAKE2B 8eb9f38a0dd8af26dce9150475778d9df8ef7de3daac0a52196e4c8be80a89a286dc01aeaf388fb5fc7a7a5382d39fbcb3d130da84e9e1c0a99f2f41bad4757a SHA512 701f0dc93330e5a0ab9a817008a8d9bf1536a4733b9d3b9b698d758d5a2ebe69be03f25b520fb4c7143e79145cfb88d6795c73f2ca034130546d4e48cf1a7eae
-EBUILD libgit2-1.8.1.ebuild 1657 BLAKE2B 1ebe9ea3e126a96f674deca1f1f095ae91e3b1caf90c3ab1305074a1fe5cd38a69ba698f76cf4a28b3696979b37107da67e310da2dfc65c5de496a2675b49ca9 SHA512 02e6eacf28fde4055647ec3c93508e23eb29f9d5a0000c4a8f7f727b618a03984b1518ade9346649bbedc93f8767a26a3b9920d4016fc09d072b261dc00c62fb
+EBUILD libgit2-1.8.1.ebuild 1656 BLAKE2B bf7f2d8a03ebca97eed4a9068623d610b76908ee9b249e887f0960c4b147a7937627dc5ed68b976de01f2f4864acd6a53e4e2a309dca9e5196fa730be84b6515 SHA512 df054586e91c79ab9efa0753bff3fcc48c5ed617871181167eeef3a969fc45e27d2ed4fa6e73811efc299fba8d1b7226cbcb8c96aa0d52b44be07d496e7bc3a8
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.8.0-r1.ebuild b/dev-libs/libgit2/libgit2-1.8.0-r1.ebuild
deleted file mode 100644
index dbc498fedac5..000000000000
--- a/dev-libs/libgit2/libgit2-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org/"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
-IUSE="examples gssapi +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libpcre2:=
-	net-libs/http-parser:=
-	sys-libs/zlib
-	dev-libs/openssl:0=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DUSE_SSH=$(usex ssh ON OFF)
-		-DUSE_GSSAPI=$(usex gssapi ON OFF)
-		-DUSE_HTTP_PARSER=system
-		-DREGEX_BACKEND=pcre2
-	)
-	# https://bugs.gentoo.org/927821
-	append-flags -fno-strict-aliasing
-	filter-lto
-	# https://bugs.gentoo.org/925207
-	append-lfs-flags
-	cmake_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-1.8.1.ebuild b/dev-libs/libgit2/libgit2-1.8.1.ebuild
index 035bb7cb68e1..d2b9098cf1c3 100644
--- a/dev-libs/libgit2/libgit2-1.8.1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake flag-o-matic python-any-r1
 
@@ -16,7 +16,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 75a3ae34d47e..5c5b3bf7f059 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,10 +1,14 @@
 AUX libpcre2-10.10-000-Fix-multilib.patch 726 BLAKE2B 4f4c0db0f6a8a10851fa80ac6066f0b85031cbb5a55c29003cd9dd98364f32c679e66a5f905dc7713e15c85807da55fef5d1143d725c0aaf8d897a0b86d31e27 SHA512 aa3dc3148808d0e856e7d8c608342bd91b515e9924fefcfe1eec14af98ec4d6d194c0aedd559b2617145985376ca7496362a4e04c0bc35fe40983e8122c961d6
 AUX libpcre2-10.43-fix-loong-sljit.patch 1195 BLAKE2B a608f2dfd6ff5802ec978f3326e2c835322bc84f56b81406cbc3a96e90de04806ceba1b93f27c441d2d49ea12688236f94cf080ac8e7b26f794d12bb04600597 SHA512 1eefd5466bc886159825437e9af0a2cbd3cea25372a22bfbca46b13b7b169664d9207a7fe7a227aea69f637059e91d456ab0f7f461686050da01a66d4c471896
+DIST libpcre2-10.44-32bit-tests.patch.xz 7024 BLAKE2B d8de8443a9ec165aa3b57384518c8bba06ded1c3d07d03d1451db07f4df13ee2514d055d4a4771162923a9845ac4694dd588ccdc773f0f3d013d7377581fe8b4 SHA512 bf8724db31b8cbdc631904cfdbcd1b2e66efa31f958a8919de0f3f03e129410e64e1274d28d0406c70b8a8ef49c3ed47712368bf9fd9ba2d3203afe4d4b104b7
 DIST pcre2-10.42.tar.bz2 1799866 BLAKE2B 40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0 SHA512 72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3
 DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df3d166bf8b638b998aebacaefb4e88df7e813d6977af2dc7d82c93b7179ad0043c4f46fc4e06d99d214b0b7fcf SHA512 22ce3c7903835b1cf835ac6cfa725badecc982f1504382e62525c88307b2e3bd8951f2221fdd3d73920843e69f714b6df99fe741069e610f1f809087512a31f7
 DIST pcre2-10.43.tar.bz2 1905255 BLAKE2B f87f9f36dd6a806cdba1f077f51b53da2583f1898f83e41d594622b28ac8efbc1b2d122b752a9d6cd461fe0e3c7c85ee93358443df518a336da4ee9d72cca808 SHA512 8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9
 DIST pcre2-10.43.tar.bz2.sig 310 BLAKE2B 5625358ec542a2c808be852437ca47a4df005068759e35b95ba20a55e5d1647b0953df6684e24b6a9de1442c6d6784e45fb1665d48c904dda4ffa16154437c7d SHA512 5edb16176ea4335ab1d35f1b77837c8b6b836f346e379e6b5762e1f4463cb3fb55557fee4dc6d0e9b2084766cdba727c9503830031bb92af91f9706e11389d81
+DIST pcre2-10.44.tar.bz2 1928086 BLAKE2B fb06228f8bdc5906ef4f19d7d677f1009070855149d9ad3f807cfcd164f5cb6165f96e074fedc3942226d4b29edf4b29fab6cde2f2ba58bf6da282730941412b SHA512 ee91cc10a2962bc7818b03d368df3dd31f42ea9a7260ae51483ea8cd331b7431e36e63256b0adc213cc6d6741e7c90414fd420622308c0ae3fcb5dd878591be2
+DIST pcre2-10.44.tar.bz2.sig 310 BLAKE2B a03943d4b04af319ca18992188c9fdd089fc20ef35207b09f2c859ab0090401a9bc140c653ee68a542984d26c0ec59f3ba72b0f9a9d6b3ae322b0823a440a21c SHA512 12dca6fb6ac3dbbe9e3625214b333d20d4ece4c2efa73ada292b178b17ea3640b4f068f2b4da2bea15f5368213e123837dea4e988170d1c6bf5b7afe04b3f8bc
 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
 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.ebuild
new file mode 100644
index 000000000000..4d571ec14abb
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.44.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc
+inherit libtool multilib-minimal verify-sig
+
+MY_P="pcre2-${PV/_rc/-RC}"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/"
+SRC_URI="
+	https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
+	https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
+	verify-sig? ( https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )
+"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-32bit-tests.patch.xz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0/3" # libpcre2-posix.so version
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-philiphazel )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch
+	"${WORKDIR}"/${P}-32bit-tests.patch
+)
+
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.bz2{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable valgrind)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_test() {
+	emake check VERBOSE=yes
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index d66253c2e145..181eff9a014d 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -14,5 +14,5 @@ EBUILD libxml2-2.12.5.ebuild 5248 BLAKE2B 5bfa07ebbef8b985c246b28b9d56dcca2f9cbd
 EBUILD libxml2-2.12.6.ebuild 5248 BLAKE2B 5bfa07ebbef8b985c246b28b9d56dcca2f9cbd881a7933dcc29fea023ed850c9d3630611651b0214f59f2b7ddb6dc0759f37f72c34a09e429e8b7284d339051a SHA512 53766010d7b0f9d9bbd35b9c3df96f777c44b2d003cba8a3d17d075c0fc0ddc7347688980ec597c11623156544896fc4e64870dec56b625a1c36eacdc2a40a0c
 EBUILD libxml2-2.12.7.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd
 EBUILD libxml2-2.12.8.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd
-EBUILD libxml2-9999.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd
+EBUILD libxml2-9999.ebuild 4906 BLAKE2B 61247853a173e8294c8a6c33dab565acdf761693d9cf098aae9364d11db17168386c84a2e9649b1f140912d1d75c7c9b8abb999097a0a926c267eb61039e46d1 SHA512 184005fcf8fb255e04fdf006b49f4a736dccef59e39adc986de04b133b85cdc69bd1e51acc15ff9cdb30d52195dc55d684676eb1a41d23184582e3486281a1d4
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
index c4d87530a6d4..e3b042b80914 100644
--- a/dev-libs/libxml2/libxml2-9999.ebuild
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal
+inherit python-r1 multilib-minimal
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
@@ -37,7 +37,7 @@ S="${WORKDIR}/${PN}-${PV%_rc*}"
 
 LICENSE="MIT"
 SLOT="2"
-IUSE="debug examples +ftp icu lzma +python readline static-libs test"
+IUSE="examples icu lzma +python readline static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -99,17 +99,8 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# Filter seemingly problematic CFLAGS (bug #26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# Notes:
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
 	libxml2_configure() {
 		ECONF_SOURCE="${S}" econf \
-			--enable-ipv6 \
-			$(use_with ftp) \
-			$(use_with debug run-debug) \
 			$(use_with icu) \
 			$(use_with lzma) \
 			$(use_enable static-libs static) \
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index c4cce3734e7d..eb319aa326eb 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,5 +1,5 @@
 AUX libxslt-1.1.39-libxml2-2.11-tests.patch 911 BLAKE2B b9240d9720044ec75fff2ca73abb5b5192f8a0262d5cc51cd5e3bc5b8e07af45486a257d4eb5098cf0c7263d1324a7a9995cce38210245d5b53afc5fe7f4d224 SHA512 26f8664c3cc2bf2579eb236cb771d9fbc0ee528472a44ea55e7975fa0182e63c12a1b7d30c9c01b2e848f9ec91dded5ec4a59c60a7eea2bb283bd120c3e0fedc
 DIST libxslt-1.1.39.tar.xz 1578216 BLAKE2B 7c87b769d345fc99a966bea6b4e94533fa211dc3a987ce013a03eefb05dde73ef75526bdecf7d32d8c77112232096fb22d8ec4f0a781b9f59d0422a2db75df01 SHA512 c0c99dc63f8b2acb6cc3ad7ad684ffa2a427ee8d1740495cbf8a7c9b9c8679f96351b4b676c73ccc191014db4cb4ab42b9a0070f6295565f39dbc665c5c16f89
 EBUILD libxslt-1.1.39.ebuild 3077 BLAKE2B 4237046549c25493c3a7f12bedfbed3daf8782f169e191b0d0df609ba76880b49e1b746228013ba4cb2b7c5c4b6819b3408e8a58f06a9699fbd1ed11e524834e SHA512 a47042c01fda8dec62bc52d11322b749dcfee9586b8f9d0ea8b65b5a60bb1a2902d5e5501b7bfeba6372176c64f462df76ef830a4398737c01bc9ddc7c837c05
-EBUILD libxslt-9999.ebuild 3027 BLAKE2B dec8c4ebdd4a8ea42362b348627024a9049477001b0aeeb2e5c17473955364c172afa03174007c38dc162637b8fa6dc56e530ccaac079f618b3cb4db92996e99 SHA512 8554ed8945bba8a1936ccbfb597cd6962465407b0429d6e82822221cf0805f9053cc0e2bd377e2f9637004e9c02ded779afbc069b083373b91f222f752fc947b
+EBUILD libxslt-9999.ebuild 2858 BLAKE2B ca04bff5151ae6882095cf1787ed9ff6e730b95c347c8b8b042a95698fcc62d9e50900b87c6dd693f811ee5fb930d2b7fb7810d4b5c050049ce8685fe377b715 SHA512 4836fdb88d8dc56da5b2de3dca921ee892467e553870fe413da73eeb19f7791c86db614ee529659ed5b05213987ddadb2cc39ad7361aa3e6675a40cfb56887b9
 MISC metadata.xml 519 BLAKE2B 19c44d930c1d6af33c7cd756ddd74fb29f93d37dc4953956011e8ff5a563caa119b8848ef8e47ca0e71ced4134b7dfc9092c89a14cf1000148e0383c01183ddc SHA512 6c5e8dcd014d9203f0f50ba2e11d3fd52d89f226ef2f4d1d39143347a8de4433e1f6fa30881f87701695438da263c13dad59230c957002aea2950da01eb66c00
diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild
index 1f4d62a88f6a..22acdc53723a 100644
--- a/dev-libs/libxslt/libxslt-9999.ebuild
+++ b/dev-libs/libxslt/libxslt-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Note: Please bump this in sync with dev-libs/libxml2.
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic python-r1 multilib-minimal
+inherit python-r1 multilib-minimal
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
@@ -51,10 +51,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# Remove this after upstream merge request to add AC_SYS_LARGEFILE lands:
-	# https://gitlab.gnome.org/GNOME/libxslt/-/merge_requests/55
-	append-lfs-flags
-
 	libxslt_configure() {
 		ECONF_SOURCE="${S}" econf \
 			--without-python \
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 83c446f407da..2f5ba553c86a 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,10 +1,10 @@
+DIST nettle-3.10.tar.gz 2640485 BLAKE2B edf0ba6375f06e2dd4b1e3ed4bab5f592ac04a36f748ce0461bbec32622eb3d5f96f89350926c24b5bbbf37dbe14a1ad64bba5df7cb7ad5987ec634573aabbb5 SHA512 18d5b904ce60514aa81b57bff2945e5f7f4366d4775e6a5ffc227b85be2def72b3d2159b983b75ac95a56d3167a2ef1a25b5dfc2fb6193f16a012935c36a7b34
+DIST nettle-3.10.tar.gz.sig 374 BLAKE2B 9edebae1bc1941dfc19c3c3653f80ebf66e8aed974c99673a294ff6835145ca8265f5466829e27c5d0352e88a73e9a58fb017cdbad678705ae29cd27dd80fefe SHA512 a56d46bfd545b0dff47ee6426e019afea024ebf40698018b8a4b7a25168ce615bbfe773894dc01ab246f7010ef6a7f1c248cf1f9c693f0f0dbaf27c33c7d216f
 DIST nettle-3.8.1.tar.gz 2406251 BLAKE2B 22b4ec81645b579504356597ba87b637e46285682020c90e03ecaea386ac9b48eaf91ee76ae3b86b6060be355de20c320ab3b74958074ad23fc08ad9ab6a4cbb SHA512 a405da3438d185d96917b03b00abb9ab43e04f58f770f657f716c25d64bb258ee170a71328e74736caa7121f50c0c89d3cc840c1201d2a92cfaf1357d24bdc6a
 DIST nettle-3.8.1.tar.gz.sig 374 BLAKE2B e2bfce4aaa1be114fb9bf8724f25db75c69c3b98538df46e9b1428ce615f7db3b9e9f9240d232fddac195db4568439b3f58989c20beca82aa6db79f4956db547 SHA512 978304b1faa5adc3b0d6ea7e9597af6154ad5d6e328913ac19184ece94771fdb2a7d5ce0af535ae8d28cb6ccd94fb3d4ef2613c0356df9e08b5d4c26ea646e09
 DIST nettle-3.9.1.tar.gz 2396741 BLAKE2B e3ceaefa19491e58f26b900beaf8b4e746feb2357c7677f5c050f257f4a23c304773446b6283a42a82cf9640e16522b8a71c47f137759f1df23cdeee4625d142 SHA512 5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced
 DIST nettle-3.9.1.tar.gz.sig 374 BLAKE2B 41c37cc0ea649445c7e4bbe2d0e9ab1c6f7bb50000adef2c2ee4828e7efdd2d7c6d823d64209f251cb7d82ce85e73768430a435ee7f1d5a3732e744987918d0c SHA512 fe6f4c9746e7dbc10f61843673de95d2faea209b1caea5c7bf69b81d3f6b2248a4907012b2baf0d65e54682f835cff465482db37615b789017ce0a9e7e267d7d
-DIST nettle-3.9.tar.gz 2393838 BLAKE2B 80885fa380de58765155a5d4b209e524f4bd0336156ba6f5189702007438998094df0e4e801370fd0a74251b8cf91f46638b0c0139388c2c2098b1207ed3415c SHA512 5e44f59b37ec1e92345fce0b963151d1f2aabf01b3a197b8d931067c51af4ba025059c6a07f2bcd19b17eb49d6ede98f5c200e58d340959826cda473459d2fba
-DIST nettle-3.9.tar.gz.sig 374 BLAKE2B 4fb9fbdafd01712db2506e070a64b6821dcc0c3ff3cea83011662ee4cdd5120ed10c6fa7b41d556069fe2d8827a312e94bb3586be845284fa7a7ac75f000a750 SHA512 8cf060e9f8e0dc0a70a7d324cf2366e0fc990fca2d8a1c677e66382f6853f96146fe30ea9b8629030991f4799430c7660ae7867c94167760bb945abb526b5bda
+EBUILD nettle-3.10.ebuild 3295 BLAKE2B c0fd90d2b496227a53431fdc93ff1bdec98e6c3a726d042097abdcd650c3538eef05cd0da0ee927a8bd2ac72a148bb118b72abe0d066a127df9d1fb05ab28bab SHA512 3d5888cd83ee6116a12cbe9d6a015eb9fad7319990a716988dc17cdd83619554db0f294ff6eda298efa4ea75df4e2df0e3e52f509df24078828152f02bf236d2
 EBUILD nettle-3.8.1.ebuild 2623 BLAKE2B 60ea85fbaedf21cb3c7a056d08eb46eb1ce1e487e5ef5c69f2e0baef1d312cd514580a48e6f5b0b99b9762e2f9cc01e82dc8ef5d30aabe4b00c1f60313fc93b5 SHA512 3c6ded7aa546c6436a3c1399285928d1192b25e8dfef7c41084eb04987e31cb12860f51e10627aaea03f80d6d394a45b46ce43e37092f6fad6f06c2382b48a30
-EBUILD nettle-3.9.1.ebuild 2771 BLAKE2B dceddb86e5d689a8466400800013a54d556d224ab1670848efb77976920430ae1674daf72d8234aa4e374a119a08d8ffb8308ad63955fc213c7ea6457c3d7e49 SHA512 b38045798c6bc78135621202cb6805d622285d63788909eb244b827184fafdf33493d871dc34b02911c6c5aa6f8bd62920a99f96923c9fd6caf1d82a514c8d6a
-EBUILD nettle-3.9.ebuild 2775 BLAKE2B 398d74b891728f19012f2125332889b17737e044c5e4469ed684ddbf96bb0eab9bcc447002cb93b1a48660c467123761eb73d7590135a6b3a63fab52db68fe50 SHA512 d74e24f6bd5d915dd1d929058d7810a60d2a8a1e646778f77de03c61b7eb53db633caf13f269aba0f23fdde593fe8f890bedfa241bdeb54bb7758bdc2b0632e5
+EBUILD nettle-3.9.1-r1.ebuild 3113 BLAKE2B 57b7050e5d17abee26bcaf7a8acaaa392133457a01ab67c8b483a4f3c814602479e1d0489ae13b2cad07c687b567ae5768d0a48680be3a0b3edf994145c30143 SHA512 cfe542893db48ffbfa9b5e649dbe716099339c787657ed1e53095ce0268c5a39b75348294c7f45261029ad93908fdeee25e929b9a3bcd8464e6d5c2c497929fb
 MISC metadata.xml 401 BLAKE2B 8840ace8e513d9ee82322e82f348b15c94ed9ece2b102bc2bb977041e518f56f5f6b068318771759b1895d47db084026ae443841a9f305cf965c37121ef0100b SHA512 b2c4a89887b5882fc8e04a83e047d2f9bdc60e2f1799fd724c83275acd1f7b9b4c1c08c4c3ada810f5d30cf3c6048cd8043c7792dd909969b7e4bf4da66b42c8
diff --git a/dev-libs/nettle/nettle-3.9.ebuild b/dev-libs/nettle/nettle-3.10.ebuild
index 2d307d66cb40..b79aa1e683e3 100644
--- a/dev-libs/nettle/nettle-3.9.ebuild
+++ b/dev-libs/nettle/nettle-3.10.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
@@ -15,7 +15,7 @@ LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 # Subslot = libnettle - libhogweed soname version
 SLOT="0/8-6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
+IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
 # The arm64 crypto option controls AES, SHA1, and SHA2 usage.
 REQUIRED_USE="
 	cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
@@ -54,6 +54,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# We don't want to run Valgrind within ebuilds, it often gets
+	# confused by sandbox, etc.
+	export nettle_cv_prog_valgrind=no
+
+	# TODO: USE=debug w/ --enable-extra-asserts?
 	local myeconfargs=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 
@@ -63,13 +68,11 @@ multilib_src_configure() {
 		$(use_enable cpu_flags_arm_neon arm-neon)
 		$(use_enable cpu_flags_arm_aes arm64-crypto)
 		$(use_enable cpu_flags_ppc_altivec power-altivec)
+		$(use_enable cpu_flags_ppc_vsx2 power-crypto-ext)
+		$(use_enable cpu_flags_ppc_vsx3 power9)
 		$(use_enable cpu_flags_x86_aes x86-aesni)
 		$(use_enable cpu_flags_x86_sha x86-sha-ni)
 		$(use_enable cpu_flags_x86_pclmul x86-pclmul)
-		# TODO: PPC crypto flag?
-		--disable-power-crypto-ext
-		# TODO: How do we detect this in ebuilds reliably?
-		--disable-power9
 		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
 		# TODO: cpu_flags_s390?
 		--disable-s390x-vf
@@ -85,5 +88,12 @@ multilib_src_configure() {
 		--disable-openssl
 	)
 
+	# https://git.lysator.liu.se/nettle/nettle/-/issues/7
+	if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" "${CPPFLAGS}" "${CFLAGS}" ; then
+		ewarn "cpu_flags_ppc_altivec is enabled, but nettle's asm requires >=P7."
+		ewarn "Disabling, sorry! See bug #920234."
+		myeconfargs+=( --disable-power-altivec )
+	fi
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/dev-libs/nettle/nettle-3.9.1.ebuild b/dev-libs/nettle/nettle-3.9.1-r1.ebuild
index f2e77b0432af..5f20798db8f1 100644
--- a/dev-libs/nettle/nettle-3.9.1.ebuild
+++ b/dev-libs/nettle/nettle-3.9.1-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
@@ -83,5 +83,12 @@ multilib_src_configure() {
 		--disable-openssl
 	)
 
+	# https://git.lysator.liu.se/nettle/nettle/-/issues/7
+	if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" "${CPPFLAGS}" "${CFLAGS}" ; then
+		ewarn "cpu_flags_ppc_altivec is enabled, but nettle's asm requires >=P7."
+		ewarn "Disabling, sorry! See bug #920234."
+		myeconfargs+=( --disable-power-altivec )
+	fi
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 021bc4f7c7b8..47de3756dedc 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -6,6 +6,6 @@ DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d
 DIST xerces-c-3.2.5.tar.xz 4274820 BLAKE2B e0926660bf29e35c05843aae683a7a4f2fe5a6f5f68c76ce16fde975a24277c0e50465a02bfa785f96f4ebec3c7d411785793914491f112ce19477b5dd59e351 SHA512 77b80148b0a3dbb61af648e2571855d59040512dd0c739a892e8ac6a6d7ddbb43b49850c87c39fcf374f2c7658a9c795b3e3fcd4785efbc6226f831b938d5300
 EBUILD xerces-c-3.2.4-r2.ebuild 2830 BLAKE2B e45c73a6f2639505c25d401f1291133df224b8f8dc95f77e97a607105fb683874fbc53500ad7f6756401e8b857b4782a6cc80534dc1135d86eb9435e809d1974 SHA512 97252a94fdf378e99725cbc9549326892fd89454d29c502509e093f0b2a5c8f7aead9aa49eed387bf8c956efa22348bcb3ad341c2063627416cca6ed546f788c
 EBUILD xerces-c-3.2.4-r3.ebuild 2961 BLAKE2B 96a7e8ee1cbbcd3178d439e51862bcd322e3e46fe7df80de709190bd1338ddc7838f55990a1fd5e778f84817dde55fad8a8dbf9873bffc92e72bc6f6d8b0551c SHA512 49f588de6a49b7f98ec7976a4beceb84c205f37600372972e0d142804d8363de407bf2c88c29c12545284afde03c9db602180e658d24d5cd6211cca97e22ee8b
-EBUILD xerces-c-3.2.5.ebuild 2951 BLAKE2B 9508486419f2db2011ce94d80949d8a7be78d5483b08f16301dcb825d90ac4ba26ff9d983decf091a12fd45ed9ecb6ec57f498e3e8bb6422a20c539a1a34aded SHA512 388e504f7d4e3ed42223c7068a42a445d92cc99c2d09a92db3e2bbda6f41cb415ec778f10496101dd8840bfa2f20944e6e8c13fffb86aa7fd931199637d91fbd
+EBUILD xerces-c-3.2.5.ebuild 2949 BLAKE2B 203456efea190f4a3949480a164ae3432712379d361a3e3e0c3970fd474bd9f5b123daaf54b567c72065153f764c8a6beb78c9bc15dca2debf65c65d2986f638 SHA512 92c5ad74f5e062157247e08c9da3f34415c997d872454c1d2ec72eb4a023007c38f47244cbe561446e8521fe07ec3eb215244c193efb4fa51586582de31aa838
 EBUILD xerces-c-9999.ebuild 2911 BLAKE2B b9b699470070dc8f225f0dfccfc85c122e0460c5288f0fe59cfb9a2cfd34b81812eade9347fa38028f24d40f92949609798933224909feb5ada062d651e36eb8 SHA512 139d4edbc70dce0bc595cb29a1e0e4244638cc97f4e42b0f5f052221a7f8f39a4ef00f0c1090e40696de342b2a1875686dcc54c77ba25d64c19955878ff75e8f
 MISC metadata.xml 639 BLAKE2B 478311dd96d2a5938161f66cbcd3e0bbdb51bc5680c2bc9aaddcfef3921d356bb568fcf3047d181d54f3cf2560b547dcca3e964e064506c8bfccad9291c6d0da SHA512 8c8fd2d5a525000a06fb08b0cd20c4aefd6c9fb6554e7e8586bfc7a58be2884a629417035e0863950246bf12b756466c0453e2768a31678da002d029dceacb73
diff --git a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
index eb1a572509b9..7ad99efa9366 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"