gentoo auto-resync : 15:04:2024 - 12:04:02

author: V3n3RiX <venerix@koprulu.sector> 2024-04-15 12:04:03 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-04-15 12:04:03 +0100
commit: 7fa8a1e3f149eea4c844c47cfe26136ed7614c58 (patch)
tree: e514d1b9999d088064bee1e34a3a3c500d6d7a07 /dev-libs
parent: d993571e2ee444d08f4e9e90d493ee37338657e3 (diff)
71 files changed, 2292 insertions, 861 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5f109b8b974d..31d459822be8 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/blake3/Manifest b/dev-libs/blake3/Manifest
index dc9b49665a0f..d33f76db755b 100644
--- a/dev-libs/blake3/Manifest
+++ b/dev-libs/blake3/Manifest
@@ -1,5 +1,5 @@
-DIST blake3-1.4.1.tar.gz 224891 BLAKE2B c5d20f40ee2c4c35dfa89de8318e246baef2feab23d71e6c73da201c726ea51b42bec2a5769660a18298057591f479a62b29150f91f07b37eed3438f1a78bec1 SHA512 d21025764fb9ae020561ce2301156a69a77c89a4c5e402a27095e5014159d1a8fee340ff1b1db00b5b22f7a9a4d38273132aab13ca5bd639944492f1b31c9ec1
 DIST blake3-1.5.0.tar.gz 228053 BLAKE2B 04405b0bea5e0a5a774c84e712f36c61fd695c4cbe203a327741db7138af38fc4deda7c75a149f1850a1ca01a519897fb8e84c2cbe38f9cc084357c5ed61a1ed SHA512 eb782d48240cf2fa8cc3cddd699dce3a362eb480b3ca58a97d54cd3595a0c969e51fe14374b91136036e8e29c8f745efbd5a4d1aaed2c17f23cb89fb756645d0
-EBUILD blake3-1.4.1.ebuild 469 BLAKE2B b2133739a3f5677e154966a6640c97df7914a4de6458f6c05b391ac375c609f2305b415e0e5bdbc75d0539d3e8ddc7a4de3da6a3db4bd94d4371d66c2f13b6f6 SHA512 e840c658a3b710916588f15a39c1dcc372636431f109dcf71779c335a093c29efdacd9d4f0b18e9ff5059435436d7be45a3fe991377bd46e81a7d9041bb38e21
+DIST blake3-1.5.1.tar.gz 242161 BLAKE2B 12712bcc6413f90bd9d79ee87d73b45ee611032ccfa3f9e73b2c41b080c2a9451db028c9ff32efa546bef19b85e4aa9fc5ecd9fc6b76c34fd347cbc5fe337649 SHA512 a2ac662b0e45d1f4c4ee01a5e556a47c49ab5407a6057034033ce6fd0fc6b88f66dd428d80f5e7c4a8413356cb4b5ab655924d96138213499893e0204d7c8d24
 EBUILD blake3-1.5.0.ebuild 480 BLAKE2B f0662530d0ab585a6b2edd863b7dc9c1acc6215d3c2b7f0e92cdb866d92b3ca09a77c1e3b6a522b1f7a7b7613ef5f7d0fe09cc64ec0038bccfcfb2771424b28c SHA512 8efb675b88b3cf0c9c999bda8910c3ec75e2be8bbf45261b46d9602dacc6b8c09ac08297600a1d2dde079ee8b1d70457a020ea48a6a85fb36c920e143314cba7
+EBUILD blake3-1.5.1.ebuild 454 BLAKE2B c753a56fa9dca1cbc3fd08b8284d1407c078041c33e9eb560d19569dc856b69a4b6c0250de988470fc0a1c496991b2825cf01109d09fdf5f59b6611f23d3e65a SHA512 f1115db05a294c9b65abd59a1662bc5c46e9551b726d9d62d17163b5bb6613e88454890027becda4142116832733ce1d02686486beb79feb38a071cdbb4fc11c
 MISC metadata.xml 331 BLAKE2B 04a0d860646b72b60fbc082a4f28fa681e122d6f53dadb858777c4054b1bedb9eb33929758ba0693c72f56b69abe3ae88a69e3fc4460d4e1acc0a9c82f26239f SHA512 849d76599dcbdf00b4fbd501eb2b3cb123dc930418e36ea65701fed34e82d8353624122018b0f1e759a583c38285b14f92b6c89a615512e6646af908efb079cf
diff --git a/dev-libs/blake3/blake3-1.4.1.ebuild b/dev-libs/blake3/blake3-1.5.1.ebuild
index 2bc612e7279e..7440aae92bc1 100644
--- a/dev-libs/blake3/blake3-1.4.1.ebuild
+++ b/dev-libs/blake3/blake3-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,4 @@ S="${WORKDIR}/BLAKE3-${PV}/c"
 
 LICENSE="|| ( CC0-1.0 Apache-2.0 )"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 45f36c3204a8..c59e68b106ba 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,3 @@
-DIST gjs-1.78.1.tar.xz 654556 BLAKE2B 1d723ad2fd15e7ba6b9194cb90f0c0bc7b89c150604beb11ad95e1628ead2bea7ed8b423e1836736013a31e8ff8f3e2400458faa26dcc95d3a6dc36c65957583 SHA512 9a5d02bacbf82364cf5daa69d6613eb38ef34121eb350b2773b87cf1027ccc1b9905b651275fd71036817e710d834d356ee1cecac2f7c83ff571c39e98360286
-DIST gjs-1.78.4.tar.xz 655220 BLAKE2B 0adcc3d0cc88a36b94b2113a6d88ded9be7fa034392fa38abb9ac22a962fb8601a76b6c886500e48c40fbe8708b3164b1d403dd83cd4e77358a4a020e8c15632 SHA512 a402050cee011a84f0ebb6b1512a2e681e792cf559b3182ece0868e57191be64337d6683ebcb8a7ee89ba79c12947a8cbca85f015c6015d26901352b5255c2c4
 DIST gjs-1.78.5.tar.xz 656168 BLAKE2B e1458d000998b66fda90e448ca487e591729e003c3e11a939dc474958b6de55783d41db8de5b243a329361f12acc15a8e84f4131650705becb046b68c54a24a2 SHA512 bb25e52dff53bfbde6d2329027d4ff68849740cf753da58f9bdf5a19ea7b029e2517d67978f461f16660dd1aa48b223798e9c0a24cde0ccb62060e4a0c83a02e
-EBUILD gjs-1.78.1.ebuild 1957 BLAKE2B 19fde0ff5de1a7a910e2231afb6adc97b71db7355cc74c3a62f7e4275d928710ed3001e117568ef674496a9688dd3f6a90fbea72fba94dddfea7f97af93c42e5 SHA512 5d4f165c38216bdc44fb80dc8c74521b6bad8b6307059132261de23749fef4e93f0d3b93092ee1b3f40e3e1657f2cc721d33232a65f54bd9f6c392d7724d1853
-EBUILD gjs-1.78.4.ebuild 1963 BLAKE2B 9d19ebb0ed14d760355e592dd385449644dede3b512247017e0f1f5d516afdfb3c65767bce9275796500c070594e690ba0a29d0443fcd96687cb2b92b4e15667 SHA512 0a863ef3882f04c7b61a7d16d8382c5169f3b526876c6cd2517b397586672fb3b6d2df9c69b1861ced3c43880ce372fe6d33e6b9e53af23144455c8a0e6d84ed
 EBUILD gjs-1.78.5.ebuild 1957 BLAKE2B 19fde0ff5de1a7a910e2231afb6adc97b71db7355cc74c3a62f7e4275d928710ed3001e117568ef674496a9688dd3f6a90fbea72fba94dddfea7f97af93c42e5 SHA512 5d4f165c38216bdc44fb80dc8c74521b6bad8b6307059132261de23749fef4e93f0d3b93092ee1b3f40e3e1657f2cc721d33232a65f54bd9f6c392d7724d1853
 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2
