gentoo auto-resync : 12:12:2024 - 02:01:23

26 files changed, 76 insertions, 224 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e1e5f30a00a6..9a5b1d757321 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index 740e25d52330..ef90c8515b09 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -2,7 +2,9 @@ AUX cfssl-1.4.1-build-fix.patch 587 BLAKE2B 74651f5b21947cab2a004e25ca4b30cc6f33
 DIST cfssl-1.4.1.tar.gz 5736648 BLAKE2B 581627eb269fcbbbe9ff3afe558c6ddc7afa10f563444899244045baa0ae195d8822b389e7c59bec6c9135b1159b18d2a5e497c83cd26eaa47a3a87de23ce694 SHA512 0aa557708a300e2eaf48a99d55794069530b6842584cdd867a864272b205c89d5abc2acf3a19d34b3b5519a6429b5f55685129638e65d574ad6afe5b7e1e1e8f
 DIST cfssl-1.6.0.tar.gz 7428162 BLAKE2B 100313b756885e00a09003bfd326f8b0d69a14d148cd65b97a53667716c14a8841d862740b7dafbca74da30a8f1d6465ca3f3bad6ccd2ed39379bb1de80fd225 SHA512 a1470c50a6ffa506d2c1798a9e8af5a60206cd41d24cc3ca8a071e9ddfc3249a07fa79c03dabc3df0800985be7e930018045ae95ee83d31486cba93e516da111
 DIST cfssl-1.6.4.tar.gz 7890450 BLAKE2B d179f8768894b3686b377698120df6dd33f7dd82b4f8c74b626ca62168f59eff350129793f0954cc7db5e621d26d99f4e26ea579cf7eb5d5f89520cad060f5ee SHA512 6327d15dda24bf072958c74f4cd0bf1aa4023f935bb24da7f5655739992970fa777f6771603dd3a6edfee6cd2ed418a2fef335f7209ce88cf07674d592c3110f
-EBUILD cfssl-1.4.1.ebuild 723 BLAKE2B 8796b3a7fac888d22b3f772efbdb170fda602d81dee6dbb7596e4dad342253bcdee0960097360ace5990aa52b799c4019cbea0825ce19c47b3107461f8ed7802 SHA512 5d14c653d7e696e9e71e6c1a1916ada90df93bde6e879ca2b812fd6a258e2506dc72ac0881a18b3ae573d0cdf7d29a8f0681db120f88fe1d217027a6067b23f7
+DIST cfssl-1.6.5.tar.gz 8164981 BLAKE2B e82a80969f1b51142753bb9a8fcd4ec4854eb3a456bc1170159117ca8a29d6cb883c25e37981e7922f91480e161b1d0eea0c5265caaa550ccf31e01b092dac8b SHA512 b59863d534474ba73efe2dc38b55ba4eb1e0911346b6b9fff7778a3bdc77bf58290ab7173e3ce2cd69f38594dc471ce78632c2aa1cf9188eb6163ca272391185
+EBUILD cfssl-1.4.1-r1.ebuild 860 BLAKE2B cf553f611df5790abd13d3a9270d976b20727f9567eb6b62b7f3cf09e0eba546934dfbb57e13267ee04c9cfeecb07997710b9640b3642bacffcbdbbde765abfe SHA512 42651ec77a4b58c2690186a90ec1049be39d4669e3e161aa5a475f0ef3bdfb4bced7c4913be8563e1d413a7626295985471801e0e800b9efa56dace4ad44c621
 EBUILD cfssl-1.6.0.ebuild 738 BLAKE2B bac345d0dc6032d3add53cce501bd996495bbc8da5babc834a2ccb83dd0bd9cace7d7632bcbca80517324aca14dd997e3e3725da5d1b253b6d70df86a55b4dc6 SHA512 03878122f426c1ab6bfe45037ec6d03b1060a432f1c2507f35f8e87a2d9f444e690d5b2ed99e923a566cf7917e91f699cdfd369f0d14284a0317e2747ec5a854
-EBUILD cfssl-1.6.4.ebuild 738 BLAKE2B bac345d0dc6032d3add53cce501bd996495bbc8da5babc834a2ccb83dd0bd9cace7d7632bcbca80517324aca14dd997e3e3725da5d1b253b6d70df86a55b4dc6 SHA512 03878122f426c1ab6bfe45037ec6d03b1060a432f1c2507f35f8e87a2d9f444e690d5b2ed99e923a566cf7917e91f699cdfd369f0d14284a0317e2747ec5a854
+EBUILD cfssl-1.6.4-r1.ebuild 875 BLAKE2B 3e00dd52283341acec95cbe250155424ba1c3f142b7a5e6eeb2ea0d836294e0978fd7baa2ca077d5d5bd04bdda36880ffa377fce4d5f5b9b2735046563e0ec53 SHA512 215c716bb683c97df35b973b7ebbed5c5568c7e27f10300000f9e23b46872254a933f447c94192fe040a325085ac4c4cd0b3d58d109bf42da30eff913452cfcc
+EBUILD cfssl-1.6.5.ebuild 799 BLAKE2B bde5014559c12c9ae212ed19a6fadae4a4eb82dae94e5361e5752ad5dd2ff918564cdf9f3aaffce53ede96cae2f5c301e6503ae36249adec3cf99f52a5d48642 SHA512 961aed162f61ad3e64c8c2bad4c8fbe12676767de9324951b712ebf2de735c97e36ddbf0411176a5fadecd85c22982aa3cda70311adc792565108d57130b4c4c
 MISC metadata.xml 330 BLAKE2B bbb2f2d9abd1ba1fbde9fff4d2d359cf7c3b73d5ddc0eaf0b5a8dc9bce9fcadef9ee807a2f68145d5b02979aec8d509b592a36bfb64cd9780fa7a18420814253 SHA512 c8c8a7ae44906be864148824b20790319e86c4fe2424cfc5d5560610e7bbfcf04103af2f8a365c88dfd801154a5c3f4a35b4fc0f8bead4eb3ef0af77473a59a9
