14 files changed, 4 insertions, 231 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 5a3fcb4698d8..c4d66b1cee96 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index a5eb4d5b48ac..e76efba66736 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,8 +1,6 @@
 AUX gnupg-pkcs11-scd-proxy.confd 38 BLAKE2B 56951cac6c364a75191cbcf5b074e537bf9783e32defe4c571a64e00754565666c4f379956ff4b1db713d496ebb838ff599d2b25223fb66652dd7d727812ef4f SHA512 15a4e6534e5069a9f02050e0d7dc5a27609065fafa789985a2ab448033811c9099fbc00ded558b98797b6191c5ced94cbd1bda626a1dab85cde747a856ed1ecf
 AUX gnupg-pkcs11-scd-proxy.initd 685 BLAKE2B a7f38141554e98b859f8a6945c7e50f1c223157163bfa3f2dc10c291458935b95b29a8a383f937e144e4970d63e3b857bb9f6ec51143f90043f57da92f083feb SHA512 7afd4f088946f6829b19b897eb7bee67456f25a3f14d10f6fed14918327212d19cdd01028214207a4aba3abed6fb592e34333a5e2424d830af2ff1ec8d8a5e02
-DIST gnupg-pkcs11-scd-0.10.0.tar.bz2 149036 BLAKE2B 7282850ddb953a32114a3b28e9f1992dd73cc64d065c00308479276750bdfd52533c3347361d86fb6ddc8ae01fcfabe5b375501280c9bd93e6a6d4e209c63e98 SHA512 47b9afdc3552fc9a741a725c6732cd31cd2643d7483a50d26222d68d0557b700addff37d8598ee1076575b8bc1e1134a52e06b67d4f94dda7c90141a57ca4182
 DIST gnupg-pkcs11-scd-0.11.0.tar.bz2 154497 BLAKE2B d5a0c84c6a31a3b8396b11cc2935995a2ed754e163f60bc81b142c59d37fe6f282c5d33222b85d50f95590e07da1187ba319e0dea23490e35ccc8c04346e93b5 SHA512 6f8da7e4166dc37aa98f424a470ea6f0678cfd5b02ac7b8e11516ea0a4bda0d84855b20fde166a5406047e8251b77f1544d7b362f72016bb5ee0a13ba040a40c