diff --git a/dev-libs/gjs/gjs-1.78.1.ebuild b/dev-libs/gjs/gjs-1.78.1.ebuild
deleted file mode 100644
index 805b43049029..000000000000
--- a/dev-libs/gjs/gjs-1.78.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-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 ~loong ppc ppc64 ~riscv x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.71.1:=
-	dev-lang/spidermonkey:115
-	cairo? ( x11-libs/cairo[X,glib] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? (
-		sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	append-cppflags -DG_DISABLE_CAST_CHECKS
-
-	# On musl, it's required that either gjs, pixman or gnome-shell to be built
-	# with a larger stack otherwise librsvg fails to render a particular SVG, as
-	# a result we fail to get gdm or gnome-shell running (greeted with a fail
-	# whale screen). The bug has been reported to librsvg. This is ideally just
-	# a temporary workaround until we understand what exactly needs a larger
-	# stack size, as it's not sufficient to do just librsvg.
-	#
-	# Please refer to:
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
-	#
-	# TODO: Find an actual fix instead of increasing the stack
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-		-Db_pch=True # TODO this has to go
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/gjs/gjs-1.78.4.ebuild b/dev-libs/gjs/gjs-1.78.4.ebuild
deleted file mode 100644
index f9d52d43c6ba..000000000000
--- a/dev-libs/gjs/gjs-1.78.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-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 ~loong ~ppc ~ppc64 ~riscv ~x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.71.1:=
-	dev-lang/spidermonkey:115
-	cairo? ( x11-libs/cairo[X,glib] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? (
-		sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	append-cppflags -DG_DISABLE_CAST_CHECKS
-
-	# On musl, it's required that either gjs, pixman or gnome-shell to be built
-	# with a larger stack otherwise librsvg fails to render a particular SVG, as
-	# a result we fail to get gdm or gnome-shell running (greeted with a fail
-	# whale screen). The bug has been reported to librsvg. This is ideally just
-	# a temporary workaround until we understand what exactly needs a larger
-	# stack size, as it's not sufficient to do just librsvg.
-	#
-	# Please refer to:
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
-	#
-	# TODO: Find an actual fix instead of increasing the stack
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-		-Db_pch=True # TODO this has to go
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index bdcfd0e152d1..e4444e39b570 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,7 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
-DIST gmime-3.2.13.tar.xz 2231624 BLAKE2B c1b4af7ea911c6e2cdea01700d76d218028f7a7f3fc0443b15f915658f945b0fd784928eaa572b0a4b1cd2ea6f7b2812de75f066e3dd2bef23ebd4075a393ee9 SHA512 cfbf5d9e8d6cafcb340b6e470acaf7ae0a96581d39119a751b22fcf3ede089cc24accbd26a79ec2a4b7901ce66d7092765e8c388bbfa2138606dbb4b3f81f4d3
 DIST gmime-3.2.14.tar.xz 2231340 BLAKE2B bbe147151349c626d92890783a3fccd4b1156b5a9fc305812447f28ec34d5d7694a702f99865ad5ef41737eb4e0d0c08d879e4525f58c272972531c51d436fd6 SHA512 d6127a8567f96784b3f975452cd43a4ef6c8921845feb11974f785576f7ef138f25d20d0f309022893ca445fffb000b4dc98bf65ff3a781ececd5c16b1f0e9c6
 EBUILD gmime-2.6.23-r2.ebuild 1268 BLAKE2B dfbaf36bf70c8dc0dc7d2a5458e8bb40402c08717c3e2d0a90a2c6ab2c898d111d9d52276667aa75dc1346553774060bef1e3ea8189f4813ae1adaea806f4c67 SHA512 9f85429b8dd190d20f7f8e502f7a1ad5ffb2aaca6f29c8113740cafae8a2ba0f889da4b9894b1b818070da2d3546f975ef0eaf79b2983e2dc0feb2189ac1a962
-EBUILD gmime-3.2.13.ebuild 1472 BLAKE2B 48aee39a6e2f6b4882b941d2ff9247c2e8eb6a65f0114491d0e3f32f64533dbe39465a0bacd2a9cf01ccec4b8624446d7a35a6ba7b7d17e853046cfe0ac29259 SHA512 b305b9f4b2399c44cc1a32029240e49fd699500de4becf8ba4f5b9df6f9994237e7e00d4ad6db94f4279c2dd7719d752439dafa2aef3bf476cfdd909297f1e48
 EBUILD gmime-3.2.14.ebuild 1472 BLAKE2B 48aee39a6e2f6b4882b941d2ff9247c2e8eb6a65f0114491d0e3f32f64533dbe39465a0bacd2a9cf01ccec4b8624446d7a35a6ba7b7d17e853046cfe0ac29259 SHA512 b305b9f4b2399c44cc1a32029240e49fd699500de4becf8ba4f5b9df6f9994237e7e00d4ad6db94f4279c2dd7719d752439dafa2aef3bf476cfdd909297f1e48
 MISC metadata.xml 426 BLAKE2B 57bee4d811bd2dfe9fb9cb24707153728e8a76f52e2c54782920e8c0f2dcb598f7906dafdba0c8e789f443b7de08ca91d168426cbf8559903a7df9c4a132c3dd SHA512 9ac95c3be4966211def1f954630b3a2ffda54924e3bccfe73d9690915b38f6407355f2a73bcd791575e14e0835cd247f6c212e388d0891e8127229ea618a675c
diff --git a/dev-libs/gmime/gmime-3.2.13.ebuild b/dev-libs/gmime/gmime-3.2.13.ebuild
deleted file mode 100644
index 209667ccf128..000000000000
--- a/dev-libs/gmime/gmime-3.2.13.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome2 vala
-
-DESCRIPTION="Library for creating and parsing MIME messages"
-HOMEPAGE="https://github.com/jstedfast/gmime http://spruce.sourceforge.net/gmime/"
-SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-SLOT="3.0"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="crypt doc idn test +vala"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.68.0:2
-	sys-libs/zlib
-	crypt? ( >=app-crypt/gpgme-1.8.0:= )
-	idn? ( net-dns/libidn2:= )
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-"
-BDEPEND="
-	>=dev-build/gtk-doc-am-1.8
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_setup
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# bug #???, why not use --with-libiconv
-		append-libs iconv
-	fi
-
-	gnome2_src_configure \
-		--enable-largefile \
-		$(use_enable crypt crypto) \
-		$(use_enable vala) \
-		$(use_with idn libidn) \
-		$(usex doc "" DB2HTML=)
-}
-
-src_compile() {
-	gnome2_src_compile
-	if use doc; then
-		emake -C docs/tutorial html
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		docinto tutorial
-		dodoc -r docs/tutorial/html/
-	fi
-}
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
deleted file mode 100644
index b4e44ec4f19a..000000000000
--- a/dev-libs/hyperscan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hyperscan-5.4.2.tar.gz 1848851 BLAKE2B a4539df7c6a4b5f097effa67bc777c37ff02aae356953acd4ffe871f621c556f6357c37ad813db144ed50af21881838946b7cb5ef9ea345412de908b84497dac SHA512 328f21133161d16b36ebdc7f8b80a7afe7ca9e7e7433348e9bfa9acb5f3641522e8314beea1b219891f4e95f1392ff8036ebb87780fe808b8b4bd15a535e9509
-EBUILD hyperscan-5.4.2.ebuild 1569 BLAKE2B 6ad306dc8dc9daa7c10519bda6a8f4f06a2d2fa4e944e3d0efc73d6d63ac9d82d6441e337a495734bc14727c0e72d8b9615a9763a41812666c03af4e0c7017db SHA512 9b5ed47e697e8422b73509ac0d222d5dd901688d019c3988be8f51b01baaa69f8ba5925af966717c7b0a93d36bd383e670ce77c145d31c48b6d8e4c1b8878004
-MISC metadata.xml 326 BLAKE2B c8b637b6f67bfdb7d3739e51a440c6acb7fdfc767ee217b6ee53656296956cb551af170426e5761af28a45457685e2fff3817d8765a524ebde2d2bbb40184ebb SHA512 4fdf11eeaf691de889bb30c0828e4e4777aa4e2e486acdad4ed41b725bcac04c4af49a046ea07b571bd609ec3f8cd1b3ac57f1457684de766a16f7ec3268f55c
diff --git a/dev-libs/hyperscan/hyperscan-5.4.2.ebuild b/dev-libs/hyperscan/hyperscan-5.4.2.ebuild
deleted file mode 100644
index 7c6fac198c94..000000000000
--- a/dev-libs/hyperscan/hyperscan-5.4.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 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="High-performance regular expression matching library"
-SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="
-	https://www.hyperscan.io/
-	https://github.com/intel/hyperscan
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/ragel
-"
-
-# We can't default this to on as it's against the expectation of
-# how CPU_FLAGS_* work for users.
-REQUIRED_USE="cpu_flags_x86_ssse3"
-
-src_prepare() {
-	# Respect user -O flags
-	sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die
-
-	# upstream workaround
-	append-cxxflags -Wno-redundant-move
-	cmake_src_prepare
-}
-
-src_configure() {
-	use cpu_flags_x86_ssse3 && append-flags -mssse3
-	use cpu_flags_x86_avx2  && append-flags -mavx2
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_AND_SHARED=OFF
-		-DBUILD_EXAMPLES=OFF
-		-DFAT_RUNTIME=false
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}"/bin/unit-hyperscan || die
-}
-
-pkg_postinst() {
-	if has_version '<mail-filter/rspamd-3.5'; then
-		elog "There is known issue with <mail-filter/rspamd-3.5 when hyperscan version changes."
-		elog "Known workaround is to remove hyperscan databases ${EROOT}/var/lib/rspamd/*.hs*"
-		elog "See https://github.com/rspamd/rspamd/issues/4409 for more information."
-	fi
-}
diff --git a/dev-libs/hyperscan/metadata.xml b/dev-libs/hyperscan/metadata.xml
deleted file mode 100644
index dc4b2f2b7d54..000000000000
--- a/dev-libs/hyperscan/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>arkamar@gentoo.org</email>
-		<name>Petr Vaněk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">intel/hyperscan</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index d5e54aace558..49c519c91975 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,4 +1,4 @@
 DIST libburn-1.5.6.tar.gz 995353 BLAKE2B 2c4b2e0a191c2a02327177bc5acd418d14a0c6eb9de065de171b0c4240a8bd7746ab2fd775fa1f0433bc1fe98dd47620524ec2954f4aa0f2015557cf881a5d3f SHA512 549cb25310aac5ce445639374d84f0c09fb1fdd70be97479588775e5afcc12dd0655c5bf51bd3f1bf8c06a66b318fd1e709dcfd72845e795ffaf353ea621accd
-EBUILD libburn-1.5.6-r1.ebuild 990 BLAKE2B 1cf77276bf79f916f7e4c7fed5f40b24e899ef9e770d7d0968efc68f9b6c2ea6f227d862a5f34c16df190e14c01c246b24c7debd2a7c57169de175740fd09c61 SHA512 4e4e35e30f15319a0c34329375752a8f9696f674d26fa51e5147a1b2766bc21f04ef8f393dcb8cb9eaaf9e7ddd9e6e799c88ef700cb1b0e14d5704f71df06440
+EBUILD libburn-1.5.6-r1.ebuild 983 BLAKE2B 701a4def0edc91e29e63a78327b6e18450e02119307e5ce42c2478c2f6991995107c2a2e5ffc268d436f436095d38b266290e110b565f9f70a1ab5b6ee1f892c SHA512 ca82ce4706c55822d97ed2703d06502ad3876962e95b2c977023e302adb5ce558ca0357379812c1fdc36758820a24bf715703c7a9702c81f305987b0c384e1cf
 EBUILD libburn-1.5.6.ebuild 851 BLAKE2B 2b3f9c26af44929e795f245fd065f0cb425431665c4f2180c3205f0b1b84a2a1cff95fc7f7fa29f25f09efcd8a458abe3158563cbe5f57f93e3904306e7cabb4 SHA512 6a5a2c37ed55a688331de533b0b4e1119e10940adec0dbb1efcb68611f3b31d1f743e3591aeb232aaf0e72b3aae3278079bd86a9673a5f14b601c2585a0ae893
 MISC metadata.xml 244 BLAKE2B 81e7bffb2ab3a3015b9a90bb48d0f62a65b55840b50a77f41b24961c3d9f682405c866b25a88c900785d60f669e60791607921808b988ab3ae525e31933e6067 SHA512 d4a328a1ed124445554a4a6f16cd5d9021314f6f4634c9e2866a68ca318220889554603e405c7aba69e9135cb5848de9bbf361f923fd3c0a5a6c803345351b93
diff --git a/dev-libs/libburn/libburn-1.5.6-r1.ebuild b/dev-libs/libburn/libburn-1.5.6-r1.ebuild
index 4fbb4fffbea8..d669c0ff6bfd 100644
--- a/dev-libs/libburn/libburn-1.5.6-r1.ebuild
+++ b/dev-libs/libburn/libburn-1.5.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libdex/Manifest b/dev-libs/libdex/Manifest
index 068cbb632acc..3ec791d15de9 100644
--- a/dev-libs/libdex/Manifest
+++ b/dev-libs/libdex/Manifest
@@ -1,5 +1,3 @@
-DIST libdex-0.4.1.tar.xz 95492 BLAKE2B 73e660cd5876f41f7e02bdb35cc460888eaf40a62c7431e7fcd2337a2eb953f975a8f6719c0726672be71ab507561413257c140a31cfdcab09491d4228362796 SHA512 80a80c6fcf936da903a64339dff1d6f802f028bfd6e2815bf3b2a3ac6bd0e9fafe3f81b66dd1ee0a6bbd6303cc31fc73b528829e587142a7d269b1b98377ca25
 DIST libdex-0.4.3.tar.xz 96820 BLAKE2B 51f6c9a209d8ff19d7e97f4d8cbc9065739f08c555712076c9b6f4d345d56522f31afa1b8dffe8da2cfc128d368d7dc5f6a93757f0fe5cfd0a55de17587d776e SHA512 26691373d560d20cefa3a23e31677259b234cdf623b17b8fb2b6976b03768e86e458d2670aa3b260638b595994f278240e972bf3ff5b765013fb6d3114f46cef
-EBUILD libdex-0.4.1.ebuild 1207 BLAKE2B fd206431446b518e559c12f15c5ca0c0f0fd98eab9807ca46a8159f5ec4847beeb855ce012b1cb82893a146979f05fb3154562b55f60a17611f5207057495e79 SHA512 797ad80e151dad2b7053da61758fc804d028a041d00a3007d3245bce426402b21d2c0634b8779273da1b200bf5f44d46fabce104006e4153fc209b643fac168f
 EBUILD libdex-0.4.3.ebuild 1481 BLAKE2B b88a3f2ee52b2ded6c15eaf019b022b4b732bf4ab548a98256dbd40133bf5938728a26708825130cce5a7651ebed72a4e8093724b98a02b7164ba8f75f9149f5 SHA512 cc31ea3c815fc288b4b18a542823ba60564af86944f1993437746d2924def8525ed8588b6e5bc1fa992a7fc9b2a10c56299d4c4bc3e0c5faea948ac6f8aff78b
 MISC metadata.xml 1034 BLAKE2B 279009c53ff4ecfd3fc2b053ec13f7497aeb65b5a6f0b225633067c173e353662654adbdf3cdd3eb5dc94fdf4c06b44750108309f917309b09957467eb3f12a3 SHA512 0d87d47c39375628cd18abdfb97db9a8d9d3ae1dab37f7937a60aa6935132dbcb36407bf7308b1b4239401676bbe65a1868e2a06f79e8da16f7f96e246bf5f8f
diff --git a/dev-libs/libdex/libdex-0.4.1.ebuild b/dev-libs/libdex/libdex-0.4.1.ebuild
deleted file mode 100644
index 0c9580a83095..000000000000
--- a/dev-libs/libdex/libdex-0.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson vala
-
-DESCRIPTION="Deferred Execution library for GNOME and GTK"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libdex"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-IUSE="gtk-doc +introspection sysprof test vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.68:2
-	>=sys-libs/liburing-0.7:=
-	introspection? ( dev-libs/gobject-introspection:= )
-	sysprof? ( dev-util/sysprof-capture:4 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gi-docgen )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dexamples=false
-		$(meson_use vala vapi)
-		$(meson_feature introspection)
-		$(meson_use sysprof)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index c3298be71d5f..1970a466900f 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,5 +1,3 @@
-DIST libgweather-4.4.0.tar.xz 2808680 BLAKE2B d3bfabd7936a5dc5f6f77cbb5acb3a7b80cebe1f08ff48582e1609cad04051ce8b84959c27576c928233e4625db8831c99d049378908cbe562b48221b6f37392 SHA512 dd232d36b168132a7c7cf06ffff16e88eb6e3e9e003e39b975df3d294ada401ab7d34de386dcc53452de6b0f8c68ff7f0cf6a94492e353828e00d4a1204b5d00
 DIST libgweather-4.4.2.tar.xz 2827456 BLAKE2B de53257f15b5b0e38bd41ccf69665e701065db85d144853831f409cd1a7116482bb374a858b022f9fb5eb167203bb393fa4a9087ab2c2272ba1b83dec3efcbb0 SHA512 66012af9bc50dfbb8cdb3d8b1ad7c72b5e8e012d8bbaa5a8d7a841f4bd5b2ebe0a490cc7ea256ea5e1d218f328da8826fb2345aa848fd961da271e64cdf330ad
-EBUILD libgweather-4.4.0.ebuild 1972 BLAKE2B 6cce4d6a1cba8577eeda498450550e88c51df2a1620299dfc769f8860afec0ed23c4da9e4b28219122b1ec2801a830c3e6cc0a1d84a304878397e084bbf766ca SHA512 176ba510adf1b7550f217cfd030d7ecfed4f4930c10093b977ef89563342241bceeb54a02f6e44db98f19cc059d9a1b37cbdcec61d48653be6b05f930c01b8d3
 EBUILD libgweather-4.4.2.ebuild 1972 BLAKE2B 6cce4d6a1cba8577eeda498450550e88c51df2a1620299dfc769f8860afec0ed23c4da9e4b28219122b1ec2801a830c3e6cc0a1d84a304878397e084bbf766ca SHA512 176ba510adf1b7550f217cfd030d7ecfed4f4930c10093b977ef89563342241bceeb54a02f6e44db98f19cc059d9a1b37cbdcec61d48653be6b05f930c01b8d3
 MISC metadata.xml 352 BLAKE2B 3726dfdf7269138db7992dbab72db960ed2362a8c753362376f28fa37e0849ef89f74b132dea4c63120dfb777f27566aea12f5dc92ddbeeb5a3b8139d4feeb9c SHA512 06dcfdd1ba301e34b2b9a23f3cdb5a686daa8fcc7a2caa8ac921eade3e805589ba2bb148da5f64f95f93d62dda71b5e19f37b33f1e35201c61bd8e0bb996bbf4
diff --git a/dev-libs/libgweather/libgweather-4.4.0.ebuild b/dev-libs/libgweather/libgweather-4.4.0.ebuild
deleted file mode 100644
index 9df29f888f84..000000000000
--- a/dev-libs/libgweather/libgweather-4.4.0.ebuild
+++ /dev/null
@@ -1,88 +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 gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Location and timezone database and weather-lookup library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="4/4-0" # subslot = 4-(libgweather-4 soname suffix)
-
-IUSE="gtk-doc +introspection test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	vala? ( introspection )
-	gtk-doc? ( introspection )
-"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.68.0:2
-	>=net-libs/libsoup-2.99.2:3.0
-	sci-geosciences/geocode-glib:2
-	>=dev-libs/libxml2-2.6.0:2
-	dev-libs/json-glib
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-	vala? ( $(vala_depend) )
-"
-
-python_check_deps() {
-	python_has_version -b "dev-python/pygobject[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-	use vala && vala_setup
-	# The metar test requires network access
-	if has network-sandbox ${FEATURES}; then
-		sed -i -e '/metar/d' libgweather/tests/meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use vala enable_vala)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use test tests)
-		-Dsoup2=false
-		)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/libgweather-4.0 "${ED}"/usr/share/gtk-doc/ || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index d280fb748eb1..6824ff594092 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,4 +1,4 @@
 DIST libisoburn-1.5.6.tar.gz 1650966 BLAKE2B 56246feb390532588861944944de50fc6e70afa284da78a33e6a1c3a37fdf02cd8362dce2fc59c8f0017cc475eb15db47841759f376342d411d0518e9ba49c9b SHA512 0fc0058aa4cf755f30d5be0de808012978c657348412c7f129b8f8128da41f18216f3e039050a5851b557ffab344cf7dc44df374400ca008e34e2e2524fbd979
-EBUILD libisoburn-1.5.6-r1.ebuild 2021 BLAKE2B dddfc59e1d995bb7118d9566da2c8f0b56fd4c332ab5330e0085159e742e8111163e662d7b990a6f24672009fdeb963f8f3021d4fe023b428e3ebb8548bc678c SHA512 fbba2321186d8aa9867e7d3b3d9f0b5537093ab67213a94f79b386b493489a709d6e34ae092814ae7b19293243ec68499ac7ade12022f6aa3228a6c7a5b686cd
+EBUILD libisoburn-1.5.6-r1.ebuild 2014 BLAKE2B 16aecdf110c8915c38021aae933a9104f4b1f27b77ec092456c0133acd31fc457ee982a00a82452102bac488ba038244d7f184d13390b675a36edf34d8129883 SHA512 1fb3afe0b98b85f0b2277693e8a1f13f317048f138a85799510f55e7490cb77465afd6df85b23167efd25f0b934422a79a34b95a5eaac6eefc9edc0f57005519
 EBUILD libisoburn-1.5.6.ebuild 1864 BLAKE2B 5c647a277c915c8d09f4bf5fe1cbecb33eb83b266a5d0c3fb306ba56ef17978d1d7f2084b9b82ad4a103d8ba09de909f1d89c07834fa41fcc5bdad83c30de9cd SHA512 634402cc70b2957d81c7fe07576f3767bf3283e79fdb8e5f8e46d49eedd9ec9427565ff3719b7f77c6976a3add53e0e812be859d30f8dcc938a0d81430d32c58
 MISC metadata.xml 830 BLAKE2B c89f5f41f77640a55e5e48c2e1b16fa87fab35fd6b9b2d5c428e3ad700aaa088682d1ff6ca1ca674025b2b110cad722453b9a80889e81d021e941d41d7e14fcd SHA512 b687baf3d21a495da1036196fc653b92934d2de797ff0b149dfd94a81dde6d965778db7b8fd4284ae09cb07d01205eaa983f586bf4adee7092d1b3b3a8b72ed9
diff --git a/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild b/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild
index cbaaa66845c3..3bbb20c4a6d4 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 989bd82fbee1..ed7ab4abe124 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,4 +1,4 @@
 DIST libisofs-1.5.6.pl01.tar.gz 879218 BLAKE2B 466cb1fed6b0a29b2a418dfe7a3ac393d38961b08cf53febfe80f1bf91f891d1c17119a482fb0cb6f44eda0c568b1c00bd7b2eeb028ad749c99451ffb18b7f8b SHA512 7760931abbe508002bd3e7eeb694071425f24316cb11c80a2f162a76c3a1d79c57593b758bc0e540107140fd18714e1bf87ae3a65510956a76a1c09f80453a80
-EBUILD libisofs-1.5.6_p1-r1.ebuild 1191 BLAKE2B 19cc8d387707876d19b598800e36abbacc7ae55eb02bf3c690c0b45cb49efac3d89a3b5397186f912ca4e36688e07e3d088d742a00c8eb472e816e6104cc98ea SHA512 2eee183bc650b62766aa46d63860f72fc3046d6e6838f9101c0f786d142cb651065e2d742b051be02ba6351aa53aa3262b51ce9458a60502f8a98e4213d93d97
+EBUILD libisofs-1.5.6_p1-r1.ebuild 1184 BLAKE2B cdd82a8c86bbba55bd898096a8882af1a6c4111d4cadf8019d99019fd36a397fa6aeac90088984d556ea4591923f285f19b59ead40eeac742eb04edb74f93166 SHA512 02ff6fa17e0a488feb2690bdb075845873b93b341ef53aa540fb47b068057de82e8366a770e76f4b3d60511d8ae13106fa712e4a2e49208a483ad1e1ac57f994
 EBUILD libisofs-1.5.6_p1.ebuild 1047 BLAKE2B 9ffdca68d57755f2dfd33a122031c1f8838542f951231cf49492e417999608ad10d96b77df91a9ebfa0aca94fc6d6b4f529e986944a978932badeae90dd734ef SHA512 d2fb2b1c6e75d51acaa4f35de7d0d486b9f4a8390df9de9286756af03413b1b43ddb465b3f9a8ff977c53df89f814b178fb997fded6ffd898b4893cba9178fb7
 MISC metadata.xml 321 BLAKE2B 88d0d1ac9eaba1741f02a93cbcd6c55dc6f2cf22f6051969e9bbdc497f515fbedb024f6027517893342466cd04fbd94cdead3b015c311c99aaedc4f3681f193d SHA512 870d6fd484548245f01fdebf2fc2e664d6445cbca7a47c34065f4d077709cc9c989a0157f799b811a37345b8c1a87d07f72f66658b86319f8425bc02c0609f47
diff --git a/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild b/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild
index bc91f16b5fee..0c18fbd5e4be 100644
--- a/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://files.libburnia-project.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index bf8cae678536..b1150d4d0574 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,5 +1,3 @@
-DIST libmanette-0.2.6.tar.xz 43236 BLAKE2B 3b2a6979aa368117fa5d61623c26e6cca61388770ad77e759c3427fcba64d40361b1e1a4f87a2931281edbf5c2943a44c2ee3b0485ef52ddbf183a9e72344892 SHA512 e10a1b3e493a6472b0cf7562e3dfbba839ee69bb878676b2e3521363e9ff7c5df7d379923a4781366797e889f3c8985397080ae606264dc9bd3a4459bce0513c
 DIST libmanette-0.2.7.tar.xz 43928 BLAKE2B 10978109c22defc1fa3361ef08d824ec5a67fda86b020504322fb86db0f7157617daf34db6ddaf0c2221ad9419b04cad07fad17bb6de103b198c7664cee12c4d SHA512 c3ebaba901731d3f106379befba1c4020aa32dcd224ced7f24aab37e547644080202dfcdd0e8cbd0cb6c864410f038e483502d357ab9842ae0f25e9570d120ef