diff --git a/app-crypt/cfssl/cfssl-1.4.1.ebuild b/app-crypt/cfssl/cfssl-1.4.1-r1.ebuild
index 7541ce49e832..d9a5facf5a3f 100644
--- a/app-crypt/cfssl/cfssl-1.4.1.ebuild
+++ b/app-crypt/cfssl/cfssl-1.4.1-r1.ebuild
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="hardened"
 
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
 PATCHES=(
 	"${FILESDIR}/${P}-build-fix.patch"
 )
@@ -30,4 +28,10 @@ src_compile() {
 src_install() {
 	dobin bin/*
 	dodoc CHANGELOG README.md
+	mv -iv "${ED}"/usr/bin/mkbundle{,.cfssl} || die
+}
+
+pkg_postinst() {
+	ewarn "Please note that mkbundle is renamed to mkbundle.cfssl, to avoid"
+	ewarn "collision with mkbundle in dev-lang/mono"
 }
diff --git a/app-crypt/cfssl/cfssl-1.6.4.ebuild b/app-crypt/cfssl/cfssl-1.6.4-r1.ebuild
index 3d244721ab37..83786737696b 100644
--- a/app-crypt/cfssl/cfssl-1.6.4.ebuild
+++ b/app-crypt/cfssl/cfssl-1.6.4-r1.ebuild
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
 PATCHES=(
 	"${FILESDIR}/${PN}-1.4.1-build-fix.patch"
 )
@@ -30,4 +28,10 @@ src_compile() {
 src_install() {
 	dobin bin/*
 	dodoc CHANGELOG README.md
+	mv -iv "${ED}"/usr/bin/mkbundle{,.cfssl} || die
+}
+
+pkg_postinst() {
+	ewarn "Please note that mkbundle is renamed to mkbundle.cfssl, to avoid"
+	ewarn "collision with mkbundle in dev-lang/mono"
 }
diff --git a/app-crypt/cfssl/cfssl-1.6.5.ebuild b/app-crypt/cfssl/cfssl-1.6.5.ebuild
new file mode 100644
index 000000000000..bddb9317c463
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.6.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Cloudflare's PKI and TLS toolkit"
+HOMEPAGE="https://github.com/cloudflare/cfssl"
+SRC_URI="https://github.com/cloudflare/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-1 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.1-build-fix.patch"
+)
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" emake VERSION="${PV}"
+}
+
+src_install() {
+	dobin bin/*
+	dodoc CHANGELOG README.md
+	mv -iv "${ED}"/usr/bin/mkbundle{,.cfssl} || die
+}
+
+pkg_postinst() {
+	ewarn "Please note that mkbundle is renamed to mkbundle.cfssl, to avoid"
+	ewarn "collision with mkbundle in dev-lang/mono"
+}
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index e41566cca837..23c19530bc80 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,4 +1,4 @@
 AUX libb2-0.98.1-distcc.patch 473 BLAKE2B 245a73813769d12c83089893d2a82fcb9f6f7f5a284b12997132d271484a4e5ca8df1891a83514a2c9aae984bd003424290ac4700c2e24a9885694c4e5bdedc3 SHA512 9684f9358dff01b23a799c74c0e72f3af9bec1a5577e66620c24b0a0e91a0e17fd6ab426b42e238375529eed4fbd47b5974764bd136907614abccd21c13d0c65
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
-EBUILD libb2-0.98.1-r3.ebuild 1886 BLAKE2B c16f7d06c9d6bd3d9f4a0d5032b2b47e48f58b63244db84220bb78d1313cf9d6d7f0a1a74af0226cc99fa59b149cdb216d273f7eed38f9e89c1fa1b920ae9177 SHA512 9c98a472ebd0728bbd907d4e238be1d5081b37543e97a7f577fbb3f082ba162f920ab01e220cb812a352f071693769a2e115aeed81eb0f606c79671c514244b0
+EBUILD libb2-0.98.1-r3.ebuild 1886 BLAKE2B cf1adae5ba9acbb0dd816789de04c02eeb80e9400bcc3a35af46f03211f132fe9afbc6715450bf19abca228de438ec2b1d65bc2e6f1171a2b2ed42e5efd9ee69 SHA512 51e47d86ecb0b77bbf2ff48023f8865efba7b6243e9efc538894533ce90a72c45b6fa469b3790446a285de2c61fd0193935c3b88eff90eaccfc3a0c43bb4b8c3
 MISC metadata.xml 766 BLAKE2B 145882c283f1380a065f239f056b67f46dd281bcdfd1ca1cf946b049136a4465c41ea7aa6262a5fcd2763a06a4a350edfbd3007c80e767c5868193125d4dd766 SHA512 0887ed2a64e96fb780c01061fcde1fe526c6d0caa0ba44b982d10bb62bf387f189ec0804494fb9fa86a7abb463e571d788f73dc4433a2e4cd751e985e0d35347
diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
index 17751b670871..d3b6b87a1c0f 100644
--- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r3.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=7
@@ -17,7 +17,7 @@ IUSE="static-libs native-cflags openmp"
 
 DEPEND="
 	openmp? (
-		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
+		|| ( >=sys-devel/gcc-4.2:*[openmp] llvm-core/clang-runtime:*[openmp] )
 	)
 "
 RDEPEND="${DEPEND}"
diff --git a/app-crypt/rpm-sequoia/Manifest b/app-crypt/rpm-sequoia/Manifest
index 1a626bf17899..c9db9939ab72 100644
--- a/app-crypt/rpm-sequoia/Manifest
+++ b/app-crypt/rpm-sequoia/Manifest
@@ -353,6 +353,6 @@ DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe1
 DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
 DIST zerovec-0.10.4.crate 126398 BLAKE2B b078784d6f178bbb9de1c3c1b6c7ef996f00bdd7dfd2924bda921e62f3e09e953fbf50f8d0da99ac6ff6d134f146253846f5663549dcf8df08eaf34b9d4016b3 SHA512 db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0
 DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
-EBUILD rpm-sequoia-1.6.0-r1.ebuild 6088 BLAKE2B 4aac4f6ea7fe0ef14fc64456d50015f658854fd367cced2c3cf09fddca51db31a428b28ec0634ed7ee4d349be1f5c3cc8e1e6d72ba24a3fb2190fb03798451a6 SHA512 46724192693191b13361b1937e609c157d45eef29b4f104250bc7b0e9992e957e75a8cb5cfb8e18d8fa1d7fadd54f51d8764af4595d8a8c0ff2fe028c2ee2aea
-EBUILD rpm-sequoia-1.7.0-r1.ebuild 6271 BLAKE2B 1e8baf7851a2fe74a3fd22698c06462edcc49a51cfb0ab79b78d5994d0e93be79e4bece2cf5d6e878da6c409f15722489ba78fb369623afc129f36f9c521ff05 SHA512 6b6ffcd843f0efa769727071c36ceaa9eda533a10c698814d4c2a2bec9e6c51da05d3a99cb3f46417ce77a0a19d2bac95ca99e7fe5f22f44dfb89ec1fcbdd452
+EBUILD rpm-sequoia-1.6.0-r1.ebuild 6088 BLAKE2B 0a8b8d3c51e1fe5fb1bd7ed11a3deeeb4d27a21c53f680e681971a992b04597bd442614d680825a970f58ba5e8aedf16f55f544982e29b02f3b0e6cd9c6ac71c SHA512 b5806cdee5bfd4cc7e041470f694710c6585f969757501c7fd15da423c9e7b6d951a1005bae1a0833d75b523f13b7a0857499ca604a5581c538c0d01aa226034
+EBUILD rpm-sequoia-1.7.0-r1.ebuild 6271 BLAKE2B 42b3621c0832d6605dcec32341dfda6999a1ce3c3981c3ce64360404eaab550b4bda5f0c0503a704b3e58f5f957598988fe51bf030785e6627e612c09dae3c6e SHA512 bfcf7c2d75262d77dba6342b63626d90bcb996642a1209da1125d1bcc90d317a3009f69921cb3bb424b0116d77116fb91f161c25c2374b024fd28b8ca4425b77
 MISC metadata.xml 677 BLAKE2B ef639f0cedd83cf162d928db6409331c199ee34e8a9ba8b1861d1b5ae22d79eb586e9c7c6725910aeedaf5f5a06a7477677062613f376db262b12bd6c1c2cba6 SHA512 478ca30d1961b6dceb053e1afb04a1d57e3a9bc8b7de003367b7d111c4cfb675dfe803a973c6c368bb8541d66d23b91e67733177820d9f0d90c2d7ffeb3c0fb1
diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
index afd0c9eb297b..4164ea3ae292 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild
@@ -266,7 +266,7 @@ RDEPEND="${DEPEND}"
 # Clang is required for bindgen
 BDEPEND="
 	virtual/pkgconfig
-	nettle? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') )
+	nettle? ( $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') )
 "
 
 QA_FLAGS_IGNORED="usr/lib.*/librpm_sequoia.so.1"
@@ -278,7 +278,7 @@ pkg_setup() {
 
 llvm_check_deps() {
 	if use nettle; then
-		has_version -b "sys-devel/clang:${LLVM_SLOT}"
+		has_version -b "llvm-core/clang:${LLVM_SLOT}"
 	fi
 }
 
diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
index 6c85a5471878..cffa19bf99f0 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0-r1.ebuild
@@ -284,7 +284,7 @@ RDEPEND="${DEPEND}"
 # Clang is required for bindgen
 BDEPEND="
 	virtual/pkgconfig
-	nettle? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') )
+	nettle? ( $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') )
 "
 
 QA_FLAGS_IGNORED="usr/lib.*/librpm_sequoia.so.1"
diff --git a/app-crypt/sequoia-chameleon-gnupg/Manifest b/app-crypt/sequoia-chameleon-gnupg/Manifest
index fa9291a6486a..115d352d81b2 100644
--- a/app-crypt/sequoia-chameleon-gnupg/Manifest
+++ b/app-crypt/sequoia-chameleon-gnupg/Manifest
@@ -527,8 +527,8 @@ DIST zerovec-0.10.2.crate 126403 BLAKE2B f6f7e08c27e5724c9071cf007c09a3fdc80b84b
 DIST zerovec-0.10.3.crate 126403 BLAKE2B ed783804e7852c85f2d19225c2c397f9e87c9c52e1e31b222796aee5772503e9cf7bdf21c44c1566804a5e69585420d57d5af11b8024df69df063acc9704f5e0 SHA512 692ed6150047b131cd540c392351fa953fe477d9eea7a8b05f5e6d3bf27434e27c149099f8875bb0db5aa24ed1c974ab9f8afa14e9557022e91ad168d2831a0d
 DIST zerovec-derive-0.10.2.crate 19366 BLAKE2B 226d599e59c682ba167506d9cedf4f1b004881a624cec3b462ae0d2a1982e9297b9943b70649f0e98e46bf6a6fca68952d181625723a5bdcf779f07cf412dba7 SHA512 da4a056e9147142e51a58c3b16a12179433fc889b4efacbadd1294bb5a750860201a472bf7d72a10e7e82e95d97761a67ec93a727620c1c1844a15362f6736ea
 DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
-EBUILD sequoia-chameleon-gnupg-0.10.0-r1.ebuild 8779 BLAKE2B 78b099eb690c4b56a7403820ec0ccb2d3190ac06844780ae97103980cebc56a1d7386aae17d0f21ca1ee2b15a4877e8740f37d8b6b1c28ee20c3e617df5c5587 SHA512 ded68a47292a8b8a9c4f5c50b44da057cbec376932286ba8ea5ea6c10d0abe0122fc8035e92c4170c4824b5da87b4207b8c4ef7c312d9c7a910e7e52e9b074f9
-EBUILD sequoia-chameleon-gnupg-0.10.1-r1.ebuild 8749 BLAKE2B 7872d5b9977d9d41e6575b1cfab18ef16db50551493c16f573e808f92031a8c09e023a33b0119a630b825b24455ad1dd50def05621e64f4cc8021ff817708e6b SHA512 b84719bc8489e8d732b3acb5caa188097920a3cdafacd6c5d9c3eea96f9f01d071e42593089754bf09549cb0d59677b020d149ebe0c51606e6bfd5ccc91ebd88
-EBUILD sequoia-chameleon-gnupg-0.8.0-r1.ebuild 8183 BLAKE2B a2398b756f363599762f9b84fad6128c6b91661900608881651cbcc6450105cc1fedd4851670134c6fed54e39a167580b956f80f1240ff14abbc8b1c86aaf438 SHA512 330fe4a69d3babf0813dfef3a7419ca3c22d7e1d1c8eea19fcb1f941afba0ac40647b7fded6a5e8781f13decdb9ee5d8445128c20f93e3727942687b1c816d51
-EBUILD sequoia-chameleon-gnupg-0.9.0-r1.ebuild 8249 BLAKE2B dadb1ab31d6724d92bae31abfb521e2b21ac72005aa58708765cb84ea4ce9761b3f001e3e95419f581660f288193bbc6f93878652b077a93d1b55850438b883a SHA512 ba30848f7d320cb58250332f39c5c84aaa26cb18292d678efe9682948352f3a8e3b7c1f29f4b11daf4adf4111992da58a5d35a4c62840c058b130c8787f53d4c
+EBUILD sequoia-chameleon-gnupg-0.10.0-r1.ebuild 8779 BLAKE2B 5c5410266cabc5403ac5bc7411c8cb4027e78dcc49baef97c05d2d721249e4a6e8396ca00cf7f43da4b50e8a2ee911b76ca6150335f25db5f3efe0a5534dacb0 SHA512 dbbbbb68cacb641f26fbb6e8a06faeb72e24a51061211611522a80fbef8ce92858affa7b45b0662bdfe284ee9ad55f3254c2f8ebf701af0b62d3606dac390bb3
+EBUILD sequoia-chameleon-gnupg-0.10.1-r1.ebuild 8749 BLAKE2B 55d4a215ce88e220089134ca932fed176aa0156b415be3b4d502c9edb640048f7cd286a2cbb48db82811234c043c61250ff6795b6c72b7ecb9cf31a282a56005 SHA512 2cfe6a8e9fc6915b5a9fed903f4784e187b5a6df04bff9c02fc3a042ded7f7cecf1a04fb3293703110ad5a89ce3e2b2b3d722714b26869c53e55a0a72c8e8d05
+EBUILD sequoia-chameleon-gnupg-0.8.0-r1.ebuild 8183 BLAKE2B 946446915d9b5fe8db2457bce79f157cc13efc19f4f72788a00cbf4a022b46ccb7651d0e78603ef5ecdad537c5273021a1a3e865ab2295beb84e718c7ffd92d3 SHA512 ac676ba73a94d06fe5892f66d480b33991bb9a8ff73f33c1dca403a47cd9684300f0838bd3c993d7961f2a30b46d5d6cae8fa1578ce57258ca83b2d0fa3ed791
+EBUILD sequoia-chameleon-gnupg-0.9.0-r1.ebuild 8249 BLAKE2B 0c7dd40364169b253410df132d36459754c966cc153e71ccc8e0e6e6250e63adbe1d31d3b742e299f9cb73715f5ca6d3808ecb1a67d4172285e036d628cad965 SHA512 2bca7afc9a3a26ac5eab143914c60e3a98bf02fec930b12dfd1d1eadda97f6fdf5c771576a06407c6bca6339d7d13196abd4988e0565cb30c885bcdea1e055e4
 MISC metadata.xml 447 BLAKE2B a876bb1a6e3290305705c7b732d4225f658687095bcba12285f3c3e258177ffe9dd3ba0cd4e3b309dcb6e076906a8d568f9af1d932870ee1a4d471b9989a07cf SHA512 7d2d5e66179740cc71a73bc918c20ce0e022053841f60a1b8bbe71b9ef7df64457c39d2113e98043eaadc435953475823c0d8945e59f2ba3700b505680953afe
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
index 64b191ed02db..77e21bae6c1c 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
@@ -429,7 +429,7 @@ RDEPEND="${DEPEND}"
 # Clang needed for bindgen
 BDEPEND="
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}
 	')
 "
 
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
index afaeb7fd6362..e88952d1ac7b 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
@@ -427,7 +427,7 @@ RDEPEND="${DEPEND}"
 # Clang needed for bindgen
 BDEPEND="
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}
 	')
 "
 
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
index 95658418e7e9..36d5eb24e7c4 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
@@ -400,7 +400,7 @@ RDEPEND="${DEPEND}"
 # Clang needed for bindgen
 BDEPEND="
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}
 	')
 "
 
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
index e1f74372c492..9f1505dc419f 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
@@ -403,7 +403,7 @@ RDEPEND="${DEPEND}"
 # Clang needed for bindgen
 BDEPEND="
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}
 	')
 "
 
