gentoo auto-resync : 09:09:2023 - 16:33:38

57 files changed, 154 insertions, 1822 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 58824cfcda3b..48cddc080915 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acr38u/Manifest b/app-crypt/acr38u/Manifest
index 706f2d84eed1..910d12d5bf91 100644
--- a/app-crypt/acr38u/Manifest
+++ b/app-crypt/acr38u/Manifest
@@ -1,5 +1,5 @@
 AUX 1.7.11-bis.rules 590 BLAKE2B 8604b9d067bac53501127f7d6ed8b6ef226e6faee64cd89cb0f53f66a89dcbb62e3de71743845c48e5326254f69ab1b07a207375614224066980df672b1bf5f6 SHA512 9e2d806a13a978f1a27a9b3bb6bf4f63809bc3cd03057b513f48bee0d2f2589f75484ff4e0e18dcf8b1b37b9af2465014fc3bcf87b48dd330a375fee3baef52f
 AUX acr38u-1.7.11-build.patch 5819 BLAKE2B 46747a588006909d04c14e643f098ba8de3fd69943d311cf82bbc8135d4bcafab30526366f021d5bfcd150a20debabc4e6e35355f19938591fdc423a68b65730 SHA512 a9395d41e55c381de65ebc9b9e796d1ae01c75a0261fdc80d5d819dc4cf85030eb3fe1e6123d9beb247abca3b60fa94210eb12b325b37cf8b367ee3a00919cae
 DIST ACR38_LINUX_100711_P.tar.bz2 274137 BLAKE2B 0087cc63ee3af898824fd7cfe31f8b1f922ca4dded22215196b2bdaf1296cd50319d4923735fd2ecdb3cc329dee0df7f288a70e875417b02eb0803d19b1613af SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7
-EBUILD acr38u-1.7.11-r4.ebuild 1411 BLAKE2B 8b1c7b00fdf8818494dac5882e640352b885f163379a21dc5b5d86e24dd89d3dccbe0b6ba9f9c8ade821808e63933dbc8bcf44a0df6397b5c7defb2c676c7be6 SHA512 c66782ec7a2dd5983ee3143c5e4598e7bbc343186a380861cc7cf315e81824b222a2682ee102218cc1bd5cc6809a1c91dd358f60c35e1d9ec06e7611bc52a73b
+EBUILD acr38u-1.7.11-r4.ebuild 1397 BLAKE2B 281368a9b98ab2a237b6abe61bc3759881a15d2a30ed2150746f8ee63c3b8b2c7923be38a0904b7cae9d3d5564e6f1e9ef681128775af2d712a7fd737b051cd1 SHA512 983b5dce2574692828120cb628a0e4d560b1f7dd35ef0e7770c13c21bf2594918953275ee9bc05aa8aefc1a21fc3193846456ac4dc81090c7ef70a714d3c190a
 MISC metadata.xml 384 BLAKE2B ed3f61fac35344e337b92528527d1a72fb6b42ce7504df0a3e7525864fd9a7979dc3008dfdb5f3ac46b725c130b4b05b74d47cabd85ec02fa5945b21c3d974f1 SHA512 9b69e0c9084463997343e06e5bcb50d7c4c0c9dced4c13aba208d4422417a05e0165259850346547e6ac3f5f82c0e098afc3036bcf53a645de877b1ee1c37978
diff --git a/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
index 2af122979701..285b807fbd33 100644
--- a/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
@@ -1,38 +1,36 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools toolchain-funcs udev
+inherit autotools udev
 
-MY_P=ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P
+MY_P="ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P"
 
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
-
 #SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
 # tarball release is encapsuled in a .zip file :-(
 # http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
-# This drivers is not maintained by ACS anymore.
+# This driver is not maintained by ACS anymore.
 SRC_URI="https://www.linuxunderground.be/${MY_P}.tar.bz2"
 HOMEPAGE="https://www.acs.com.hk"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 # Make this safe from collisions, require a version of pcsc-lite that
 # uses libusb-1.0 and use the wrapper library instead.
 # Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
 # libusb-compat is marked stable and primary in the virtual. -ssuominen
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+RDEPEND="
+	>=sys-apps/pcsc-lite-1.6.4
 	virtual/libusb:0"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
 
 src_prepare() {
 	default
@@ -41,7 +39,7 @@ src_prepare() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	# note: for eudev support this pkg may always need to install rules to /usr
 	udev_newrules "${FILESDIR}/${PV}-bis.rules" 92-pcscd-acr38u.rules
diff --git a/app-crypt/aespipe/Manifest b/app-crypt/aespipe/Manifest
index e9597503ba6d..08487e3a7ded 100644
--- a/app-crypt/aespipe/Manifest
+++ b/app-crypt/aespipe/Manifest
@@ -1,5 +1,3 @@
-DIST aespipe-v2.4e.tar.bz2 107741 BLAKE2B 9331441214b495f042f8ac41b57203057e762156aa7b6bd9fcb8d55b3e149fb79dd0d7c06358599fefd6662d797baf4cf9ba84fc4425e637c9fef0abf1b254c7 SHA512 e038f710ac971e5ba740648c0f255e8bc9fcea9be1a6b76208a453f21f013e1662c006d4f4495fa2b2560fd9b0c236947462a9b337a120073c6a5335b29f077e
 DIST aespipe-v2.4f.tar.bz2 107663 BLAKE2B 80af945ec938307ddaeb1a1f7a91da71d4f1aeabe4cb303166cad95c36e0d0090fd8440bb636ac0245d2701d61fdea715c84e18dfacf32bfba7f4b85a2db091f SHA512 75b6b2069a0e013dbded29b07b990fc783cc04ce05fc37e6591dae7e8190485960735ec1a1af18d065be57d0b7ec23dbe520e920f92e9c01170b7a23eb32eb3f
-EBUILD aespipe-2.4e.ebuild 733 BLAKE2B 2395312b9ed293a5b2907a332101e1fac0ed43ceadf5581247f99857d424336108ead65e487100585233a73c1a948e9f82d3c1adc78040f81594edf779ed44b4 SHA512 28b70e2600db722994a022fa7304c9db78bb6516c8974b2e4fe05a5140b2056236598f91842e97becb2894b69a864601018d3701ab5ce7a14c6b03ca91d78769
-EBUILD aespipe-2.4f.ebuild 723 BLAKE2B 017c0c740ef9450824b204d5567dbb4a76ad02af5123e109d11fc570a5e7864254b8afe9f448fa41870f35ac6f8fae077bad6f913af1a66e8133a9a9826f40f5 SHA512 8630ea3fd7ed2d1f95e354c03855bf15cfbe8d0acd9f2ac715d17dc2a91fbc6659b336fa31e6de7a9cd8d54163f2da793bc9c5d5a90f9b38ea6040da05d3780f
+EBUILD aespipe-2.4f-r1.ebuild 725 BLAKE2B 3916c1baebfe66f91252a6f5ebb9e99f6ff09955289c9980f67ad306e9c3da631b95f0550bcae9b7e9c7f3a63d1aade305cc42ec9ae5bdaf10a25683591e38d0 SHA512 1d67c8049f3c1208235b9f149e1ed8a3b11796efe68dba5f3158dea3e56cc8d314e452e884482e844bf1e4cd0c28a5b6b9a8da20385660812032add69ec107f5
 MISC metadata.xml 681 BLAKE2B 5b4ae8ac348b437beaef0c69a9e38f05a093f5deedce199b65d30052b8478ed57d974b7a73601765cdf0460ee053ad5df0e22fb15cf6d7d363a2acac7bc69994 SHA512 0542ed498f9ff32239cc4467e8d3222154e115c948c7b4104192683d37c5f8d4d29775f3a845b3824271eb927afb86e83316aeba54bfd6073ab1d5d1b6541902
diff --git a/app-crypt/aespipe/aespipe-2.4e.ebuild b/app-crypt/aespipe/aespipe-2.4e.ebuild
deleted file mode 100644
index cf46e5c67d98..000000000000
--- a/app-crypt/aespipe/aespipe-2.4e.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Encrypts data from stdin to stdout"
-HOMEPAGE="https://loop-aes.sourceforge.net"
-SRC_URI="https://loop-aes.sourceforge.net/aespipe/${PN}-v${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_padlock static"
-DEPEND=""
-RDEPEND="app-arch/sharutils
-	app-crypt/gnupg"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		$(use_enable asm) \
-		$(use_enable cpu_flags_x86_aes intelaes) \
-		$(use_enable cpu_flags_x86_padlock padlock)
-}
diff --git a/app-crypt/aespipe/aespipe-2.4f.ebuild b/app-crypt/aespipe/aespipe-2.4f-r1.ebuild
index 3adf1b9778ab..c8ed90346146 100644
--- a/app-crypt/aespipe/aespipe-2.4f.ebuild
+++ b/app-crypt/aespipe/aespipe-2.4f-r1.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic
 
 DESCRIPTION="Encrypts data from stdin to stdout"
 HOMEPAGE="https://loop-aes.sourceforge.net"
 SRC_URI="https://loop-aes.sourceforge.net/aespipe/${PN}-v${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_padlock static"
-RDEPEND="app-arch/sharutils
-	app-crypt/gnupg"
 