-EBUILD libmanette-0.2.6.ebuild 1069 BLAKE2B efddccb38e92a034b83a0302addf3def26a37a811cf7ca312996b0227742cd6a8564e9a063b8f45f1643fe46fe9451055bd229123cd2f319fe391ae39fe0cfde SHA512 06c99ac9c8ac033e22ad45cbbac9bd19e66bcebc63398a193306743347ef5fdac408d1d6514eec476627641fbb8b7d3f5b0a5e69b9fee04fea8c7e2a0fc30ea8
 EBUILD libmanette-0.2.7.ebuild 1069 BLAKE2B a5864a3163db39a5573ba869229dc31e01fd4298500b5e70471eb8bd8425c47280b023938caa689c55356a0d9e526c5868ebd49700bb0b6c92f8d91bd2606c20 SHA512 4e5ad51e9d1a98b65e5a88883402aa0460d13e33ba29e5ce7a9428919f4d21057199febe509431f1d3254d574e8f4cce56322e5700ad3e4a7916e2d1a551ef6b
 MISC metadata.xml 351 BLAKE2B 61be879316a839e85ea1577878e04f3b11fdcbd580de740b448507b5a77480e6036265f437ac9ab3e728eef464c7eae9125c969db045c8ade206770f2307eba8 SHA512 ff39d3c4b93e95652b726d6a0642a55b4a6a474b8b1467db9b93ee454b84dae9152f1d9f78f5d9be921811dd1bad3d4b7a12c118848ad552e96f8d31bce4825e
diff --git a/dev-libs/libmanette/libmanette-0.2.6.ebuild b/dev-libs/libmanette/libmanette-0.2.6.ebuild
deleted file mode 100644
index f60d2061f5df..000000000000
--- a/dev-libs/libmanette/libmanette-0.2.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Simple GObject game controller library"
-HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE="gtk-doc +introspection +udev +vala test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.50:2
-	udev? ( dev-libs/libgudev[introspection?] )
-	dev-libs/libevdev
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddemos=false
-		$(meson_use test build-tests)
-		-Dinstall-tests=false
-		$(meson_use gtk-doc doc)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_feature udev gudev)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 70f394bcd84b..51fedbbd0aea 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,5 +1,4 @@
 AUX libp11-0.4.12-openssl-3.1.patch 1969 BLAKE2B 94f516348da3e76a07923dcfff46e0c0ffd8bcea4e58eda75a7d753dd09a1d14d6357ec369630afec7007ccc2638c44cd714d769c3eccb4aef398ebd88cd01b3 SHA512 90f426ff7b817f335c0eac38f167ded3be1c0033ffd38ce87dbe5843d2ad2e43327ea613760fec5c86c9a7a39860787c9997506fd4a8d464cdabfe7388520342
 DIST libp11-0.4.12.tar.gz 516414 BLAKE2B a816749984753a1916dd58860c51b49d316946b59eb3bc839f6a21dcff14de48d7a4937f55fc7ad96a26b914591854d5cf11a1fbac2d5f2f5e04c833973c0e42 SHA512 674cfca2c9eaf162262204c94f9d59d3095dabbc348c1842e758b897e1a5bd4ba08b2d589ec3b2a2d1343a8760eab253e7008dc09ef5b499e2f16385efe5c8cc
-EBUILD libp11-0.4.12-r1.ebuild 736 BLAKE2B 381af06451d3374ebed0cdc0868bdcd3883b1196ea4944bda41ebe1f881760129d515428eb17238692760e5d3e755e7834bb7506e6c768dfdff44ee9422ea80c SHA512 6cefbee4a04eeb6242ce12661d3015be687325046f0e852a1c8adf851b735256572409d74655adce191c6a4a1e603eea9a3705fa2281ab213c5ad2c732e5ed00
-EBUILD libp11-0.4.12-r6.ebuild 1126 BLAKE2B 9f1c70cdbb533c545a517a98c1af4d622a3f044c7c96ae1ac50eb4ce9aee4c2da0d3b7e4a115f6489abde3e9652e15dcb94012a655338ed42f551bc9ba551bc5 SHA512 20f0e1121e3a9eb4586087ca356a65db8e80f2532e0d207f1755ab5a7b5e51afef9675f791647501805c66d0f5b67796917fc0c4f86cce841c635a22dcdc45ce
+EBUILD libp11-0.4.12-r7.ebuild 1150 BLAKE2B e17693bc871fb64f0805b72a7f1fc3e5b433b47d7ae038f896767198cb50017e5e7cc69776fc46636beae712d546afe656a124b4b2b41df1f60de36d091aa6f6 SHA512 2486d51d5b63e7623fdc324c6668b3a21e625230a2e5d2696ca4a65143477cfcd24a88e18ed5f6b034aedeef753255ef4a8c634b52a3d336ae6bbb8b76c85c37
 MISC metadata.xml 605 BLAKE2B 69d65e5f468abb8e4ac74afe597d7f1129e3dd1ecb249aa794a75c628268e5250cc0385c8119c0752155967d22a07fdfac2d31af458c0811a47bd32663627d1d SHA512 a2bd8e47b0d86aa7f3009bc724cc22adfbab5ddc041b2ec87f6f96faa4f2bfb442e501668c27627723727058b4c615cd6c80ef40f1bbdd580fdf6b7fe7326229
diff --git a/dev-libs/libp11/libp11-0.4.12-r1.ebuild b/dev-libs/libp11/libp11-0.4.12-r1.ebuild
deleted file mode 100644
index 6590012a74ae..000000000000
--- a/dev-libs/libp11/libp11-0.4.12-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
-HOMEPAGE="https://github.com/opensc/libp11/wiki"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc static-libs"
-
-RDEPEND="dev-libs/openssl:=[bindist(+)]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-text/doxygen )"
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable doc api-doc)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libp11/libp11-0.4.12-r6.ebuild b/dev-libs/libp11/libp11-0.4.12-r7.ebuild
index 857488c8b4ab..fb5a4c7faf18 100644
--- a/dev-libs/libp11/libp11-0.4.12-r6.ebuild
+++ b/dev-libs/libp11/libp11-0.4.12-r7.ebuild
@@ -11,18 +11,17 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-libs/openssl:=[bindist(+)]
+	>=dev-libs/openssl-3.0.0:=[bindist(+)]
 	!~dev-libs/openssl-3.2.0
 	!=dev-libs/openssl-3.2.1-r0
-	|| (
-		>=dev-libs/openssl-3.1.5-r1
-		<dev-libs/openssl-3.0.12
-	)
+	!=dev-libs/openssl-3.0.13-r1
+	!=dev-libs/openssl-3.0.13-r0
+	!~dev-libs/openssl-3.0.12
 "
 DEPEND="${RDEPEND}
 	test? ( dev-libs/softhsm )
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index db3d92a97dc7..53b38dd55732 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,7 +1,5 @@
 DIST libsigc++-2.12.0.tar.xz 5002560 BLAKE2B f4d42dfbac95be974a5e49a7bcfd4c97fb0423f5bcc9d0bda79e6cee6bab54ae77969a3e5c58094264068c38212a0ff66b3dae2a519c4101bdfa170e94767641 SHA512 88e382e274a574a4b6129e23916054642e1696c663a4bb84f05e14a401f0cb56d0a0bf8c3a6273aec36ce121ce18a338b6d491fb213bcdf5a627bd382719e021
-DIST libsigc++-3.4.0.tar.xz 949316 BLAKE2B f12e8199333f5d23827a33718e884835af79ae90f3aa9d71944b5277783f171ed17b81453b46ee9c46e945f3fd6f5152707723dfdc471c992375f0efb6a253ef SHA512 1677d5151db5e74388d8ba4f5cf316f1e5c92aa380c0725ea62ee41f10f549296d528a8998dfa4767ca699782c93f756c072de9e0e07e52307f61ff72c952fe4
 DIST libsigc++-3.6.0.tar.xz 991392 BLAKE2B b060d6437ac1253d9a58971a5b5e6203691f3718b1fb220a47a9f1a73fdcce746a036c0193743bdda8cc2d0ed722a84eda4a53f2449606f6f190771d0543b61d SHA512 fa79067b4fecf68501288b93eed3d3e7017899cb8a02d3106a41f6dd1818f7b8c724a5b38d4b9ac89699fd8084976f9ad8eca8e832a45a5b6dc7cae5db99cb56
 EBUILD libsigc++-2.12.0.ebuild 1107 BLAKE2B 2f041949f4181d9f3794e1791ab2011bf6998b88a8b7d20087d5150676eafab6b65721bb5a9af345b00ed07908b2c037792cf9e1dccf5611fdf51fce3a86839d SHA512 3b3fbf85c728bc35952e50b38307d1f40a02eb0ce08f61ffecf3828b6894679cf229a8df8c45d8d0e74db49ec7681e6f4ba699e092e3387ef724dc3be20292b4
-EBUILD libsigc++-3.4.0.ebuild 1047 BLAKE2B 6c91e86a950fca31c3eef7778a5e9d9e60452f3f4e12c326c297e37e6e8210baf1259be34da5ee6356a00bba72a028feb15d5ff5314d64f4e81e49a586bff521 SHA512 7e99f9e61907ab733c1b33f1d5d1ae6e678775ce693bd4ac098352263df938a0870157a6b3f339b383507084eefe531fd8fd45e346f56bac1244cd6c6fec7ee5
 EBUILD libsigc++-3.6.0.ebuild 1047 BLAKE2B 6c91e86a950fca31c3eef7778a5e9d9e60452f3f4e12c326c297e37e6e8210baf1259be34da5ee6356a00bba72a028feb15d5ff5314d64f4e81e49a586bff521 SHA512 7e99f9e61907ab733c1b33f1d5d1ae6e678775ce693bd4ac098352263df938a0870157a6b3f339b383507084eefe531fd8fd45e346f56bac1244cd6c6fec7ee5
 MISC metadata.xml 360 BLAKE2B cd5d7f32949df66ccd10d45bccf8d6433a5c0d218356bfd453037e1b0c3ad7e39a1fa1b9354a4f2c68a9340c1bed0c940f77e28ac43fb904a547bae0f4ef5b7e SHA512 0cab4a9537dbf409b15c8bcaba9653d434776292eb65c1bf9708c0ce2cf9134c23ceae09c4384950733928095735f137f51e8ad6d0253b77c9b3fafbc2b75877