diff --git a/app-crypt/sequoia-sq/Manifest b/app-crypt/sequoia-sq/Manifest
index 5527031e482b..61ebdeb7ced7 100644
--- a/app-crypt/sequoia-sq/Manifest
+++ b/app-crypt/sequoia-sq/Manifest
@@ -619,7 +619,7 @@ DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe1
 DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
 DIST zerovec-0.10.2.crate 126403 BLAKE2B f6f7e08c27e5724c9071cf007c09a3fdc80b84bc3f7a08647d6e312674f82c1e35335e8c72da5d47904a937bdc6f29c26729b35123f6e8119f6991c7055318af SHA512 159cb90d2ee2a2662429141e0948cfb44e7784ba35e92c32b2ac7183d6b69a9318b0617ff4de7b87831f9727f9d5c9d7d4fd3a9b1f54e67ca29a4ed6afc8d046
 DIST zerovec-derive-0.10.2.crate 19366 BLAKE2B 226d599e59c682ba167506d9cedf4f1b004881a624cec3b462ae0d2a1982e9297b9943b70649f0e98e46bf6a6fca68952d181625723a5bdcf779f07cf412dba7 SHA512 da4a056e9147142e51a58c3b16a12179433fc889b4efacbadd1294bb5a750860201a472bf7d72a10e7e82e95d97761a67ec93a727620c1c1844a15362f6736ea