-S="${WORKDIR}/${PN}-v${PV}"
+RDEPEND="
+	app-arch/sharutils
+	app-crypt/gnupg"
 
 src_configure() {
 	use static && append-ldflags -static
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 6a9343be9c74..d8ce17caf2fa 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,8 +1,3 @@
-AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
-DIST ccid-1.4.35.tar.bz2 676789 BLAKE2B d1123c024a798a22906a5c2c2e35f5485b8d2252ddec28571af835bbf169bc5abeb26fea871ef70d67270cc1eb52f992c56f0abb74f6deed555f15e39dbf4756 SHA512 da990b5537ec35baa1b36b9c4be7f1bdccfc149cfa4ce024ddf59504f2a2044273057c1454f227fdad8f6b04fceaf48b88e70d4d0a5475384749b367529deaeb
-DIST ccid-1.5.0.tar.bz2 689961 BLAKE2B e5621f9af647028787cddd1b5a0d674420b4bf0c532a8527b4e10773bbd8af6f6600e7c40039e27f1ae182504d4b69b5e1e4aae509154ebd9653a34bd085f820 SHA512 fa2eac306066255fd89e8220e2b8d82811ce9e284baa155ea968b7afe0f113a94b1ee1898578d02fb8cde0634b6fe60ae8af956089ce5401c11bb90c3b334d5a
 DIST ccid-1.5.1.tar.bz2 702586 BLAKE2B 7b9e3c6daf03c186f34ac9b13bd960293a6481f9237ee52937ece1040bd3a79b7dab318e1244205a7feae992261ab5e82292d80ae023a4f621e0e7af7cdb9df5 SHA512 492bde96f5752e2a5316693c44e35e2d041785a00d15e094905c0aafad392f5329009d12801899367276328a582936ee53a1c5239c1813c4536001cb8a608f2e
-EBUILD ccid-1.4.35.ebuild 1547 BLAKE2B f9c400087032250e51f1103a4ea19491fbc68b47f4a02ff9474a7182b7dcc7405f4e128d9f02663685e4e33bb565354e2550f27ad86a253181c2c63e31cc50ee SHA512 267e3b6d789a33ebc01d0586524c423cbf03434ff34040d39c1039be235f982546b39acad51b38d4deb779786a542d5c5f843f3464abe8d3d30712d156a35197
-EBUILD ccid-1.5.0.ebuild 1618 BLAKE2B 7fb2069cb13c95003be20d28a230b5f8516f6e5b03a03171d3c24de4dccd431286189e1c7d95f355717b0757d20708cb3c7658363fac3ce68b2e7068e23966be SHA512 66765d3df507dfe68b620c92a630835edf0bd51652d1ed532a4c9df5c0f47aa6b71bf0aeec0b057bda81c6deadefa097b2b4061b7886f3375001bbe958096a2b
 EBUILD ccid-1.5.1.ebuild 940 BLAKE2B da6ac353e97b916126ef0990a80be03a92105c38e1ed4dc1893fad853df419188b10d381bc23d810a083427a0b35dea9066b705baf868ccb2d4bab1dfa39fec0 SHA512 e0264beda6138afc794d401cb2f0763820bce74047532063a113ebc072121e3e20221da74a633805a738a760272c38fc0e793456d115c97230d99e8e592791f7
-MISC metadata.xml 410 BLAKE2B e62b5075deab55dab4f862dfe242085935f383cd51d35f3a61a7e2aeb4d913f3352980d28cdd7ff4ac41f5bf0adf44c763f8267a8e141908fd4371e4656cbc87 SHA512 aabb5b8462ef6146d0230a6d67656fbc8fb2e4a25036e72b4ce9fa3a7ffb29ea1ae0d7eb8bc474343ea654dec649d13749fa844516689ae3f3e33734e0a24d3a
+MISC metadata.xml 326 BLAKE2B de798cbfe01f7330b10609981582be2ddc70351f18de659bf5ed4f4fd3a8e73ab48dc6ea1a01ecf14f30c980e201dd101d201e760125bbee00ed9448cc806160 SHA512 d467f827be2f17fb219f7933705dd1b8679f8d6c8da8b8cfccd2a8f97372a814a9627f950abe6bb4e6af0115a53191c5307253ee89ea323428a815dd40a0f59f
diff --git a/app-crypt/ccid/ccid-1.4.35.ebuild b/app-crypt/ccid/ccid-1.4.35.ebuild
deleted file mode 100644
index 680c83b8ed8a..000000000000
--- a/app-crypt/ccid/ccid-1.4.35.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README.md AUTHORS )
-
-src_configure() {
-	econf \
-		LEX=: \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_compile() {
-	default
-	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
-	default
-
-	if use kobil-midentity; then
-		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
-		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
-	fi
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be
-		# installed to /usr
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer use the pcscd group. Using the old ones in
-		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
-		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
-		if ! use kobil-midentity; then
-			sed \
-				-e '/Kobil_mIDentity_switch/s/^/#/' \
-				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
-		fi
-
-	fi
-}
diff --git a/app-crypt/ccid/ccid-1.5.0.ebuild b/app-crypt/ccid/ccid-1.5.0.ebuild
deleted file mode 100644
index 6470001902ae..000000000000
--- a/app-crypt/ccid/ccid-1.5.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README.md AUTHORS )
-
-src_configure() {
-	econf \
-		LEX=: \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_compile() {
-	default
-	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
-	default
-
-	if use kobil-midentity; then
-		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
-		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
-	fi
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be
-		# installed to /usr
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer use the pcscd group. Using the old ones in
-		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
-		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
-		if ! use kobil-midentity; then
-			sed \
-				-e '/Kobil_mIDentity_switch/s/^/#/' \
-				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
-		fi
-
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/app-crypt/ccid/files/92_pcscd_ccid-2.rules b/app-crypt/ccid/files/92_pcscd_ccid-2.rules
deleted file mode 100644
index ca4d1ce1b729..000000000000
--- a/app-crypt/ccid/files/92_pcscd_ccid-2.rules
+++ /dev/null
@@ -1,50 +0,0 @@
-# udev rules to set the access rights of CCID smart card readers
-# so they can be used by pcscd
-
-# $Id: 92_pcscd_ccid.rules 6587 2013-04-05 16:31:55Z rousseau $
-
-# Gemplus PCMCIA Card
-#SUBSYSTEMS=="pcmcia", DRIVERS=="serial_cs", ACTION=="add", ATTRS{prod_id1}=="Gemplus", ATTRS{prod_id2}=="SerialPort", ATTRS{prod_id3}=="GemPC Card", RUN+="/usr/sbin/pcscd --hotplug" 
-
-# If not adding the device, go away
-ACTION!="add", GOTO="pcscd_ccid_rules_end"
-SUBSYSTEM!="usb", GOTO="pcscd_ccid_rules_end"
-ENV{DEVTYPE}!="usb_device", GOTO="pcscd_ccid_rules_end"
-
-# Kobil mIDentity
-ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="4081", RUN+="/usr/sbin/Kobil_mIDentity_switch"
-
-# generic CCID device (bInterfaceClass = 0x0b)
-# change group from default "root" to "pcscd"
-ENV{ID_USB_INTERFACES}=="*:0b0000:*", ENV{PCSCD}="1"
-
-# set USB power management to auto. "power/level" has been deprecated in
-# Linux 2.6.35 and replaced by "power/control"
-ENV{ID_USB_INTERFACES}==":0b0000:", RUN+="/bin/sh -c 'if test -e /sys/$env{DEVPATH}/power/control; then echo auto > /sys/$env{DEVPATH}/power/control; elif test -e /sys/$env{DEVPATH}/power/level; then echo auto > /sys/$env{DEVPATH}/power/level; fi'"
-
-# non CCID generic (InterfaceClass: 0xFF)
-# CherrySmartTerminalST2XXX.txt
-ATTRS{idVendor}=="046a", ATTRS{idProduct}=="003e", ENV{PCSCD}="1"
-# DellSK-3106.txt
-ATTRS{idVendor}=="413c", ATTRS{idProduct}=="2100", ENV{PCSCD}="1"
-# MySmartPad.txt
-ATTRS{idVendor}=="09be", ATTRS{idProduct}=="0002", ENV{PCSCD}="1"
-# SCR3310-NTTCom USB SmartCard Reader
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="511a", ENV{PCSCD}="1"
-# SCR331-DI USB Smart Card Reader
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5120", ENV{PCSCD}="1"
-# SCR331-DI.txt
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111", ENV{PCSCD}="1"
-# SDI010.txt
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5121", ENV{PCSCD}="1"
-# SPR532.txt
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="e003", ENV{PCSCD}="1"
-# Verisign_secure_storage_token.txt
-ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="1359", ENV{PCSCD}="1"
-# Verisign_secure_token.txt
-ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="ace0", ENV{PCSCD}="1"
-# SchlumbergerSema Cyberflex Access e-gate
-ATTRS{idVendor}=="0973", ATTRS{idProduct}=="0003", ENV{PCSCD}="1"
-
-# All done
-LABEL="pcscd_ccid_rules_end"
diff --git a/app-crypt/ccid/metadata.xml b/app-crypt/ccid/metadata.xml
index 495300421b7d..cb05a176c9b1 100644
--- a/app-crypt/ccid/metadata.xml
+++ b/app-crypt/ccid/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="kobil-midentity">Build and install Kobil_mIDentity_switch tool</flag>
 		<flag name="twinserial">Enable twinserial reader</flag>
 	</use>
 	<upstream>
diff --git a/app-crypt/crackpkcs12/Manifest b/app-crypt/crackpkcs12/Manifest
index 973aac97852a..6aa728f5a2cc 100644
--- a/app-crypt/crackpkcs12/Manifest
+++ b/app-crypt/crackpkcs12/Manifest
@@ -1,5 +1,3 @@
-DIST crackpkcs12-0.2.10.tar.gz 94473 BLAKE2B 4e83dddfae5c861d442e7d040f4ba7065e1b89b1e7487c554acd871a11445de16fbd25787d581ce4c903ba6eb63d458902fd41711e72aee2ccfa2188031aa65a SHA512 5a2217e7809bef90a983cf8b7efff394bf59dac8ebea2b44c241b27ff07af59c86ce72db77ca1c9b1cbea15245165c200711bcb0bb64ccd4f3b38d3a2dfecbc5
 DIST crackpkcs12-0.2.11.tar.gz 94400 BLAKE2B 11d53f95f55f95d82885ebce780a3ff99e71217529f912c1f935898d9df9724f991b8e84ee08c3050b8484e50b2d22f0a1b2c6df0548e08ddf1d6e50d0700f90 SHA512 555f2fb1dd26ac2a1fbfe0d104c3e9f4188323ecf40d9825b32c694faf29d9bb6e49efc76f0728b940b940c363d6579fb0cd523a76454ca5b9eb1057b85609bf
-EBUILD crackpkcs12-0.2.10.ebuild 369 BLAKE2B d7e06d4e1dd33b65ee20935c02a9a04b91b7b5834a5f9444e17925898cd5d269f37c230a9b0c47284bcee822c7f28cab7a215ffde3af7809dc6a63f037ed1d95 SHA512 262178b0e807a70632a1e7d6ae9904b085e5a3c1c4b7bb840b3e36549396744ffbdb526f4817d8df4ac928aeb14c4d8012f4430050bcdb5ed073ce5fbaf21370
 EBUILD crackpkcs12-0.2.11.ebuild 369 BLAKE2B bbc4f9207693fcdc3301631194a80d61d850148d5c8f044658388f9c2f42bf72e565eb769245cae432074f3b7eea05efe1d4657189674c2d861d9175457503df SHA512 77a8a9d7677fd7484e894ae453af1bb4e3f6bc653b7e54713061d2164a5a26eabfc65bf942542541870d8f926be105d3244997021f61d700f4a58252f1b943c3
 MISC metadata.xml 486 BLAKE2B d34c3ebe617cda3731e3968b0a7e9b5f24592c32ecfe47d17116e0d77f877c51e97646a2611e6da875aa4cc09f4d4f0eff8e4559c1db43caa1c2759020ef2198 SHA512 4a487879d06985a0fdfcc34da36d9874a70152c6753ce7a4b4ed5b89067a02b9c277a832bbb3f34cde422dd057ed9865d45aef015d00170306bc4a735c53d688
diff --git a/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild b/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
deleted file mode 100644
index f6fa7524d916..000000000000
--- a/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Multithreaded program to crack PKCS#12 files"
-HOMEPAGE="http://crackpkcs12.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index b3301e8bfeac..c50f227dcbe4 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -1,12 +1,6 @@
 AUX 65easy-rsa 37 BLAKE2B 4a53c21a6027a9c5857d93e23703651b3d2642f54ce4519e727dd421230662f27f2ab45761041cf5b6b6cd654831d33297f1656eab26c496ee3e4f9d39f6ac3d SHA512 2f8c4f489ebd2ad2e5a0d45351361ecfc06a9481d9e15ea48215addb82ddf2083a85acb0a5c171d0c7e5406152d3679a5a7835e22ba9953e554614d94026d778
-DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
-DIST easy-rsa-3.0.8.tar.gz 3864366 BLAKE2B 8bbb16a8885a2141c59f590882002f5e4fa5c52c77130ac56b7ee5b1817a6c3acdecac2d8db4f4f4bce39f62b469afaf60b5d56f46c1ea9472afe36a5fb7a818 SHA512 db23262ba2cd1b7fec17340ebe11504741baff23098ea9b4b1118077abf8ff3091b1299f9624a6dd788b2e1c169d9820ba41d11b091949f3f6c96ee8e0509231
 DIST easy-rsa-3.1.2.tar.gz 6424018 BLAKE2B fef84b90875837c151bf9d71f71587d81aba79579948f4ff29ec3632cd17b0de82bf64c7d25b93720a696d339acdbf520b3a366e3ab214789acd17629d5db5ba SHA512 f36d3e11488ee98be4d901a8ae4f6cf08f4f0efc95bec38d1f1cde3ebd9dd133fe493cab2ebbbbbc99e803e318f93536e6a45ae677adb65c94d998114278035a
-DIST easy-rsa-3.1.5.tar.gz 6456901 BLAKE2B 04bf53b5e6c4dc9062b05f96fea5e28005fd409dcb0f4ac490318322fd80b91bae3d66d2af62b59f8f2ccb24becc27ea1510a5edf4b4a401deafcdc6a09f63e2 SHA512 f803e790d5a93c3cfd127621f55af572d4d5eb99220c2ec9ccfc6db6659588bcbf43a41ac0aca81c45f964ecd9584f27e0cd3384b7141ebf49420e5ad4a8521c
 DIST easy-rsa-3.1.6.tar.gz 6814828 BLAKE2B e61fa195e8edeb4b529c86f5814f47f8b10746dfe2effe48685651edd43e4ec9efe4acc2df4d5d13e4348455e36d0623bf5d1a78f2b0f68fb0e63afcee8630d4 SHA512 fb4cb25d63c2ca81cb1723d2ad0f321ff78b519fbde99ebbb97cea82d69292d283a5b927583f9721e91d157587615ecb7c918364d3aca0676b4e2ee624883074
-EBUILD easy-rsa-3.0.6.ebuild 726 BLAKE2B 7877107a820558a01423c4e7060d92c44e645fe5ca2d2a8ac715a758d3c0bb3ee5cbc2ab573d49df79a7ba32ed6fc51825abba661be2d4490d43c273492857a7 SHA512 a618400d47f9fd8628099b4c20a282e552bb00e759976c6c628cfe75a7f70cc6d47c17916a0201e29ea86490947ffe2031055b12d636d5125ea47ab2f38da282
-EBUILD easy-rsa-3.0.8.ebuild 733 BLAKE2B 346eb414a4eb33ee183f29555797db2d863d37010e8575c4bfdb333c8b86dbd06c388ad7b697a24a54c8c0db23e1207a2a2ce803af246382976b5dfa57409954 SHA512 6e6ff81a50cbaa1f8aa6ec89c11033b89fc7fbdceed9e2f12bfb3fc11e3998296c1a1e149cce229a13b5071826755bc3a47858836b8aea235601858f313b5573
 EBUILD easy-rsa-3.1.2.ebuild 733 BLAKE2B 74957898bb12e53fe69207f2ee69ab5df723796aa4a2539b2e0c2a6eeb60b81eb8b846c47e189c9a39bd9b25f5cba95941b9acfd142d8998e825d4f2b5d9d9ef SHA512 57de036d944e1bc55f201fbf618ed7da897fc470d7d066b4541d6c7aeb22eca7e6a8766520cd06a3afbf6924e7bb5665b92381313736395fde1b03f1bdef1d97
-EBUILD easy-rsa-3.1.5.ebuild 739 BLAKE2B ea8a36a87a31a05a3b0da567fac8a1869fe35dbe8ac5e2ef84e9bf026ff37f1a4aada80a9c73b303e41ca204ae634b05c05b6b18a3ca30386bf0e7ae91596960 SHA512 7021b250ec57cbfd010c92c8386ea298ca33bd3cd48e4a7b33759de5c755c9a0bf1fdb9ec803db5dcc2e58038b8b7932dfa9aa24b22072a8da3d7a2f79efe6c5
 EBUILD easy-rsa-3.1.6.ebuild 739 BLAKE2B ea8a36a87a31a05a3b0da567fac8a1869fe35dbe8ac5e2ef84e9bf026ff37f1a4aada80a9c73b303e41ca204ae634b05c05b6b18a3ca30386bf0e7ae91596960 SHA512 7021b250ec57cbfd010c92c8386ea298ca33bd3cd48e4a7b33759de5c755c9a0bf1fdb9ec803db5dcc2e58038b8b7932dfa9aa24b22072a8da3d7a2f79efe6c5
 MISC metadata.xml 334 BLAKE2B e1ef3179415d52b55684873a36d6ed5eeff1c2727816a862feb34fdfebb9774bf7930e1e5028c0146034fb85e9214b0958b021db89dba15f8bf8f7cf78dada1e SHA512 9964c197845a58aede767ae26fdf3ab707a9e74bfc05deacc4c0b8d8349f33e9d64794045d5937d01529f704ec69bb8ecd42dddc8ea6553dc01d4e8e8dd949df
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
deleted file mode 100644
index 00a7d25b0394..000000000000
--- a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	exeinto /usr/share/easy-rsa
-	doexe easyrsa3/easyrsa
-	insinto /usr/share/easy-rsa
-	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
-	dodoc README.quickstart.md ChangeLog
-	dodoc -r doc
-	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
deleted file mode 100644
index 8641cdf65fea..000000000000
--- a/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	exeinto /usr/share/easy-rsa
-	doexe easyrsa3/easyrsa
-	insinto /usr/share/easy-rsa
-	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
-	dodoc README.quickstart.md ChangeLog
-	dodoc -r doc
-	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
diff --git a/app-crypt/easy-rsa/easy-rsa-3.1.5.ebuild b/app-crypt/easy-rsa/easy-rsa-3.1.5.ebuild
deleted file mode 100644
index c35bb375fc0c..000000000000
--- a/app-crypt/easy-rsa/easy-rsa-3.1.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	exeinto /usr/share/easy-rsa
-	doexe easyrsa3/easyrsa
-	insinto /usr/share/easy-rsa
-	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
-	dodoc README.quickstart.md ChangeLog
-	dodoc -r doc
-	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 1bec5384b62e..c92ef35e2d20 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,9 +1,3 @@
-DIST jitterentropy-2.2.0.tar.gz 25556 BLAKE2B d0a8faa9131e9fd5712fad4179725ac29ba813e0d77e5ae9dc905841b92f67fc51e79c407142b2e8c3473f92a59a5b03f03d2013bd7e5d1ae07110da52461255 SHA512 4701a7e0a82ee583cbde5edfdacb737a5f588b42c61b16434b5a11bdfb1a108e7b9df8b8b38d9e92290e702b33f2ae8774580d6a71e6e8ac3af295ffc8ff5ff9
-DIST jitterentropy-3.0.1.tar.gz 31212 BLAKE2B 522e9b88e96ed1e6f57e793779c46f7799185f9d25390268f628eb309239a3522ac13277a037acf54dcce7e7b1364b2ec6e15d21a5f13aaa5a87ece7690d57fd SHA512 fd195e150ea861fcd5ff72a84f48ef8b7d0d8a3d44aae51f0fe5c39a1d1409ca98271a6cf06140fa8b6aba08d8bbbddf097cd7d99b5c1b698db08f056236e547
-DIST jitterentropy-3.3.1.tar.gz 81596 BLAKE2B ad8bf87d5a30b4bc98a3af7c1dcff442516c0330050aea90f2f05d68c4c2f1e9fe4b8db885f00dcd138ae7cb5a6ca58800686ae507f0e41596c95176a33e2b96 SHA512 7dc17c377cf90d38057bbc135e00730a3f84bc66aeed83eca1ad1b0e1c2fb89c5346ec20bdf25d3ce27f1d21893d44e52c08e96175554c18dfa1934a8d4fd9f7
 DIST jitterentropy-3.4.1.tar.gz 86110 BLAKE2B 729ef7d01a17c9eb16cc352da0286bd292f2faae63754b06036dbb44d52e85e2e2e0d2a38ac57d4350eaebbc47457f0457a988a657f7fe6c5d782d50922552d2 SHA512 c832b33c084a8c56fb9ee0c0f7397fa9206cbd6fcbea047495e543566fc0d9b5d8978c8668103203d87b5b70c0e177f9ef7cc614b3ce689b90fbb8b85e6fedbb
-EBUILD jitterentropy-2.2.0.ebuild 923 BLAKE2B 2cdcfbc5e413a0049b0743aeba0f905c7eb274de0fe2b775d65f8b5fd6c576595b796745b5ed55a4c006774412a2948e8fc75720b3fef9e233719b1dd48c2dfa SHA512 1aa071401c70f21315e819adc18b139af5c294f19bed9a6f2481b24c102654571cbc2dbfde46ef74927b2c1680cd615bf989d880d9e857d951e0f13b46c81d92
-EBUILD jitterentropy-3.0.1.ebuild 967 BLAKE2B d8d88a202b58736e7c26733f5877c19924865e350fdeb317fa6d91f3c98734c609dfa9a9d11e2ef1e7494237f662660e362f33c3e49779f77a838d2fb12b3429 SHA512 951dbe3572d366f35f326790a9243597eab572739b234865390121b4e6056e17dc3c415dd44fc87b13ff0b72c119625cebaa8e326ab18f106479e1e3117e6a67
-EBUILD jitterentropy-3.3.1.ebuild 1611 BLAKE2B 68bb4a6caa3b8a1fc27ac77fd7a869b8382038b1298343bef3421cdef5a717989b1e0cd48609daf6e2251d983acde87cd73d2beef71a6fd1b867358bf8f821a3 SHA512 f877aed4be270d51c485bce5be1cd156a4b77c4c4c3254c0e821b177a21a9fd2275ca1549a18e59a8baf0c12fbaf0e1ef648421fbcc185e4cdd8de0ef0e24529
 EBUILD jitterentropy-3.4.1.ebuild 1611 BLAKE2B cbac2e59cf9c2eadc177a288134e9d7e141a1798c0ba32c14064f1f174a3206f1696e46ec3e1f13e6ee4d2a573cd4c7505733f59aeeb1d5352a342adce395770 SHA512 97760c7ad5934cddff17d6bc0c57b15df856076a15f845775d8a652fbfa49be33058b277c6b34be631cce5af6abddf6ca6e2b09dd59f454181b6632fb0cf3561
-MISC metadata.xml 667 BLAKE2B 9133417986fe9e64d3fd5abe0cae7b0e8e8d9fa792645c13599856b1a30f929f4291f05b58d38f7ef1cf99a91fb60ff56a61571bd48da801c9b5a5ff87166447 SHA512 47cbaa73c37c0eb2b6ad0321b716e31342e721828413f6523fda7d688d3851c83ad714cd23a6ba7d0147367c09ec2a45f6c2da44ffa7f7b2905cd41d18502b7d
+MISC metadata.xml 681 BLAKE2B c0777e7525bc36dd9a65680b2cb0b918d73f9e091fe686b7d7ec3ec4441b73c776bf8d3526cf8f16dcb34228532a633b9d6d9df18b2dc626f602eb813cf53634 SHA512 1cc9f7bdca491ac96ce85adf9a0fe1462e52e1da99181750aaf362197dde3c68e9278ead72e0ca81b689812edcb3670e1a143ef37c5dab7b646b818df5c893a1
diff --git a/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild b/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
deleted file mode 100644
index 5871f3580a1c..000000000000
--- a/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hardware RNG based on CPU timing jitter"
-HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
-SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/${PN}-library-${PV}"
-
-src_prepare() {
-	default
-
-	# Disable man page compression on install
-	sed -e '/\tgzip.*man/ d' -i Makefile || die
-	# Let the package manager handle stripping
-	sed -e '/\tinstall.*-s / s/-s //g' -i Makefile || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="$(get_libdir)" \
-		  DESTDIR="${D}" install
-	use static-libs && dolib.a lib${PN}.a
-}
diff --git a/app-crypt/jitterentropy/jitterentropy-3.0.1.ebuild b/app-crypt/jitterentropy/jitterentropy-3.0.1.ebuild
deleted file mode 100644
index 921bb7705ddf..000000000000
--- a/app-crypt/jitterentropy/jitterentropy-3.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hardware RNG based on CPU timing jitter"
-HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
-SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/${PN}-library-${PV}"
-
-src_prepare() {
-	default
-
-	# Disable man page compression on install
-	sed -e '/\tgzip.*man/ d' -i Makefile || die
-	# Remove the default upstream optimization level
-	sed -e '/^CFLAGS +=/ s|-O2||' -i Makefile || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="$(get_libdir)" \
-		  DESTDIR="${D}" \
-		  INSTALL_STRIP="install" \
-		  install $(usex static-libs install-static '')
-}
diff --git a/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild b/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
deleted file mode 100644
index 92ced29204d0..000000000000
--- a/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Hardware RNG based on CPU timing jitter"
-HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
-SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# For future reference, tests/raw-entropy/validation-{restart,runtime}
-# have a weird license clause where it says:
-#   The licensee IS NOT granted permission to redistribute the source code or
-#   derivatives of the source code, and the binaries compiled from the source
-#   code or its derivatives to any third parties.
-# Do not package these two components!
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/${PN}-library-${PV}"
-
-src_prepare() {
-	default
-
-	# Disable man page compression on install
-	sed -e '/\tgzip.*man/ d' -i Makefile || die
-}
-
-src_compile() {
-	# Upstream defines some of CFLAGS in the Makefile using '?='
-	# This allows those default flags to be overwritten by
-	# user-defined CFLAGS. Restore some of the defaults.
-	append-cflags '-fwrapv' '-fvisibility=hidden' '-fPIE'
-	# Optimizations are not allowed by upstream, which already
-	# overrides CFLAGS in Makefile. We need to handle CPPFLAGS here.
-	append-cppflags '-O0'
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="$(get_libdir)" \
-		  DESTDIR="${D}" \
-		  INSTALL_STRIP="install" \
-		  install $(usex static-libs install-static '')
-}
diff --git a/app-crypt/jitterentropy/metadata.xml b/app-crypt/jitterentropy/metadata.xml
index fce25169ae8f..9025bc9ab092 100644
--- a/app-crypt/jitterentropy/metadata.xml
+++ b/app-crypt/jitterentropy/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>gokturk@gentoo.org</email>
-	<name>Göktürk Yüksek</name>
-</maintainer>
-<longdescription>
-	The Jitter RNG provides a noise source using the CPU execution
-	timing jitter. It does not depend on any system resource other
-	than a high-resolution time stamp. It is a small-scale, yet
-	fast entropy source that is viable in almost all environments
-	and on a lot of CPU architectures.
-</longdescription>
-<upstream>
-	<remote-id type="github">smuellerDD/jitterentropy-library</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>gokturk@gentoo.org</email>
+		<name>Göktürk Yüksek</name>
+	</maintainer>
+	<longdescription>
+		The Jitter RNG provides a noise source using the CPU execution
+		timing jitter. It does not depend on any system resource other
+		than a high-resolution time stamp. It is a small-scale, yet
+		fast entropy source that is viable in almost all environments
+		and on a lot of CPU architectures.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">smuellerDD/jitterentropy-library</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 21748d60cca1..fa69f1096c9b 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,5 +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-r2.ebuild 1724 BLAKE2B 6dbb293b0a64b164dbbae0edc48e2461c99ae24386fcd7b89d28e56901c11bb39888f40befbc91c0b1769774de730ebe0b4b9a2d4da183f5f797a04b2f422fb9 SHA512 3472652c5b34c8c20d9e68d008354ec623427b8bd0c750edfdf89d2f52a16946a2859259c742cf56280366c1e5cb666709e13f66e3258c94ef8ce8c0ea861bd7
 EBUILD libb2-0.98.1-r3.ebuild 1776 BLAKE2B 0b986faa95fabaa4b33c304a1c730813cacf069de277930ce7c8d7572b3ec45fac7a6d99b3df8f5cba38611c94b214fe92747577873cf18ed784539a11995364 SHA512 ac01aed957dd076057a26673935d1accd3a35e00c039dc516abf1008175b2c2848e6708ca1345323c20b6409ca892d6c8c870bc62deacad78bbb138355a1077a
 MISC metadata.xml 766 BLAKE2B 145882c283f1380a065f239f056b67f46dd281bcdfd1ca1cf946b049136a4465c41ea7aa6262a5fcd2763a06a4a350edfbd3007c80e767c5868193125d4dd766 SHA512 0887ed2a64e96fb780c01061fcde1fe526c6d0caa0ba44b982d10bb62bf387f189ec0804494fb9fa86a7abb463e571d788f73dc4433a2e4cd751e985e0d35347
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
deleted file mode 100644
index 2b1d540995b7..000000000000
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal toolchain-funcs
-
-DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
-HOMEPAGE="https://github.com/BLAKE2/libb2"
-GITHASH="73d41c8255a991ed2adea41c108b388d9d14b449"
-SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="static-libs native-cflags openmp"
-
-DEPEND="
-	openmp? (
-		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${GITHASH}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	# fix bashism
-	sed -i -e 's/ == / = /' configure.ac || die
-	# https://github.com/BLAKE2/libb2/pull/28
-	echo 'libb2_la_LDFLAGS = -no-undefined' >> src/Makefile.am || die
-	eautoreconf  # upstream doesn't make releases
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable native-cflags native) \
-		$(use_enable openmp)
-}
-
-do_make() {
-	# respect our CFLAGS when native-cflags is not in effect
-	local openmp=$(use openmp && echo -fopenmp)
-	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS} ${openmp}" "$@"
-}
-
-multilib_src_compile() {
-	do_make
-}
-
-multilib_src_test() {
-	do_make check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/app-crypt/minisign/Manifest b/app-crypt/minisign/Manifest
index 7c8691f6608a..901b85b9d7d5 100644
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@@ -1,6 +1,4 @@
-DIST minisign-0.10.tar.gz 18242 BLAKE2B 8b71f01ced4be00c38937e7db5ace2c7e348410a9381f6cc27374827fa0a9da70cca96153af199880ccd5f2265e18a7f21d074f877e0e21ca797bbba2bf5cbf5 SHA512 6a38500ed896c17b100bca47443f9806debe6e44d3ce09189f5f8913a41d4913434397175d1caa770fb0cc0918078dfc71c01b82b9bf919fdfba00434f4ce100
 DIST minisign-0.11.tar.gz 18410 BLAKE2B 503d73f53b9405f337865536d132e0de880cdefa9df2c08815b4cc9f7e2995a0d3032fe7b2ec48610c10b6023d998286ac705e0d10c6a475185b60405f69ec50 SHA512 a7445cb9646ae56fcba718f61f73486d5774d9cafe72ef051a3e60f94baf852b597261778bce50371ea5ee63395b0477bf1a33c7683fde32d003fab66029241f
-EBUILD minisign-0.10.ebuild 738 BLAKE2B 22b39865a54a6964ccbaba58b3b622255636df52bb1c109a90a07d49c391f7e64b1eab6a557b4c116b326e7cb22080837bf072fddc9e6628a8a1cfbef7011d55 SHA512 7346da6c7581bb2e35fee599c7cea451c94ec978d712e543dc3c1962b3b81f1b8490abcfe1a97c846845563323f7b84ba768bca3ac0b5d72e056b999076b5bce
 EBUILD minisign-0.11.ebuild 738 BLAKE2B 22b39865a54a6964ccbaba58b3b622255636df52bb1c109a90a07d49c391f7e64b1eab6a557b4c116b326e7cb22080837bf072fddc9e6628a8a1cfbef7011d55 SHA512 7346da6c7581bb2e35fee599c7cea451c94ec978d712e543dc3c1962b3b81f1b8490abcfe1a97c846845563323f7b84ba768bca3ac0b5d72e056b999076b5bce
 EBUILD minisign-9999.ebuild 746 BLAKE2B ce654c167698fe14ca148a25af7be63a4b86afc48ca6760b3c8b9abab3e4a783fc47686b5a1337dcb012370839517d7bfff0f91d6cf97f8b69cd07ecfa941c2c SHA512 354823117095e758bd6fd836aece311034eeff4cccd83b99b8a2446b893557638352b60de4dc1903e7ab5bab9c3a816468ce72f5f0e6a0e09cd218521e0e0535
 MISC metadata.xml 682 BLAKE2B a3a405073dbad7ea7c570ae8eccef230b2f3baf389d0210e6ba1afb57e0b3504172225b1cb3a957812ed08bf2b8080b1b4dcb13ab982eccc8bdc15377a90cffa SHA512 8e88cae8452b76db2c57e86f6c50a5859964cb3e7e3f6a574990fbebd74d512a57015ed53c966ca714c7545d43160412c8aca9e954180333c6ecce81df8c4b51
diff --git a/app-crypt/minisign/minisign-0.10.ebuild b/app-crypt/minisign/minisign-0.10.ebuild
deleted file mode 100644
index 929ac4ad6490..000000000000
--- a/app-crypt/minisign/minisign-0.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Dead simple tool to sign files and verify signatures"
-HOMEPAGE="https://github.com/jedisct1/minisign"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
-else
-	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/libsodium:=[-minimal]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DCMAKE_STRIP=OFF )
-	cmake_src_configure
-}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 85e3f0d42477..15bfb31ac17e 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,10 +1,7 @@
 AUX p11-kit-0.24.1-configure-clang16.patch 1071 BLAKE2B d12b500a4f38060ec9845cf6b0a348af11b8a1f02fb7d9c4cb2a74825305808d710ab6f69efc0b36f304f0e74a269a81b89b5651e2261c2109b6f942d80749d3 SHA512 5a6dc630d23607910faa1923e2389817f356df33a90e973612f92ef0617a53650cb316e1f2d009ddc658e4599721ad76b5a31ea2150928702c1b6937ab07023d
 AUX p11-kit-0.25.0-fix-C_GetInterface.patch 1410 BLAKE2B c15a8950a73cd9b0a656df2e00c8068abacb14dc9c9b30e67fb777b9987a4419a215904828554a0269699319725d90aab4996895231d325be825a431e99ad4e4 SHA512 69c31b5f2c5dbfb5504281c2518a1cb555973e0a80c5317dc8605d793740c8f2fca0506c2f9baa88de181bab9455a16efdf9649a5a08c35214f2bc46e9dc265a
-DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
 DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
 DIST p11-kit-0.25.0.tar.xz 958940 BLAKE2B 6ffce977f86c516a327afe50f4cc5a36e86ba7f43c6cb555db419d9e4ba7543a9f1847ba83da348cd6d7bbebe55dfa26cfe3a3aaa3e1d5420a4b8dc6cbbff088 SHA512 e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe
-EBUILD p11-kit-0.23.22.ebuild 1419 BLAKE2B dbd06b7fbf70073570c4bf38bb8f5f6c8875fc932f77bfbeb6934b00d0550371576276190b8b4d054f23633778a69d65ac4c7cc5930f0350fa9e5389d23b4c62 SHA512 d4330c6ea50ebab32a47c550148276a34ead4b8202a8d34efb427564e1b1edf42e9c21885a1252abb49d5820a90498f5e455189de2f6fa6dd3af0c3e53c39aff
 EBUILD p11-kit-0.24.1-r1.ebuild 1667 BLAKE2B 75be06aefb5adde36d1009778e221f09a3a1d6b2fa24dfe364b7b04c514decfe3473a998114a2ba6f3d9d3c96cfca7de1f2a2179cb441ed3bff11ebc13c03909 SHA512 3fde1185e77d1a04b268bb270c62b00829984f1f2a8ce9f0ea704efb4bdfbe4bc1be2750bf210724cb2bb46775eab03a8c881cdc397afb37173ae125fa038683
 EBUILD p11-kit-0.25.0-r1.ebuild 1433 BLAKE2B 20ab41a51f607759ccada59de661667f766f515ced1ba6927f50f52866edfc22a95a7dc790b2dc3721f6e989161fa32cbd91787ce8cfe86c1751353dcf589d0a SHA512 3f954712703ce1f85c231e9a1177bbb235c0f0f58e3e6c561bd0dd5be89752b105a60b2c3fb467cc476ad6d866b31cf8ded37353b472b9759125675cb5c7320c