diff --git a/dev-libs/libsigc++/libsigc++-3.4.0.ebuild b/dev-libs/libsigc++/libsigc++-3.4.0.ebuild
deleted file mode 100644
index 38c4be7f1d0c..000000000000
--- a/dev-libs/libsigc++/libsigc++-3.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org flag-o-matic meson-multilib
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
-	https://github.com/libsigcplusplus/libsigcplusplus"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="gtk-doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	gtk-doc? (
-		app-text/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-multilib_src_configure() {
-	filter-flags -fno-exceptions #84263
-
-	local emesonargs=(
-		-Dbuild-examples=false
-		$(meson_native_use_bool gtk-doc build-documentation)
-		$(meson_use test build-tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	# Note: html docs are installed into /usr/share/doc/libsigc++-3.0
-	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
-	:;
-}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index dc6403e6f232..8e9692e9fc37 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,10 +2,12 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 AUX nss-3.87-use-clang-as-bgo892686.patch 2693 BLAKE2B fe8a25c9c8599e0f3e630202c824b854ebfa5b3580e79a61f7172a93a5aad2df3754e2e5aba718a22bb2ad5102f4d638ca10508f0b66cf6e8f21da4ea52bf966 SHA512 67d231aa1b2433e5feeff59af6849eee78f6d5ebf601c0f7baaf0e1b5b44c25ca63f012ced677f5562bb45e3fc0dabe0210b123a78b56de4dfe11c5eaafac3bc
+AUX nss-3.90-remove-support-of-curve25519.patch 2740 BLAKE2B 6404d5030bafd276431bf6956ceef51c2af7a79a4a632f5893d9f3ab170c327ba8e17a8697ce8616cfc444f16dfd46ab51df66551f0e0751d6a97492be4c9c40 SHA512 44725be175e1e933ae4b5dbe8e17836ee60fe734daba641cceb6f63bfbecec486a722c07394beba6749464b1d1f0efc13a2f0f90365c9102f4eb0923888535ab
 AUX nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch 1325 BLAKE2B c128966b1ea2a73c6957cf53b447a20ff142c277337a74421065e1f77c1de74cac5cbed7c192064fc6c45205e562003a7152e39df7438a1583418625607fc2bc SHA512 5625e3e78e7700bcbb589c734d47b91ebe39315994bd422766ad9100405c36d930ad031be5cf80de6bb4d9914db5fe553ee658daf5a2e66e79d517c0a6d9ad32
 DIST nss-3.90.2.tar.gz 72215444 BLAKE2B 74b8eebf5f053dcebd9c6e6ef17c6113ac42a01f910f4ba621dadb09739d5a6090d022800d2c3a4bc0c58413f03512ca611ead1098488d303f1ee1e4bca5c222 SHA512 048a0c0a06fef8cd9c363ac511b9d6125ec131a306c5e093525a937f9e8740f1a2163f274c9a3907ed38331b2fb99b22b528b5e89da1e186c9ba9473d959ef4a
 DIST nss-3.99.tar.gz 76753982 BLAKE2B b6ce605232934644b6d80682615eac2fa171078fcdd75316ab2accc55caeaed5b548f16c2cef5cefcfb37b96a4d6eb918785be3aa195a561e46d2d3fd8fa217b SHA512 8ae032f3cb8eadfe524505d20e430b90ed25af2b4732b2cf286c435b0fcd5701d2f5c48bd2cfb3f9aa0bfdf503c1f3d5394cf34f860f51a1141cc4a7586bba32
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
+EBUILD nss-3.90.2-r1.ebuild 11705 BLAKE2B cf8738b38638de75f8894a23753868a179c192624380acf063d57c6e87e112878f6175740f4890cceddea405707ee99b7311d9c5ddf7f8dea19fea800ccfb949 SHA512 fbf24b47ba3eb842d02cfe5d588e692899b834306aad77daaccca03330f586ce80ad4862c59b75e656d7aa6aa8ae128e17fa4731e7f79d04944fba1a3f4a57a8
 EBUILD nss-3.90.2.ebuild 11641 BLAKE2B acd00f630641008af848c854f7868fa4a0496bdaa6afd438cdcc9dd67b6baa44479132a6ffdb387cf5585d272ef4b4f850b0043a2104f17a624463e6ecaeb8db SHA512 1577699e91a6dbf0e3c3887647b0a2677471d2b6efbc3b3a095f6959c24551f2b785d375fd8f04342d8ac07f0ca541fd6f050097c3a4386054a3514c4a970376
 EBUILD nss-3.99.ebuild 11566 BLAKE2B b7640451c4426a43224e72afe53a494cf795be550933b3586c729155ae2d0dc42bcdee3930ac0f594c6ef4e807f8112f43c149232047d6522453d66196de7ed4 SHA512 311f94bd3925e163af2a852503fc09ccc57f9d3a68c0bd6357f2149f09bbe8acdd118df57f88e2fdf6af6a8f6da591a16ad0ed495fab7716929c4bf3185cc753
 MISC metadata.xml 603 BLAKE2B 74c5a84f8a860b6a43731ed83cd40373187236de7add14ca33f3417eb0cfc165aa5df5308dca14b4664bcfe453e0f328988df4459af5781da4cbcb7bfc00e93d SHA512 9d7fb0be71d18ad1da440de047f4430bd3b50a8584d8dccd43e5e4cdf050f5c5cfeb34cd82ea617f2419ff092908becd1508eb7efcf54f3cca8c7f36af9517bb
diff --git a/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch b/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
new file mode 100644
index 000000000000..d883db8181d1
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
@@ -0,0 +1,78 @@
+# HG changeset patch
+# User Natalia Kulatova <nkulatova@mozilla.com>
+# Date 1687519432 0
+#      Fri Jun 23 11:23:52 2023 +0000
+# Node ID 653f4c1b58425219c0e9c005d555994a3fe1fa72
+# Parent  f095bf91ffaa273ea38ca6df34c905e5442de012
+Bug 1836925 - Removing the support of Curve25519 r=bbeurdouche,nss-reviewers
+
+Differential Revision: https://phabricator.services.mozilla.com/D180068
+
+diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/Makefile
+--- a/lib/freebl/Makefile	Fri Jun 23 08:56:27 2023 +0000
++++ b/lib/freebl/Makefile	Fri Jun 23 11:23:52 2023 +0000
+@@ -568,9 +568,6 @@
+             HAVE_INT128_SUPPORT = 1
+             DEFINES += -DHAVE_INT128_SUPPORT
+     else ifeq (1,$(CC_IS_GCC))
+-        ifeq ($(CPU_ARCH),x86_64)
+-            SUPPORTS_VALE_CURVE25519 = 1
+-        endif
+         ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
+             HAVE_INT128_SUPPORT = 1
+             DEFINES += -DHAVE_INT128_SUPPORT
+@@ -595,11 +592,6 @@
+     DEFINES += -DKRML_VERIFIED_UINT128
+ endif
+ 
+-ifdef SUPPORTS_VALE_CURVE25519
+-    VERIFIED_SRCS += Hacl_Curve25519_64.c
+-    DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
+-endif
+-
+ ifndef NSS_DISABLE_CHACHAPOLY
+     ifeq ($(CPU_ARCH),x86_64)
+         ifndef NSS_DISABLE_AVX2
+diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl.gyp
+--- a/lib/freebl/freebl.gyp	Fri Jun 23 08:56:27 2023 +0000
++++ b/lib/freebl/freebl.gyp	Fri Jun 23 11:23:52 2023 +0000
+@@ -866,12 +866,6 @@
+           }],
+         ],
+       }],
+-      [ 'supports_vale_curve25519==1', {
+-        'defines': [
+-          # The Makefile does version-tests on GCC, but we're not doing that here.
+-          'HACL_CAN_COMPILE_INLINE_ASM',
+-        ],
+-      }],
+       [ 'OS=="linux" or OS=="android"', {
+         'conditions': [
+           [ 'target_arch=="x64"', {
+@@ -934,11 +928,6 @@
+   'variables': {
+     'module': 'nss',
+     'conditions': [
+-      [ 'target_arch=="x64" and cc_is_gcc==1', {
+-        'supports_vale_curve25519%': 1,
+-      }, {
+-        'supports_vale_curve25519%': 0,
+-      }],
+       [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
+         'have_int128_support%': 1,
+       }, {
+diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl_base.gypi
+--- a/lib/freebl/freebl_base.gypi	Fri Jun 23 08:56:27 2023 +0000
++++ b/lib/freebl/freebl_base.gypi	Fri Jun 23 11:23:52 2023 +0000
+@@ -154,11 +154,6 @@
+         'ecl/curve25519_32.c',
+       ],
+     }],
+-    ['supports_vale_curve25519==1', {
+-      'sources': [
+-        'verified/Hacl_Curve25519_64.c',
+-      ],
+-    }],
+     ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {
+       'sources': [
+         # Gyp does not support per-file cflags, so working around like this.
diff --git a/dev-libs/nss/nss-3.90.2-r1.ebuild b/dev-libs/nss/nss-3.90.2-r1.ebuild
new file mode 100644
index 000000000000..96f5c85ed19b
--- /dev/null
+++ b/dev-libs/nss/nss-3.90.2-r1.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.35"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch
+	"${FILESDIR}"/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
+	"${FILESDIR}"/nss-3.90-remove-support-of-curve25519.patch
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069
+	sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die
+
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	# TODO: Port this to toolchain-funcs tc-get-ptr-size/tc-get-build-ptr-size
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -fno-lto -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file -S "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+		disable_ckbi=0
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
+	# Include exportable custom settings defined by users, #900915
+	# Two examples uses:
+	#   EXTRA_NSSCONF="MYONESWITCH=1"
+	#   EXTRA_NSSCONF="MYVALUE=0 MYOTHERVALUE=1 MYTHIRDVALUE=1"
+	# e.g.
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0"
+	# or
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0 NSS_ENABLE_WERROR=1"
+	# etc.
+	if [[ -n "${EXTRA_NSSCONF}" ]]; then
+		ewarn "EXTRA_NSSCONF applied, please disable custom settings before reporting bugs."
+		read -a myextranssconf <<< "${EXTRA_NSSCONF}"
+
+		for (( i=0; i<${#myextranssconf[@]}; i++ )); do
+			export "${myextranssconf[$i]}"
+			echo "exported ${myextranssconf[$i]}"
+		done
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	use cpu_flags_x86_avx2 || export NSS_DISABLE_AVX2=1
+	use cpu_flags_x86_sse3 || export NSS_DISABLE_SSE3=1
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+			${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "30-45+ minutes per lib configuration. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	# Only run the standard cycle instead of full, reducing testing time from 45 minutes to 15
+	# per lib implementation.
+	export NSS_CYCLES=standard
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index aed8e9f0f7a5..46161b2f09e6 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -2,5 +2,5 @@ AUX openct-0.6.20-automake.patch 786 BLAKE2B f37d39bdbc0c1db10ec7058536d0d34ac30
 AUX openct-0.6.20-slibtool.patch 1353 BLAKE2B b8a5747258cb7d5ac8bacda87c9eaf2f177e202490c162594aec6559f13c65e562b887e6c8d056c1ce5ab247e80c51ca6610654e61b2c593e7b13e22e458b43a SHA512 34ab2345b44424d9868c95a9af862d03603647b824e1d84a1f35a8171249b2beba7fae9ae3a4d0468d9029cf6c748c02fb2032e30462640eb42ff08d3cdd3868
 AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
-EBUILD openct-0.6.20-r5.ebuild 1922 BLAKE2B d55c705f9de0b11773aa59339b9700b54cd01c8fcf78e370cfae5e624357bb38e84e20cd16432cb2f82229d790b116a82231a42cb9dbf61343b226f159d4dec2 SHA512 242deb5811a29020a0bfe871eadb419538ea9432e45015bb3b2620bbc789972fd470a1983fec7d6c5a52314de406826855fa2da686a85f5a7e0b2c5066ec61a7
+EBUILD openct-0.6.20-r5.ebuild 1921 BLAKE2B 2a4336d43813d09923fe4d37a8bd01cebde233809197536c977f44ac6c83a371e0101ebaff43037998b487ac0fa7384861b498bbd333f61d56a8dcaf37adb050 SHA512 70b73d17fe8258e376c817dd04af9935fb76ed798cdd621f569652c88fd76f39b0c533f3037a80833772421f55450257e4904133970df34c7795add8f47d1ce2
 MISC metadata.xml 560 BLAKE2B 255522c34b5e1d9bf69da73ff2ab70a1df6703acab0e703c752bf6d03312d2b58974b08aede380deed3250025a21592e99cbd399cab8813d943b091042d597f7 SHA512 6abe85fb17bca4935dc62b3f1a55e4c54f7bc39c5d8ab43fd7081b6e5bbe5690551a8a04a9824a541f70833d652d0c4958ba35df32ec91b33e0ffe775d3cb26f
diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild
index c26193b88277..bcc0ae168c43 100644
--- a/dev-libs/openct/openct-0.6.20-r5.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 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="doc debug pcsc-lite selinux usb"
 
 DEPEND="
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index a86924a082e3..e10667f4cd91 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -2,7 +2,7 @@ AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f92
 DIST opensc-0.24.0.tar.gz 2440952 BLAKE2B afacdd151d169dd1840ecd6df1cec99a9805598d7b7af81e17b648f146cd1b3ad1d3dcae19ed94cf8ce0dbbd5b4285af9653af5ef5739d53908ce30a49544adb SHA512 0fd2ea858874ae0b85c8fe8c4b920988693a47ca95b26449a1e95f86e17b76000f236c1f75d63ee133306e01a965155da5e14c1b8a59053b85026ecb58fb97bb
 DIST opensc-0.25.0.tar.gz 2406137 BLAKE2B 07c7de7fa1c258a90b1acbfbc01383f204ad88169ae1d3681f240e881ab80652dc9b04ba452a433576847caa5ef49d35608b3f895e965fec9e79da231ecabab2 SHA512 c220607a543b1fcf7c89e051e7c7ca3908abab6c022818b01a6219becdbad217708fb3c5fe2fe2218ac82be0f174c5694e5fa07c6e0ae540cf3171462a23eee6
 EBUILD opensc-0.24.0.ebuild 1875 BLAKE2B 9b20b04338f11a4d83b44440162afaefd9289e6cce39e4d4e500cc9a0f9e61182aa117c5386d890456c1e50422fe0e3cc4ba1dd6172a4345247e2e5ef536d4ab SHA512 d75bd4cd69a41338e0616e6a31e8e19d435ee42c0bd03ad595bcd186c765e1ead02e51b49679fae625e7a6bcab402c33f44192ce2f97216fcd3d7e13a51527fa
-EBUILD opensc-0.25.0-r1.ebuild 2273 BLAKE2B 08a5e3940697eb075f46f4385dc938f30d2640c57be217a582657f89c43af6dc772e1a0efa36e4d0ee2e9ff1e2af5fba8589d8c5788683dd8efab70b1911962f SHA512 e3bf31074540b125348932a7a2ff20e70879bafcc0301bfeed2e573caa496f0a1954d0f3e8ac3b3ab7f72129d7933c2405af5d867e21016604bf6a66764f4caf
+EBUILD opensc-0.25.0-r1.ebuild 2268 BLAKE2B 6d789832c24989be4c788552626af693b255acc3544b877514eb2ffb22682073a930a0fc9c5e29a6b29142ba7bef21b0704e36714c5d1397435d39757eab54f1 SHA512 cde5fcfa177484f03dac639e6ebc0241784cb872bcd69b759cc537a40c293df274f349cd1c2c4b77a1732a472cee9da0c2dbe99c791701ccb79f771f48f963b8
 EBUILD opensc-0.25.0.ebuild 1881 BLAKE2B 89d86dedc8fdc230ec8fd44c45d02064aae594c91f2194d8a170948a8887be23802af5b642367990969c640c08404958823caeccf1bb521f46afaf1c0122e573 SHA512 28d35731a06304a80abc7496c35326918397b8125c1ba0006a49ed532710a9a4bd1ff1e11bb75779961273910088e5cd83ab300168765deab56022a9d9638980
 EBUILD opensc-9999.ebuild 2266 BLAKE2B dfc9b021c2da06edd14aa6e8ef8ffffee2a8838fd7d55e6eb7e0b2420d5bc5799a7710e8e19982e1fada5eb03ad1ff848c9ef284617d583b0447801d19e32d1c SHA512 2715f9099109ecd1494b511cbd475b4ea03488d38e8ad2f84832a1cb50516c6bff1f339fa227471f4cf4532a65987ee76adfc6df4f830fb1f3055e409361d28d
 MISC metadata.xml 1305 BLAKE2B 8560829a2784e38e10b41f5e083568a7fafd19e9fe185b1675c787b2514ea01a18b3fa6c7d0018b6e45638512d02e9bec12fbc5df4e50bf49db6558ef89a9af8 SHA512 8b477d96f6acb7a808e24af1d4b29e16e06b83eaf29799dbc6b74181ded74de47d7527712e21412bfb92a26e1d03974368a2c1790208785230280a18d21aff06
diff --git a/dev-libs/opensc/opensc-0.25.0-r1.ebuild b/dev-libs/opensc/opensc-0.25.0-r1.ebuild
index 5fbac563e07a..cd1b22fb2bc5 100644
--- a/dev-libs/opensc/opensc-0.25.0-r1.ebuild
+++ b/dev-libs/opensc/opensc-0.25.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git"
 else
 	SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 679deb59c440..37f223c26bad 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -2,7 +2,11 @@ AUX gentoo.config-1.0.2 5302 BLAKE2B b699533ed86c48c0d033092b4d901de837a6a495113
 AUX gentoo.config-1.0.4 6038 BLAKE2B e2fd6b073cc6be3fa312a73cf031140e3f91eafe432212f8b24795297fdd0a4090d605fcfcbc59df6cc9f659a3dcd0e56df8eb734aa117d5e1f4fe78b4063f8c SHA512 df7c9944b993536df7ff8cd5159ba1534b122fb1db946890e7b25b10596c9259e569e0e3a5fe854726ac8302eb9804edb7af344386b146146d862596175d5ca2
 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.13-CVE-2024-2511.patch 5256 BLAKE2B 6e07983af20fe00c448deb45777e67d18ff844309edb2a2130f9e916c0c7167c7f64c64abc3c8082121a96e7a13e6b1b3bfb4de25674ab9db71a8dbb3ce61d2a SHA512 9c762f2c5916b2e2c49bee56cf92d695b106eb535badb5818b77cd72f3ad6554ef24d58c0a161843821984c1d5d697757f72919f2d7903f8e15d8a541534b32f
+AUX openssl-3.0.13-p11-segfault.patch 2275 BLAKE2B 842cc10d6a81b2859729b0024dd82e538782defb2e3fa341986df6ed65c9e5b3be39647a7d95670356cd0f7bc2a5e0b27eb48d00078308922a32d2053a6c1756 SHA512 4575da2d5acfef90c7d28e096d541a812f74b4ff77887a7a251554d35ca5b9de1ac4117b9f8228ab240e8f64770d648dfadc7003a496d2b051728afab1ec779e
+AUX openssl-3.1.5-CVE-2024-2511.patch 5116 BLAKE2B f0c19c5d75636ae757c4fd8ef603817ea3c6d5e9f0df0a494b3f679999fcc9e3382959477ddd9945ee3fd795ba8d4e5b5f8b0c68416d96673cb49c2154c3fb53 SHA512 bf7825185b054f3d2fcd90573687cdce395e2f840a82daf0ce1c9d2e11b991582ff5478dc9aed3152dd6892a7e401274c7fc38d6e53e81e42cb7c471737078e3
 AUX openssl-3.1.5-p11-segfault.patch 2274 BLAKE2B 6a283f0ab89386435272b096893ec1835557c15a699d7579f12d33b95c692abb50bd03289d01ccd85dd56058931f5b0d55320d36cfe0a824521fde2218bba734 SHA512 9d9810f0d8b9163fa8fa58c6e47db47dbe392236ed6990e246185e10bc9e7af44007cc8cb7973706480b41a84e3479aefdcaf9b95f0ac041aaf88eb8c078a725
+AUX openssl-3.2.1-CVE-2024-2511.patch 5166 BLAKE2B 22ebed2ada20ee5c65d489677d270c079940b401582e3ff2dc06222b7a95084e81730dc78a154d98c72c64db237e4c63d5dee653aaf2821779c2729d0fe29833 SHA512 7ec3f0a127ea8f507a6292ac3f56d413e0df552d11795e4421db023516aaa1b1bb6e419b2b85c6940eb26b7ca93ad36a7e87cf2ef2e577e6ea094e2d191fd597
 AUX openssl-3.2.1-p11-segfault.patch 2275 BLAKE2B d47816615ece0d015be0a307db950cee1217a522570040a48b9a9a7f7a23927f73ba5633718937c07c90c9a49564e9acc00de239d156cf8632b473afcdba8705 SHA512 9ab62a72036f8fbae34e844e6b17ab3482259de24918279230c2e5daa373de8ee59bd17942c2f4b2dcf06b1bf31796dc539324055e1cded099f6d8630bc13fff
 AUX openssl-3.2.1-riscv.patch 3713 BLAKE2B 427a35e30768116b7d65f442c4b2b5ddf6cc7387dc69ec7311345336a59bb86984b45e5572bab67fecf159580b2321aec35db9c6306b74c2d76db51479d910b8 SHA512 e80a244e9674cbd250244aab16501ea5ab6a03efb44ea744ac109063dda003cc638d0eb6da4630f1c1d7eeabbbc14530b21e3c74608ac961141133b09f4795af
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
@@ -24,7 +28,11 @@ EBUILD openssl-1.0.2u-r1.ebuild 10129 BLAKE2B fe03657452c1218e9ed6fff4b939ae5a1b
 EBUILD openssl-1.1.1w.ebuild 8233 BLAKE2B 4657e3e413f25f4503dbc5484e3d06e63c25c64f9132e3ce64629601f729380b6e1918d34f19e9269ac8ed066b2014d2163d54808e67476d033b2af1603cf609 SHA512 122f5d3e3577d9da17d0a49b38925d3fbbaab4117c116f37d0430463d5dcaa3803089cacbc5fddbc5466506eb6a59f1b5fef130dec200c5951f67d9d6c5b160b
 EBUILD openssl-3.0.11.ebuild 8719 BLAKE2B fa28b31cc2f72147114cdc89b4253603855bd6cdf93b62a124caaff88f927412fdd1811e50ca35adb9885fa3fccb53203a46f231479373047fbd0fe709c8e228 SHA512 b5a46310bc8a5e842cca20c7755494fa6ff1d63eab24efbad516362cd68dce74380790050143beee437808fd724a41f323e04f4815833f6ea535c8022bc12162
 EBUILD openssl-3.0.12.ebuild 8719 BLAKE2B fa28b31cc2f72147114cdc89b4253603855bd6cdf93b62a124caaff88f927412fdd1811e50ca35adb9885fa3fccb53203a46f231479373047fbd0fe709c8e228 SHA512 b5a46310bc8a5e842cca20c7755494fa6ff1d63eab24efbad516362cd68dce74380790050143beee437808fd724a41f323e04f4815833f6ea535c8022bc12162
+EBUILD openssl-3.0.13-r1.ebuild 8556 BLAKE2B 5e6b7dd5cd4a4ddba9e894281d5aab747360774fc2f588d9c026bc01fa850b8ae682f867d32484c206d35e67b19744accc2f090845e586088e106139df3cff02 SHA512 865c22ec6db34e4f7249828bcdfe1cb677ae435fcd50a4007905f4f72b84a4dc0dfd4a039d2d0d1945cd1e8220613b8e4946135f8e918a2619eb9209b5b911ec
+EBUILD openssl-3.0.13-r2.ebuild 8587 BLAKE2B 39161a29ee357f55dcc2bea45f9733bee32887e0531041fc08deb5fa4db369f3c034883079bb8467f6e8b419a826f37a97c31e79ce88b8f7ce2fdbb430cebe70 SHA512 d9bd754555cbe1ecb987739b8ef47aeca159e620d4fb517e0ca7205e8bf71411970b2ad5092f272bd5c87cb01e3489ba95c2cc3a0bbb58e5c11e697b90ed0008
 EBUILD openssl-3.0.13.ebuild 8487 BLAKE2B f59e012d00584a3d17b51dd8ce6a1e0e77071fbc9a4144f604314e19e8cc57addcc32d12f2d4c03eda2b1e9c8023ad629ca27369f0d7b6d9983d092d53dbf6d7 SHA512 7ccae792fdaae34aec986e59630d64e5dc4ba2916b37093c95dc4649a2d314e701f38018f79c4e10af7eab5a809fa7dbfd1b35ae49bef74327804c6d00170267
 EBUILD openssl-3.1.5-r1.ebuild 8586 BLAKE2B c22d038b5af42c19389048b43618e3aad090062a8b5ca78eccf3572714d5d2469c1535ea3c4801241d313bf508191448dfa7e8bb52efc24f82523d1fc5273f85 SHA512 fa711d41776c086f9b31001143730e7f8524a41f6272d9df11fe7315c666113b8ba817fbaed7cd85482275014112e8f6a95213f0078531b2bd6a9f503c3f96a1
+EBUILD openssl-3.1.5-r2.ebuild 8626 BLAKE2B ae09c41b277f416c8ad0180384fc3fbe7cee002e180ebb4817b6b4b2562a3b4782fe2e9240a275aff8c1a34d22160485dc1e6bac4a03546a3859d454a20b7cae SHA512 d7d687dd36f5839ac75c616f454fb8192d9826057638db17b6ea63dee11da6b5449d89d1a0cf47e0e67a98f51a5a46ca368770e0f03e3d77ce0642b1627d8d5b
 EBUILD openssl-3.2.1-r1.ebuild 9305 BLAKE2B 9be044f9fd88230cf5bcfaca16458bcdbb9abc2ad6d66f56ebbc1dd74a2bfcf17dd43d1ca713be1e07bc99f775f620b214fcee5f46ab7a1d2bc1b80778bddb50 SHA512 829c77aecfa5acc0949fd481be6297ec0ecf1d12d2e65846ca75436bef359cb96b1617ed8acb60b2a665da80de31b971614221a9000a3e8e5c8954c50c89d22c
+EBUILD openssl-3.2.1-r2.ebuild 9345 BLAKE2B d40d084b65cb98d5924961c8c9b9aa7f33243af5a6aa20cd57dc6bd6599653b910a6dae9f88b55e7ba1086b0f45d81b3ba80d1613f4966d7912a2807ac8a14a6 SHA512 3a46af388ec9b7226d85f5eeaa9e3af8c46c1f3e0fb1daa16166aff56febf81cdb68102f1b08ee70dbfb59db753b195eeef11c739adf1008e91d26938adc64a2
 MISC metadata.xml 1566 BLAKE2B ae4515c90356b8a2d3e2df8e0cea43c587f73bd2e08f696c065c2254639009b6806806df8a84c63d00781b0cbf906a0d11e94b715749ab1292e77afa9cd5bcc2 SHA512 4a5e6b894476e74f1f93f00c326139eadf1afd498f4508fb723322539f29e53aec6dd198da878db714d2da61ab266089c2dd2f91b9fc66a34375ceb6f68ca394
diff --git a/dev-libs/openssl/files/openssl-3.0.13-CVE-2024-2511.patch b/dev-libs/openssl/files/openssl-3.0.13-CVE-2024-2511.patch
new file mode 100644
index 000000000000..fff4fb72837b
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.0.13-CVE-2024-2511.patch
@@ -0,0 +1,141 @@
+https://www.openssl.org/news/secadv/20240408.txt
+https://bugs.gentoo.org/930047
+https://github.com/openssl/openssl/commit/b52867a9f618bb955bed2a3ce3db4d4f97ed8e5d
+https://github.com/openssl/openssl/commit/cc9ece9118eeacccc3571c2ee852f8ba067d0607
+
+From b52867a9f618bb955bed2a3ce3db4d4f97ed8e5d Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Tue, 5 Mar 2024 15:43:53 +0000
+Subject: [PATCH] Fix unconstrained session cache growth in TLSv1.3
+
+In TLSv1.3 we create a new session object for each ticket that we send.
+We do this by duplicating the original session. If SSL_OP_NO_TICKET is in
+use then the new session will be added to the session cache. However, if
+early data is not in use (and therefore anti-replay protection is being
+used), then multiple threads could be resuming from the same session
+simultaneously. If this happens and a problem occurs on one of the threads,
+then the original session object could be marked as not_resumable. When we
+duplicate the session object this not_resumable status gets copied into the
+new session object. The new session object is then added to the session
+cache even though it is not_resumable.
+
+Subsequently, another bug means that the session_id_length is set to 0 for
+sessions that are marked as not_resumable - even though that session is
+still in the cache. Once this happens the session can never be removed from
+the cache. When that object gets to be the session cache tail object the
+cache never shrinks again and grows indefinitely.
+
+CVE-2024-2511
+
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24044)
+
+(cherry picked from commit 7e4d731b1c07201ad9374c1cd9ac5263bdf35bce)
+--- a/ssl/ssl_lib.c
++++ b/ssl/ssl_lib.c
+@@ -3736,9 +3736,10 @@ void ssl_update_cache(SSL *s, int mode)
+ 
+     /*
+      * If the session_id_length is 0, we are not supposed to cache it, and it
+-     * would be rather hard to do anyway :-)
++     * would be rather hard to do anyway :-). Also if the session has already
++     * been marked as not_resumable we should not cache it for later reuse.
+      */
+-    if (s->session->session_id_length == 0)
++    if (s->session->session_id_length == 0 || s->session->not_resumable)
+         return;
+ 
+     /*
+--- a/ssl/ssl_sess.c
++++ b/ssl/ssl_sess.c
+@@ -152,16 +152,11 @@ SSL_SESSION *SSL_SESSION_new(void)
+     return ss;
+ }
+ 
+-SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src)
+-{
+-    return ssl_session_dup(src, 1);
+-}
+-
+ /*
+  * Create a new SSL_SESSION and duplicate the contents of |src| into it. If
+  * ticket == 0 then no ticket information is duplicated, otherwise it is.
+  */
+-SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
++static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket)
+ {
+     SSL_SESSION *dest;
+ 
+@@ -285,6 +280,27 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
+     return NULL;
+ }
+ 
++SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src)
++{
++    return ssl_session_dup_intern(src, 1);
++}
++
++/*
++ * Used internally when duplicating a session which might be already shared.
++ * We will have resumed the original session. Subsequently we might have marked
++ * it as non-resumable (e.g. in another thread) - but this copy should be ok to
++ * resume from.
++ */
++SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
++{
++    SSL_SESSION *sess = ssl_session_dup_intern(src, ticket);
++
++    if (sess != NULL)
++        sess->not_resumable = 0;
++
++    return sess;
++}
++
+ const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len)
+ {
+     if (len)
+--- a/ssl/statem/statem_srvr.c
++++ b/ssl/statem/statem_srvr.c
+@@ -2338,9 +2338,8 @@ int tls_construct_server_hello(SSL *s, WPACKET *pkt)
+      * so the following won't overwrite an ID that we're supposed
+      * to send back.
+      */
+-    if (s->session->not_resumable ||
+-        (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER)
+-         && !s->hit))
++    if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER)
++            && !s->hit)
+         s->session->session_id_length = 0;
+ 
+     if (usetls13) {
+
+From cc9ece9118eeacccc3571c2ee852f8ba067d0607 Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Fri, 15 Mar 2024 17:58:42 +0000
+Subject: [PATCH] Hardening around not_resumable sessions
+
+Make sure we can't inadvertently use a not_resumable session
+
+Related to CVE-2024-2511
+
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24044)
+
+(cherry picked from commit c342f4b8bd2d0b375b0e22337057c2eab47d9b96)
+--- a/ssl/ssl_sess.c
++++ b/ssl/ssl_sess.c
+@@ -531,6 +531,12 @@ SSL_SESSION *lookup_sess_in_cache(SSL *s, const unsigned char *sess_id,
+         ret = s->session_ctx->get_session_cb(s, sess_id, sess_id_len, &copy);
+ 
+         if (ret != NULL) {
++            if (ret->not_resumable) {
++                /* If its not resumable then ignore this session */
++                if (!copy)
++                    SSL_SESSION_free(ret);
++                return NULL;
++            }
+             ssl_tsan_counter(s->session_ctx,
+                              &s->session_ctx->stats.sess_cb_hit);
+ 
diff --git a/dev-libs/openssl/files/openssl-3.0.13-p11-segfault.patch b/dev-libs/openssl/files/openssl-3.0.13-p11-segfault.patch
new file mode 100644
index 000000000000..73b131ab7928
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.0.13-p11-segfault.patch
@@ -0,0 +1,79 @@
+https://bugs.gentoo.org/916328
+https://github.com/opendnssec/SoftHSMv2/issues/729
+https://github.com/openssl/openssl/issues/22508
+https://github.com/openssl/openssl/commit/ad6cbe4b7f57a783a66a7ae883ea0d35ef5f82b6
+
+From ad6cbe4b7f57a783a66a7ae883ea0d35ef5f82b6 Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tomas@openssl.org>
+Date: Fri, 15 Dec 2023 13:45:50 +0100
+Subject: [PATCH] Revert "Improved detection of engine-provided private
+ "classic" keys"
+
+This reverts commit 2b74e75331a27fc89cad9c8ea6a26c70019300b5.
+
+The commit was wrong. With 3.x versions the engines must be themselves
+responsible for creating their EVP_PKEYs in a way that they are treated
+as legacy - either by using the respective set1 calls or by setting
+non-default EVP_PKEY_METHOD.
+
+The workaround has caused more problems than it solved.
+
+Fixes #22945
+
+Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/23063)
+
+(cherry picked from commit 39ea78379826fa98e8dc8c0d2b07e2c17cd68380)
+--- a/crypto/engine/eng_pkey.c
++++ b/crypto/engine/eng_pkey.c
+@@ -79,48 +79,6 @@ EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
+         ERR_raise(ERR_LIB_ENGINE, ENGINE_R_FAILED_LOADING_PRIVATE_KEY);
+         return NULL;
+     }
+-    /* We enforce check for legacy key */
+-    switch (EVP_PKEY_get_id(pkey)) {
+-    case EVP_PKEY_RSA:
+-        {
+-        RSA *rsa = EVP_PKEY_get1_RSA(pkey);
+-        EVP_PKEY_set1_RSA(pkey, rsa);
+-        RSA_free(rsa);
+-        }
+-        break;
+-#  ifndef OPENSSL_NO_EC
+-    case EVP_PKEY_SM2:
+-    case EVP_PKEY_EC:
+-        {
+-        EC_KEY *ec = EVP_PKEY_get1_EC_KEY(pkey);
+-        EVP_PKEY_set1_EC_KEY(pkey, ec);
+-        EC_KEY_free(ec);
+-        }
+-        break;
+-#  endif
+-#  ifndef OPENSSL_NO_DSA
+-    case EVP_PKEY_DSA:
+-        {
+-        DSA *dsa = EVP_PKEY_get1_DSA(pkey);
+-        EVP_PKEY_set1_DSA(pkey, dsa);
+-        DSA_free(dsa);
+-        }
+-        break;
+-#endif
+-#  ifndef OPENSSL_NO_DH
+-    case EVP_PKEY_DH:
+-        {
+-        DH *dh = EVP_PKEY_get1_DH(pkey);
+-        EVP_PKEY_set1_DH(pkey, dh);
+-        DH_free(dh);
+-        }
+-        break;
+-#endif
+-    default:
+-        /*Do nothing */
+-        break;
+-    }
+-
+     return pkey;
+ }
+ 
+
diff --git a/dev-libs/openssl/files/openssl-3.1.5-CVE-2024-2511.patch b/dev-libs/openssl/files/openssl-3.1.5-CVE-2024-2511.patch
new file mode 100644
index 000000000000..c5b7dfe449f7
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.1.5-CVE-2024-2511.patch
@@ -0,0 +1,137 @@
+https://www.openssl.org/news/secadv/20240408.txt
+https://bugs.gentoo.org/930047
+https://github.com/openssl/openssl/commit/7e4d731b1c07201ad9374c1cd9ac5263bdf35bce
+https://github.com/openssl/openssl/commit/c342f4b8bd2d0b375b0e22337057c2eab47d9b96
+
+From 7e4d731b1c07201ad9374c1cd9ac5263bdf35bce Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Tue, 5 Mar 2024 15:43:53 +0000
+Subject: [PATCH] Fix unconstrained session cache growth in TLSv1.3
+
+In TLSv1.3 we create a new session object for each ticket that we send.
+We do this by duplicating the original session. If SSL_OP_NO_TICKET is in
+use then the new session will be added to the session cache. However, if
+early data is not in use (and therefore anti-replay protection is being
+used), then multiple threads could be resuming from the same session
+simultaneously. If this happens and a problem occurs on one of the threads,
+then the original session object could be marked as not_resumable. When we
+duplicate the session object this not_resumable status gets copied into the
+new session object. The new session object is then added to the session
+cache even though it is not_resumable.
+
+Subsequently, another bug means that the session_id_length is set to 0 for
+sessions that are marked as not_resumable - even though that session is
+still in the cache. Once this happens the session can never be removed from
+the cache. When that object gets to be the session cache tail object the
+cache never shrinks again and grows indefinitely.
+
+CVE-2024-2511
+
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24044)
+--- a/ssl/ssl_lib.c
++++ b/ssl/ssl_lib.c
+@@ -3737,9 +3737,10 @@ void ssl_update_cache(SSL *s, int mode)
+ 
+     /*
+      * If the session_id_length is 0, we are not supposed to cache it, and it
+-     * would be rather hard to do anyway :-)
++     * would be rather hard to do anyway :-). Also if the session has already
++     * been marked as not_resumable we should not cache it for later reuse.
+      */
+-    if (s->session->session_id_length == 0)
++    if (s->session->session_id_length == 0 || s->session->not_resumable)
+         return;
+ 
+     /*
+--- a/ssl/ssl_sess.c
++++ b/ssl/ssl_sess.c
+@@ -154,16 +154,11 @@ SSL_SESSION *SSL_SESSION_new(void)
+     return ss;
+ }
+ 
+-SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src)
+-{
+-    return ssl_session_dup(src, 1);
+-}
+-
+ /*
+  * Create a new SSL_SESSION and duplicate the contents of |src| into it. If
+  * ticket == 0 then no ticket information is duplicated, otherwise it is.
+  */
+-SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
++static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket)
+ {
+     SSL_SESSION *dest;
+ 
+@@ -287,6 +282,27 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
+     return NULL;
+ }
+ 
++SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src)
++{
++    return ssl_session_dup_intern(src, 1);
++}
++
++/*
++ * Used internally when duplicating a session which might be already shared.
++ * We will have resumed the original session. Subsequently we might have marked
++ * it as non-resumable (e.g. in another thread) - but this copy should be ok to
++ * resume from.
++ */
++SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
++{
++    SSL_SESSION *sess = ssl_session_dup_intern(src, ticket);
++
++    if (sess != NULL)
++        sess->not_resumable = 0;
++
++    return sess;
++}
++
+ const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len)
+ {
+     if (len)
+--- a/ssl/statem/statem_srvr.c
++++ b/ssl/statem/statem_srvr.c
+@@ -2338,9 +2338,8 @@ int tls_construct_server_hello(SSL *s, WPACKET *pkt)
+      * so the following won't overwrite an ID that we're supposed
+      * to send back.
+      */
+-    if (s->session->not_resumable ||
+-        (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER)
+-         && !s->hit))
++    if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER)
++            && !s->hit)
+         s->session->session_id_length = 0;
+ 
+     if (usetls13) {
+
+From c342f4b8bd2d0b375b0e22337057c2eab47d9b96 Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Fri, 15 Mar 2024 17:58:42 +0000
+Subject: [PATCH] Hardening around not_resumable sessions
+
+Make sure we can't inadvertently use a not_resumable session
+
+Related to CVE-2024-2511
+
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24044)
+--- a/ssl/ssl_sess.c
++++ b/ssl/ssl_sess.c
+@@ -533,6 +533,12 @@ SSL_SESSION *lookup_sess_in_cache(SSL *s, const unsigned char *sess_id,
+         ret = s->session_ctx->get_session_cb(s, sess_id, sess_id_len, &copy);
+ 
+         if (ret != NULL) {
++            if (ret->not_resumable) {
++                /* If its not resumable then ignore this session */
++                if (!copy)
++                    SSL_SESSION_free(ret);
++                return NULL;
++            }
+             ssl_tsan_counter(s->session_ctx,
+                              &s->session_ctx->stats.sess_cb_hit);
+ 
diff --git a/dev-libs/openssl/files/openssl-3.2.1-CVE-2024-2511.patch b/dev-libs/openssl/files/openssl-3.2.1-CVE-2024-2511.patch
new file mode 100644
index 000000000000..d5b40447d745
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.2.1-CVE-2024-2511.patch
@@ -0,0 +1,137 @@
+https://www.openssl.org/news/secadv/20240408.txt
+https://bugs.gentoo.org/930047
+https://github.com/openssl/openssl/commit/e9d7083e241670332e0443da0f0d4ffb52829f08
+https://github.com/openssl/openssl/commit/4d67109432646c113887b0aa8091fb0d1b3057e6
+
+From e9d7083e241670332e0443da0f0d4ffb52829f08 Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Tue, 5 Mar 2024 15:43:53 +0000
+Subject: [PATCH] Fix unconstrained session cache growth in TLSv1.3
+
+In TLSv1.3 we create a new session object for each ticket that we send.
+We do this by duplicating the original session. If SSL_OP_NO_TICKET is in
+use then the new session will be added to the session cache. However, if
+early data is not in use (and therefore anti-replay protection is being
+used), then multiple threads could be resuming from the same session
+simultaneously. If this happens and a problem occurs on one of the threads,
+then the original session object could be marked as not_resumable. When we
+duplicate the session object this not_resumable status gets copied into the
+new session object. The new session object is then added to the session
+cache even though it is not_resumable.
+
+Subsequently, another bug means that the session_id_length is set to 0 for
+sessions that are marked as not_resumable - even though that session is
+still in the cache. Once this happens the session can never be removed from
+the cache. When that object gets to be the session cache tail object the
+cache never shrinks again and grows indefinitely.
+
+CVE-2024-2511
+
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24043)
+--- a/ssl/ssl_lib.c
++++ b/ssl/ssl_lib.c
+@@ -4457,9 +4457,10 @@ void ssl_update_cache(SSL_CONNECTION *s, int mode)
+ 
+     /*
+      * If the session_id_length is 0, we are not supposed to cache it, and it
+-     * would be rather hard to do anyway :-)
++     * would be rather hard to do anyway :-). Also if the session has already
++     * been marked as not_resumable we should not cache it for later reuse.
+      */
+-    if (s->session->session_id_length == 0)
++    if (s->session->session_id_length == 0 || s->session->not_resumable)
+         return;
+ 
+     /*
+--- a/ssl/ssl_sess.c
++++ b/ssl/ssl_sess.c
+@@ -127,16 +127,11 @@ SSL_SESSION *SSL_SESSION_new(void)
+     return ss;
+ }
+ 
+-SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src)
+-{
+-    return ssl_session_dup(src, 1);
+-}
+-
+ /*
+  * Create a new SSL_SESSION and duplicate the contents of |src| into it. If
+  * ticket == 0 then no ticket information is duplicated, otherwise it is.
+  */
+-SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
++static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket)
+ {
+     SSL_SESSION *dest;
+ 
+@@ -265,6 +260,27 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
+     return NULL;
+ }
+ 
++SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src)
++{
++    return ssl_session_dup_intern(src, 1);
++}
++
++/*
++ * Used internally when duplicating a session which might be already shared.
++ * We will have resumed the original session. Subsequently we might have marked
++ * it as non-resumable (e.g. in another thread) - but this copy should be ok to
++ * resume from.
++ */
++SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket)
++{
++    SSL_SESSION *sess = ssl_session_dup_intern(src, ticket);
++
++    if (sess != NULL)
++        sess->not_resumable = 0;
++
++    return sess;
++}
++
+ const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len)
+ {
+     if (len)
+--- a/ssl/statem/statem_srvr.c
++++ b/ssl/statem/statem_srvr.c
+@@ -2445,9 +2445,8 @@ CON_FUNC_RETURN tls_construct_server_hello(SSL_CONNECTION *s, WPACKET *pkt)
+      * so the following won't overwrite an ID that we're supposed
+      * to send back.
+      */
+-    if (s->session->not_resumable ||
+-        (!(SSL_CONNECTION_GET_CTX(s)->session_cache_mode & SSL_SESS_CACHE_SERVER)
+-         && !s->hit))
++    if (!(SSL_CONNECTION_GET_CTX(s)->session_cache_mode & SSL_SESS_CACHE_SERVER)
++            && !s->hit)
+         s->session->session_id_length = 0;
+ 
+     if (usetls13) {
+
+From 4d67109432646c113887b0aa8091fb0d1b3057e6 Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Fri, 15 Mar 2024 17:58:42 +0000
+Subject: [PATCH] Hardening around not_resumable sessions
+
+Make sure we can't inadvertently use a not_resumable session
+
+Related to CVE-2024-2511
+
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24043)
+--- a/ssl/ssl_sess.c
++++ b/ssl/ssl_sess.c
+@@ -519,6 +519,12 @@ SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s,
+                                              sess_id, sess_id_len, &copy);
+ 
+         if (ret != NULL) {
++            if (ret->not_resumable) {
++                /* If its not resumable then ignore this session */
++                if (!copy)
++                    SSL_SESSION_free(ret);
++                return NULL;
++            }
+             ssl_tsan_counter(s->session_ctx,
+                              &s->session_ctx->stats.sess_cb_hit);
+ 
diff --git a/dev-libs/openssl/openssl-3.0.13-r1.ebuild b/dev-libs/openssl/openssl-3.0.13-r1.ebuild
new file mode 100644
index 000000000000..4241ad7f72ed
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.0.13-r1.ebuild
@@ -0,0 +1,282 @@
+# 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/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230801 )"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.13-CVE-2024-2511.patch
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile || die
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308
+	append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/openssl/openssl-3.0.13-r2.ebuild b/dev-libs/openssl/openssl-3.0.13-r2.ebuild
new file mode 100644
index 000000000000..3743359d3e0d
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.0.13-r2.ebuild
@@ -0,0 +1,283 @@
+# 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/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230801 )"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2024-2511.patch
+	"${FILESDIR}"/${P}-p11-segfault.patch
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile || die
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308
+	append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/openssl/openssl-3.1.5-r2.ebuild b/dev-libs/openssl/openssl-3.1.5-r2.ebuild
new file mode 100644
index 000000000000..1c3b048b75a0
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.1.5-r2.ebuild
@@ -0,0 +1,286 @@
+# 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/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="
+		mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!<net-misc/openssh-9.2_p1-r3
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230801 )"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-p11-segfault.patch
+	"${FILESDIR}"/${P}-CVE-2024-2511.patch
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308
+	append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/openssl/openssl-3.2.1-r2.ebuild b/dev-libs/openssl/openssl-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..31486ad9fabe
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.2.1-r2.ebuild
@@ -0,0 +1,307 @@
+# 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/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="
+		mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )
+	"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!<net-misc/openssh-9.2_p1-r3
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230801 )"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-p11-segfault.patch
+	# bug 923956 (drop on next version bump)
+	"${FILESDIR}"/${P}-riscv.patch
+	"${FILESDIR}"/${P}-CVE-2024-2511.patch
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308 -- check inserts GNU ld-compatible arguments
+	[[ ${CHOST} == *-darwin* ]] || append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# See https://github.com/openssl/openssl/blob/master/test/README.md for options.
+	#
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	#
+	# -j1 here for https://github.com/openssl/openssl/issues/21999, but it
+	# shouldn't matter as tests were already built earlier, and HARNESS_JOBS
+	# controls running the tests.
+	emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index a30c37f39234..9c4162de27c6 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,3 +1,5 @@
+DIST softhsm-2.6.1-patches.tar.xz 7460 BLAKE2B e9c5496ff1a79121ab62e77ab6541a1678d4254395622aaf76c4b8fdcabbd6144caba5c171e28744ae181169826d2523c9ddf73859ca9ca6bb7a5fdf36a8ea8e SHA512 35330e969d7de532f3b6a0821dc5faa40726dcdd9c62f5e78d05cfec1c35057e183dba0ed638388f3d0ad1bd536b4fbb3cc1ff060e133109cee9681c8ac48052
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
 EBUILD softhsm-2.6.1-r2.ebuild 994 BLAKE2B 3ddc801e791ae90e198c60c2fa7db906be4b32d55157e9d9b63d7d162e1bf3071eabdb9a9a84f5713b5c44868909f623009dee67e4ea0bee6e7f396c479b978a SHA512 863e8bf2fe3beffad592ec8137c20cc29dda78f46a8713470f626aaa19974ce9948ab5d5c3af70959463b59cd0ad8ea2c34393e2f601c3c9443469ac61316099