-EBUILD sequoia-sq-0.35.0-r1.ebuild 10677 BLAKE2B 34c603a25333789f848a30f90ccfa1876e4687f08a4edeea16c9b8a05d05616005a3c35047edddd0ea00cb332084bc45846aebd4b855eea38724204b068df0ba SHA512 c816c13ed11447b76740134845f2d78990d54fe68ad8edbf8b2868bbf8eef4eb9f6cdf750568d9de910f3f7b9432db349e0b0ea45934ff3401c42829e60b08c9
-EBUILD sequoia-sq-0.36.0-r1.ebuild 10771 BLAKE2B 008911130d25fa7b77ec18d0ea3fbf7d7946fa610c3f6fea012074fa69adc489efb8cacc21284cc59a3084ab5af77395dddb8358d1c01e1e53ed621330745358 SHA512 2b22f5c958aa32ec00ba866be423191395d7852be6d62e0313eccbb24e68fc735360ab4f74e24322037e489061858a0f3bd7dcbf5b5d4e4416214a327936abbe
-EBUILD sequoia-sq-0.37.0-r1.ebuild 11297 BLAKE2B 5aa21ab31f0d50d37a67f188bfdae5922f2ae58d281122e7bb117434c80e8e922bd65178971897103ffb77a694321dca0d0e6b550f145a90d1eb007df7ba72fb SHA512 cd74c081bdbe313df9aa42257d4d9e6aacae7adf232b8bd4a1a69d574a5674fd4c84389837893f76a070c3dfd71b4ba26e6be9d6d2aafbcd914b3fcea9b61262
+EBUILD sequoia-sq-0.35.0-r1.ebuild 10677 BLAKE2B c90c52b8cd94283c1f3939bfb079c4a37011c983c65f7684b3c6392700d799750061d6bc531e328f1f6e7fb596c0ced77dabadecbf01e37f42923e1816aa3440 SHA512 0fa429f655e36d1b2f869f396ff01222bb5965fae917902672e9f8394d86d04d62bcabf986111b11beffc69a9d2a6bcd113a92e6ffd44a4e7d4e3764071bccab
+EBUILD sequoia-sq-0.36.0-r1.ebuild 10771 BLAKE2B 85dd5743e56fd71341de904513276d96debbc70faeee0c40a08aa784f15459cbec94b948294320761d500a906ac2aef2725b1b20a849f9aa15ff3fb1c56d5848 SHA512 e9d00ce2f99f75d115ee040767d33362dd02c5a49a6b4e8a1f1d9f546ba6fd9cb0d349159ee54329024c1566df0213861f60307c6026ad03d7353b269ac9237e
+EBUILD sequoia-sq-0.37.0-r1.ebuild 11297 BLAKE2B 88b362907edfd5c6142bdc3ff882b27be33b71bfecd0b4857ebae22556dcafb7e49b4e678ca09edb2e51946705a64d4b7ed7c6c4c52d39c50dc8b2711f741459 SHA512 995911039ccccc7e705340813c99fe6a90f427a2cfe9ef35c98d6a9971622bde5d9e99e5bb1638cbcc7a4453ed89818971fc15f4a0ffabdd7ac6ebd1f5b7c63f
 MISC metadata.xml 493 BLAKE2B fe962d673ec673634b5f8451d0438206935ae852dcaf7cf6b96dfe33b408785cbd8a19779f91d35bdcbc3c21ffd756f8fe9fe4b2bcaf02856d8d5be64532dcbd SHA512 97b04243d9a88ea6b816b66f5e771cedca887ac44c66b35db69ecfd917480ee2f8e81498a22cb0fe85713fe4ad276aa7178f47e83a7604b097fae3bb23cc62af
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
index bac089222857..67da219c4c14 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
@@ -525,7 +525,7 @@ RDEPEND="
 # Clang needed for bindgen
 BDEPEND="
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}
 	')
 	virtual/pkgconfig
 "
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
index 784b920e5d85..ff40d8957e9d 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
@@ -529,7 +529,7 @@ RDEPEND="
 # Clang needed for bindgen
 BDEPEND="
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}
 	')
 	virtual/pkgconfig
 "
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
index 16c18d31960d..6ee98d77be75 100644
--- a/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.37.0-r1.ebuild
@@ -555,7 +555,7 @@ RDEPEND="
 # Clang needed for bindgen
 BDEPEND="
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}
 	')
 	virtual/pkgconfig
 "