-EBUILD gnupg-pkcs11-scd-0.10.0.ebuild 1194 BLAKE2B 6dad16be3e00d26cb3519f75e86e292542be61ff5e3bf33e3c58f7fd4bc0da6f353fed1202b5d7220fafbdd924537bc119eb2f5b91e7856531eee0f2c3ecb3e9 SHA512 705d5871d406d541ebc9fd20dd211e60066184fea13fdf863069e6bd14309a096d50d49c26f4b38dafc420d193e0b3520d447cc1ffae01ca82349d86baf48b90
 EBUILD gnupg-pkcs11-scd-0.11.0.ebuild 1191 BLAKE2B 0109b716264315a56ebdee8fd866b76fc5b9dbe141e908819c3d14dfb19d6e03a4bca7fa1826a3445f4ae6c2aa4725d7d4b7df66148f6d32c5b7cff79da6fad2 SHA512 0b459d679dadc2171bc3489170936b084ba22e6709492b332ad29dafd3a570c33b6785602dde54898493f01b6edd428859fb8151fccfd113d862687227f5a9b5
 EBUILD gnupg-pkcs11-scd-9999.ebuild 1191 BLAKE2B 0109b716264315a56ebdee8fd866b76fc5b9dbe141e908819c3d14dfb19d6e03a4bca7fa1826a3445f4ae6c2aa4725d7d4b7df66148f6d32c5b7cff79da6fad2 SHA512 0b459d679dadc2171bc3489170936b084ba22e6709492b332ad29dafd3a570c33b6785602dde54898493f01b6edd428859fb8151fccfd113d862687227f5a9b5
 MISC metadata.xml 388 BLAKE2B c98dcab45a87ea80fb7a4ef3090cb888701bf14a9f0074a39174549ad3ec94cb5071c792562d39856e5d40b31e8dd5b9a82e00d428bf0def47ed9338d8259ba0 SHA512 7fdcbc1668e16afc5b98006196d184cdfccbacb51740b888c4f14551e9bbabe7e8cea704c3baf1f7bdbc8984f57130b141acf20d1332a96985227c9ba333c73c
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
deleted file mode 100644
index 3a54b3d1ca4a..000000000000
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.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
-
-DESCRIPTION="PKCS#11 support for GnuPG"
-HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/alonbl/gnupg-pkcs11-scd.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="proxy"
-
-DEPEND="
-	dev-libs/openssl:=
-	<dev-libs/libassuan-3:=
-	dev-libs/libgcrypt:=
-	dev-libs/libgpg-error:=
-	dev-libs/pkcs11-helper:=
-"
-RDEPEND="
-	${DEPEND}
-	proxy? (
-		acct-group/gnupg-pkcs11
-		acct-group/gnupg-pkcs11-scd-proxy
-		acct-user/gnupg-pkcs11-scd-proxy
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable proxy)
-		--with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use proxy; then
-		newinitd "${FILESDIR}"/gnupg-pkcs11-scd-proxy.initd gnupg-pkcs11-scd-proxy
-		newconfd "${FILESDIR}"/gnupg-pkcs11-scd-proxy.confd gnupg-pkcs11-scd-proxy
-	fi
-}
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index f5bd61bc601b..6604c11f026a 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,5 +1,5 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
 DIST john-1.9.0.tar.xz 8944932 BLAKE2B 57f5b83a541a7048e34d87dbee2f8f56953ef8a98bf7163b981064289d38452d11e59f1fb48a98a4f5f61d5f33866987f7c8515bf9900d742c09b7ac3e61376e SHA512 26e9a245e9f050344ae8c3320e1e24dad6bc2b73e99cc041a50c2d124b2c898c93d048727451ab8a2ba1c8aa4d8d462a8c0c9fea7de39f3479a0c170a5e9ad60
 EBUILD johntheripper-1.8.0-r2.ebuild 2869 BLAKE2B 970038b161660bc47a1a92279c911010fb77fa5008c4bcc8cc4f90ce7cb374629282943cf1742a542d14b5e62442bff431ad956826bb7e1b5498886aa42f03d9 SHA512 199605c25f5d02064f5df1a323099c065f916c66fcd9910c60c6c1c74c2419abe59f652496158e320e09b099b31c270f413de590ce480e9bef5ce8fa900c0181
-EBUILD johntheripper-1.9.0.ebuild 3158 BLAKE2B b85f8af831156b753ac23ca91cf65b0291bb3558dde5a82d874d0aeafa67cc8230b8ccac81db80bfdc81c0d8baccbf5ff07d4fb1496b998195352de459633598 SHA512 f2eaeb0d5237c80592b0ad00c6a5a737553055acb796cf98f4df514a025b3be7740e6fd7859fae6c784248f58d1909c31bc6cf71e1da452a53076c4828d42bbf
+EBUILD johntheripper-1.9.0.ebuild 3157 BLAKE2B bd1420ebd21607b76333c20f1a83d47dcb8515063d20797e285b783a31b09531493fa6540b4491d8af071f33bfb00bc5f8aaf8913f9e7ad67618d090a12d0adf SHA512 47c4fecf21455c2778072f6aa5ea89f73e152e87e67b57f6f43dc024c6070a622d7d7896fb2a12e22ade2e1e4ae566d4718bcc419878a8de360c1fef1cc12777
 MISC metadata.xml 409 BLAKE2B f8d40635490b818425ab465d2d34e41c05881a51860e7714161c50af9b061bea3801aefcbad8edb403f3af753b919621b709d23b0a86a0b303b903653f273fd5 SHA512 ed0271486767ec9b53851b534179307b2f160aea50f3a071b9d68aaa21265f5e0e5d031be3b00580e8f706b944ab7ec7aaa7c325485acf73655d899a8787ba13
diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index b4c3fd20c0fe..158f6df061c2 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index 8380777cf565..1309ec3da831 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1,8 +1,5 @@
 AUX libscrypt-1.22-aliasing.patch 8753 BLAKE2B 3bb7c36cee79fed3959e84fe9a35ed0f5952b6ba26385b1366d0f273327e932a068145a101256ef94d3faacc98972e9fdecbb5baddf082ed6724b1e242c04314 SHA512 886f33ff25892a7b72e3cb8497a423160f3d2087c21c99bace9268f758d9c74593616a767cb75f3f8b83b0dfcb22dbd6d2715e5c96dc4f75ea1b82f3e0383eb9
 AUX libscrypt-1.22-no-clobber-fortify-source.patch 438 BLAKE2B e5089a6532f054447cd5161a8b7dbdfb32a432527b7702ce265d8c1bac76b8549d6adfcc6157e890bde4e0c9551d78f2d0aff24ea7ab989423a3716e65fcb334 SHA512 cbb9c1d6608c562c298abe5989d31b6b49f63e4640e271b93031d35fd749427182bafae64a75b6effc4e7143ae9f2867f3772090ec503f7c8073a3c10b53949f
 DIST libscrypt-1.22.tar.gz 19495 BLAKE2B 2c04b91dc48e807223a3433739deb31186efc1b4066cb57e3db835b68de4d08b9586d0a686d5f0f4c119582e82823fbf0556944c190d586664cc4d6f014ad5ab SHA512 3c01fd76441bdf7c90fa17534bfdda9e279469676359172eda7f7683ca65a7aae576a87d07125ce38598ef3fd2755547d53417132b9159a2b211898f70c80f51
-EBUILD libscrypt-1.22-r1.ebuild 714 BLAKE2B 2059031221c9ace3a5fcb8e3f4632869078b1fbeba2101fcb68816434f43f1856edc073973ad3691aa17998c14c96ff84a29a794491fb60734c08004a2648a5b SHA512 d432ffdf0f3da3105c21de0de925169d60faf4af8ca760c2415b123241434758b7a47bd80b42e1bac53130386845401f5ffd88250786beb3926eb861f05999ea
-EBUILD libscrypt-1.22-r2.ebuild 810 BLAKE2B c293491b3d8f1088de1a7f243e3c15e79db72eff273fb0312eb1981fa97f5b872e3799355333a101f36aa5acaad62c427bcae4f9c20aed9ead93653268379fa4 SHA512 43352d147b73beb6b8edac61a6ea8aaf4162a35d0789cf7635ae404bfd72cd48035c419c6ae12e6f33f2e5b1fd85c41871fdc458d3471f9715ad7d97f6c0305f
 EBUILD libscrypt-1.22-r3.ebuild 851 BLAKE2B e05805ddac1283b3b6938570db46d5ed46614a08bd7c6be88fad4be992ee7ab56a85ce8291c6fce4fdfa517f6affecef2ccf8235d2b3ac5bb279161b005e0116 SHA512 8be7476ebc9e003e433564e65759ddea3f2af137d49348d2a8336730e38a35ff1d683207079bba0cf2b6d257105b2d5e518e4dfc04c7fbd1b05acbf4f0c7dc8f
-EBUILD libscrypt-1.22.ebuild 651 BLAKE2B 5450158a061a864f203f10da091136f0aaaab11eecb3fe6f0c9b94cecfda50e0549ad88b6f498309ed4e16d813822e6a326655964a2b965e44e3712c63bcd45a SHA512 8fd7aa25a3662c4fe46a03641636d5b1fc5afd1f81f533ea77ace70880e4c1ac3329d21b0ef452256a3fc75bd387310a832fa79caf96f38e2d9dce5a7f11fa6b
 MISC metadata.xml 256 BLAKE2B 0583a0f48ddab7dd1ff43587374095c077c0d5afc7134fda41a688d537250f7b9942cf538518c890f3cb175c8c8f7dd170bc3a54ff717129ac16c2531bd48d56 SHA512 db3da96ac2e1680073a199ced5f81dd8b9f17954fef1cfd5b52a626f90a02024f7fcb9eaf4433194d0b6596c22553d5aec1695234a23f3a9d6fcb3e12c6c128f