-MISC metadata.xml 293 BLAKE2B 160341ef0b3359ef0db3bd7c78fc0fc0cb443d46c3e9d41fbb6b517c86a3f7afb7afee87d1afcf45b65b2e94b89c4b35e5a74dcb6ac4533be8c843d2190f228b SHA512 6994691430cb2953ff999558029f1e210d3b6f335c3637eb3d96e31310d706ca066b9cc7d94859a2a3559c8e9791b4d260decf240bb73401da9b19851b711bec
+EBUILD softhsm-2.6.1-r3.ebuild 1468 BLAKE2B 16af6643cdd4be652ef664ff826505eb147277eebb0dbfadd57e07d4b7d192a70eda7df0d998036f41e6b1f54314d1a3b6c4b8e5d9466dde96a1c29fdc865762 SHA512 1b4d3bd86103ba8769a8eb0d2df23d7dd0b139217baeed685ef1b36621d601a8bc33faa5597bb4ffeef28944d5b9c26060c9776226424f0ad0a55dba3ce1954d
+MISC metadata.xml 378 BLAKE2B 409f78dda08431fc3f1a48eade1c831716a59ab0bf43136b5a07003281404d075b9f0510010aa7d644c43673e8193f9755345a9c97a0da2e6ee9eac2be926562 SHA512 c0b5d304981ce1189969401bf609131b23977276977beaf61ab36d94417ee0f53d08baa82a1ba22b271d985d2357ee92eac41260c8395ef73b64e09a36706673
diff --git a/dev-libs/softhsm/metadata.xml b/dev-libs/softhsm/metadata.xml
index 73e6a5df718a..61d4cdeef207 100644
--- a/dev-libs/softhsm/metadata.xml
+++ b/dev-libs/softhsm/metadata.xml
@@ -6,4 +6,7 @@
 		<flag name="gost">Enable gost algorithm</flag>
 		<flag name="migration-tool">Build db migration tool</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">opendnssec/SoftHSMv2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/softhsm/softhsm-2.6.1-r3.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r3.ebuild