diff --git a/app-crypt/sequoia-sqv/Manifest b/app-crypt/sequoia-sqv/Manifest
index 9e5b316552fa..e3285f93eb6f 100644
--- a/app-crypt/sequoia-sqv/Manifest
+++ b/app-crypt/sequoia-sqv/Manifest
@@ -243,5 +243,5 @@ DIST x25519-dalek-2.0.1.crate 87820 BLAKE2B 039749d0278d95996016260f9e32162b3705
 DIST xxhash-rust-0.8.10.crate 20066 BLAKE2B 5fca80ff05e00d5f78c2655093a963b08a16d2bd40e74e53c9e48e9812f81d668f9d60cd23872cb76ecb643cd381eddb841da5ba93a5f9fc92e42e6d8bb7e871 SHA512 c5a66c4c7a30dffe9d925dbfa8d0b5ae5b825770cb5d52a0d5de2eadf24c9af1b08b11b2e7a94ce60a30dabb2ce61cd3066cc781d05c90bc6a9d46daa2e04b71
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
-EBUILD sequoia-sqv-1.2.1-r1.ebuild 6199 BLAKE2B 724e1e81c19f38817b6ee3b08a2510ddb628081cb0553b8d6c29a4a7cb8d7c3664939a382fd56a998aed327467ce5c57647da09aa12480d9309db64c626dcf74 SHA512 aee586df47ebce5164e4bbb074ef80f51cb886e85975fcb9ffda14a482db3c53e2995d0aae578d40400052b223ca7c2b62ff6306bd4b42eeb7f261fa1e4194d9
+EBUILD sequoia-sqv-1.2.1-r1.ebuild 6199 BLAKE2B 8d39072048d1809953d75a6c0a564d7d7e4b896e5d54a0d83b9627aea32be5a59b2934bae6a4b778a76a3a85a988b9ae36192991dc71ef1b0eda7ba833e8659b SHA512 37f897a1bb9deb30fe09511e5678f940907c7879d945ee80f0f97736729e60d7e0179198af62f557403c770c86b2a11211de821d8379123ad4345959fa217a5a
 MISC metadata.xml 435 BLAKE2B 0d2b4ad9f546657d9736088eb9deea2622976a78128476013fad90173d2c0e837df89a527e597fc70108e38289dd74b55417a1edb01430a5393d24c7c5142a1d SHA512 c230769f501b0abe786f94d36cb6583bf8c85ef957fab89db4258fe773473b8940748029fa158ffe17e1db02f2c6ee8a2481ffebfb5b0d3e4e86a1a2ebcad99d