-EBUILD p11-kit-0.25.0.ebuild 1341 BLAKE2B 51085ea00a4726dc7f6a82407c0307186f5ff63d05f7285912cd300d83392cc170b9843605823667ff16dbe03cfc71c6aed7c462c69adeeefa25340a4129e08d SHA512 17f6336889db7ebdc49aa78c73ff67f93c99b92ce717cbba798ba9942cde91c0404b88479b05ccb00dec3db88c119e1b8d1edd7ba5f42c8fe4d9fc16847d813f
 MISC metadata.xml 382 BLAKE2B 9ed935e598f60088af1877e443371ccb2c70fc397b21702cb4c47a971132c8a912763bf6ab0d27a3b1a387df39542ac7c5f59345a123808476578878633ed938 SHA512 97c120c9c10d8ee73162beb9970f07153f10b095199adee814459754a3df1414f25b8faae036a19f165a45f8ed4ad0a3087272139d69326018450006b75047a1
diff --git a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
deleted file mode 100644
index fdc123c2b489..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+asn1 debug +libffi systemd +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
-	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-	trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	# disable unsafe tests, bug#502088
-	export FAKED_MODE=1
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable trust trust-module) \
-		$(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \
-		$(use_enable debug) \
-		$(use_with libffi) \
-		$(use_with asn1 libtasn1) \
-		$(multilib_native_use_with systemd)
-
-	if multilib_is_native_abi; then
-		# re-use provided documentation
-		ln -s "${S}"/doc/manual/html doc/manual/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.25.0.ebuild b/app-crypt/p11-kit/p11-kit-0.25.0.ebuild
deleted file mode 100644
index 46287250efa9..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.25.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 meson-multilib
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+libffi gtk-doc nls systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}]
-	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-"
-
-multilib_src_configure() {
-	# Disable unsafe tests, bug#502088
-	export FAKED_MODE=1
-
-	local emesonargs=(
-		-Dbashcompdir="$(get_bashcompdir)"
-		-Dtrust_module=enabled
-		-Dtrust_paths="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		$(meson_feature libffi)
-		$(meson_use nls)
-		$(meson_use test)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_true man)
-		$(meson_native_use_feature systemd)
-	)
-
-	meson_src_configure
-}
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 464da84711a8..92d8f061e7b4 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,11 +1,8 @@
 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
-DIST swtpm-0.7.3.tar.gz 354088 BLAKE2B 687e3161cbc08be68427648187ba2fb05749bcaaf9929b951eea4884bd4210c6105a2494f5e7d51915e5be1b700b13889cd83c96d22e00d621ea9336221ee67b SHA512 7f4cdf7ca2539f28e3a78e2a081b24983f3305905c7cafcac0957b14f5c06c8ee9485a0adaf3710561091f9ee85e00822fe1ff874389808218c1e17f938c45d9
 DIST swtpm-0.8.0.tar.gz 363951 BLAKE2B 8ec91961c5ac145dc5d1c3c4a609d18bc425caef0efb4d2b18c08c76acacefa619617b6e7b6e8e4e707117a29e3ff3c0198b63d81d24fc747435c6e06e48e8e9 SHA512 7f70c19f732404061be6168c96c0dd3ec91ed8b50dddcafcb50d810062ce0e83ad85360191f97db5db9dc034e01d91cebe3912449d896d2cde68fe060a0adb09
 DIST swtpm-0.8.1.tar.gz 364169 BLAKE2B 4b364ed581ea97d78c5c6248870503b1612d7d164b05b76c1f02644aade6fd09f204396f0a2d0db4e0ecec2792dc512f7c4393c44bf7ce447a3a7fbb8754594f SHA512 07276519b0e20c9c4167ce78e789d2072eb90172ed9bcba2a11eef46ee03a77860f7a2218f4dc013a2ddb8471079e3cbe43f8ab02174bd704a78aea8eee3d2fc
-EBUILD swtpm-0.7.3.ebuild 1416 BLAKE2B 4344cd948a48f8d6b576f058b3566dc836d7616af160ea19327df80e16f8b11b732b5425bdd1d94beeb144ec8ce7359bbb934ca915d3debf6e99315e12b102a6 SHA512 1ee0112873d63b7b33bd23496e0f92bf957da0cc5952fbe1302c79af1517312a50534a3c3dce70b407ce182efcb20775c3057898414ec45ce96fc1cdb7e04f1f
-EBUILD swtpm-0.8.0-r2.ebuild 1340 BLAKE2B 7d8fb65105ff3fee6014a30955a947a7de340215057172e895c9e52c016cf4851c7b4c9ed44c027cf0883768e932be15ea0f7c54936d1679711f495fee45f3d4 SHA512 15d98c5a6fcb9f00718071b6035a585a8347d321d8dab1646b36714b31f1b3126978c11e15d78f23c2d5191840df21ef6486df4d4b725207c8e9a19ede3a3013
 EBUILD swtpm-0.8.0.ebuild 1423 BLAKE2B a136fec1ca90e331569b9d8e0c8735fca8efba749dc27939d7d821cb9a00df8fb4bb34a352a94b087288758ad07f04d40ad7944c698841a429ac3994c547b370 SHA512 72bf70275da3c31c087db9498572685b0d052b82510311341aeff16ccc2df1f286e379aa4fca7beb624b0f99da27871993a9191ae931069b34ad2cb9234bc80d