new file mode 100644
index 000000000000..4e6bb2768abb
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-2.6.1-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.6.1-patches.tar.xz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="gost migration-tool test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	migration-tool? ( dev-db/sqlite:3= )
+	dev-libs/openssl:=
+	!~dev-libs/softhsm-2.0.0:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gcc:=[cxx]
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )
+"
+
+DOCS=( NEWS README.md )
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-onexit.patch
+	"${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-openssl3-tests.patch
+	"${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-uninitialised.patch
+	"${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-prevent-global-deleted-objects-access.patch
+)
+
+src_configure() {
+	# Test failures with LTO (bug #867637)
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	econf \
+		--with-crypto-backend=openssl \
+		--disable-p11-kit \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-ecc \
+		$(use_enable gost) \
+		$(use_with migration-tool migrate)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	keepdir /var/lib/softhsm/tokens
+}
diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest
index 43f05c66876a..c83d98f9a3d0 100644
--- a/dev-libs/template-glib/Manifest
+++ b/dev-libs/template-glib/Manifest
@@ -1,5 +1,3 @@
-DIST template-glib-3.36.1.tar.xz 64580 BLAKE2B 3dbedb59c769ec169d469ae6640d9319c8d3ec09aa91cadc4be64290401f36b83e514c0dc8c03fb0eddefef0ddc0a717fdbad12e67c9aaf6d4b291b00b289d02 SHA512 7c00d750f7d58e98f2d6c9baa6fa84efde1cce2eaacfb334ef0ee19d0583373d303d67d43cc290cd1a41239f2ee804077e104bb4799b70cfd6760ac3fb04178e
 DIST template-glib-3.36.2.tar.xz 64832 BLAKE2B 63d413b8474ea641cb8ad3eecc69f4fefbb1b3d5b9a3ec1bc4dd7ddd3526ca3c8599bf811041df6685daa868ff5c302d650b1fc956a441a5d2b80adc069453ae SHA512 226247151c932931a3c5c0f2278929ab6e6e82edbcab10dead5723ee4b8ef5c6d12775491b1aed7e7ccfee8b794be69a8c457e6639a63fdfc2b6e41d7efc2bee
-EBUILD template-glib-3.36.1.ebuild 1110 BLAKE2B 90f289e48e3437764ee0d389a3bebeeb17fdc654993e5e9152b21068208c9b1adffda6d71db203afc53c42609096764091505c0e3d639309c8614f4195559c55 SHA512 b22f36df70d7f201f32154beb0f1316d56c9c0df46cd7c81c5bd26fd3379fc0f019df33ced2b4fc1aed58a8ddbc3f5a05cbb2582dba73b5eb92df74ca0fd40da
 EBUILD template-glib-3.36.2.ebuild 1110 BLAKE2B 90f289e48e3437764ee0d389a3bebeeb17fdc654993e5e9152b21068208c9b1adffda6d71db203afc53c42609096764091505c0e3d639309c8614f4195559c55 SHA512 b22f36df70d7f201f32154beb0f1316d56c9c0df46cd7c81c5bd26fd3379fc0f019df33ced2b4fc1aed58a8ddbc3f5a05cbb2582dba73b5eb92df74ca0fd40da
 MISC metadata.xml 762 BLAKE2B a82aa17f494b2721428a999a60f16a3d86ef2b7b3310d398d6d296e1d840c6a2bd5477fa4e281678cb87d19db311077371ddda9b39ba5c98c46849479a76bf79 SHA512 122b0e14f897b1d92ed71ac0969eb1f0f5beb7ecf5b44b71444ad1f80e9477906936e1ec7ca4cafc3d0875424bcdf3473acb71900a6d323f63c21e0c77030eee
diff --git a/dev-libs/template-glib/template-glib-3.36.1.ebuild b/dev-libs/template-glib/template-glib-3.36.1.ebuild
deleted file mode 100644
index 52a0c01b99f1..000000000000
--- a/dev-libs/template-glib/template-glib-3.36.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson vala
-
-DESCRIPTION="Templating library for GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE="gtk-doc +introspection test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection:=
-" # depends on go-i unconditionally for own functionality, USE flag controls GIR/typelib generation
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-util/glib-utils
-	app-alternatives/yacc
-	app-alternatives/lex
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtracing=false # extra trace debugging that would make things slower
-		-Dprofiling=false # -pg passing
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/thrift/Manifest b/dev-libs/thrift/Manifest
index b1fe58afb9c5..c8f8713d8b70 100644
--- a/dev-libs/thrift/Manifest
+++ b/dev-libs/thrift/Manifest
@@ -5,5 +5,5 @@ DIST thrift-0.18.1.tar.gz 4310494 BLAKE2B 3e6c7e03059341e79d3f58e16b55761888b530
 DIST thrift-0.20.0.tar.gz 4397667 BLAKE2B 23422fdcdf7e0dbce8bc0f8017f54b5848594e2da21de56834152c17c74da7d1c4df23c5b57cf3ba811bb03f1a8588ddf1c2a05222bb726aceda4292a15af21e SHA512 8dc77f666e60141a6b3cf7ee1407b08a0e80d176f8ccfee69317d7df89ab87aea2c7b3ba3e59d4561835edf1ce23762443ad5aeed0099bf075b010853d5eb1cd
 EBUILD thrift-0.16.0-r2.ebuild 955 BLAKE2B af2d7197d12e51e06b8cc6f6c63ece98425f96e169d0abe105d67236dba2bfc66e6ab3d34c4de4d56e2d77c799877e4faab44af8d44d5cdfb46a77845f86aa22 SHA512 0fd770c1ed096eb6905867ae53bf40fc7b5978e5be1556c7416a7ecef695658edc6ef152165e4616aa1d7a5b0b3ca38ddf75b96d3c352c58ee428053745fa1f1
 EBUILD thrift-0.18.1-r1.ebuild 1155 BLAKE2B 632d0ce721faea13b24bd94705416adc2843f8995347c11e21c6b7c496846874679f33dc052e814ab35984a0aab4d8f134d7ee2bfadcc98f028dea77d80fb1cd SHA512 b2d4de48a3a1df54c0f30b80a07601bb9dbfd5aca191736d1474b0b0610d4ebc8297339e01070b43fa7eb3519578ccd3ea42eb2835e38e24f51b9823d4221151
-EBUILD thrift-0.20.0.ebuild 1158 BLAKE2B 69c59a1d509e530d5e9d085bcae5062f9bc563c3cc9a6f192de68582bab461cab842c0107a23ccc4dd55ff9a10e776709a0d6edc6ccd1573032442cb04ca429e SHA512 b4460eb3d246930e9ba5caa7fa2250e4c1ec6aa719753941d9b21f9edd7e5116054c1cc261ed950dd8f6ce3859b59786c72166363f055bbdfb5ef59b9bcf8efd
+EBUILD thrift-0.20.0.ebuild 1162 BLAKE2B 43f9d03d4944f11777f1f68d9ca80d8669a6e9da5414907df20d499cda3a7a6253b9f46dbba39d84e92a040db40e639583c877f1d9e7436d2477a4be2d53361f SHA512 96b797ddcbb718db0bc5a350ef7aa2e7631c1502e89f3bc9f5c01612491507012a14b21d9099c8e1d69e4330bb31f943070e809f1657298fe123fd77d05c5cb5
 MISC metadata.xml 489 BLAKE2B 2b2c924951cd9c5dfa2a9d4f50f4a74b3f422d853fdf61248424500d792f87a9348335a80e54c2c110039274060ec8df87f3369c8ff81c3dc8d515cb7de58fa8 SHA512 f15102234cb9eb25272e4d1788b7cdd4274ef9c5ad0d2af3521533d86a4145b0f2789385ce9663f9d0aa9161c218d357cc76d56e5c47ed597c56f7ac35d8a373