diff --git a/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild b/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
index 980514150d8f..4747509779ff 100644
--- a/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
+++ b/app-crypt/sequoia-sqv/sequoia-sqv-1.2.1-r1.ebuild
@@ -286,7 +286,7 @@ RDEPEND="${COMMON_DEPEND}"
 # Needed for bindgen
 BDEPEND="
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}
 	')
 	virtual/pkgconfig
 "
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index c98c39dc1d1b..ab10b0699d9c 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,14 +1,9 @@
 AUX swtpm-0.10.0-build-sys-Remove-WError.patch 458 BLAKE2B 70ac46cde8c995a8569749c2878d2ca0f4d6edf66a4668c7943d5e46f193767b9ff13a93284c255296351a08038c1444b2ad829d7389665aae2f2cdf5d866c99 SHA512 d2766c1c78f3b0fd45e574b963b6b49c53ffcf03788962bdf4ed992574bad9ccdf9eaaa7fa5ec70236daca8a4f4edade63267990df1b93dae8ffae345bda3506
 AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aab6b8f7cd3de53509716d48fd2f30d136279bb2a52a6a942f43a2c87e6f66db9f3470f0486255db8056da8c49b2b788048af62aa3ba SHA512 981a1fe5bf25c7a820dc5913b0384bc48b0bc50cd84e04921f0f64a4be6dd6b2a815d4cba39370b2e62c4473f2edbdc6bba7b09ce74b9e441f1b8df3166eb959
 AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