diff --git a/app-crypt/libscrypt/libscrypt-1.22-r1.ebuild b/app-crypt/libscrypt/libscrypt-1.22-r1.ebuild
deleted file mode 100644
index a34dd8604875..000000000000
--- a/app-crypt/libscrypt/libscrypt-1.22-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Shared library to implement the scrypt algorithm"
-HOMEPAGE="https://github.com/technion/libscrypt"
-SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.22-no-clobber-fortify-source.patch
-)
-
-src_configure() {
-	export LIBDIR=${PREFIX}/$(get_libdir)
-	export CFLAGS_EXTRA="${CFLAGS}"
-	export LDFLAGS_EXTRA="${LDFLAGS}"
-	export PREFIX=/usr
-	unset CFLAGS
-	unset LDFLAGS
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild b/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
deleted file mode 100644
index b0e3714c5c4d..000000000000
--- a/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Shared library to implement the scrypt algorithm"
-HOMEPAGE="https://github.com/technion/libscrypt"
-SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.22-no-clobber-fortify-source.patch
-)
-
-src_prepare() {
-	sed -i -e "s|ar rcs|$(tc-getAR) rcs|g" Makefile || die
-	default
-}
-
-src_configure() {
-	export PREFIX="${EPREFIX}"/usr
-	export LIBDIR=${PREFIX}/$(get_libdir)
-	export CFLAGS_EXTRA="${CFLAGS}"
-	export LDFLAGS_EXTRA="${LDFLAGS}"
-	unset CFLAGS
-	unset LDFLAGS
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/app-crypt/libscrypt/libscrypt-1.22.ebuild b/app-crypt/libscrypt/libscrypt-1.22.ebuild
deleted file mode 100644
index f4b0f206dc02..000000000000
--- a/app-crypt/libscrypt/libscrypt-1.22.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Shared library to impliment the scrypt algorithm"
-HOMEPAGE="https://github.com/technion/libscrypt"
-SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-pkg_setup() {
-	export LIBDIR=${PREFIX}/$(get_libdir)
-	export CFLAGS_EXTRA="${CFLAGS}"
-	export LDFLAGS_EXTRA="${LDFLAGS}"
-	export PREFIX=/usr
-	unset CFLAGS
-	unset LDFLAGS
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)"
-}
diff --git a/app-crypt/sbctl/Manifest b/app-crypt/sbctl/Manifest
index 7d16c6d69a28..8cec577cb854 100644
--- a/app-crypt/sbctl/Manifest
+++ b/app-crypt/sbctl/Manifest
@@ -1,5 +1,3 @@
-AUX sbctl-0.13-no-installkernel-error.patch 896 BLAKE2B aa75eacbe2ce3b99f6491d33284c8fad4594ad09998714015e82ccead7d975c9f8f521c63857ec80879620448405ff4b4701cf02d5d49f27a3cf49734203ee76 SHA512 cc9b45ecde8703d56d0603e6061ba0407277a1ea0d5429565123e134926ad250f45f537d129fb1a559ede3544b72dea233ac6641bc7c8c87d1cb9d7c3bb8bc1e
-AUX sbctl-0.14-installkernel-bashism.patch 1361 BLAKE2B 7caebd45b6f3ae4810a1111dbcc6cb15724c7e9c8853a5dd022b10ad52416afc5645e03c70b130ae8c3dc8b484b76756d964badfce47b60671a50c37881bf72d SHA512 e450ddea3578e1d54e52af965b69b16e608464fb40f850ca39925a91db8b3ed03d83413759b0b5675d90d9354fd226309a22b2b2b559a1fd98f4f8aad52cf61a
 DIST sbctl-0.15.4-deps.tar.xz 123785076 BLAKE2B c54b60e89b4ea0bf6ce414198a74465b5e176a5a200f070e092fa536f81d48945a2c2ac88fdcaadfd4d7bc6511c32cbfe9e8c8a4c30c7ea8ea9947af9fdf9545 SHA512 7c5ca431e8832e576cef662d5ba806b4be07a23567d86f7b8e8cb16c57167aaeafe8bafa8875806db2ba7aced9979d5999b837dccd1d90ade60c029de244b242
 DIST sbctl-0.15.4.tar.gz 17822565 BLAKE2B a2c7f1c49ac3052a30af9245b015c730cdc0cc9d9bca011e52de967da5d733f0de0bee2da8ba28da00418553ce4d86cfd3859a5f029f44ae8cfec6f18da50102 SHA512 98278b816c14f61191d3aadeb7bcf22b5482315b36b201764ce88d3287420f488b7c9cb2cc1468800bfa2351cb0e8c8dbc32ecabbe4f6ab275f375859379fc03
 DIST sbctl-0.15.4.tar.gz.sig 566 BLAKE2B 678351ba31138e2b1bb90e2dbfe20f0af333b47c6f1cfb5caf5d473efa716d5ac00d407f858ab6510130430a0f54fc61edb8e261f2c11faa49763a97395850d5 SHA512 3cc14391c4d2446a64bd9f34b29816f05e1e2ff2db2c65228b536298bca0035eb991322264f03f5c68e7b488af0df09fb77276d942b265e43f831e5d9777fcfe