diff --git a/dev-libs/thrift/thrift-0.20.0.ebuild b/dev-libs/thrift/thrift-0.20.0.ebuild
index e4d818edb3dd..f57f4a9b262a 100644
--- a/dev-libs/thrift/thrift-0.20.0.ebuild
+++ b/dev-libs/thrift/thrift-0.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://thrift.apache.org/lib/cpp.html"
 SRC_URI="mirror://apache/thrift/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0/0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~s390 ~x86"
 IUSE="libevent lua +ssl test"
 
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index a025dd1330cb..d8627a9aaad4 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -2,5 +2,4 @@ AUX 3.26.6-c99.patch 808 BLAKE2B 000b5b1e169bbf4713cdd3ca3dd035171e67c5080e55c3b
 AUX 3.26.6-plparser-Fix-uninitialized-variable-error.patch 1002 BLAKE2B 20af6936f47b2b1932417caec381df50bf503eff6e5235b1edeb4645dfc248358fdfc528016bcebaeb47f14f0cb99bd6a69519ae0a1a6e82b2629316522922e9 SHA512 65d015cb956c5f0b82bb2436309bbc35535d3decf7d8de4730fa3d41abf4378131756d09b536d3a16b9581c7e76fa18e795976753e90e91edea76428281f9386
 DIST totem-pl-parser-3.26.6.tar.xz 1503888 BLAKE2B b0768f54c77ff902ad20aeaa9162c616e0cc64ccfc2839d2db2e4c9076f82a611baedf127b0b74f84ec8698a5adc25c43fb9245dcb26a221da7024372a61896b SHA512 1a7aa69e147b55c3c9761328604821a7e40bac4e7b82492e5ce1b2405e3b6d5154e3b06687f2446ec923b34bf6ea96eef179ef8410c005a061d448fc6b3e754e
 EBUILD totem-pl-parser-3.26.6-r1.ebuild 2040 BLAKE2B ca9ed3859d1112d66900cdfc6fa00e414742f50f39e75f951f696a04a3499e46474337a50c4d8e7e50d76ca11cfd45bda8a3d376b06e1996f10da0c33ec81be5 SHA512 3430fa14ab63878fb7b2ddfa02eacef8b87e801f42b53e4989658707e1f00d20a08ed47589cf9886e9e1ba087044cf652feb5d36260e5c0843184c8496845bb8