-AUX swtpm-0.7.2-Conditionalize-test-dependencies.patch 1065 BLAKE2B 359cf6e692691317255d8c456abee7fe59a5370bf94f0bdd37ee6bb16ceb80340939f3f0a348398c6c93177690f4e2dc141d2b6c9f12319586c5a850dec2cd5c SHA512 8a2731b9d9c49fa2a8ea2732b20dbbd7264b1c93b00848e67f83e5d54f8ed150e97ff940422ccf46de21ae8d81fbf951314b3908ef0377d8548adebc4872474f
 AUX swtpm-0.8.2-slibtool.patch 779 BLAKE2B 4403ddecb4d1b2f0f40c3f4511ccc51eb0345d8570a5b36ef125c8c8781d8bceee6741b08f77057ca9eb222cfe31045748e722d837c011a393512cd539c1f7e7 SHA512 37bdaf16950b3b94af4ea8d8f042919a550fae1c9a8519eac36acc1fa289daa5677ba227b5e5a224a98b4f6859335a3f4e10de293c8283ac87474a84cef49f9a
 DIST swtpm-0.10.0.tar.gz 414698 BLAKE2B 62ebc5638e7c0b6c2be42d8da5369dfce708339882b582b154aa46d5ae6ed4a59f4e6cc31a05b062190b98a461caed82281bf64b05e8941d3923d200cfde501c SHA512 6f1848b0514799417582c1a5bedf9b7110e3627ab14f02ea193ad76ce8a188eba596494f410405c5f7226e2daf7d9ee889983a2265285839e72de12e6368180d
-DIST swtpm-0.8.1.tar.gz 364169 BLAKE2B 4b364ed581ea97d78c5c6248870503b1612d7d164b05b76c1f02644aade6fd09f204396f0a2d0db4e0ecec2792dc512f7c4393c44bf7ce447a3a7fbb8754594f SHA512 07276519b0e20c9c4167ce78e789d2072eb90172ed9bcba2a11eef46ee03a77860f7a2218f4dc013a2ddb8471079e3cbe43f8ab02174bd704a78aea8eee3d2fc
-DIST swtpm-0.8.2.tar.gz 364432 BLAKE2B 1ffa6feed88a67a2eeea1fca1c034f6513347173d59ae0c0654696faa1e791529e7fa044c478e5fb7e016117ce5f3151b875014d85eac528e4b6d92d5cf9017b SHA512 3b63116b1ed56087e05b0b697462720a10fe384ea2b8ec7115b549df8f557f6a9cf4de8e7d65b8061a1c85e54e015e0249bfbb613d35c1b64453a98d23ce334f
 DIST swtpm-0.9.0.tar.gz 370942 BLAKE2B bed63851dfdb94f463bbac962044114f75abd36f6558f173fd67be608f50c8954c6038d33bb6e3d2e88427238c7c06048beae23b84b2a1e186c0de98a9bd5ad8 SHA512 4f1723679b85218e80ea6aacdffa687e541ee309ddab9bcb8d8e5aa0b461ee431c880f2e300f1dcae112646f3636593005a342ee0cb762ec115aa599369e111c
-EBUILD swtpm-0.10.0.ebuild 1616 BLAKE2B a11fe1855918ccfcb97c1234b0ed46ea0058a03c3418ad55468424d05e475df20b731dc1b6bf65a8e65e0ca077b2512eac65ed681c16282cb98e75b8114e8724 SHA512 06ce80f839576120aa7d46a760e5ff0bd5373cefadeae459b621308aec93c188c2a7f842a63bfd3335d64be27784f652e9b5dfc73539383688072db57d3baf1a
-EBUILD swtpm-0.8.1-r2.ebuild 1602 BLAKE2B b51ae100307f16be7042c8215121b12a2724c0d370b4261ca9cb2fa3ee1533901b40f7839916fca557f91c0c048154184b9012bd59b2d3997d1c288ce5b0986c SHA512 6c1ee351c2d46a7dcfc368efead75ead25471aa1fdd214827df0fa156259d1b12b348846aee6e87ec1f0c8015eb279967760eedb10f27b7ad1cf43c341043d64
-EBUILD swtpm-0.8.2.ebuild 1584 BLAKE2B 56ef23842f8f8db53af77801012e0774cdd9b491d5253c4c763247ea219bd2b9c3888be484b1d8d96b0e6b1f1a43c076e25da61721896be278f57f7433714089 SHA512 dd7e4b1940abe4eb2f0e327b92f9405be5bc38701e3fbb757dc535b12c537d7d6542d772a7b30c517ec3c212971501704d19a93f92f07d59ba94521f95f8bf27
+EBUILD swtpm-0.10.0.ebuild 1666 BLAKE2B 7c6700343d532e012586f11a23e90f553063970431b7e6f6644f56351efbbc4058c8d952d7c14f37bd53b11d686a1a542984cd2e4c10de53084ffd9da8d40409 SHA512 1bc9e84a84fbd7c9fd9a1575ace864c3e012375ee53d18b86570217e8b16cbbb1e00062ba34e800cb77d3c90006ee80edbae85a57dde40fa38d6e296f180bdab
 EBUILD swtpm-0.9.0.ebuild 1602 BLAKE2B 2370b7d3776c44a308fe6b15a87c4632b800a233974e951f7a6e254784c73921d141ac90cbfd84b925ab5f43ca13e0feceb113f7186585b52b5f9d24270c4108 SHA512 5dcf477bf01109b2086628ec4beb030eb37cf046051cdd31052708b9ef62ebfc124a3e5828c9ce2bb6cac9617106e6bcf0b7c55b7744b0cbfc826da0c294be61
 MISC metadata.xml 717 BLAKE2B 70de08f9ed69084e7ed07c72ae96ab76cdb8bf489c3d3664edab24d2a904f44a6483bb9685f0e97f4520420dab1b6796e58cff00ba82190459af12398aa4b6d1 SHA512 a4f2977c84e03e215f6455def44ead6f767d6a4803061942b799b38bedaada373b51bbd47bd87c4339df32138a339b5f595a5ea19c5706b5e424329cc8aec0a5