diff --git a/app-crypt/sbctl/files/sbctl-0.13-no-installkernel-error.patch b/app-crypt/sbctl/files/sbctl-0.13-no-installkernel-error.patch
deleted file mode 100644
index 18e28eb39b1d..000000000000
--- a/app-crypt/sbctl/files/sbctl-0.13-no-installkernel-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: https://github.com/Foxboron/sbctl/pull/188
-From: John Helmert III <ajak@gentoo.org>
-Date: Sat, 10 Feb 2024 11:46:01 -0800
-Subject: [PATCH] 91-sbctl.install: don't sign without signing keys
-
-It's expected that signing doesn't work without having previously
-generated keys, so don't try to sign when keys don't exist.
-
-Closes: https://github.com/Foxboron/sbctl/issues/187
-Signed-off-by: John Helmert III <ajak@gentoo.org>
---- a/contrib/kernel-install/91-sbctl.install
-+++ b/contrib/kernel-install/91-sbctl.install
-@@ -28,6 +28,14 @@ fi
- case "$COMMAND" in
- add)
- 	printf 'sbctl: Signing kernel %s\n' "$IMAGE_FILE"
-+
-+	# exit without error if keys don't exist
-+	# https://github.com/Foxboron/sbctl/issues/187
-+	if ! test -d /usr/share/secureboot/keys; then
-+		echo "Secureboot key directory doesn't exist, not signing!"
-+		exit 0
-+	fi
-+
- 	sbctl sign -s "$IMAGE_FILE" 1>/dev/null
- 	;;
- remove)
diff --git a/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch b/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch
deleted file mode 100644
index bc1b988769fc..000000000000
--- a/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1167500b9da76febe85342e09b1bf9eeaf367ca6 Mon Sep 17 00:00:00 2001
-From: MithicSpirit <rpc01234@gmail.com>
-Date: Fri, 10 May 2024 17:51:59 -0400
-Subject: [PATCH] nit(91-sbctl.install): consistent syntax for tests
-
-Unifies usage of testing commands like `[]`, `test`, and `[[]]` to just
-use `[]` everywhere. This also improves compatibility, as `[[]]` is not
-available in POSIX sh.
-
-Bug: https://bugs.gentoo.org/934768
-Signed-off-by: Steffen Winter <steffen.winter@proton.me>
---- a/contrib/kernel-install/91-sbctl.install
-+++ b/contrib/kernel-install/91-sbctl.install
-@@ -31,7 +31,7 @@ add)
- 
- 	# exit without error if keys don't exist
- 	# https://github.com/Foxboron/sbctl/issues/187
--	if ! test -d /usr/share/secureboot/keys; then
-+	if ! [ -d /usr/share/secureboot/keys ]; then
- 		echo "Secureboot key directory doesn't exist, not signing!"
- 		exit 0
- 	fi
-@@ -39,10 +39,10 @@ add)
- 	sbctl sign -s "$IMAGE_FILE" 1>/dev/null
- 	;;
- remove)
--	if [[ -e "$IMAGE_FILE" ]]; then
--	    [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] &&
--		printf 'sbctl: Removing kernel %s from signing database\n' "$IMAGE_FILE"
--	    sbctl remove-file "$IMAGE_FILE" 1>/dev/null
-+	if [ -e "$IMAGE_FILE" ]; then
-+		[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] &&
-+			printf 'sbctl: Removing kernel %s from signing database\n' "$IMAGE_FILE"
-+		sbctl remove-file "$IMAGE_FILE" 1>/dev/null
- 	fi
- 	;;
- esac
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index dc2267cf7146..a31282525087 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,3 +1,3 @@
 DIST ssss-0.5.7.tar.gz 21774 BLAKE2B 923f9e0c46e82261dc4f293635aa318c986cee221a93e9df3d232e4b923a7828f0301c8729a5beb72b66e1646e5a0694cfa9546ea26b0e06fa16a8a0c7487ef6 SHA512 aca85b7a63e6d009fffe5540b0c8e3190c364aa2070e8d8487fd42d7ac76143e404b226b28f3630022d102679371673cc7c08b8c5d3bcf63e3676b7293d2ba00