-EBUILD totem-pl-parser-3.26.6.ebuild 2009 BLAKE2B c7629148a390427e6d383a07b2b325d801629d354399adcb8821bae2e2ef80c1a0bdc0ebd94931614f1f7d7dcdbe5e2310913c5311d26f88ab25034f5777482d SHA512 330fa1b9e94dcdb30243b3486d9db815c1a671e4eb020b14cfea6cd55ea8dbfa5c13de5844b5e32def6030c543907a7fb7b1ce2235a2ce67b0c8c686812283a8
 MISC metadata.xml 646 BLAKE2B 3d31347805d778dea4005273c7c882664e8c7a296d6749eafbb4e8d4a48c07f85f53fbafd8c6ba90b584a82dbbb796d5685ca8a4518f848694115d4789758c61 SHA512 61c9b51ab203dd767e80f0cb34e4d2e276a364153d5b431d42ad37b04745dc25e2c9fede1792817f6652cac8d7592be03416f2e410a2378c59a5f0236e158e81
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
deleted file mode 100644
index 99a530f0613a..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0/18"
-IUSE="archive crypt gtk-doc +introspection test +uchardet"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.56:2
-	archive? ( >=app-arch/libarchive-3:0= )
-	dev-libs/libxml2:2
-	crypt? ( dev-libs/libgcrypt:0= )
-	uchardet? ( app-i18n/uchardet )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		gnome-base/gvfs[http]
-		sys-apps/dbus
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-plparser-Fix-uninitialized-variable-error.patch
-)
-
-src_prepare() {
-	# Disable tests requiring network access, bug #346127
-	# 3rd test fails on upgrade, not once installed
-	# Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
-	#sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-	#	-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-	#	-e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
-	#	-i plparse/tests/parser.c || die "sed failed"
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# uninstalled-tests is abused to switch from loading live FS helper
-	# to in-build-tree helper, check on upgrades this is not having other
-	# consequences, bug #630242
-	local emesonargs=(
-		-Denable-libarchive=$(usex archive)
-		-Denable-libgcrypt=$(usex crypt)
-		-Denable-uchardet=$(usex uchardet)
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index 860b68f3af9a..4f2a10cea450 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -5,5 +5,5 @@ DIST tree-sitter-bash-0.21.0.tar.gz 557096 BLAKE2B bfbdb4db0f75c292567043a47d32e
 EBUILD tree-sitter-bash-0.19.0.ebuild 364 BLAKE2B aa9e2ebb88fc9b7cfc560a1363d7f6627f3a15e4be9d050a8c86ce394fb31717cc3bbafa1bd4be4e72d7a1798371743952780f96cab888fe5166312dbe30431e SHA512 08d01e57e92bcf1f0fd0f745b05e547e82655e15aba70a93b43f6893c9f1db4ed0faad844b3ad8d1a9d63eac7124c09237b58a9ec6c02bb0688db57ae2428a75
 EBUILD tree-sitter-bash-0.20.4-r1.ebuild 512 BLAKE2B 73fb15078b2830a9e470d2ec10c2da386835ca91cfeb22a54b1108b86f09122ca43478a94cc538e36df10f127db79e3815dd7736c3d3ca150351a4ea7b3eade8 SHA512 afdf6aa801ad1d8a7af0567a0901755cb659bbaee8f1fb0e03102150819747f70a930fd90cee2e877e46e52814726c52a9f28888eb4a5ca67ee0f7de6be4a11f
 EBUILD tree-sitter-bash-0.20.5.ebuild 364 BLAKE2B 2046737a627bfce8cf821b97fe10365c2bce44389f21b669ee24bb6df6dc6758ce9a409bcb4d57460f362a95c0f7006d7a32b1a8dc48e925b333bdf15644a0e4 SHA512 b98545066d6acc380dcfd16030417af37b26067b4d9f7a85e79660acdf8d3a5e2287728a4ecd418be1d230f15d5dc36f2473673ef4f69a7c8c0a793c79cd16ea
-EBUILD tree-sitter-bash-0.21.0-r1.ebuild 396 BLAKE2B f39fede03ae7b8be837a3e27fdee6f411707f797089df8665e62ec4b1d79bcc66b448d2dfa4698d202217b0ba468a075a8a8f3efa1a64cf7ced02ae70aeb6603 SHA512 5d8bc0f257221f5f92d537f4f1e3d88ff5e05d0c50dfbf664e8682661fdbc591aa3e65a46175082cde39f94908e506aad770ebbb3c69c6cb9b3d59a1a0aff813
+EBUILD tree-sitter-bash-0.21.0-r1.ebuild 392 BLAKE2B 8d40e1ed18e1af1cb048f009b5bfa54f9af0d187c5bfe2b8a6ccc3f8c14db177a909a7a94990f638d70ef5b5476d45756073ca203e86a73618b28a5b88f0e7d4 SHA512 47f7dbdcec1a3401e502909d112d78d892d19101d51049d3ab6ec613e6bef27428d516d5cf1ec30791db704a276f084fd100d51340d056465c34457f8e8f7ab6
 MISC metadata.xml 549 BLAKE2B 0e7aa59fc51d20125f5a7b2310579c1f54ef300cf8140022bd37ba090acf4d20d567f154d2f456274167141e9ca242cd322d94f3146cd2358211e9229b3ca2b0 SHA512 68daaf748836ae31aa3a581df1591d7059aa8aa115907986f541f343f057def3bb4fdbc249d4db931680ea5fecf5c850fa5f561cd3dc275eb2bf026d38de1466
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild
index b9d109250cad..1b35e389cd19 100644
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.21.0-r1.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
diff --git a/dev-libs/tree-sitter-go/Manifest b/dev-libs/tree-sitter-go/Manifest
index 9444551758ee..316caef8de87 100644
--- a/dev-libs/tree-sitter-go/Manifest
+++ b/dev-libs/tree-sitter-go/Manifest
@@ -1,5 +1,5 @@
-DIST tree-sitter-go-0.19.1.tar.gz 160180 BLAKE2B f92bbb342eae3a7705dbd6f6564a16fdbad1a25c405970bca1e8df01ff6d0c20b45f9849a0d13d53e2f56d95b71db0f7813765f64e0dcdfd9ca617d1f71e688d SHA512 8390dd3e39daa42ec5254b4c6c0b15fec0caa7ae64a9ec3b9116a10f9e9f1b6940cd88c8cf14dc50b28b97ea588ff302ebd16f3c88e0bd6983e76b5526a31b45
 DIST tree-sitter-go-0.20.0-2.tar.gz 195753 BLAKE2B eca2965c0d7bba3c639e092845ac98d05936e9d87290dca2a283dcd6afb1151f8d63aba907337fee79e9fd9b0d901edfda62ec936ef948f57dc663c9d906715b SHA512 ff438a6c84454f38cdefe506f5da787007cb50b3d41bcb9c7f26ed7d951a3268e6bf0b32f2e750d0e4233516c1e4a827c24af831020f81f268fe825adcd5f836
-EBUILD tree-sitter-go-0.19.1.ebuild 299 BLAKE2B 4fdf4bfbcc4a8ff5e79eaa3c23ad4ccd4b7186e849164557076bd97cbd15a1efe6d9004892206759ec6a97dd61aa8784c02c19914e201a51370314ff70a2fd7a SHA512 242c0256830fbdbb67ca6f05ca6e4af4e4b6e31eea5ee0549436f1a256254961b6df93c618b5e0cbb9ec1d374c9ab069d333938645a12bd52e72e1e19bcc17ab
+DIST tree-sitter-go-0.21.0.tar.gz 210048 BLAKE2B 3589922c610d6a8f32fb753cb91f2c925a2bd4d63dc5b32cc37bb7723b7b6eb7339135cc2dd1629c6aa42684c4fe376dd1364bd928fc8c48100471203b68b627 SHA512 c12725c85ab6836fc6554edc64bc2f005d62e45c3d69d07811138cd09d29635399f70ba5837ead05f5827a327a1666bb4134475c99e2f8da81bd3412e4946a59
 EBUILD tree-sitter-go-0.20.0-r1.ebuild 436 BLAKE2B 7d57ae3c83ce1854ec4f83b9cd7ea5d1bd7442684ad69c7479857ee0781f8e457a0b2c0ffba6e9087f13f86c757e32da4c0b605436acc4cda15e64ff782658f8 SHA512 def4723c1ef76c1d4e5847f73d515acac0ab5e5626fb50069e2d9c1ae0d25ead8fb7ed7769e9e4c8e4bce42d842c7830c6fa584355ae176a3282b3728cf0797d
+EBUILD tree-sitter-go-0.21.0.ebuild 289 BLAKE2B 9ef68003a4f5686c1ab88ac4f615f4b3f619129fd204f2afd03f24d9036c9935007e6b42122eaa35e9a35fbb348a5c00be75889b540121e70c423c0745c27c7f SHA512 a462042356227d7e11067c65695da83daaa9ba051c5cefeaa8d7d6a94c958b711a3f7dcba9efbd1bc74553d600fe54718442970ef6f2ee133aae7a1aa286e073
 MISC metadata.xml 444 BLAKE2B fa5fa7e6372e8bda6a7bc00aa4b7904f721ce2cfcf11cf9df7f582846a304f31750d23c6090b1e93584500bd1cca2b528c3ae14ac85bf31e7999ccb557ad8807 SHA512 372434b52dba0f7a4adfbc7ecd975fe161852a9b9c1c599cef12d3071c973a514e546e9182e0f3bb840a4d71109df5ab3e9ff6e1c86f72e6112551c8e37c0f57
diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.21.0.ebuild
index 4193e530e8c5..322cb405b4be 100644
--- a/dev-libs/tree-sitter-go/tree-sitter-go-0.19.1.ebuild
+++ b/dev-libs/tree-sitter-go/tree-sitter-go-0.21.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-TS_PV=rust-0.19.1
 inherit tree-sitter-grammar
 
 DESCRIPTION="Go grammar for Tree-sitter"
@@ -11,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-go"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64 ~arm64"
diff --git a/dev-libs/tree-sitter-java/Manifest b/dev-libs/tree-sitter-java/Manifest
index 5b469ea0f3c1..2eee7df33965 100644
--- a/dev-libs/tree-sitter-java/Manifest
+++ b/dev-libs/tree-sitter-java/Manifest
@@ -1,9 +1,5 @@
-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
 DIST tree-sitter-java-0.20.2.tar.gz 200727 BLAKE2B 03c9b805ad94b852fc9e02f1e266cae9010636cd33ffd2a7f3da1076843aced2358f95022476476edd0b201efb87b164f31bdd610654f182cc627fd762c39cb8 SHA512 188b4d4c5aad6367ab25e5bbc3b7f56fe1b6108ee1dbe072d71a7376e52793364fad004e2f79d1aa6e18176d5642afef982a40b8da127d4252f2ea10d4bf874c
-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 285 BLAKE2B 193074042b2bc281c8c6b1c87a4daf58cc16ff63ec7242f2122978c19c8ecf69c9d1c4ec192dcbbb6feb684071c70be35f85f06c444f89f0aea9d2370f9fd20c SHA512 04be915902faa48fc9f6973274bd426d373014699c4fc569b094adda4ab421811c1fdd7bca5e83315a906ca5e61f82b9ac4a4f8abd3e4662cfbe21b331f7c55e
+DIST tree-sitter-java-0.21.0.tar.gz 218672 BLAKE2B 8138dbfdb76aebd1067be3a6c97543c71d601b3b5475e14b050251e163a0f1fff97003505ef4c3f997b34f588470acd5e46df70e54afead8dc2f80b020cb41a3 SHA512 236159990182f2cab0fd50ab1f43898f021243a37e7517f7c8df039296f08e1fe615889a0fd0677eae3abd6a495333ed56be5164f43855cb9ef8e0cc4f2b70c9
 EBUILD tree-sitter-java-0.20.2.ebuild 285 BLAKE2B f3056e1066f06069884cd76ce85d244822689108cc4a4fc3cda88d12ac088f4be69fe7b1d7bbd32609f6933b37ee708d3889dd26e763e82c87a37eca77ebc58a SHA512 014ce7de05f5a508b1d3ae459b359e3409fbb2fb01b95f987c4a414f5a11e4642800e148ac5192904b73fde40ca20a7dd326dff0a274972cc6157036f6ab05e9
+EBUILD tree-sitter-java-0.21.0.ebuild 286 BLAKE2B 844246381114db6780cb5d1f6f2983c2a30cf37aae1d65213e74c833c9c930cc40759770d6bb77704f60f0aad44bd40f6837b6887a5b3f735ea7dc67860057a3 SHA512 39fe6bff5bfcaa40f974956afa2413d42c1e95923650f36809d3d6186bf272c2fa78a2e364bfd861b2de9952e378d338f567507ab1edeb5b200afe1ac7081817
 MISC metadata.xml 559 BLAKE2B 2a33b73a90591c3af8e0023e8cc6ad0be46b007255e7c3137fb5e2a0763f22493d89f70463ba59c9250a62aaef680271bb8a876926a2b967a3f9fec3647c3e25 SHA512 22e3de0937611b46f49706bbefc34fe902a0ab284ec41e04e0312859cf20e51168a49564d6a4c4ac8959312a1e5755b03f9f88885ee14d5e0ffc3569f4663ad7
diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild
deleted file mode 100644
index 5b79a06f012a..000000000000
--- a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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"
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
deleted file mode 100644
index 19ac8915ea50..000000000000
--- a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2023 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"
diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.21.0.ebuild
index d90c0532fc87..e09c03cd7396 100644
--- a/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild
+++ b/dev-libs/tree-sitter-java/tree-sitter-java-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-libs/tree-sitter-javascript/Manifest b/dev-libs/tree-sitter-javascript/Manifest
index e7dbe9930ade..3178cd76fdcc 100644
--- a/dev-libs/tree-sitter-javascript/Manifest
+++ b/dev-libs/tree-sitter-javascript/Manifest
@@ -1,9 +1,7 @@
-DIST tree-sitter-javascript-0.20.0.tar.gz 278831 BLAKE2B cd66005e7ebdae154a192ff556d4cb35e91d93a2ab645a24b9492217858278adc1f7917a7dc5033bbcfd84ca7ef41a3e7ebb1ff934bb09b79c8923469110e1de SHA512 778e0f2f5bf276d7ffb6eab0fe3f7473b56605de707c8e2f491fbb5826da94067b9f1bc476306013267001b5ecaab11a956e896b78520cdedd27006fac97fe41
 DIST tree-sitter-javascript-0.20.1-2.tar.gz 371027 BLAKE2B 5bd9b11f1e10ff37950b2142031bebd3b5f6111818a21bf5a7d97a8a27a5340bd09cd139d76846141ed64a824f82f1e1394b90d8622192524d7db9a02ed95223 SHA512 5341311b419cf763c0a6d23348eba0e38b417ba07c2def341027223347d850c28b86db6add136dbf73cd5296133823a4548493ee649e09247dfbe5bcbaaab76d
-DIST tree-sitter-javascript-0.20.3.tar.gz 394552 BLAKE2B e578299df6645b3529e8b82385a8060a8e25f122faf63f4e7f0ecc6ddbec7f29986c552a83dba9cf0bc8866225e749e3c9c0a5a9556e6266e8e731cf09af4def SHA512 31fd1b645fcbdd6670bc6b00e6c4adc2ce440aa35ba9b530a6161849fd70d0a38f8539727d321ba2bbc60a8d9bcf33296b561f8921115a8e68c50a40b253bbc4
 DIST tree-sitter-javascript-0.20.4.tar.gz 396452 BLAKE2B b33c4c44fb59985af7809ef9bd015d12dac185999993570164de4ac87a60cde28cf4c1232a06dd3e312ce256f2b021ef5fa500fd9e0772a3fb657f74256500a4 SHA512 65171e5af35c9c5cc9a6c54792d2194b197e130ec277b35e67e04b654082bcb1b98cb9bbe497bbe1dde69f582e5cdca01cba4f40682b7b587fd19e89b88f3dd6
-EBUILD tree-sitter-javascript-0.20.0.ebuild 315 BLAKE2B 2b9f5a9c4b709644a5c5c3794a70246704199b5626a48d3ebae585f6de8d69e31be08ff3023ff63bd995f520c73268d95d5f376d35d098594230501c030bd87e SHA512 2641dfcebef2c291114997f80fccc9ceefd352559b726ca3ea198382dfd055225705c4797eb4b33f5a20cd29c34a5511afbc53bc85acef3fffbd0df62fbf7c64
+DIST tree-sitter-javascript-0.21.0.tar.gz 367344 BLAKE2B 7698b918db7fb49bd73ee03757fa17d5f6c0adc14a279410e2bc924123b1a187e6018b534bc1d2b6cbc41e5f42f7b4b6541c65d4f70d6345dda31c719bf479c6 SHA512 c83d7525e3639e237b9f81cac38d0290a3257aa98dba62f079abfb234f3cbd3de23e0b275da85878d3ab4b8de03384dc4e8a8512641b17ff0aca2e3a722947a6
 EBUILD tree-sitter-javascript-0.20.1-r1.ebuild 445 BLAKE2B db27d411dbee91e8ce15ca9d093ed7d197dafa0161af52faf6599dccb4307c0a0298bc7a7fb4b69feeea9fafec95588d6f237dc02e9fccf6a8618e968a0b4eb2 SHA512 18f36b40a18ce2ee7863de12fc58522eab2e0066a5aff8d0f67feb8ed6d788fc52df3d3d97407efbb9c9cfd2c707eb8a206e65126516d7cd544e6fe94719a793
-EBUILD tree-sitter-javascript-0.20.3.ebuild 298 BLAKE2B f9c80cc1f9df5bb9b637e24c5ef4b82699ac1d53c58da0bc75c0deb511c3dc7fe14e2b8d1eebc1a881ad70a5328a6e83d1fedefadc9908c291f0353ee8e759a2 SHA512 8dbaf3d05913917c1601414fdcae326cef4dc8f071a7924d78a2b62edc6a0206bd6ff3240c0f2b008a3affa7d6ac60ccd097ba17d9382c66eb84a32e32b26e98
 EBUILD tree-sitter-javascript-0.20.4.ebuild 298 BLAKE2B f9c80cc1f9df5bb9b637e24c5ef4b82699ac1d53c58da0bc75c0deb511c3dc7fe14e2b8d1eebc1a881ad70a5328a6e83d1fedefadc9908c291f0353ee8e759a2 SHA512 8dbaf3d05913917c1601414fdcae326cef4dc8f071a7924d78a2b62edc6a0206bd6ff3240c0f2b008a3affa7d6ac60ccd097ba17d9382c66eb84a32e32b26e98
+EBUILD tree-sitter-javascript-0.21.0.ebuild 298 BLAKE2B f9c80cc1f9df5bb9b637e24c5ef4b82699ac1d53c58da0bc75c0deb511c3dc7fe14e2b8d1eebc1a881ad70a5328a6e83d1fedefadc9908c291f0353ee8e759a2 SHA512 8dbaf3d05913917c1601414fdcae326cef4dc8f071a7924d78a2b62edc6a0206bd6ff3240c0f2b008a3affa7d6ac60ccd097ba17d9382c66eb84a32e32b26e98
 MISC metadata.xml 452 BLAKE2B c0a1b41f1e185ed114d88bd150adb7c0db6b3f4519a40bf84947706621725cc592f31d30d83a2068458026fc920a6e273a480a63f9d90a136f7afab93cac4481 SHA512 e05141731ca0a84b6d6037e73c5ffe3a11cc6bf86f8d2c4642333ba05dff558eb93d8fb062cc67059e3ebe4d9b75041eb6f1ef3f79b38b1dc1abd9fc4c6fc77a
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild
deleted file mode 100644
index a082528027b0..000000000000
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TS_PV=rust-0.20.0
-inherit tree-sitter-grammar
-
-DESCRIPTION="JavaScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.3.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.0.ebuild
index a95e21c0d4a6..a95e21c0d4a6 100644
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.3.ebuild
+++ b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.21.0.ebuild
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 8b43147ab039..8c4867378694 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,16 +1,14 @@
-AUX tree-sitter-0.20.8-no-parser-header.patch 1007 BLAKE2B f1e088a764629685f84d9526eda219a8e52f4e7e6aefe3cc1f4ef713ffa4b21cd228369f4be6ba082359a1065b73bdcb52f80ba1a1cded2215153e3d59d9097a SHA512 c2a5541fb528ca07daffb80103397226a59d53d4f206282ae43e2deee27220ef9a9d5ade86da7b09130398c8bcd2e809c547c490f8271ae696f097d89a6931e8
 AUX tree-sitter-0.20.9-no-static.patch 756 BLAKE2B 26b67c972575d3fce7d9ac841828e66d395c6b4d81b99023332649e72bb2a0a515b9c257a9927dcb654fbdf20c4b538b5ad39c18f063f47f3de171a2258eecc9 SHA512 0d624ae97d7bbde0a035128b372dc175eb9d0a41871270fb43179356632d040d7827d2d6a073a1f7ecff537c1ec1a647df907c5ee39ab6b8840a1827b7f1808d
 AUX tree-sitter-0.22.1-no-static.patch 858 BLAKE2B 0f3ea5693f55a80af02597c740beee5371b98cbf3c671c203fb5eb916f0454916c995fd3f53cd64942db2efef500e9473edd4ead7320d082b98f14bbb7fb0bed SHA512 90edc87e5cf6039ef86e7e3e3906acea2fc3066f37fffa026c832904effa7c3df546143b7b2465de0f979b3f8750cbb89778f8780b1cce0b529c542af7202f1a
 AUX tree-sitter-0.22.2-no-static.patch 952 BLAKE2B f961ad07850be8c7a7535eac82e234aa236ee7499d2a6e2ea5ee23636bb92f78017b29e74a3ae452f0a4f13611838a5ed4d1b397b1410749264f7e80715d8ac6 SHA512 7d06011b5f5068eb94891d9e116a5d6a3d3023fae999a9766cc19309ae2a4a33d4722074d313efcd87231794ef79d18907e468299da7de4fc4edaacbb9cbc9eb
-AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5 SHA512 30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967
 DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0 SHA512 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a
 DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40 SHA512 fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7
 DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B c18a79b4fdf553c50b4dd4c67c92d02fd341c5266c4658eb226d9ea455f23d2d22fe4ed4ca48811da2c8a59c403d8eff53dd9257468df7a9cfa640652c485c95 SHA512 a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856
-EBUILD tree-sitter-0.20.8-r1.ebuild 1328 BLAKE2B 53e234169c5f1378ed6f67a59a58e40efc186c0354b6b845973ae2e1676accd35f54434ac3a88d34648f27027439b5489a6db10953f9443cdf500e21f914301d SHA512 0ed16e8d4994053a6a08633793a6f3ff37e077e1825d14f6be8cfcff3343042b8b41f12195e987263350acc99a47ae3660f33b5c04c9c574e479dff08636eabe
-EBUILD tree-sitter-0.20.8.ebuild 1277 BLAKE2B fca5db0fb7a996038dd8c65c12b74e038d566b01d68e2a19ea00a56b69d5e17feb1f175ffc7077dde778861fa1a918e3f1d33201f08b3d46ec90cb19e5639acf SHA512 97138d0d18931238eb7359a4f0043c69bb63624785d48326ca127fc166c3cb8c372dabbde1aa787041fe7345aca642b6eafdc2c9907bc75992e771185fcf3933
+DIST tree-sitter-0.22.4.tar.gz 3034955 BLAKE2B 797feb6e2171b0e00b10c67c8b6dcda6cc2ec420ef797991a642524982629496e4b7bcae92a2658ba3adffea75332bcda09ecbced01e73e13ba6f4c39d15e9ea SHA512 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36
 EBUILD tree-sitter-0.20.9-r1.ebuild 1328 BLAKE2B e4432d8bb3b9781b1ff1daf21c85899450cabaa22021826758a10a4750bf28af87da4ac0c55e4f63521fa6434bd45ab79bc7470ac0148cf8f10d17ae4c4d255e SHA512 2ecbff6a41cf5549c5dadadcfdeee21e5b488eba99ecde07225aa1a5939b3376d3e744d0d1eb14e2ecb0e1d6b6470a8661d2e2989c6bea49840d985c93f49807
 EBUILD tree-sitter-0.22.1.ebuild 1150 BLAKE2B 046ddf28b24a4bf7c4f58e09106dafee717965b7a890ec07124689c3126cecc470b9177c87708d2dadda0998cf17066635f56ba9bca8209205979544727f03ef SHA512 6c03ec0d32279d19198922f8a373f8faf3933c932b372526c1360e4e51d46327ea30e8c647161dcd153b74ec3e6011fc1c6a380d98d4d4b45308e96cdfdbf8bf
-EBUILD tree-sitter-0.22.2.ebuild 1150 BLAKE2B d83d893cf04690c68429b80d7def7ef21f9f32521fa0278e4e5f6323f49b007f05450a77d7fd00e42b4de8453ca51c8ff4f979ebb1122393eb549ff1b93014cf SHA512 edc32600c9c6ab175d51df6956ed4b5f23846419b5a94dc0f10343a89a6815fd56f9331753a90161223490440c0115214532d6c52c3bf5e7aaf573d063d0b829
-EBUILD tree-sitter-9999.ebuild 1025 BLAKE2B 85ec2589b2036eccd8a1e73dbf66b250ac818135bfc771667f9c61f0ee9ad125992a94c01f33f0662d6bd059e1c57eda8616a2c2f0a918461db9ef09601b0834 SHA512 e3141a10101219d2ee2a978277214827b787ab0a9ed67d0532f070805393a05e5ed040c954d7c8ee157c5fb5161126ffb65a12b834122564d913addc9ef451ee
+EBUILD tree-sitter-0.22.2.ebuild 1143 BLAKE2B 25e98788f742fec7dcd30f2a075ea7d46927bbe2c288512c88314b411cae48857f0654ba9a5f41eed70a0ca7b7f775fa7d49fbe086d208f46555c47bcf9dea66 SHA512 5c56d4299dc40d13e56c2f9cf374d0d93ed9d8f83a8d9519c784ebbbff790756bc4ff82c3714046e7ea70e61be9dd4d58a67909fc311a7eff85d768b3bca5afa
+EBUILD tree-sitter-0.22.4-r1.ebuild 1167 BLAKE2B 0c741d26c7ddea422b5a5a5a94606e6b0c6450f1e7b8d3dd59bb8e685f8cc83606969ff519b7668e64f4acb4dee8f33e15b73d4b3cfd98c1d2636372ef77f746 SHA512 21f01d2f7139b5edf50de4c363da3d2943a73abe984daa66833c965b72232d930fde2b07281b7967e07abc8b5f88cad45d8d87b3f303ee312036e2a986158ac9
+EBUILD tree-sitter-0.22.4.ebuild 1103 BLAKE2B 0c53403941f9668490fdd8f6ad06e32a2720ede999659233b781b7f00d0f47b4d0c0ae22f9da8a11bd30b3146e38bcb8bddb8b4b4667277addb3f2b9dedcb664 SHA512 bfff1ce9bb10c5272d3b127fd8dadace79daebc30bf2e8d3b2c7e3642ea58153709bf58ffba7b6a34142418cfcb7f729e82a7d79857b04b474065169e028f9c3
+EBUILD tree-sitter-9999.ebuild 1103 BLAKE2B 0c53403941f9668490fdd8f6ad06e32a2720ede999659233b781b7f00d0f47b4d0c0ae22f9da8a11bd30b3146e38bcb8bddb8b4b4667277addb3f2b9dedcb664 SHA512 bfff1ce9bb10c5272d3b127fd8dadace79daebc30bf2e8d3b2c7e3642ea58153709bf58ffba7b6a34142418cfcb7f729e82a7d79857b04b474065169e028f9c3
 MISC metadata.xml 1030 BLAKE2B 378584c9e0ae9c9d988cadd1150bbad84a14e5693120f874247d5ca744cd21d6b60cfdbcce8d028f5e8aefb6aac1ce2e8faebd23e68d86976f6dff333aecd518 SHA512 e97e2bc17d4d79fca8b18bf412250ee6547af95d7700b830b04eadc6cb783bcae618df58eecd7aa8b3209bcb6e2e13f2c92d175c9e75d437b6bac3b6c89a898f
diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch b/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch
deleted file mode 100644
index 1e055a69e00d..000000000000
--- a/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/tree-sitter/tree-sitter-bash/issues/199
-https://github.com/tree-sitter/tree-sitter/pull/2573
-https://github.com/tree-sitter/tree-sitter/pull/2574
-
-From 05b18c2cda9b391efffb4986bf46fa56333d801b Mon Sep 17 00:00:00 2001
-From: Andrew Hlynskyi <ahlincq@gmail.com>
-Date: Sat, 26 Aug 2023 20:50:23 +0300
-Subject: [PATCH] fix: makefile should install only  header
-
---- a/Makefile
-+++ b/Makefile
-@@ -57,7 +57,7 @@ install: all
- 	ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
- 	ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)
- 	install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter
--	install -m644 lib/include/tree_sitter/*.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/
-+	install -m644 lib/include/tree_sitter/api.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/
- 	install -d '$(DESTDIR)$(PCLIBDIR)'
- 	sed -e 's|@LIBDIR@|$(LIBDIR)|;s|@INCLUDEDIR@|$(INCLUDEDIR)|;s|@VERSION@|$(VERSION)|' \
- 	    -e 's|=$(PREFIX)|=$${prefix}|' \
--- 
-2.42.0
-
diff --git a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
deleted file mode 100644
index dd898b059612..000000000000
--- a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 764f411a..86aaefd8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
- 	PCLIBDIR := $(PREFIX)/libdata/pkgconfig
- endif
- 
--all: libtree-sitter.a libtree-sitter.$(SOEXTVER)
-+all: libtree-sitter.$(SOEXTVER)
- 
- libtree-sitter.a: $(OBJ)
- 	$(AR) rcs $@ $^
-@@ -53,7 +53,6 @@ libtree-sitter.$(SOEXTVER): $(OBJ)
- 
- install: all
- 	install -d '$(DESTDIR)$(LIBDIR)'
--	install -m755 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a
- 	install -m755 libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER)
- 	ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
- 	ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
index d3fc3901eeef..957abaa4ed60 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild
index f44668ee69e9..d9718e3f31d5 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.4-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
@@ -12,21 +12,18 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
-SLOT="0"
+# soname is .0, but abi was broken unexpectedly
+# Bug #930039
+SLOT="0/1"
+RESTRICT="test" # tests are for CLI and not the lib
 
-PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" )
-
-# see Makefile:1
-QA_PKGCONFIG_VERSION="0.20.9"
-
-# XXX: Please, don't forget to check this on next version bump.
-# And, maybe remove as non-needed, if version in Makefile will
-# match the release.
-# ref: https://github.com/tree-sitter/tree-sitter/issues/2210
+PATCHES=(
+	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
+)
 
 src_prepare() {
 	default
@@ -36,14 +33,15 @@ src_prepare() {
 src_compile() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		STRIP="" # bug 930020
 }
 
 src_install() {
 	emake DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
+		  PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		  install
 }
 
 pkg_postinst() {
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.4.ebuild
index d521078d2bfc..db60d1726316 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.4.ebuild
@@ -12,24 +12,17 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
 SLOT="0"
+RESTRICT="test" # tests are for CLI and not the lib
 
 PATCHES=(
-	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
-	"${FILESDIR}/${PN}-0.20.8-no-parser-header.patch"
+	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
 )
 
-# XXX: Please, don't forget to check this on next version bump.
-# And, maybe remove as non-needed, if version in Makefile will
-# match the release.
-# ref: https://github.com/tree-sitter/tree-sitter/issues/2210
-# see Makefile:1
-QA_PKGCONFIG_VERSION="0.20.9"
-
 src_prepare() {
 	default
 	tc-export CC
@@ -38,14 +31,15 @@ src_prepare() {
 src_compile() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		STRIP="" # bug 930020
 }
 
 src_install() {
 	emake DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
+		  PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		  install
 }
 
 pkg_postinst() {
diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
index 1725e8da5f49..db60d1726316 100644
--- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
@@ -17,9 +17,10 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
+RESTRICT="test" # tests are for CLI and not the lib
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.20.9-no-static.patch"
+	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
 )
 
 src_prepare() {
@@ -30,7 +31,8 @@ src_prepare() {
 src_compile() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		STRIP="" # bug 930020
 }
 
 src_install() {
author	V3n3RiX <venerix@koprulu.sector>	2024-04-15 12:04:03 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-04-15 12:04:03 +0100
commit	7fa8a1e3f149eea4c844c47cfe26136ed7614c58 (patch)
tree	e514d1b9999d088064bee1e34a3a3c500d6d7a07 /dev-libs
parent	d993571e2ee444d08f4e9e90d493ee37338657e3 (diff)