-EBUILD swtpm-0.8.1.ebuild 1338 BLAKE2B ec3c20cbd28da305745fe34e2aafc2836fcee6cc9bb70d2ba5c1db3b431d48ad869033ef52fe7cb1298041c4c8955bc73f712b072f762563688f9f5b5a76791c SHA512 b9926b777609183d462d07a5bd443f08c9ab18e1dcc0924df5bd6b1877dd2231547e76dae74393e0681106e4fb59e5174fe3f73acb1ec2bc544f0736230266ef
+EBUILD swtpm-0.8.1.ebuild 1339 BLAKE2B c2fe347092a6d68980b8a88d27b21f5de0ef17682f4125ed9259de851a6879b9a70b8e8e9b305c3bdea8d6506678b234e186d307a7432660cc447c9f79809c6d SHA512 73628fb233229d092645c1da283a793a55d50862c94cab9934e35549aa643b6316149a973eaed7983a20067508a1e68d8c6db57868f8d890440c7e821e6c5989
 MISC metadata.xml 794 BLAKE2B dba4f05f021693e7404cf11c978290f95002956abe33e4a1296ea485854fa8f3bbbb66ef10f11393c68a9a4ef06218b379e250ef9c3e764d0460e7fcd8121014 SHA512 e7f0800df5a146f216ead60faabaf6b590fb02a0518895714a6b7666798588a3301bb86225296ac4fc65ea8c1d243dfcab97cf6eca9962ae40ce566add3af542
diff --git a/app-crypt/swtpm/swtpm-0.7.3.ebuild b/app-crypt/swtpm/swtpm-0.7.3.ebuild
deleted file mode 100644
index 4ae448778f9c..000000000000
--- a/app-crypt/swtpm/swtpm-0.7.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-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 ~ppc ppc64 ~riscv x86"
-IUSE="fuse +gnutls seccomp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	gnutls? (
-		dev-libs/libtasn1:=
-		>=net-libs/gnutls-3.1.0:=[tools,pkcs11]
-	)
-	seccomp? ( sys-libs/libseccomp )
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms"
-
-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 \
-		--without-selinux \
-		$(use_with fuse cuse) \
-		$(use_with gnutls) \
-		$(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.0-r2.ebuild b/app-crypt/swtpm/swtpm-0.8.0-r2.ebuild
deleted file mode 100644
index 4f2d43053f44..000000000000
--- a/app-crypt/swtpm/swtpm-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-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 )"
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	seccomp? ( sys-libs/libseccomp )
-	dev-libs/libtasn1:=
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms"
-
-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 \
-		--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.1.ebuild b/app-crypt/swtpm/swtpm-0.8.1.ebuild
index b4921f3d1e2b..b7d305979779 100644
--- a/app-crypt/swtpm/swtpm-0.8.1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10,11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools python-any-r1
 
diff --git a/app-crypt/tc-play/Manifest b/app-crypt/tc-play/Manifest
index 0fb176a289d3..ceed80ddadfa 100644
--- a/app-crypt/tc-play/Manifest
+++ b/app-crypt/tc-play/Manifest
@@ -1,7 +1,4 @@
-AUX tc-play-2.0-build.patch 677 BLAKE2B 1b0f8372a6e94a7ff2cc3c1236855d6d1973172b78586e6ee72f29723841aa700ece23be1c985b00c37196da20ea18c1b30f13d0e00fa8de6bf603cfce769110 SHA512 0f41f59b8fe4376f5d48dcb3e3ca76698b141924b6f0b3768eb46238f6d597f2a8cf3c6aa840bba57ecfd61337182eb48e627fc1a04b348849e8bc5346c82e9b
 AUX tc-play-3.3-ldflags.patch 480 BLAKE2B 3d2309cc506eea800c7cc2333d746f96d7e8c25d3a74cf2f2c669536e1e7fc6a3f6632d7720e41f9a39bef57fc8628b74034c0dd45113a4909728cef41afee9f SHA512 d878cef17e2a7ce417f33d19f6d54c00b2c4c6994f77a747686b69ffc3a378c951c215a17b7cb30d5fe026877358359141a276b93d6abbabf950b4894d31d491
-DIST tc-play-2.0.tar.gz 1015525 BLAKE2B 1481eecc8aaf2cb9698eed96a9cdabaa2b74daf11865dd29a6fab7e66fb76aa2f6e544fe7ac53a2510415ee6ddf3c5732c774a26708fe354113eb9de6a9b62d9 SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7
 DIST tc-play-3.3.tar.gz 2591752 BLAKE2B c02489d6e291dfc1425745af86506e72fda7f67dba0668b9250a85604ba301761b5bbbad6927238042a0f89da1035d9e3275006e34e895835a53cdc24974f419 SHA512 78cc84b1ca333e6760b87dfd22035a027bea8d562201c028247e9cfc4377260490cdc42236ef1eeb1c263a49ca1654d8ae637abdf1b4e507f958bc780fc85d94
-EBUILD tc-play-2.0-r2.ebuild 1073 BLAKE2B 048fa78747be7f9565216cb957ebc8d24d1732ef5d8b1663935c1d84bd00a56485ef5b3119d4cc98ca70dc4b9282a66ee68985c8921b66076424d1d628f14971 SHA512 d6c300ccc813cec15b1803144e92d53980db531ba962e771cb7abd1ea143e05b226cffe5d7d7426bbf86b67150acb1ee3e53fc0866c0e0ea7d389a4e2048e5cc
 EBUILD tc-play-3.3.ebuild 1084 BLAKE2B bb097cc904f223029ea6ea4209c207659fab1ea95b6db35f6a20605701eebb61c31b6f2a9f5b4f35ac98bbe255cfd9456843394732b923d07a0ab1f0cf46154d SHA512 281031b618f0a8a0f72c7df8a626264f07122aa061e77a1c0ba0862c79c5fc30d2e4477817741e9ecdacabf8e4d0c839c0326578b97eca5ce8d917d7d27ce15d
-MISC metadata.xml 252 BLAKE2B 555780b1a53410dc9c4d9157d8995e674e5306af2df14855c098124f3eb3a705007fc9d6122108f6ca8f842b968335e8a2c1866fde46d73801a9fb5eaabcd057 SHA512 1c6cddedeba42c9c2c82d30e312f953f0cee04bce36a70fbd1586dceb92407324b274de60d55f58251065d61ee186769e55b7a0d2cfc8cbff6c7e816015742f1
+MISC metadata.xml 247 BLAKE2B 17054c2278ae08f73a7a3eca8cb5b2f93167f3f5f239bc712ce64c96982e4303d3c919f6d3dc10fff9efcbb30e65148e8f6b96d705520018b0a26b4acab5a029 SHA512 025dbc3f70d3387ba36f9f7f7c0355fa8b641168d3f8b79b84650758f60aa2493a4020d929374cc97757b49da9c928d1c10c34c6fd1b7c03801360090e631149
diff --git a/app-crypt/tc-play/files/tc-play-2.0-build.patch b/app-crypt/tc-play/files/tc-play-2.0-build.patch
deleted file mode 100644
index 0385f33b45b4..000000000000
--- a/app-crypt/tc-play/files/tc-play-2.0-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3f9235841ba4494962b3c7dafcd16fd3ff5f6575 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 8 Apr 2017 20:27:17 +0300
-Subject: [PATCH] build: include sys/sysmacros.h for recent glibc
-
-https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- tcplay.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tcplay.c b/tcplay.c
-index cd882cf..a6d4655 100644
---- a/tcplay.c
-+++ b/tcplay.c
-@@ -47,6 +47,7 @@
- #if defined(__linux__)
- #include <libdevmapper.h>
- #include <uuid/uuid.h>
-+#include <sys/sysmacros.h>
- #elif defined(__DragonFly__)
- #include <libdm.h>
- #include <uuid.h>
--- 
-2.10.2
-
diff --git a/app-crypt/tc-play/metadata.xml b/app-crypt/tc-play/metadata.xml
index 683a10b4df2a..ce2564530426 100644
--- a/app-crypt/tc-play/metadata.xml
+++ b/app-crypt/tc-play/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">bwalex/tc-play</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">bwalex/tc-play</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/tc-play/tc-play-2.0-r2.ebuild b/app-crypt/tc-play/tc-play-2.0-r2.ebuild
deleted file mode 100644
index 244696e5f144..000000000000
--- a/app-crypt/tc-play/tc-play-2.0-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A free, pretty much fully featured and stable TrueCrypt implementation"
-HOMEPAGE="https://github.com/bwalex/tc-play"
-SRC_URI="https://github.com/bwalex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnutls"
-
-DEPEND="
-	dev-libs/libgcrypt:=
-	dev-libs/libgpg-error
-	sys-apps/util-linux
-	sys-fs/lvm2
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		dev-libs/openssl:=
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	local backend="openssl"
-	use gnutls && local backend="gcrypt"
-
-	EXTRA_MAKE_FLAGS=(
-		PBKDF_BACKEND="${backend}"
-		WARNFLAGS=""
-		CC="$(tc-getCC)"
-		AR="$(tc-getAR)"
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-	)
-}
-
-src_compile() {
-	emake -f Makefile.classic \
-		tcplay \
-		"${EXTRA_MAKE_FLAGS[@]}"
-}
-
-src_install() {
-	emake -f Makefile.classic \
-		"${EXTRA_MAKE_FLAGS[@]}" \
-		install_program \
-		DESTDIR="${ED}"
-}
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index e6679d79fd9b..753fcf7b6a31 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,7 +1,3 @@
-AUX tpm-tools-1.3.9.1-openssl-1.1.patch 5937 BLAKE2B b8ca021f3b1cd91656a0b0f43dfb4e9238b39360dfe6cfe314ad6a37dbe544480d8d49dab4c5a6c68c8bba3ce903424a1569b714e8d35516a133f5e77a9fbcc3 SHA512 4af3e4f52c7c5af5c271d5c0a2410a0a14efb4cb64cab007742cd1f95f30f9c792b0d3ce9d506535b63cf832245d189368b9121bcd33fc2748140fd207a7274a
-DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
 DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa SHA512 b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb
-EBUILD tpm-tools-1.3.9.1-r1.ebuild 954 BLAKE2B f53bed313b12de4bd985c76d168a110a5f2e66448afb39636f8ccbef173810ec2ce60d0a01a39fb289cdc82b723237e58091b4f561668b77e28144d141592969 SHA512 045475346c2c8778ce588cf8fe893c24eca0c9d6ecf27161a2807f35d47737ba75f16d44d7b3c244b5ce35dc382a24c52ba3bd9c72e48bff9dfd8d488465a40e
 EBUILD tpm-tools-1.3.9.2-r1.ebuild 1098 BLAKE2B 530cb0fb4ef300bb2d278d58d00b37cd336d0bc87deecbbf0b8618919b0f8173064a51ad96aa7acecd7884c70545395afdf1b101e67b109ed6ed0d562cc2bc9b SHA512 ff2ae54dcf8069db4767b68802fcafea634dc8c9f8e0255ed8138be265d41f705e09f7f8803029611867dffea5dbeb1fc1787bb693ac4ac8e8b55fa3e1c96430