-EBUILD ssss-0.5.7-r2.ebuild 852 BLAKE2B 26d308a731417ecb27bc21b9296b4a8eba0ed384cf8a8fe860db1590d4f785f65aa9c0a479e0c48635eedfb8b7e55f58fa20162e8c9bafe308adb1b32b1e8d3e SHA512 89cb736ef4dbada0204011b04d3077dc207e2055e9cfac0274477eb9e3b2559c48e42f3babf16b537ad9a0309eac7d7da59102b200a3fd465648bf49ef12adca
+EBUILD ssss-0.5.7-r3.ebuild 855 BLAKE2B 684990592b0a6498e202e22545306b60ef3cec7de61164a66491b716df17aeccf7254fd94a2d9538a6c6d9e66166ba03a91771bdbc17d041f8037983b4fdada7 SHA512 b9fcc73b470fce0bab428051e67e84e0beda8812a3431b0c3184ebc18a54ff2cf96187e127bb8fdf69595c14ce64515be63ab47fdf09f22de79a6cedc62a5fd8
 MISC metadata.xml 572 BLAKE2B a40cd8132c114b04e6af99883713fe581dc6527d6773a4a74422e1e853dfa85455f1b199c9b8b9db056cbd7877087c8b713b3285f9bb3fe75a28fa076e3bfe65 SHA512 f715a45bd74530c74b8934c8da2d2067ec00b9af6eaebb5e50310b45295db8dbc1bd65e2258e1860f624e69565f5f04c37aaf4f5813637404b28135ff22967ca
diff --git a/app-crypt/ssss/ssss-0.5.7-r2.ebuild b/app-crypt/ssss/ssss-0.5.7-r3.ebuild
index c9c3277abf1a..07d5ef24f93b 100644
--- a/app-crypt/ssss/ssss-0.5.7-r2.ebuild
+++ b/app-crypt/ssss/ssss-0.5.7-r3.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 	# Respect users [CL]FLAGS
 	# Don't strip, as portage does this part
 	# Don't use 'which'
-	sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -e 's/which/type -P/g' -i Makefile || die
+	sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -e 's/which/command -v/g' -i Makefile || die
 }
 
 src_install() {