diff --git a/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch
deleted file mode 100644
index b17e1c2470fc..000000000000
--- a/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-configure.ac: Conditionalize test dependencies
-
-Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
---- a/configure.ac
-+++ b/configure.ac
-@@ -369,20 +369,25 @@ else
- fi
- AC_SUBST([DEFAULT_PCR_BANKS])
- 
--AC_PATH_PROG([EXPECT], expect)
--if test "x$EXPECT" = "x"; then
--	AC_MSG_ERROR([expect is required: expect package])
--fi
-+AC_ARG_ENABLE([test],
-+	[AS_HELP_STRING([--enable-test],
-+			[enable tests (default is yes)])],
-+	[enable_test=$enableval],
-+	[enable_test=yes])
-+
-+AS_IF([test "x$enable_test" != xno],
-+	[AC_PATH_PROG([EXPECT], expect)
-+	AS_IF([test "x$EXPECT" = "x"],
-+		AC_MSG_ERROR([expect is required: expect package]))
-+	AC_PATH_PROG([SOCAT], socat)
-+	AS_IF([test "x$SOCAT" = "x"],
-+		AC_MSG_ERROR([socat is required: socat package]))])
- 
- AC_PATH_PROG([GAWK], gawk)
- if test "x$GAWK" = "x"; then
- 	AC_MSG_ERROR([gawk is required: gawk package])
- fi
- 
--AC_PATH_PROG([SOCAT], socat)
--if test "x$SOCAT" = "x"; then
--	AC_MSG_ERROR([socat is required: socat package])
--fi
- 
- AC_PATH_PROG([BASE64], base64)
- if test "x$BASE64" = "x"; then
--- 
-2.34.1
-
diff --git a/app-crypt/swtpm/swtpm-0.10.0.ebuild b/app-crypt/swtpm/swtpm-0.10.0.ebuild
index eeeaaf2f76aa..10f6f19f8ed2 100644
--- a/app-crypt/swtpm/swtpm-0.10.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.10.0.ebuild
@@ -67,6 +67,7 @@ src_configure() {
 
 src_install() {
 	default
+	rm -fr "${ED}/usr/libexec/installed-tests/swtpm"
 	fowners -R tss:root /var/lib/swtpm-localca
 	fperms 750 /var/lib/swtpm-localca
 	keepdir /var/lib/swtpm-localca
diff --git a/app-crypt/swtpm/swtpm-0.8.1-r2.ebuild b/app-crypt/swtpm/swtpm-0.8.1-r2.ebuild
deleted file mode 100644
index 650e54402d13..000000000000
--- a/app-crypt/swtpm/swtpm-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,73 +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 autotools python-any-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-IUSE="fuse seccomp test"
-RESTRICT="!test? ( test )"
-
-# net-libs/gnutls[pkcs11,tools] is required otherwsie it not possible to
-# provision new vTPMs. swtpm_cert spawns certttool, and upstream expects
-# pkcs11 in gnutls: https://github.com/stefanberger/swtpm/issues/477.
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	seccomp? ( sys-libs/libseccomp )
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms
-	dev-libs/libtasn1:=
-	net-libs/gnutls[pkcs11,tools]
-"
-
-DEPEND="${RDEPEND}
-	test?	(
-		net-misc/socat
-		dev-tcltk/expect
-		)"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
-	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
-	"${FILESDIR}/${PN}-0.7.2-Conditionalize-test-dependencies.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl \
-		--with-gnutls \
-		--without-selinux \
-		$(use_with fuse cuse) \
-		$(use_with seccomp) \
-		$(use_enable test)
-}
-
-src_install() {
-	default
-	fowners -R tss:root /var/lib/swtpm-localca
-	fperms 750 /var/lib/swtpm-localca
-	keepdir /var/lib/swtpm-localca
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/swtpm/swtpm-0.8.2.ebuild b/app-crypt/swtpm/swtpm-0.8.2.ebuild
deleted file mode 100644
index 786d1888290a..000000000000
--- a/app-crypt/swtpm/swtpm-0.8.2.ebuild
+++ /dev/null
@@ -1,73 +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 autotools python-any-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-IUSE="fuse seccomp test"
-RESTRICT="!test? ( test )"
-
-# net-libs/gnutls[pkcs11,tools] is required otherwsie it not possible to
-# provision new vTPMs. swtpm_cert spawns certttool, and upstream expects
-# pkcs11 in gnutls: https://github.com/stefanberger/swtpm/issues/477.
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	seccomp? ( sys-libs/libseccomp )
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms
-	dev-libs/libtasn1:=
-	net-libs/gnutls[pkcs11,tools]
-"
-
-DEPEND="${RDEPEND}
-	test?	(
-		net-misc/socat
-		dev-tcltk/expect
-		)"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
-	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
-	"${FILESDIR}/${PN}-0.8.2-slibtool.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl \
-		--with-gnutls \
-		--without-selinux \
-		$(use_with fuse cuse) \
-		$(use_with seccomp) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	fowners -R tss:root /var/lib/swtpm-localca
-	fperms 750 /var/lib/swtpm-localca
-	keepdir /var/lib/swtpm-localca
-	find "${D}" -name '*.la' -delete || die
-}