-EBUILD tpm-tools-1.3.9.2.ebuild 1094 BLAKE2B f635866f67a93e3d4aac3d5435ff39399753978a8d2a67e404d0416e7dace32135aa54a80146a0b44de7d65391d977d038b7d0fa34a8923740ef34605eeed2de SHA512 310612239dc290c2b013c69a968c09013a1215a6cb6607ed1b49ebd4fb60e6afafbd413450f975f3fe8f258dc4e939294218408a05999ef1d025009e4f3f45f2
 MISC metadata.xml 655 BLAKE2B 32c7f70c902ebfbc7f182b4ff474b97163112e4418597f12e2c4f10e082f7803a27948e1cbf17bfea491564a26a1c968fa5d7ec51878eaa79eb3e9598ee51ad9 SHA512 57f1c5a445c98a90025ab2b19fa00b55071bec42e3b130dae8dae203e1a81544cbcf723f8b4d4bfcc47771060e350663bb1c0ea976595c6c044809ed358f7ad0
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
deleted file mode 100644
index ae31af025851..000000000000
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From 31d9cebc43833de939a0e13be0110ed830b66cbd Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 8 Dec 2018 23:28:54 +0200
-Subject: [PATCH] data_import.c: support openssl-1.1
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
-Bug: https://sourceforge.net/p/trousers/bugs/227/
----
- src/data_mgmt/data_import.c | 159 +++++++++++++++++++++++++-----------
- 1 file changed, 112 insertions(+), 47 deletions(-)
-
-diff --git a/src/data_mgmt/data_import.c b/src/data_mgmt/data_import.c
-index f534717..33c76e7 100644
---- a/src/data_mgmt/data_import.c
-+++ b/src/data_mgmt/data_import.c
-@@ -39,6 +39,30 @@
- #include <openssl/evp.h>
- #include <openssl/err.h>
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+static void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) {
-+	if ( n )
-+		*n = r->n;
-+	if ( e )
-+		*e = r->e;
-+	if ( d )
-+		*d = r->d;
-+}
-+static void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q) {
-+	if ( p )
-+		*p = r->p;
-+	if ( q )
-+		*q = r->q;
-+}
-+static void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp) {
-+	if ( dmp1 )
-+		*dmp1 = r->dmp1;
-+	if ( dmq1 )
-+		*dmq1 = r->dmq1;
-+	if ( iqmp )
-+		*iqmp = r->iqmp;
-+}
-+#endif
- 
- /*
-  * Global variables
-@@ -372,7 +396,7 @@ readX509Cert( const char  *a_pszFile,
- 		goto out;
- 	}
- 
--	if ( EVP_PKEY_type( pKey->type ) != EVP_PKEY_RSA ) {
-+	if ( EVP_PKEY_base_id( pKey ) != EVP_PKEY_RSA ) {
- 		logError( TOKEN_RSA_KEY_ERROR );
- 
- 		X509_free( pX509 );
-@@ -691,17 +715,35 @@ createRsaPubKeyObject( RSA               *a_pRsa,
- 
- 	int  rc = -1;
- 
--	int  nLen = BN_num_bytes( a_pRsa->n );
--	int  eLen = BN_num_bytes( a_pRsa->e );
-+	const BIGNUM *bn;
-+	const BIGNUM *be;
-+	int  nLen;
-+	int  eLen;
-+	CK_BYTE *n = NULL;
-+	CK_BYTE *e = NULL;
-+
-+	RSA_get0_key( a_pRsa, &bn, &be, NULL );
-+
-+	nLen = BN_num_bytes( bn );
-+	eLen = BN_num_bytes( be );
-+	n = malloc( nLen );
-+	e = malloc( eLen );
-+
-+	if ( !n || !e ) {
-+		logError( TOKEN_MEMORY_ERROR );
-+		goto out;
-+	}
-+
-+	// Get binary representations of the RSA key information
-+	BN_bn2bin( bn, n );
-+	BN_bn2bin( be, e );
- 
-+	{
- 	CK_RV  rv;
- 
- 	CK_BBOOL  bTrue  = TRUE;
- 	CK_BBOOL  bFalse = FALSE;
- 
--	CK_BYTE *n = malloc( nLen );
--	CK_BYTE *e = malloc( eLen );
--
- 	CK_OBJECT_CLASS  clPubClass  = CKO_PUBLIC_KEY;
- 	CK_KEY_TYPE      tKeyType    = CKK_RSA;
- 	CK_BBOOL         bPrivate    = ( !g_bPublic ) ? TRUE : FALSE;
-@@ -726,21 +768,13 @@ createRsaPubKeyObject( RSA               *a_pRsa,
- 
- 	*a_hObject = 0;
- 
--	if ( !n || !e ) {
--		logError( TOKEN_MEMORY_ERROR );
--		goto out;
--	}
--
--	// Get binary representations of the RSA key information
--	BN_bn2bin( a_pRsa->n, n );
--	BN_bn2bin( a_pRsa->e, e );
--
- 	// Create the RSA public key object
- 	rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject );
- 	if ( rv != CKR_OK )
- 		goto out;
- 
- 	rc = 0;
-+	}
- 
- out:
- 	free( n );
-@@ -760,29 +794,74 @@ createRsaPrivKeyObject( RSA               *a_pRsa,
- 
- 	int  rc = -1;
- 
--	int  nLen = BN_num_bytes( a_pRsa->n );
--	int  eLen = BN_num_bytes( a_pRsa->e );
--	int  dLen = BN_num_bytes( a_pRsa->d );
--	int  pLen = BN_num_bytes( a_pRsa->p );
--	int  qLen = BN_num_bytes( a_pRsa->q );
--	int  dmp1Len = BN_num_bytes( a_pRsa->dmp1 );
--	int  dmq1Len = BN_num_bytes( a_pRsa->dmq1 );
--	int  iqmpLen = BN_num_bytes( a_pRsa->iqmp );
-+	const BIGNUM *bn;
-+	const BIGNUM *be;
-+	const BIGNUM *bd;
-+	const BIGNUM *bp;
-+	const BIGNUM *bq;
-+	const BIGNUM *bdmp1;
-+	const BIGNUM *bdmq1;
-+	const BIGNUM *biqmp;
-+	int  nLen;
-+	int  eLen;
-+	int  dLen;
-+	int  pLen;
-+	int  qLen;
-+	int  dmp1Len;
-+	int  dmq1Len;
-+	int  iqmpLen;
-+	CK_BYTE *n = NULL;
-+	CK_BYTE *e = NULL;
-+	CK_BYTE *d = NULL;
-+	CK_BYTE *p = NULL;
-+	CK_BYTE *q = NULL;
-+	CK_BYTE *dmp1 = NULL;
-+	CK_BYTE *dmq1 = NULL;
-+	CK_BYTE *iqmp = NULL;
-+
-+	RSA_get0_key( a_pRsa, &bn, &be, &bd);
-+	RSA_get0_factors( a_pRsa, &bp, &bq);
-+	RSA_get0_crt_params( a_pRsa, &bdmp1, &bdmq1, &biqmp );
-+
-+	nLen = BN_num_bytes( bn );
-+	eLen = BN_num_bytes( be );
-+	dLen = BN_num_bytes( bd );
-+	pLen = BN_num_bytes( bp );
-+	qLen = BN_num_bytes( bq );
-+	dmp1Len = BN_num_bytes( bdmp1 );
-+	dmq1Len = BN_num_bytes( bdmq1 );
-+	iqmpLen = BN_num_bytes( biqmp );
-+
-+	n = malloc( nLen );
-+	e = malloc( eLen );
-+	d = malloc( dLen );
-+	p = malloc( pLen );
-+	q = malloc( qLen );
-+	dmp1 = malloc( dmp1Len );
-+	dmq1 = malloc( dmq1Len );
-+	iqmp = malloc( iqmpLen );
- 
-+	if ( !n || !e || !d || !p || !q || !dmp1 || !dmq1 || !iqmp ) {
-+		logError( TOKEN_MEMORY_ERROR );
-+		goto out;
-+	}
-+
-+	// Get binary representations of the RSA key information
-+	BN_bn2bin( bn, n );
-+	BN_bn2bin( be, e );
-+	BN_bn2bin( bd, d );
-+	BN_bn2bin( bp, p );
-+	BN_bn2bin( bq, q );
-+	BN_bn2bin( bdmp1, dmp1 );
-+	BN_bn2bin( bdmq1, dmq1 );
-+	BN_bn2bin( biqmp, iqmp );
-+
-+	{
- 	CK_RV  rv;
- 
- 	CK_BBOOL  bTrue  = TRUE;
- 	CK_BBOOL  bFalse = FALSE;
- 
--	CK_BYTE *n = malloc( nLen );
--	CK_BYTE *e = malloc( eLen );
--	CK_BYTE *d = malloc( dLen );
--	CK_BYTE *p = malloc( pLen );
--	CK_BYTE *q = malloc( qLen );
--	CK_BYTE *dmp1 = malloc( dmp1Len );
--	CK_BYTE *dmq1 = malloc( dmq1Len );
--	CK_BYTE *iqmp = malloc( iqmpLen );
--
- 	CK_OBJECT_CLASS  clPrivClass = CKO_PRIVATE_KEY;
- 	CK_KEY_TYPE      tKeyType    = CKK_RSA;
- 	CK_BBOOL         bPrivate    = ( !g_bPublic ) ? TRUE : FALSE;
-@@ -815,25 +894,11 @@ createRsaPrivKeyObject( RSA               *a_pRsa,
- 
- 	*a_hObject = 0;
- 
--	if ( !n || !e || !d || !p || !q || !dmp1 || !dmq1 || !iqmp ) {
--		logError( TOKEN_MEMORY_ERROR );
--		goto out;
--	}
--
--	// Get binary representations of the RSA key information
--	BN_bn2bin( a_pRsa->n, n );
--	BN_bn2bin( a_pRsa->e, e );
--	BN_bn2bin( a_pRsa->d, d );
--	BN_bn2bin( a_pRsa->p, p );
--	BN_bn2bin( a_pRsa->q, q );
--	BN_bn2bin( a_pRsa->dmp1, dmp1 );
--	BN_bn2bin( a_pRsa->dmq1, dmq1 );
--	BN_bn2bin( a_pRsa->iqmp, iqmp );
--
- 	// Create the RSA private key object
- 	rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject );
- 	if ( rv != CKR_OK )
- 		goto out;
-+	}
- 
- 	rc = 0;
- 
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
deleted file mode 100644
index 2f87a05d5456..000000000000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
-IUSE="nls pkcs11 debug"
-
-DEPEND=">=app-crypt/trousers-0.3.0
-	dev-libs/openssl:0=
-	pkcs11? ( dev-libs/opencryptoki )"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openssl-1.1.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -r \
-		-e '/CFLAGS/s/ -m64//' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags $(usex debug -DDEBUG -DNDEBUG)
-
-	econf \
-		$(use_enable nls) \
-		$(use pkcs11 || echo --disable-pkcs11-support)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
deleted file mode 100644
index 4bfe4151f59a..000000000000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
-IUSE="nls pkcs11 debug"
-
-DEPEND=">=app-crypt/trousers-0.3.0
-	dev-libs/openssl:0=
-	pkcs11? ( dev-libs/opencryptoki )"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-# upstream didn't generate the tarball correctly so we must bootstrap
-# ouselves
-	mkdir -p po || die
-	mkdir -p m4 || die
-	cp -R po_/* po/ || die
-	touch po/Makefile.in.in || die
-	touch m4/Makefile.am || die
-
-	sed -i -r \
-		-e '/CFLAGS/s/ -m64//' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags $(usex debug -DDEBUG -DNDEBUG)
-
-	econf \
-		$(use_enable nls) \
-		$(use pkcs11 || echo --disable-pkcs11-support)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index f69a4c6aac0d..26c755a8e968 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1,8 +1,5 @@
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 401 BLAKE2B 6e8579e5fd754f5321b3d5b797e44ee7167bfdf4322ad07827484c665c2fc2d52cff374bc772432ff79ba6205a0130b583deac9029b2693bc53c0b06ddb58cff SHA512 64961eb317203c72b2b862b8493826ac0f9ce36d004d40a2a7651acd011c443ae6cdad3b67cded53989689e9220b86560967f4a1d8631b9322ccf42afdb386db
-DIST tpm2-abrmd-2.4.1.tar.gz 577259 BLAKE2B 7d97e1069a171f3693fb11b8e2ce0243993f4352aae9fd691bfbf1b8fcef8615b79957f8f662ac00fe59bf7e3830d8abb79c67790f7be1cd3140fd1c7b1ed560 SHA512 0335285678cfceca4f185981ded90d213ff796cadddc9b5d6dbf2db533f81023a0f1089bbd8a8017bccb95190889be23b24d38a176d3368d221479aff4ff7d6c
 DIST tpm2-abrmd-3.0.0.tar.gz 576822 BLAKE2B cdcb677a2dec59cdc454b98793bb0784ba3403c276b618cd37c5748ab1d883ee8f3f69c0ae95c7bf262e2e993dcc0b12ae39010de12c6c211fe3de8c21515160 SHA512 65a39cd0518dfbcbd5835ac6c6628444d412e36471702f2cd1f1077d788330a477778e6403899ea2fa0497b643e5db9ca3e746845492eff78c4c78d8dd8f9e7d
-EBUILD tpm2-abrmd-2.4.1-r1.ebuild 1580 BLAKE2B 9598e8a6d2b1dd25cffd6bc23c2fe6c68369dbba39a584101a8b65a743eae09e3ac6aee930517e8c6fedd4f83f451f531ac254fb132687210d074159aa5169f9 SHA512 b46319faf9d9b8b5e626afcbdc30fbdc88a1f0660fc11f38eb9cc4ed3ac8e7d2e835318d732463de6580765effb0bd2faf48c5c91662b21b7bc1582fb3366722
-EBUILD tpm2-abrmd-3.0.0-r1.ebuild 1462 BLAKE2B 485c7377a0ad59718f678fed16492b3330d58f14b8d226beeead3712b39462f1d93916b29fc4bca791e8beea098034324d823eb8698911bab599bf396872a0e4 SHA512 7665df2ddf3106c58de354324cfce3489ee7a5be5e9edf148fba5148bbd74261672aef2402dc88c2b5b31a99b0e20592c2b4147a02f190cadc3097a4455664f2
 EBUILD tpm2-abrmd-3.0.0-r2.ebuild 1468 BLAKE2B 32d7a67ac703af8fa2405f74eb27660e9345bd672181c547b9d7ca37b67b031a508c54a7819443dd81a1a86a6e6eecf29730b3570d66e6f7bb9704dc35bcfd21 SHA512 180f32200a795db227adfe0240d3d149580f92e829db5671f1e68acd59cb7aac3e800dd6997580e695f7bd7abecc0e7efce0ebd7418b9fbbd3038c0cb3d58296
 MISC metadata.xml 493 BLAKE2B fd3fd8c23a18d535957ac767d6f1a8cc49a91ad362d02b3df87e14040d856c7f01341561fed23090b6776937d9cb11e7015d869fc5399620e9047f1644591e9d SHA512 2f72ada33f64c867a9b0a453919d0dbd444ba072abe3212fd6a3c2fb5bd337fb38b6ff0b8474345e6843160822d6c065261881799a9598de3a57045f09208667
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild
deleted file mode 100644
index cda953bf6908..000000000000
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	sys-apps/dbus
-	dev-libs/glib:=
-	app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
-	test? (
-		app-crypt/swtpm
-		>=app-crypt/tpm2-tss-3.0.0:=
-		dev-util/cmocka
-	)"
-BDEPEND="virtual/pkgconfig
-	dev-util/gdbus-codegen"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# tests fail with LTO enabbled. See bug 865275
-	filter-lto
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		$(use_enable test integration) \
-		--disable-defaultflags \
-		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
-		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
-		--with-systemdpresetdisable \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-tcti-tabrmd.pc" || die) ]] ; then
-		# Safeguard for bug #833887
-		die "pkg-config file version doesn't match ${PV}! Please report a bug!"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild
deleted file mode 100644
index 21214f012174..000000000000
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	sys-apps/dbus
-	dev-libs/glib:=
-	app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
-	test? (
-		app-crypt/swtpm
-		>=app-crypt/tpm2-tss-3.0.0:=
-		dev-util/cmocka
-	)"
-BDEPEND="virtual/pkgconfig
-	dev-util/gdbus-codegen"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# tests fail with LTO enabbled. See bug 865275
-	filter-lto
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		$(use_enable test integration) \
-		--disable-defaultflags \
-		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
-		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
-		--with-systemdpresetdisable \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	einfo "As of tpm2-abrmd 3.0.0, users must be in the tss group"
-	einfo "to access the TPM"
-}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index ddb1b863d196..8094070a38d1 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,9 +1,3 @@
-AUX tpm2-tools-5.1.1-no-efivar-automagic.patch 1083 BLAKE2B 10a8299a28ee54339ac73692dc54475da3044d3afcfe570d6c72f5d8ace2bbf3faf5242002be02c4a765ba9b9c37ba9777d9b4b8bac416e6721d9b8660d19bf2 SHA512 4622e235ef5202cc3448fbc67f362ce36396ca04892c340f275f67c93d5bb2857a14094329ec499c4f7215ac10002b70d18cfc2bdef1474d93f556c5759383ae
-AUX tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch 1380 BLAKE2B ffbbe59cbfd4a411544ef7f03ed04c73afc774edebaa2da8deb11e7fe4f321b88b686d3138fd5524b2279407518dda32de0e1cb96a5517ba87f8cc8c9ddb2be5 SHA512 557ad07048e288a9611222b920e8c82fab9852dde04da2b57981cb04ce3bb9d4ea40c57ba24fb2b3dc09cacc16ef731d11428d0603d757f7f7adc2023c5ca779
-DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
-DIST tpm2-tools-5.4.tar.gz 1241132 BLAKE2B 21406ec61de19db49f1dd1ff9648e1b0a9ae2647df2ce290acca40c2fc54464e3c8a744afdbc9314ca731869ac974a7863e2bea3c70df844a972501a5b7973f2 SHA512 8d7802b85bd26b6efa0ed6be73b917b907bb7b424ff7d07e46e5574dfdd9d46ea2d7727904ebaba4651c8d1249cd52a7dc6dff8e9635666c8d97ca7c337a0396
 DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26 SHA512 24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470
-EBUILD tpm2-tools-5.2-r1.ebuild 1739 BLAKE2B a866142cfee255878eeca763d5a8d5cd0405d93fd6a7d5ffeac578bc82bfeb8344dce79090acd5442c2358949f7bb15317f4a9c490761bdd5494b71978f5cfbb SHA512 603d4afddfb7c39efd4347f05586650c8d04631980a946e4f381960e009cb3e62895715ec1f28c037c8f1e3600e064dbc059a4b80ae7a8cee6b5736ab81fa3f0
-EBUILD tpm2-tools-5.4.ebuild 1402 BLAKE2B 5265346e03869106b969f606399a954c359501c1721b04e9d73445c769d64b1aa2401414954be2d264e3e7fa3a022a8528f043d2a9e75575130c086ac851d3e8 SHA512 2cc22f53a0d947fa487ae38cdadd8ddd5839d97b500e02da2997f629c2e90cc4a3629b66038f2758562f4ccf759820c6e67fc4e60651b25cd85c2a24049b9714
-EBUILD tpm2-tools-5.5.ebuild 1642 BLAKE2B e9698633e5a4521fb42f6a02d03846760b8efcab7217c64dcbd60b1f828325338bd7f5dc216c9b2f3bad5e42ad8ae1cd2fe06ab77b936376269c26aceebd1050 SHA512 79044299a7a0566bcdfe386e2e53b8a0e794c644a6efd94c3f400bd005f7bb2de197a2d176c48a6766cc952f77c2d3b897355b13a2394502d7450ff812e18505
+EBUILD tpm2-tools-5.5.ebuild 1643 BLAKE2B ac47e76838b39ccd2cc164b9c0c20a03766aef1553eb51778371cf416bb4a242b14f13b4a312d3fb2f7eaf71114eddd942af5de63d60df256449cdad33a3d292 SHA512 afb456d7ddeab801b9f30e7f6754c27d817232bdd642be17fb9fc52496a751784678472451a1a99f9ea241dbbe7485644f7c3f656d427281f9e707ab471e2c02
 MISC metadata.xml 560 BLAKE2B fe8daaba2a7586247537f8ed7b92769676b20f2c1377f7bb582dff49e06cf3f9beba4f79e28f10ea76d67d089eb152b060b091414dd9b47c5694ca153211421f SHA512 a744fcc50c7e44b1939190150404aee9054eab8e921e6f63cafa58dc80be5f20692632509de85399b6a9633701da72fd951e8bcfbe9e5177f315fa1dcbcc9ee5
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
deleted file mode 100644
index 25f3ef43fe3d..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/812047
-
-From 0cea7f0f78f1a9e8dca789eb5f2ece052e026bed Mon Sep 17 00:00:00 2001
-From: Christopher Byrne <salah.coronya@gmail.com>
-Date: Tue, 7 Sep 2021 20:22:27 -0500
-Subject: [PATCH] configure.ac: Fix automagic depency on libefivar
-
-Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
----
- configure.ac | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f1c17116..bdb4abda 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,8 +62,12 @@ PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.1.0])
- PKG_CHECK_MODULES([CURL], [libcurl])
- 
- # pretty print of devicepath if efivar library is present
--PKG_CHECK_MODULES([EFIVAR], [efivar],,[true])
--AC_CHECK_HEADERS([efivar/efivar.h])
-+AC_ARG_WITH([efivar], AS_HELP_STRING([--without-efivar], [Build without efivar library (default: test)]))
-+
-+AS_IF([test "x$with_efivar" != "xno"], [
-+	PKG_CHECK_MODULES([EFIVAR], [efivar])
-+	AC_CHECK_HEADERS([efivar/efivar.h])
-+])
- 
- # backwards compat with older pkg-config
- # - pull in AC_DEFUN from pkg.m4
--- 
-2.32.0
-
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
deleted file mode 100644
index e1094647bdfd..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3d80fad66694ad14a58dd89204a25e9248c4ab0c Mon Sep 17 00:00:00 2001
-From: Jonas Witschel <git@diabonas.de>
-Date: Wed, 29 Sep 2021 17:08:07 +0200
-Subject: [PATCH] testparms: fix condition for negative test
-
-Commit e858dec76686bb4c42e74e0984b433231e530f93 ("testparms: ensure curve not
-supported before negative test") is supposed to ensure that the negative test
-is run only if ecc521 is *not* supported, but instead it runs the negative test
-if ecc521 is *available*. This worked anyway for libtpms < 0.9.0 because camellia
-was not supported, but since libtpms 0.9.0 added support for this algorithm, the
-test suite fails now with swtpm.
-
-Signed-off-by: Jonas Witschel <git@diabonas.de>
----
- test/integration/tests/testparms.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/integration/tests/testparms.sh b/test/integration/tests/testparms.sh
-index 8c3548e5..a587a60a 100644
---- a/test/integration/tests/testparms.sh
-+++ b/test/integration/tests/testparms.sh
-@@ -63,7 +63,7 @@ else
- fi
- 
- # Attempt to specify a suite that is not supported (error from TPM)
--if tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
-+if ! tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
-     if tpm2 testparms "ecc521:ecdsa:camellia" &>/dev/null; then
-         echo "tpm2 testparms succeeded while it shouldn't or TPM failed"
-         exit 1
--- 
-2.32.0
-
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
deleted file mode 100644
index b51e5b4b83e0..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-	dev-libs/openssl:=
-	net-misc/curl
-	sys-libs/efivar:="
-DEPEND="${RDEPEND}
-	test? (
-		app-crypt/swtpm
-		app-crypt/tpm2-abrmd
-		dev-util/cmocka
-	)"
-BDEPEND="virtual/pkgconfig
-	sys-devel/autoconf-archive
-	test? (
-		app-editors/vim-core
-		dev-tcltk/expect
-		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	)
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch"
-	"${FILESDIR}/${PN}-5.2-testparms-fix-condition-for-negative-test.patch"
-)
-
-python_check_deps() {
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i \
-	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-		"configure.ac" || die
-	"./scripts/utils/man_to_bashcompletion.sh" || die
-	eautoreconf
-}
-
-src_configure() {
-	# tests fail with LTO enabbled. See bug 865275 and 865277
-	filter-lto
-	econf \
-		$(use_enable fapi) \
-		$(use_enable test unit) \
-		--with-bashcompdir=$(get_bashcompdir) \
-		--enable-hardening
-}
-
-src_install() {
-	default
-	mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
-	local utils=( "${ED}"/usr/bin/tpm2_* )
-	bashcomp_alias tpm2 "${utils[@]##*/}"
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
deleted file mode 100644
index c6a8bf53eeb0..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-	dev-libs/openssl:=
-	net-misc/curl
-	sys-libs/efivar:="
-DEPEND="${RDEPEND}
-	test? (
-		app-crypt/swtpm
-		app-crypt/tpm2-abrmd
-		dev-util/cmocka
-	)"
-BDEPEND="virtual/pkgconfig
-	sys-devel/autoconf-archive
-	test? (
-		app-editors/vim-core
-		dev-tcltk/expect
-		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	)
-	${PYTHON_DEPS}"
-
-python_check_deps() {
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-        use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# tests fail with LTO enabbled. See bug 865275 and 865277
-	filter-lto
-	econf \
-		$(use_enable fapi) \
-		$(use_enable test unit) \
-		--with-bashcompdir=$(get_bashcompdir) \
-		--enable-hardening
-}
-
-src_install() {
-	default
-	mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
-	local utils=( "${ED}"/usr/bin/tpm2_* )
-	bashcomp_alias tpm2 "${utils[@]##*/}"
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
index 98c2668e4ddd..3369665b5b11 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit bash-completion-r1 flag-o-matic python-any-r1
 
 DESCRIPTION="Tools for the TPM 2.0 TSS"
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index b8e7a02637ae..e29e41c8fa2c 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,8 +1,4 @@
 AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
-DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
-DIST veracrypt-1.25.7.tar.gz 26108318 BLAKE2B e3974e6abec3ff462239b6c7a775ebfde4138dde295863c8788de88b593bc4bcd69db66eb81dd08333055b0efed2cccccf24d5f038099f6fc25b8f550cb90347 SHA512 955d5354d7401625196f1bd43d5e40695f4a2ebc7742cdfe0850d3b974a02126446346fe7e3174e16a38de39b507fc436b45b5e43d6fb714f37a4b8b394843dd
 DIST veracrypt-1.25.9.tar.gz 26200897 BLAKE2B e48f060343f875a0660040dde35fa826ca87c3659d97a039c2b84193276075b4d3596119bde6727e51eead0c876c91a5a1a3ea77717e74061d5d20a4ea1a6fed SHA512 e83bf7ca52d3893347dd06295db0534931f6f388fc6b0f26dc80ffef77f13918bf9558ab8ac2e6225945415f3291646d7c1c8de382dbe8e468ab1e927251982c
-EBUILD veracrypt-1.24_p8.ebuild 2633 BLAKE2B 9cbbde75cc90c56405c49235eecb9e2b997cfa60bd0048c56d849734c49a9c2059d804d7bad217a3b2603e4e49f15dc66c391d1a739884c606ee35ef80f85a9b SHA512 e67824eb329231342c1b0b932736305de87adeb107290e1cdcea7080b347f9e813a0188c69716e2318609597ace85b330469313f77aa4b07c1d45a8ab0b85ad7
-EBUILD veracrypt-1.25.7.ebuild 2578 BLAKE2B 3dcad45a436142ff44dd980ca78b925c1b339caf2328bd1f1199b65b2ef2dd4eb9e6e4b1a1998eb750e0c488a636374be6a3cfa07bac701816c53fdad19eefba SHA512 1759f4df7495ffc3105176f8fbd13eeff6622a9aa4545876b11750a4a06d5224fcfac1e1c49c02febd420798ec797bfdf75981dfcd4dd908f51108cc71c0fb70
 EBUILD veracrypt-1.25.9.ebuild 2577 BLAKE2B 18da6b6114152e215d7adbda334a33424e7f35ea0148d037c7ebece6ca589423811c422497b054077aeabab3f3b60bb69bc4d02fde8195090bbe87a1fe8a6def SHA512 cf56b42b7ef36170fb9c481113570f7d9aaf5f7ffc55979d6946ba1ac32c580a6edeaf3e3240915c1e5e8a233ce5dd96393c7c98e81aba42968b770e21b2f6f5
-MISC metadata.xml 400 BLAKE2B 9dedf1fc4c897fe4061f844b05a281b3b629beb82fa7806527550362528de0cb0b894c6901b4eceb7b86bfa07a0708dd6557e388a506151eeb17c307ffa66e8e SHA512 2923a0c7330435996e1fee89531ce36897a50ad7592978742dea69b9e07a58b322b92cfc2f83b0a5bfcc58705951fd53e8764dd770787681b298f6ec66c74c0a
+MISC metadata.xml 410 BLAKE2B db2f7b5477f9bfc3190069e1762f6af0ff585711a83a43c959918a4ea755b41a768ff44af7f2f3ffd6f3a75f3cbd3a7f71842e272e709de2cc4e05b01db063fc SHA512 a967137df23d239f00df8e0046886792bd6899f365189814cb47b4d03a3c83b69631d06997a57fa7c51fb33af8274140515a848c97e392c30131a26acab5bbdd
diff --git a/app-crypt/veracrypt/metadata.xml b/app-crypt/veracrypt/metadata.xml
index 796c16c58a5b..656d4d1ad68c 100644
--- a/app-crypt/veracrypt/metadata.xml
+++ b/app-crypt/veracrypt/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
-	<flag name="asm">Enable assembly for optimization</flag>
-</use>
-<maintainer type="person">
-	<email>gokturk@gentoo.org</email>
-	<name>Göktürk Yüksek</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">veracrypt/VeraCrypt</remote-id>
-</upstream>
+	<use>
+		<flag name="asm">Enable assembly for optimization</flag>
+	</use>
+	<maintainer type="person">
+		<email>gokturk@gentoo.org</email>
+		<name>Göktürk Yüksek</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">veracrypt/VeraCrypt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
deleted file mode 100644
index 513ddf482560..000000000000
--- a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
-
-MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)_MacOSX"
-
-DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
-HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
-SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
-
-# The modules not linked against in Linux include (but not limited to):
-#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
-# Tested by actually removing the source files and performing a build
-# For this reason, we don't have to worry about their licenses
-LICENSE="Apache-2.0 BSD truecrypt-3.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	sys-fs/lvm2
-	sys-fs/fuse:0
-	x11-libs/wxGTK:${WX_GTK_VER}[X?]
-	app-admin/sudo
-	dev-libs/pkcs11-helper"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	asm? ( dev-lang/yasm )"
-
-CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
-
-src_configure() {
-	setup-wxwidgets
-
-	# https://bugs.gentoo.org/786741
-	# std::byte clashes with src/Common/Tcdefs.h typedef
-	append-cxxflags -std=c++14
-}
-
-src_compile() {
-	local myemakeargs=(
-		NOSTRIP=1
-		NOTEST=1
-		VERBOSE=1
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		TC_EXTRA_CFLAGS="${CFLAGS}"
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
-		TC_EXTRA_LFLAGS="${LDFLAGS}"
-		WX_CONFIG="${WX_CONFIG}"
-		$(usex X "" "NOGUI=1")
-		$(usex asm "" "NOASM=1")
-		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
-		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
-		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	./Main/veracrypt --text --test || die "tests failed"
-}
-
-src_install() {
-	local DOCS=( Readme.txt )
-
-	dobin Main/veracrypt
-	if use doc; then
-		DOCS+=( "${S}"/../doc/EFI-DCS )
-		docompress -x /usr/share/doc/${PF}/EFI-DCS
-		HTML_DOCS=( "${S}"/../doc/html/. )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}"/veracrypt.init veracrypt
-
-	if use X; then
-		local s
-		for s in 16 48 128 256; do
-			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
-		done
-		make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
-	fi
-
-	pax-mark -m "${ED}"/usr/bin/veracrypt
-}
-
-pkg_postinst() {
-	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
-	ewarn "of the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/veracrypt/veracrypt-1.25.7.ebuild b/app-crypt/veracrypt/veracrypt-1.25.7.ebuild
deleted file mode 100644
index 41d225cd1baf..000000000000
--- a/app-crypt/veracrypt/veracrypt-1.25.7.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
-
-DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
-HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
-SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
-
-# The modules not linked against in Linux include (but not limited to):
-#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
-# Tested by actually removing the source files and performing a build
-# For this reason, we don't have to worry about their licenses
-LICENSE="Apache-2.0 BSD truecrypt-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	sys-fs/lvm2
-	sys-fs/fuse:0
-	x11-libs/wxGTK:${WX_GTK_VER}[X?]
-	app-admin/sudo
-	dev-libs/pkcs11-helper"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	asm? ( dev-lang/yasm )"
-
-CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
-
-src_configure() {
-	setup-wxwidgets
-
-	# https://bugs.gentoo.org/786741
-	# std::byte clashes with src/Common/Tcdefs.h typedef
-	append-cxxflags -std=c++14
-}
-
-src_compile() {
-	local myemakeargs=(
-		NOSTRIP=1
-		NOTEST=1
-		VERBOSE=1
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		TC_EXTRA_CFLAGS="${CFLAGS}"
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
-		TC_EXTRA_LFLAGS="${LDFLAGS}"
-		WX_CONFIG="${WX_CONFIG}"
-		$(usex X "" "NOGUI=1")
-		$(usex asm "" "NOASM=1")
-		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
-		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
-		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	./Main/veracrypt --text --test || die "tests failed"
-}
-
-src_install() {
-	local DOCS=( Readme.txt )
-
-	dobin Main/veracrypt
-	if use doc; then
-		DOCS+=( "${S}"/../doc/EFI-DCS )
-		docompress -x /usr/share/doc/${PF}/EFI-DCS
-		HTML_DOCS=( "${S}"/../doc/html/. )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}"/veracrypt.init veracrypt
-
-	if use X; then
-		local s
-		for s in 16 48 128 256; do
-			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
-		done
-		make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
-	fi
-
-	pax-mark -m "${ED}"/usr/bin/veracrypt
-}
-
-pkg_postinst() {
-	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
-	ewarn "of the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 162905243f98..7d9fbfab08ce 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,7 +1,9 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
 AUX xca-2.4.0-bug-733000.patch 873 BLAKE2B f63029bf31f69058728db74cb798f641be7210e54a93ee0caaa039cd8bf468106f2d79cab8c8af4891cba6a674b415f75cdb7e4acf74196809138b0fd3a91e4a SHA512 d50ca729596370d3e696f6eebdfad11df6ff1da452b4125b0ccfaa10a0e11b79bc82a2adb576524f6c3bdbb418aaf86ccabe3e7735ddece54f0ca1e88eb30678
+AUX xca-2.4.0-man-page.patch 903 BLAKE2B f734d19e252d0cfb566f4a309359d088701dce6ffe81c4529964b7af4d84ae775d7bcd2748a572c12c3d4db6e5723ec91aeef56e9c6dcf28d51da65189013d57 SHA512 43ddd7d330285b2d5dd866f6c91270b5bbc24896d825d4bc701646701f334e52804047f417e530a067486719431eb4cd6f7145cef3b87730756bb81a390fae71
 DIST xca-2.4.0.tar.gz 1778572 BLAKE2B 2e90ef264dc53019cc37700b37d5eb0c48904ca371ae1ce0cfe2ad61be8765951ea918d356c1f2764e73d846693a66c903cba1381df5d1a588aae8bb45f8c195 SHA512 e93e2cf9dc48ed43ee9b51e977f825d81ff08835eb4d77fcbe8f9dc8ce31c77c1da879b48c25ab535717542d1fe84faa6e46c410c116edbee02072040c59667c
 DIST xca-2.4.0_p20230526.tar.gz 1818483 BLAKE2B bac990117d1d6a4f80d4ad2317653d8817c7d97e3ea4e92e6fcb6a1531eb782ead4a0504748107697be6e98816e89f33f43de1a8073394e4ead39c16dee3987e SHA512 1252a8230149b04c98dab6ec5fc7f424b6eb1552553831e1c53690fa55ce919537d20741dd9f0e9ac7495d3f80503d2b6b5f0c9322912226363e2b5feb66e416
 EBUILD xca-2.4.0-r2.ebuild 1487 BLAKE2B fc8d68924c448f477ed4f710694f22d14372b7a772363106b71518b83131ecca86a52ad85218df5a4423430650c00aa9b772cc4e30ee3d43722a2524b9e67d30 SHA512 b99486bb383151d57910b427d4344804337c2cbdc76d5702a7c157d0b20d4ff7e88a6e2f25496d8ca0f370977d301e78e3e4ae408ff7fec774812b915447cdf6
+EBUILD xca-2.4.0_p20230526-r1.ebuild 1627 BLAKE2B 6a9a0502aa8aa966cb91a8137c04108d953481cec712f322c7492ecacf6c90790a8d963295c54b28106c0bd2c16fcec04479073fee4a516681b4fe56488def48 SHA512 a709c695207f046372d2226baec575cdebf12292955f40e65f90f65e2b8fa30683827dbc3ef9f1100aaab1696f1d074b85de3ee16e6b8b5bd453e3bcf0bf6d9d
 EBUILD xca-2.4.0_p20230526.ebuild 1585 BLAKE2B 87f26f1edee7a55fb4d2fd3c787c965da396b98dd3b81e213a2fcf0c9457f82b9349d9ebaf0c51376c80b329f3791688f541b501b75fee9143b81afe681a7fdc SHA512 836315aa907758a99ec9b2ee4fd8ff760df2ef197f4a920508888a0efbe23a18b1ea07f9e4ee0e0d780c476ea3e35ad074eb1ceed044e46a859fce62d91ce7a0
 MISC metadata.xml 304 BLAKE2B f99e5a2ed991066c1c605ca7bba6669b362e90a96e5a26258caf8d6491f8c5351cc897826bd06dda28ac67cc3813b0fa640b8fe304aeea7ea10b75fa3074d340 SHA512 b8d54115ab45ecc869066e083938a28d075f4436fef33607685e633976843023b3fe4fb65456ba04532f38c4f35b7dc109f68c59c11ad4e73f2332786fee6cf5
diff --git a/app-crypt/xca/files/xca-2.4.0-man-page.patch b/app-crypt/xca/files/xca-2.4.0-man-page.patch
new file mode 100644
index 000000000000..a5b52176418d
--- /dev/null
+++ b/app-crypt/xca/files/xca-2.4.0-man-page.patch
@@ -0,0 +1,24 @@
+--- a/doc/CMakeLists.txt	2023-09-09 11:10:22.671031619 +0200
++++ b/doc/CMakeLists.txt	2023-09-09 11:17:15.398798825 +0200
+@@ -138,7 +138,7 @@
+ if (NOT WIN32)
+   add_custom_command(
+-	OUTPUT "${D}/xca.1.gz"
++	OUTPUT "${D}/xca.1"
+-	COMMAND cat "${S}/xca.1.head" "${D}/xca.1.options" "${S}/xca.1.tail" | gzip -n9 > "${D}/xca.1.gz"
++	COMMAND cat "${S}/xca.1.head" "${D}/xca.1.options" "${S}/xca.1.tail" | cat > "${D}/xca.1"
+ 	DEPENDS "${S}/xca.1.head" "${S}/xca.1.tail"
+ 		"${D}/xca.1.options"
+ 	COMMENT "Compiling man page"
+@@ -148,9 +148,9 @@
+ 	COMMAND xcadoc man "${D}/xca.1.options"
+ 	COMMENT "Generate 'man' commandline documentation"
+   )
+-  add_custom_target(manpage ALL DEPENDS ${D}/xca.1.gz)
++  add_custom_target(manpage ALL DEPENDS ${D}/xca.1)
+   if (NOT APPLE)
+-    install(FILES "${D}/xca.1.gz"
++    install(FILES "${D}/xca.1"
+         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+     )
+   endif()
diff --git a/app-crypt/xca/xca-2.4.0_p20230526-r1.ebuild b/app-crypt/xca/xca-2.4.0_p20230526-r1.ebuild
new file mode 100644
index 000000000000..2501dd9cbf58
--- /dev/null
+++ b/app-crypt/xca/xca-2.4.0_p20230526-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake xdg-utils
+
+COMMIT=8983e5010d99c8d37bc7e316bf3ef00265763027
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="https://hohnstaedt.de/xca/"
+#SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/chris2511/xca/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/xca-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/libltdl:0=
+	dev-qt/qthelp:5
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-libs/openssl:*
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+	"${FILESDIR}/${PN}-2.4.0-man-page.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQTFIXEDVERSION=Qt5
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/xca
+	doins misc/*.txt
+
+	dosym xca /usr/bin/xca-console
+
+	ewarn "This is an unofficial snapshot that is compatible with openssl 3."
+	ewarn "One known flaw is that starting xca without a database will no longer open"
+	ewarn "the GUI. Provide either a new or existing database as an argument on the"
+	ewarn "command line."
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}