gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /app-crypt
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
46 files changed, 630 insertions, 789 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 46047f9b82ae..f4f73d0ad19c 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index a69945eb9d10..407669110584 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,5 +1,5 @@
 AUX gnupg-pkcs11-scd-proxy.confd 38 BLAKE2B 56951cac6c364a75191cbcf5b074e537bf9783e32defe4c571a64e00754565666c4f379956ff4b1db713d496ebb838ff599d2b25223fb66652dd7d727812ef4f SHA512 15a4e6534e5069a9f02050e0d7dc5a27609065fafa789985a2ab448033811c9099fbc00ded558b98797b6191c5ced94cbd1bda626a1dab85cde747a856ed1ecf
-AUX gnupg-pkcs11-scd-proxy.initd 716 BLAKE2B 05f2057b6a2bc1824eef62139a70b193152bdf9b92c97244d5574d81d010a19978b2905f952539f0eded8b64e045053c7b0995aa2594dbcbee3eb8e44b149cd5 SHA512 b1719720150d7380c96e987bfa0f7932bdd30aa9462f9c11d9ac06ed58efbb0ef8c60df27b50dceed812a238ee01007abccd99edf7dbea0efcf0de2d35d032bf
+AUX gnupg-pkcs11-scd-proxy.initd 688 BLAKE2B 4f682ec3ca3a23d5a1e9342c0f1ce8a9ed3383ecaec69e868bb98f21c2ea9c37e7a0763e8322deddfc75ebf84784edaa848726c350b8b5f9917f9b6ac44f6096 SHA512 fd955745390dd8bb4fc056663d76884481e15b90610f7c4b947309ba8f0a32bac7935347bed6f18aedb5854f7d2bd3fcd19a9d01dd8cf57f497633de7617e128
 DIST gnupg-pkcs11-scd-0.9.2.tar.bz2 147337 BLAKE2B 52784721bd91929c9d6efdae599893f5425d02e5621ded69d5bc2b5dfa5dd56ca6e0989d99879a2de245e53ba7add3fdacd58fb3b1200135b0a0e618163ade2d SHA512 6afb9f0c50976636df611a0204edb0ec75aa194ba332314e3c2d7228ecf798e5f79923202f8f189b1e4aefa236a46165a5e3f0e0d98320dc4fac2bd9ac38249e
 EBUILD gnupg-pkcs11-scd-0.9.2-r1.ebuild 983 BLAKE2B a3e470da5e40017e38dda4f4033cb425717a4c45fc44967754935daeea8c2995b95be6cfc1cf7274e487d3caf4bf2150660e2bd45420ed198700cb6074a41629 SHA512 90c24f353f117428e2507d875173b98fabd4ae7fe056ba39f717b80ca0691992003427bed926632e118d5a036c09c287e4f16146980e1796361d18a6e618b10c
 MISC metadata.xml 388 BLAKE2B c98dcab45a87ea80fb7a4ef3090cb888701bf14a9f0074a39174549ad3ec94cb5071c792562d39856e5d40b31e8dd5b9a82e00d428bf0def47ed9338d8259ba0 SHA512 7fdcbc1668e16afc5b98006196d184cdfccbacb51740b888c4f14551e9bbabe7e8cea704c3baf1f7bdbc8984f57130b141acf20d1332a96985227c9ba333c73c
diff --git a/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd
index 50b324882400..2861293e0ef0 100644
--- a/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd
+++ b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="gnupg-pkcs11-scd proxy."
@@ -11,7 +11,8 @@ command_args="--scd-config='${SCD_CONFIG}' --socket-group=${GNUPG_PKCS11_GROUP}
 pidfile=${PIDFILE:-/run/${SVCNAME}.pid}
 user=${USER:-gnupg-pkcs11-scd-proxy}
 group=${GROUP:-gnupg-pkcs11-scd-proxy}
-start_stop_daemon_args="--user ${user} --group ${group} --background --make-pidfile"
+command_user="${user}:${group}"
+command_background="yes"
 
 depend() {
 	need localmount
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 8254bc7af91a..7a6f85e1b433 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,15 +1,8 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
-DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84
-DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
-DIST gnupg-2.2.29.tar.bz2 7215986 BLAKE2B 04b777730b8fcbe8d93dfc8985aadd6bc7385ac2ac9684e6248cb3ae6d008daae5aa976ffa3bae27fe9e89bc2c4c1d4ae81dcaa259fb08d13f894f00f12072e9 SHA512 12645e230fc6aa4811420ef33def6baa590e847ecdf7e5f8b96eb49122e6406cbdba4595d0b52fa26700d5d5def67acb4ed7dfe7f778e496d4d21ccbef3c476b
-DIST gnupg-2.2.31.tar.bz2 7212188 BLAKE2B 57a2b6c6ea491137a708e18a0119502621b7bdf0591818d19beb8b08a521a7dbf60472243e1723f53acbfb9a5de612b8e5040c45dc847bdda26012244edb11be SHA512 2f6fa200e08d6b8993b482e5825bea6083afc8686c4e1ae80386b36ae49e1c2d73066c508edaa359a7794cb26ba7a00f81555a906fa422d1117e41415cfa2fea
 DIST gnupg-2.2.32.tar.bz2 7212625 BLAKE2B 8e1feba83a0d8fa1c154c814e26b41aa252cef4af53937e4e8954860249c180c1d6910356b0c46dfefde094846b02bd5375f17c8b6fdcc9138281d0daa292d42 SHA512 76b75d3688561ce65a8014812656aa87c9722c898d7e186fdb1331dee6af32f886a6b0a4806975c348a22ad6dda60f956ece56076d00153b9706aad4c934c6a1
-DIST gnupg-2.3.2.tar.bz2 7589445 BLAKE2B f7e35ed553ea89cdb073abb1432f67fa00bb625f6e686e534f96bca11d88f09ea272b3cb0d6706e4bce2c023f8c5b8d628742aa2f60752a2e605132cd32f62ed SHA512 2747cbe38546f500d165f024ebb2dc5be70fa68d20702af3f61e97db685eba94caf65307293137c76ea6cfcc189ed24aaee025c80cd33f26609e5fe512bdda73
+DIST gnupg-2.2.33.tar.bz2 7238439 BLAKE2B 9655ab8733f79c56c706502ddeeb41a2841467146753965898528d53a95ba77c51bcaf7fb93c51fb1c36953253ef993e67ce3c9ec756c9eece1042dcd17aa455 SHA512 0e6382ebb78425dc81b280a3b453111fb4a764b3fb0565ac09ac24cec2ecd571079617e263d9fce077ba6ce8d202fb43425b51c26f9ec6e8c61706a1ca5f8c78
 DIST gnupg-2.3.3.tar.bz2 7590874 BLAKE2B a80a84b4f6691815550de6125f4f24aa9c901b8ca8eeb6bc91c90ccd3d285a5ddb15688c7ab870aa6a6c418eb98b969e7b958120c3976b5aaea55188f39b67b0 SHA512 12d500e6b45910d5f7bfd4916bcee37ac988a58a35563fcf425a65b88c0cf92c2af2e94d3e31e9e5e19094c8beb5ec3779cf90bfe43d1555c4196f69eee2f102
-EBUILD gnupg-2.2.27.ebuild 5168 BLAKE2B cc9ad82a855cb56a630aa043537fe44fadbfece92cc09205996ba4cc3f3ca000534f7b11c29da543ec923b118d24bc23b490ce6ea29b09a799d17b36e387f855 SHA512 3f1377ad593d19580e953ef426dd23f23ae2fab65d8e6bcfee58c09605086fc0a2f2d2432b5d33ed70685ebb87561801a6b3dbf781d585aa59b6e8c9fc0dd81e
-EBUILD gnupg-2.2.29.ebuild 4709 BLAKE2B 709b2d1da7770181ce1c108c5f5afb668f46f3ac1673032c94eb41f24af6e78ab260180fad116aafd944336326d45d84388b48159518b776d3425cf40e07c605 SHA512 5617ad34369e42e934cb4704ce2c1191edb38eea902f2cdbe2494a27da86dbe92365c2dd836e24bae9aad2fb7d262df029a8fd5d1a5c0ab716f6d9918e8b04cc
-EBUILD gnupg-2.2.31.ebuild 4717 BLAKE2B cd39c581bf930c519e4f38fc0741d7c157ee44ebe6599253931e9a90f493cf28e06fac31a025a08b5958be04a0a92fa87bbc481153d746d4b8a194eb51d9377c SHA512 e3fe9d932a558b2e646b13fc98b429a6162d18f853481fe88218bde6b756a16eb8e24038860a2b8dd8922bb689e1c7b9df4855476315fd6fdf2249a169364a59
-EBUILD gnupg-2.2.32.ebuild 4711 BLAKE2B 6c0897f89045f6d8fd4586b7299394f5d1d47297f1d444697fef6e86e25214ec94828e8bd3bc7f9bbab179a96c7d36605c17fd9c6f89811ac2ab995e017b1e74 SHA512 9dc84c38c52938f88a5f2e189f204f088cada182ca21b80c2463c40c3b2869d2689ad5681cca5d002b8140051341a7e260f5b23fabb779aa728611d8cae1487c
-EBUILD gnupg-2.3.2.ebuild 4752 BLAKE2B 4014d0cbab030ecfeeaef7b80424bc47f3b7d6b1b8605b1fcbf3b73a691bb451190c99639ab06be148cddc7de41a38fe4f73f20e96f5d38cb3386e5dc6e06b38 SHA512 d393dac1af9a5a76e087a747ef809f24f47b6735bbc5c42e584e8a532ed2c53a1868dc467702f1ac7042ea1fba73389a2d7db9719f3270726943294ca34cb526
-EBUILD gnupg-2.3.3.ebuild 4817 BLAKE2B 9cdf47a977c2dc90bbcd565df0aecded46f53ebc4d0b84005dfb1547d16b47788337c93de6e28378bebb66deff1391e3a5d1c5ab8227d4017ed73304291d9475 SHA512 9c53b205bd7c0cd14e93a8290677326d3765a9b906598912afe7067b827e2207af5108a6e3f951326d00a259dea27aef193907b24ae04c688a114e47f049c605
-MISC metadata.xml 1498 BLAKE2B aba846d09c0230ea7e10a5585068509c9f56575da979a85f84caf6244555609782381bb8beae68222a0ab71a0d820a4d4655ed3d9b1399cc259e400f29d8ab6b SHA512 1314093db4291b4230cdda07bdae9c30dbce8bb698a2afb236f6c657c636791c8e2a9d5a3fc488bffddbff25d307d0ba9d50c54551652dfd099e73e70811e859
+EBUILD gnupg-2.2.32-r1.ebuild 4786 BLAKE2B 6e81532e958f0454d6ef5f56f381c794ba75378a136a396660ed32722842fa4b14017c74df05f6e8098db2a8ad57701309e36a4704088bc1109125a063e96b70 SHA512 71ea3bebf26b75f77abb79e4285f2d40bd021db819a975c5e29cb620eb95d801b62c0bad8ccf5726948eef3d0fb00b3aa8a31da7a036d50dcfb0496eff4e07c6
+EBUILD gnupg-2.2.33-r1.ebuild 4794 BLAKE2B 67398864ea884a87548d1bb5fb69899567a831f3ad0db749a7815bac2a34e6573da0eb60b755a25beac86e00639f0ce26de032e88b84e0e1f567aa562fb64027 SHA512 e3929982e9ae323839cb11d5acfe170f9f4b99fc28cc56f5aaac1825536de84f22e6638b0e6b05e3a749386f849c22caaac1cd9cd34396a2e177c36a167daad9
+EBUILD gnupg-2.3.3-r1.ebuild 4892 BLAKE2B 096437f8c9b84cbccda57b577171fe9c4c4d185f2f42b2bd90e7e31ff43603820061711895a63850be5584304f14e77faba8b25b0cd02de6b4d40e9a60f1d373 SHA512 a8607182c3a2e645207258cd5770a5797997d1888ba67d98fec7d0363e6071262b06f9fbb9855b1e0044861daa27f4d7058cf516e786e6306267a7018410e39f
+MISC metadata.xml 1307 BLAKE2B 3c9f597e695e8dc4a1aebb7a42186fbdc47c7836f837429c8e341b8e991ea18f82171476d8b8f95adbc1e0d92dba5941b2af1d1f44c6efcf9a67d39caaf43187 SHA512 d1a72ac876af1678cfb01da22ace33c87c79266fe7d25ff722d61950ce81a05431e529672db019abe3566084b5fa36649b882a7edabc1d9796a670c12406fa74
diff --git a/app-crypt/gnupg/gnupg-2.2.27.ebuild b/app-crypt/gnupg/gnupg-2.2.27.ebuild
deleted file mode 100644
index abbcdf02bd07..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.27.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
-	scd-shared-access? ( https://raw.githubusercontent.com/GPGTools/MacGPG2/5ca182f54b7b6cd635d1c0a4713953834489fdd9/patches/gnupg/scdaemon_shared-access.patch -> ${PN}-2.2.16-scdaemon_shared-access.patch )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# Existence of executables is checked during configuration.
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_prepare() {
-	default
-
-	# Made optional because it's a non-official patch
-	if use scd-shared-access ; then
-		# Patch taken from
-		# https://github.com/GPGTools/MacGPG2/tree/dev/patches/gnupg
-		eapply "${DISTDIR}/${PN}-2.2.16-scdaemon_shared-access.patch"
-	fi
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-all-tests
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.29.ebuild b/app-crypt/gnupg/gnupg-2.2.29.ebuild
deleted file mode 100644
index 654d757e6632..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.29.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# Existence of executables is checked during configuration.
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-all-tests
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.32.ebuild b/app-crypt/gnupg/gnupg-2.2.32-r1.ebuild
index 9539d8593240..8e60b86e80fc 100644
--- a/app-crypt/gnupg/gnupg-2.2.32.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.32-r1.ebuild
@@ -17,10 +17,11 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
 DEPEND=">=dev-libs/libassuan-2.5.0
 	>=dev-libs/libgcrypt-1.8.0:=
 	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.4
+	>=dev-libs/libksba-1.3.5
 	>=dev-libs/npth-1.2
 	>=net-misc/curl-7.10
 	bzip2? ( app-arch/bzip2 )
diff --git a/app-crypt/gnupg/gnupg-2.2.31.ebuild b/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild
index 81662988beb7..fb9711a1074b 100644
--- a/app-crypt/gnupg/gnupg-2.2.31.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 inherit flag-o-matic systemd toolchain-funcs
 
@@ -17,10 +17,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
 DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0
+	>=dev-libs/libgcrypt-1.8.0:=
 	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.4
+	>=dev-libs/libksba-1.3.5
 	>=dev-libs/npth-1.2
 	>=net-misc/curl-7.10
 	bzip2? ( app-arch/bzip2 )
diff --git a/app-crypt/gnupg/gnupg-2.3.2.ebuild b/app-crypt/gnupg/gnupg-2.3.2.ebuild
deleted file mode 100644
index 0c66be6c9fd2..000000000000
--- a/app-crypt/gnupg/gnupg-2.3.2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# Existence of executables is checked during configuration.
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.9.1
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	tofu? ( >=dev-db/sqlite-3.27 )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable tofu)
-		$(use_enable tofu keyboxd)
-		$(use_enable tofu sqlite)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-all-tests
-		--enable-gpgsm
-		--enable-large-secmem
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.3.3.ebuild b/app-crypt/gnupg/gnupg-2.3.3-r1.ebuild
index b32b781d0fd9..dc083b09c42e 100644
--- a/app-crypt/gnupg/gnupg-2.3.3.ebuild
+++ b/app-crypt/gnupg/gnupg-2.3.3-r1.ebuild
@@ -20,9 +20,10 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
 
 # Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
 DEPEND=">=dev-libs/libassuan-2.5.0
 	>=dev-libs/libgcrypt-1.9.1:=
-	>=dev-libs/libgpg-error-1.29
+	>=dev-libs/libgpg-error-1.41
 	>=dev-libs/libksba-1.3.4
 	>=dev-libs/npth-1.2
 	>=net-misc/curl-7.10
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index f6fc64ff0b0b..b8002cbca7e5 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -14,11 +14,6 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
-		<flag name="scd-shared-access">
-		Allow concurrent access to scdaemon by multiple apps from same
-		user. Useful if you want to use scdaemon with gnupg and for
-		example NitroKey.
-		</flag>
 		<flag name="smartcard">
 		Build scdaemon software. Enables usage of OpenPGP cards. For
 		other type of smartcards, try <pkg>app-crypt/gnupg-pkcs11-scd</pkg>.
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index e1c4a93bc222..8b16c7f4a566 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,6 +1,6 @@
 AUX gpgme-1.16.0-glibc-2.34.patch 1259 BLAKE2B 28ced8db5bc6010eeb0b870b927dba3baca3c1c1beda563263ebbf938fee37d56599e6f4816d3e701bed3b2734e68ec4bff8c4134af5a3c7891c5cdc8f1678ca SHA512 46900e8d2f816b3c1cc9e222b7f11d2ef89684a6d43b2dd84cb0e7ed5becd539f28654a3d3c0bac83e970c66a2079dc5263ab5d131a52be0719cbc595cbf7a76
 DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
 DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
-EBUILD gpgme-1.15.1.ebuild 2671 BLAKE2B 259c3eebdcb359d6e6636dba2b9588f14f2bba426511b2d8b560192c31917dac28d85952443dbeed12e8a8ddbf61aa4eee3ec68add965503bfc8fc9e1a473c0b SHA512 ef99b8044daa6e1f3371f4958dd9acda2c1cbd9594970c9f06dcd70e45f6c83e78ec4792a3228d5c29f6689693b93c529fceded96f255df23539452c8b9bd105
-EBUILD gpgme-1.16.0.ebuild 2735 BLAKE2B a3975eb847e70cafabf93312f9f9e620c97ccb8a46c3987e3211c752c9f0731f61552341caa0ba79e01e1fa918a03563d523000d4dd3d4cb05e4b25598de446c SHA512 02f8c979c22abaaf644109d84c441d8dbf4171910472f3c0d3ae987a7198634515b732ddcbf8b16c39a7a93d03a18fa28e951a15fe4bc2f8c44a95c40caa702d
+EBUILD gpgme-1.15.1.ebuild 2746 BLAKE2B 9d801a0d79d2acdf81027e4ac511c7f60df3a2db47b6a28e61f9bd881478b07237d5d87bb1ac54cbdb306708e55b51456b3b3b1283bb5f164d49776a052f9a56 SHA512 dc74be1ae8fb89b9cd449ab86ec95b5fd6b766be4c813083ce08a94297ab3700fb1ab16d3bc73baa11c0aa6951fc5e8f6e4718ebf36b9ec33de40886e1b00620
+EBUILD gpgme-1.16.0.ebuild 2804 BLAKE2B a9d58a8b7eea2fa3b24a5edbb9cc2de81a1c65f8a638a04d80896848c07250f9503695fe353d0cdb9230bc193717656f38c00a2f441e8609fc2f3ca3fbd995a9 SHA512 9e6ae0ea746252c46b4357c6d6a4f148a7302d4bb7a9522ce33549115dee0d119ee8d6b6d501a934a27f3eda548f6f2b3ece6754e27917ded113cffe737c3aaa
 MISC metadata.xml 327 BLAKE2B b81e8fb75326ade6f0c2fff8e2b542631ec799d7881e0b1d5c11749ed2dd0cbc0c157d137782c05d26b18adb1a3c7d598dabee1a7464685cf1b0be94a1c86d2b SHA512 84ee5946f52200c1484bbe23ba5f3d1e423b2d6f85b68522906948baf44bd6904453c5a6d4024e8425f3d874c29d2710dfb9a48cc3598932dbfcb54cdcfe0703
diff --git a/app-crypt/gpgme/gpgme-1.15.1.ebuild b/app-crypt/gpgme/gpgme-1.15.1.ebuild
index 49640c40ae8c..b4cc775f0009 100644
--- a/app-crypt/gpgme/gpgme-1.15.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.15.1.ebuild
@@ -17,6 +17,7 @@ SLOT="1/11" # subslot = soname major version
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5"
 
+# Note: On each bump, update dep bounds on each version from configure.ac!
 RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.5.3:=
 	>=dev-libs/libgpg-error-1.36:=
diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index d8df58daf471..e728a4e493cd 100644
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -14,9 +14,10 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5"
 
+# Note: On each bump, update dep bounds on each version from configure.ac!
 RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.5.3:=
 	>=dev-libs/libgpg-error-1.36:=
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index 73404dc5ae2a..bc89e8505318 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -2,8 +2,10 @@ AUX hashcat-6.2.4-brainless.patch 1040 BLAKE2B 0bcdb5fce7b22f95844c5fcef1c92ee0d
 AUX hashcat-6.2.4-pocl-quoting-include.patch 1480 BLAKE2B 4999e878010c8083e0ba708adafc46ee744ca4127f8f2442ae1c659a1ca59525f0a66ffb55e845ffb0da897259d7206c53534fec4a58c6daa6bdc25e28493fe9 SHA512 ed64891dc00a546b07e32aa65a30ea30bbb0b6aeacf616e43f59b0c28dfafcdc54dce8e194fdf0805187dbf57c6c0a9655153823734d7e9537ab150b798b7205
 DIST hashcat-6.2.1.tar.gz 5815254 BLAKE2B b6ce0edf7a7fe725570e557b6b414c8aad02e24933b2610be2607c895778d635543a90806aa40c3521f83f93de3b7556f04274d4f9893dacb53af82974df0be2 SHA512 435d8c66e1de14a4a95364eb06f41d10d221c4cf3286bed5ce333d3d07fe7ec2097fa57a3f925ef108a0c17091a65dc18b9c782f69ab8c0575061c14c9354563
 DIST hashcat-6.2.4.tar.gz 6269444 BLAKE2B 15d774253841350710e89bb6358f5fd615ef6e0645f271507d5bfc3e814be1533f78b83b90c11b24c7088ac60f2bb9098cf3410c4bedb5d53b0ccff4d840664c SHA512 bb18646794e168616e6f018b41c1a17c26bb0d8625aaeec0bd0d734efbc331008f432efde7b3d08e8838c995c771a406670812edaf7d605e7fdff9ef001aa954
+DIST hashcat-6.2.5.tar.gz 6341872 BLAKE2B e55a0aac0cb28041f92fc6685fb004058744e150d84d9b690bdb16bb7f4612edd12b987debcfc5d39d0c4e87bdd799148cae6974d47904c1e3d2953ceb32f076 SHA512 2b881146c625172c91cb74b33851473155dcde2421fba1b4acfba28116499b9cff832a62c4dbc24e16df06a827494f30699a7d0e5195d5ed107704f525255383
 EBUILD hashcat-6.2.1-r1.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
 EBUILD hashcat-6.2.4-r1.ebuild 2888 BLAKE2B dc79427a21aaac44371bd86e9b63761b0acedc6144d588993996728b1d3c9ab9529aed319a4b28a44eaa9b0dc8b397b9bf7808c05300b621b71cbccc40985fd5 SHA512 e6f596682a789b735c80ced40cff61f9c000a6c0b92742db5ad5c450f745304fa3c5f3315c65163b2d2168e0dc3fe6f3afaf8f8efb2088061644bbd707b51192
 EBUILD hashcat-6.2.4.ebuild 2834 BLAKE2B 3655e6a31038a45aa0106b501f902f828f0e7c818d3a53634218f0e1281aa06149c69dcdc49fbd4c96ee122150bb68cc0a5b7767ef9e9a286d9693c45f0c0ca4 SHA512 d453f5c9da614c8bb625d844d628739a78f4074d0283a6347e9f1157130f63c96d02612eb1cf6a092924e77e9939b5ad02a110aeb46ad4a4462043b59cd03050
+EBUILD hashcat-6.2.5.ebuild 2732 BLAKE2B f31745535c47efe9ba40229e3ad0a828b1c0b242938898d50bda7fa29ebdaa4cfefaec132afa531105ba850f385b8717b26bf4f274a3f7efa253664141027dba SHA512 ee2a40820af6eaf18abdf1045f382d28f316a7f7a7fe68223d58a86fb565733ad7010b7cd6de3869038a781dc453da9bc6cec3ecf21a1b14c3278685e964f059
 EBUILD hashcat-9999.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
 MISC metadata.xml 396 BLAKE2B ed0f4406e46280943a8ae7cb68486b8410653efa96e284b11d139aa201d3e64adc21abbc78021f247f8ab05da5a81483633f764917c160f776e42bb269b5ceab SHA512 482f749520452bc1dfc1e22d0cd0c694c7f1158526fbaaf6179d67e1617d17710d85ba2eb29dc65216635fd99c2f7796029604b40a447eb358fde9aca1b39ed7
diff --git a/app-crypt/hashcat/hashcat-6.2.5.ebuild b/app-crypt/hashcat/hashcat-6.2.5.ebuild
new file mode 100644
index 000000000000..c0d476c28a7e
--- /dev/null
+++ b/app-crypt/hashcat/hashcat-6.2.5.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils toolchain-funcs
+
+DESCRIPTION="World's fastest and most advanced password recovery utility"
+HOMEPAGE="https://github.com/hashcat/hashcat"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="brain video_cards_nvidia"
+
+DEPEND="app-arch/lzma
+	app-arch/unrar
+	sys-libs/zlib[minizip]
+	brain? ( dev-libs/xxhash )
+	video_cards_nvidia? (
+		>x11-drivers/nvidia-drivers-440.64
+		|| (
+			dev-util/nvidia-cuda-toolkit
+			virtual/opencl
+		)
+	)
+	!video_cards_nvidia? ( virtual/opencl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Remove bundled stuff
+	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
+	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
+
+	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
+	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
+	#rm -r deps || die "Failed to remove bundled deps"
+
+	# Do not strip
+	sed -i "/LFLAGS                  += -s/d" src/Makefile || die
+
+	# Do not add random CFLAGS
+	sed -i "s/-O2//" src/Makefile || die
+
+	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
+
+	# Respect CC, CXX, AR
+	sed -i \
+		-e 's/:= gcc/:= $(CC)/' \
+		-e 's/:= g++/:= $(CXX)/' \
+		-e 's/:= ar/:= $(AR)/' \
+		src/Makefile || die
+
+	export PREFIX="${EPREFIX}"/usr
+	export LIBRARY_FOLDER="/usr/$(get_libdir)"
+	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX AR
+
+	# Use bundled unrar for now, bug #792720
+	emake \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=0 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}"
+
+	pax-mark -mr hashcat
+}
+
+src_test() {
+	if use video_cards_nvidia; then
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidiactl
+		addwrite /dev/nvidia-uvm
+
+		if [[ ! -w /dev/nvidia0 ]]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
+		fi
+	fi
+
+	# This always exits with 255 despite success
+	#./hashcat -b -m 2500 || die "Test failed"
+	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}" \
+		install
+}
diff --git a/app-crypt/jitterentropy-rngd/Manifest b/app-crypt/jitterentropy-rngd/Manifest
index d876954e548f..af4d7149b777 100644
--- a/app-crypt/jitterentropy-rngd/Manifest
+++ b/app-crypt/jitterentropy-rngd/Manifest
@@ -1,5 +1,7 @@
 AUX jitterentropy-rngd-1.1.0-do-not-strip-and-compress.patch 581 BLAKE2B ee6f98d762fea06504ea7157ea2b13ececeaef1ee204cf0e5d63fc0932e1c41da13b2a8ad0cb8564548fcabe1989693ed16c7d461f75844323864e457e8fb804 SHA512 7c42e8deebf0d36fdd91b879cbc28eab1a92d413f64ab5f19eeaa214b51f6e96866c1bd53fdd6c2c4e335ae156cef24d2bba4c1dd6b557d96e89b61618703241
 AUX jitterentropy-rngd-initd 338 BLAKE2B a717848317980f0376058c04f53cfc7ac4e771ffbd926b36f2f5e18e121d846aa9248b38cfae7d1c6e4c2241e0c1124394d9b5b58d2d119bf455d0d8786e74df SHA512 1993262b47e703514bba9a4dff18e58ff70b6b109a2eb3097b0231467ea7f948c6fb6d0f695988de6c2d41fa2295a8a40af19124572b8e72fe09610eaf8caa39
 DIST jitterentropy-rngd-1.2.5.tar.gz 45262 BLAKE2B 0fdbd513f0dd2fa216c079d55790ea2848fac26ca17846cfce06d0d338e8e88a13f2e9a7a7d55c938f0366f7cb010d22fc35d63921e4bb1408a5bda73ac9e96c SHA512 23079ff64e1145efa22960dfa772f77dd27f45f1cd950fe7b3a45d56cb75920902a7136da92a7202c686f33db0895115624ac3d809627378056ca13250e5b07b
+DIST jitterentropy-rngd-1.2.6.tar.gz 45213 BLAKE2B f193aef0d2a39792c0fac9b5a949f493377d98a282b921d9f4d01ddac5a4f423002e9d61b8e920d35e9f6a608ae2f1341f7255084ec9d501e64ebd1a1d72a9cf SHA512 fc59f84a24b2a2078c6bb4524b9feddfb2033c97390b20a9654294211208ef50399968ad8a19f7b82079eb987841e703fdb5aee98b60f1159244bd28ee43db75
 EBUILD jitterentropy-rngd-1.2.5.ebuild 699 BLAKE2B 89349823ec63727a4822165659771c0b6c2fc8fa89bbf6f4d7be315a317278ecaaf3e82c855dcde58ba22e523f62d2415ee5b3de074fa9d6173def10cb68dff8 SHA512 27d875211941fcd597ad5ee78a643b4a633caab9b3ccfe61ffdd241835cc05339b171d5a1c51464adf4bcfd63aaf49d437644af629c6c2829bee500c3ff00ea6
+EBUILD jitterentropy-rngd-1.2.6.ebuild 699 BLAKE2B 89349823ec63727a4822165659771c0b6c2fc8fa89bbf6f4d7be315a317278ecaaf3e82c855dcde58ba22e523f62d2415ee5b3de074fa9d6173def10cb68dff8 SHA512 27d875211941fcd597ad5ee78a643b4a633caab9b3ccfe61ffdd241835cc05339b171d5a1c51464adf4bcfd63aaf49d437644af629c6c2829bee500c3ff00ea6
 MISC metadata.xml 599 BLAKE2B 4d51b86a06b56fa5ab530fdeeac4ab0e8e127afa844b64265c159ee839c3b0bc7470c5e7390b7cf88c8a89f78612e18aeec34a04791186b37eeaf76cbf7f124a SHA512 60b241303e2960e8b9a5d097771a87174d46c089770ba37ad5e8dfe764858f2e7b7f5cf71156efac25380ee8727af5f73a0eb6c69a4a0086b913c48f5dd4f280
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.6.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.6.ebuild
new file mode 100644
index 000000000000..653e5d0a9589
--- /dev/null
+++ b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info systemd
+
+DESCRIPTION="Jitter RNG daemon"
+HOMEPAGE="https://www.chronox.de/jent.html"
+SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-do-not-strip-and-compress.patch
+)
+
+src_configure() {
+	filter-flags '*'
+	append-cflags '-O0'
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
+		UNITDIR="$(systemd_get_systemunitdir)" install
+	newinitd "${FILESDIR}"/jitterentropy-rngd-initd jitterentropy-rngd
+}
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index 68545a069a78..6ef1fd1fc385 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,9 +1,12 @@
 AUX johntheripper-jumbo-1.9.0-fix-bashism.patch 939 BLAKE2B e3e4a45a7cba373203d636cf731896249208c7e92b5da64992ddd98a93922f326e077028812db57b5a505410b227afc07bc7097ad02c620858dea76539ecbe2e SHA512 9b46ed5fcdbd1efd43bb1903faa25c7c4e2c82417a8b963d8cab584d52eefee74408f51f51a059af2e558eebfcfed7bf3484c4bc85b169327548240116d5fb5a
 AUX johntheripper-jumbo-1.9.0-gcc11.patch 1713 BLAKE2B b1f3aaf0c76f1c0fc6ad0d498dce4722994ed11a6f0547bb4ff7683083b9c9d59ce817133189853380378121515aa12db1cf08699c40b39e2fdec667045da88d SHA512 d341eeb291b5bf5721b781272ac66aa56e7d38db305f0272e65a0b77bad05ffc631cfe5fe8093f94a8545cc09020d639dfebb1b903585248bd57933661571b4f
 AUX johntheripper-jumbo-1.9.0-opencl-fix.patch 333 BLAKE2B 248ad5ecba48908a982c27c9d8162c22031cfc29f0becb05209f56c837bb850f6032c847a60d8cd05ba88a0f73ad35f27a08fefb734c6bd87f458b22f77db0ab SHA512 81f9dabc6d8ad54944be7eb9b3c7204ce426db842325c31662038e213775c0a86288c860712e6d3c24f7a9d0b7a0fd8962126a25242f45e5f242307691a97d38
+AUX johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch 3933 BLAKE2B cd5d773615f4b239e857b430c35a905be7e0c8bfd83b037f43fe14799340aa6d3a02bf9f3f69c1e69a2b07a4038474c1fc57a8ab056db26fde5aa14b1842df18 SHA512 505cf695a001f22a74998a83eb79ce7b88882eb51a0864833e06bd9344dae36df629ffb6cdcdfaa019b3dfcfdedc8314a30b169d0d5b1f6976408adbaee49023
 DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6 SHA512 c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808
 DIST johntheripper-jumbo-1.9.0_p20210920.tar.gz 47758128 BLAKE2B e85255dc218c43e6358f76eac1e79af01d437a7a1fcddd608a390734fdc4070cbf949b8abc080b82decf4a1f5e32d2baa6d2a09d385a31913d8e988c8732e85e SHA512 5121434ad275921fe6288c51fd9dfd36ed3162387e70e8089bbc266d4a17ea461b72ce26b2004acfb62d95a9ee2d570ef3b3f00c1d031abd8cff2f20c3ab480a
+DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9 SHA512 f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6
 EBUILD johntheripper-jumbo-1.9.0-r3.ebuild 3046 BLAKE2B 2573edffdbd3fd90ea3cff11197767acd593d24a99ae8a1c3f60c1b4f14b9e2e6ffb134b03a6f2e86ce850c379d4d8ce5fdeddf872e045126142a3592fd0b9c6 SHA512 5714243ca54db6aeeeb083070a419d0d93c67d24c272ecba833b4e813c605f56b5909fb663ec85f3142462113e716b1817a67e3dc8bfba511e89e30a8d37bfcc
 EBUILD johntheripper-jumbo-1.9.0_p20210920.ebuild 3143 BLAKE2B 08615f5cadc78b6a833c01dcc4a2235d2e6e735542834f8325486f921faf38d95b7bfafac09481ab8370588f70a259c772d1ace0b5b9c2119474b70e6c14c60e SHA512 533c042e8b7996f2ddba22df15ddf4a44f3c358abe96ad3f0d80334ccda7de7d9dd138d0e7f891da1c564dbd536f6c658e065f9151976bf3412efcceec2de581
-EBUILD johntheripper-jumbo-9999.ebuild 2842 BLAKE2B f3a248bb7713f41e9d87f0b8d751e2edd3136266c50da26419d9aeb01f0e884f52a3bf78e8c012efa26a3192552e77eee69c4bdc832817b9907c255a52403682 SHA512 b5d8625f3c3c62e0a9a7b859c8b65be7655ec4fbab5b38cb3264f444770dd23b2770dfd8dc478de2693c8b4e9dd168a4fe5edc7adca6ede5c2e4951d52fd643d
+EBUILD johntheripper-jumbo-1.9.0_p20211129.ebuild 3404 BLAKE2B af8b6e7c6407d19e9e9c2cce9eea60198894688c48987a21d37a85f3de08d393664d2413d5f08156164bef3e387b8c8ca94343d66651e49c7e66276dcf7b69a0 SHA512 4f71d582bc5449847fd58ecc1124dd2cb0c1d2854f6021a34c600c0f7a31f787ff9fae21ed93b9641b2f7d8e21edd0358120efeb3b8a97495ed558d729bc4d31
+EBUILD johntheripper-jumbo-9999.ebuild 3353 BLAKE2B be60f37e658f516090dc7760ffd2fe69bd1c9d6b1ced228ac3d77118a6f2894033deda4cd858f9437234c776b896877b0399f3759bfab8ce582498c7efca340c SHA512 ed6f213a1cca61cf72bb54859be6fc40e59e7eaed93458e3027017048f457106c608ab352150fda37fa6278c8117f118e9d91f393bbc74a18756fd4257e47b32
 MISC metadata.xml 473 BLAKE2B ed1c424492ff052e83ce899d8ea4a805ce5d4a5604da336ad16929594d14307c2e264c4eb6e6ee985d3167b8917e8c80c38ed9f97ba5293a0b8f84f472fd9786 SHA512 f124050eecf17e3c2fa01b6140881349e089840c75cb30bf054286a049026bb372cc70e1ce7be3054fffbe5836be7dc1f7fc9e3918f874443644ea99c5b441ab
diff --git a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch
new file mode 100644
index 000000000000..2306bb018f36
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch
@@ -0,0 +1,111 @@
+https://github.com/openwall/john/pull/4908
+https://bugs.gentoo.org/763828
+
+From 7a843229dff28cf0851fe3130c74b38dfaf38411 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 3 Dec 2021 03:40:00 +0000
+Subject: [PATCH 1/2] configure: check for 'strings' and respect $STRINGS
+ variable
+
+It's possible to want a ${CHOST}-prefixed copy of strings,
+so add a check for 'strings' in configure.ac and respect
+$STRINGS within jtr_asm_magic.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/configure.ac        |  1 +
+ src/m4/jtr_asm_magic.m4 |  2 +-
+ 3 files changed, 98 insertions(+), 2 deletions(-)
+
+diff --git a/src/configure.ac b/src/configure.ac
+index 53b6a62592..98b28be202 100644
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -346,6 +346,7 @@ AS_IF([test -z "$AS"], [AS="$CC"])
+ AS_IF([test -z "$LD"], [LD="$CC"])
+ AS_IF([test -z "$AR"], [AC_CHECK_TOOL([AR], [ar])])
+ AS_IF([test -z "$STRIP"], [AC_CHECK_TOOL([STRIP], [strip])])
++AS_IF([test -z "$STRINGS"], [AC_CHECK_TOOL([STRINGS], [strings])])
+ 
+ dnl Check if we have this at all
+ PKG_PROG_PKG_CONFIG
+diff --git a/src/m4/jtr_asm_magic.m4 b/src/m4/jtr_asm_magic.m4
+index 469a944589..162736d855 100644
+--- a/src/m4/jtr_asm_magic.m4
++++ b/src/m4/jtr_asm_magic.m4
+@@ -19,7 +19,7 @@ EXTRA_AS_FLAGS=
+ AC_MSG_CHECKING([for extra ASFLAGS])
+ CC="$CC_BACKUP"
+ CFLAGS="$CFLAGS -O0"
+-AS_IF([echo "int long_ident;" > conftest.c && ${CC} -c conftest.c && strings - conftest.${OBJEXT} | ${GREP} _long_ident > conftest.out],
++AS_IF([echo "int long_ident;" > conftest.c && ${CC} -c conftest.c && ${STRINGS} - conftest.${OBJEXT} | ${GREP} _long_ident > conftest.out],
+       [JTR_LIST_ADD(EXTRA_AS_FLAGS, [-DUNDERSCORES])])
+ 
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
+
+From 8c43ed0c2f7fdb793978d90306d6f6a118122e39 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 3 Dec 2021 03:46:44 +0000
+Subject: [PATCH 2/2] configure: fix bashisms
+
+'==' isn't recognised by POSIX-compliant shells, so let's use = too.
+
+No functional change.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/configure.ac             |  8 ++++----
+ src/m4/jtr_utility_macros.m4 |  4 ++--
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -339,7 +339,7 @@ AC_CACHE_SAVE
+ AC_PATH_PROG([SORT], [sort])
+ AC_PATH_PROG([FIND], [find])
+ AC_PATH_PROG([PERL], [perl])
+-if test "x$PERL" == x ; then
++if test "x$PERL" = x ; then
+   AC_MSG_FAILURE([No perl executable found])
+ fi
+ AS_IF([test -z "$AS"], [AS="$CC"])
+@@ -370,7 +370,7 @@ dnl to succeeed.
+ dnl
+ if ( test -e ../run/john.pot ) ; then
+ AC_MSG_CHECKING([if potcheck.pl succeeds])
+-if test "x$PERL" == x ; then
++if test "x$PERL" = x ; then
+    AC_MSG_RESULT([no Perl (unable to check)])
+ else
+    $PERL ../run/potcheck.pl -validate < ../run/john.pot
+@@ -677,10 +677,10 @@ if test "x$enable_rexgen" != xno ; then
+         AC_MSG_RESULT([TOO old. Rexgen not usable!]))]
+     )]
+   )
+-  if test "x$using_rexgen" == "xyes" ; then
++  if test "x$using_rexgen" = "xyes" ; then
+     AC_DEFINE(HAVE_LIBREXGEN,1,[Define to 1 if you have the `rexgen' library (-lrexgen).])
+   else
+-    if test "x$enable_rexgen" == "xyes" ; then
++    if test "x$enable_rexgen" = "xyes" ; then
+       AC_MSG_FAILURE([rexgen not installed, or unusable version])
+     fi
+   fi
+diff --git a/src/m4/jtr_utility_macros.m4 b/src/m4/jtr_utility_macros.m4
+index 33501eeb71..6b5c58e2b7 100644
+--- a/src/m4/jtr_utility_macros.m4
++++ b/src/m4/jtr_utility_macros.m4
+@@ -189,11 +189,11 @@ dnl will be xno, xyes, xauto, etc.  forced_fail_msg is a message that
+ dnl will be output, and the script will abort, IF forced is xyes which
+ dnl means the user used --enable-foobar
+ AC_DEFUN([JTR_MSG_RESULT_FAILIF_FORCED], [
+-  if test "$1" == xyes; then
++  if test "$1" = xyes; then
+     AC_MSG_RESULT([yes])
+   else
+     AC_MSG_RESULT([no])
+-    if test "$2" == xyes; then
++    if test "$2" = xyes; then
+       AC_MSG_FAILURE([$3])
+     fi
+   fi
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
new file mode 100644
index 000000000000..684a202323cb
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="Fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+MY_PN="JohnTheRipper"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
+	inherit git-r3
+else
+	JUMBO="jumbo-1.1"
+	MY_PV="${PV}-${JUMBO}"
+	MY_P="john-${MY_PV}"
+	HASH_COMMIT="5d0c85f16f96ca7b6dd06640e95a5801081d6e20"
+
+	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/john-${HASH_COMMIT}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags kerberos mpi opencl openmp pcap"
+
+DEPEND=">=dev-libs/openssl-1.0.1:=
+	virtual/libcrypt:=
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	kerberos? ( virtual/krb5 )
+	pcap? ( net-libs/libpcap )
+	dev-libs/gmp:=
+	sys-libs/zlib
+	app-arch/bzip2"
+# Missing (unpackaged):
+# - Digest::Haval256
+# - Digest::x
+# See bug #777369.
+RDEPEND="${DEPEND}
+	dev-perl/Digest-MD2
+	virtual/perl-Digest-MD5
+	dev-perl/Digest-SHA3
+	dev-perl/Digest-GOST
+	!app-crypt/johntheripper"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-bashism.patch
+)
+
+pkg_setup() {
+	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+		tc-has-openmp || die "Please switch to an OpenMP compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	cd src || die
+	eautoreconf
+
+	sed -i 's#$prefix/share/john#/etc/john#' configure || die
+}
+
+src_configure() {
+	cd src || die
+
+	use custom-cflags || strip-flags
+
+	econf \
+		--enable-pkg-config \
+		--disable-native-march \
+		--disable-native-tests \
+		--disable-rexgen \
+		--with-openssl \
+		--with-systemwide \
+		$(use_enable mpi) \
+		$(use_enable opencl) \
+		$(use_enable openmp) \
+		$(use_enable pcap)
+}
+
+src_compile() {
+	# Uses default LD=$(CC) but if the user's set LD, it'll call it
+	# bug #729432.
+	emake LD=$(tc-getCC) -C src
+}
+
+src_test() {
+	pax-mark -mr run/john
+
+	#if use opencl; then
+		# GPU tests fail in portage, so run cpu only tests
+	#	./run/john --device=cpu --test=0 --verbosity=2 || die
+	#else
+		# Weak tests
+		#./run/john --test=0 --verbosity=2 || die
+		# Strong tests
+		#./run/john --test=1 --verbosity=2 || die
+	#fi
+
+	ewarn "When built systemwide, john can't run tests without reading files in /etc."
+	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
+}
+
+src_install() {
+	# Executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${ED}/usr/sbin/john"
+
+	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
+	local s
+	for s in \
+		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
+		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
+		hccap2john base64conv truecrypt_volume2john keystore2john
+	do
+		dosym john /usr/sbin/${s}
+	done
+
+	# Scripts
+	exeinto /usr/share/john
+	doexe run/*.pl
+	doexe run/*.py
+	cd run || die
+
+	local s
+	for s in *.pl *.py; do
+		dosym ../share/john/${s} /usr/bin/${s}
+	done
+	cd .. || die
+
+	if use opencl; then
+		insinto /etc/john
+		doins -r run/opencl
+	fi
+
+	# Config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+	doins -r run/rules run/ztex
+
+	# Documentation
+	rm -f doc/README || die
+	dodoc -r README.md doc/*
+}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 826ff08b2f51..d1fbfc6ec025 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs pax-utils
+inherit autotools flag-o-matic toolchain-funcs pax-utils
 
 DESCRIPTION="Fast password cracker"
 HOMEPAGE="http://www.openwall.com/john/"
@@ -14,20 +14,22 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
 	inherit git-r3
 else
-	JUMBO="jumbo-1"
+	JUMBO="jumbo-1.1"
 	MY_PV="${PV}-${JUMBO}"
-	MY_P="${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/magnumripper/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	MY_P="john-${MY_PV}"
+	HASH_COMMIT="5d0c85f16f96ca7b6dd06640e95a5801081d6e20"
+
+	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/john-${HASH_COMMIT}"
+
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-#removed rexgen and commoncrypto
 IUSE="custom-cflags kerberos mpi opencl openmp pcap"
 
-DEPEND=">=dev-libs/openssl-1.0.1:0=
+DEPEND=">=dev-libs/openssl-1.0.1:=
 	virtual/libcrypt:=
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
@@ -36,19 +38,30 @@ DEPEND=">=dev-libs/openssl-1.0.1:0=
 	dev-libs/gmp:=
 	sys-libs/zlib
 	app-arch/bzip2"
-
+# Missing (unpackaged):
+# - Digest::Haval256
+# - Digest::x
+# See bug #777369.
 RDEPEND="${DEPEND}
-		!app-crypt/johntheripper"
+	dev-perl/Digest-MD2
+	virtual/perl-Digest-MD5
+	dev-perl/Digest-SHA3
+	dev-perl/Digest-GOST
+	!app-crypt/johntheripper"
 
 pkg_setup() {
 	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		tc-has-openmp || die "Please switch to an OpenMP compatible compiler"
 	fi
 }
 
 src_prepare() {
-	sed -i 's#$prefix/share/john#/etc/john#' src/configure || die
 	default
+
+	cd src || die
+	eautoreconf
+
+	sed -i 's#$prefix/share/john#/etc/john#' configure || die
 }
 
 src_configure() {
@@ -57,9 +70,9 @@ src_configure() {
 	use custom-cflags || strip-flags
 
 	econf \
+		--enable-pkg-config \
 		--disable-native-march \
 		--disable-native-tests \
-		--without-commoncrypto \
 		--disable-rexgen \
 		--with-openssl \
 		--with-systemwide \
@@ -70,54 +83,69 @@ src_configure() {
 }
 
 src_compile() {
-	emake -C src
+	# Uses default LD=$(CC) but if the user's set LD, it'll call it
+	# bug #729432.
+	emake LD=$(tc-getCC) -C src
 }
 
 src_test() {
 	pax-mark -mr run/john
+
 	#if use opencl; then
-		#gpu tests fail in portage, so run cpu only tests
+		# GPU tests fail in portage, so run cpu only tests
 	#	./run/john --device=cpu --test=0 --verbosity=2 || die
 	#else
-		#weak tests
-	#	./run/john --test=0 --verbosity=2 || die
-		#strong tests
+		# Weak tests
+		#./run/john --test=0 --verbosity=2 || die
+		# Strong tests
 		#./run/john --test=1 --verbosity=2 || die
 	#fi
+
 	ewarn "When built systemwide, john can't run tests without reading files in /etc."
 	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
 }
 
 src_install() {
-	# executables
+	# Executables
 	dosbin run/john
 	newsbin run/mailer john-mailer
 
 	pax-mark -mr "${ED}/usr/sbin/john"
 
 	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
+	local s
 	for s in \
 		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
 		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
 		hccap2john base64conv truecrypt_volume2john keystore2john
 	do
-		dosym john /usr/sbin/$s
+		dosym john /usr/sbin/${s}
 	done
 
-	insinto /usr/share/john
-	doins run/*.py
+	# Scripts
+	exeinto /usr/share/john
+	doexe run/*.pl
+	doexe run/*.py
+	cd run || die
+
+	local s
+	for s in *.pl *.py; do
+		dosym ../share/john/${s} /usr/bin/${s}
+	done
+	cd .. || die
 
 	if use opencl; then
 		insinto /etc/john
-		doins -r run/kernels
+		doins -r run/opencl
 	fi
 
-	# config files
+	# Config files
 	insinto /etc/john
 	doins run/*.chr run/password.lst
 	doins run/*.conf
 	doins -r run/rules run/ztex
 
-	# documentation
-	dodoc -r doc/*
+	# Documentation
+	rm -f doc/README || die
+	dodoc -r README.md doc/*
 }
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index dbfa89c25358..61603d29ae67 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1,3 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
-EBUILD johntheripper-1.8.0-r1.ebuild 3141 BLAKE2B bc039a11336a9993c64185c1ee0b3251f98dbc4ca24cf3ff60081c4e807bf0bfa0e6a9e55be518e65702f184edd343d4819752557f44adfc90d81ae0150763bb SHA512 57186c0038b5d7dbc6252ea6e93ead4cf10c6ca5e3cb62c895a92026394a834942771e36e6e2cd11a6067a9af6af9d64d440fdb708f95da121cc2a6ba5fd5ddf
+EBUILD johntheripper-1.8.0-r1.ebuild 3142 BLAKE2B 33aba66316e4d06aa3fb92b0eee542e0352aa5b112f7277a22c954661cfd5be821b9c0a0a3ac4e1b94e9610c4ccc4f055f5eb85b42b2ab55c44e3307c411152c SHA512 9786cbfae67010bdd59690c9cdfa2e7e164d1c5e3638aa9678dad11d9de38f0a7c14a323957693460398de0f54fe25387300bdb62727bf2dcc6713b20b119df7
 MISC metadata.xml 409 BLAKE2B f8d40635490b818425ab465d2d34e41c05881a51860e7714161c50af9b061bea3801aefcbad8edb403f3af753b919621b709d23b0a86a0b303b903653f273fd5 SHA512 ed0271486767ec9b53851b534179307b2f160aea50f3a071b9d68aaa21265f5e0e5d031be3b00580e8f706b944ab7ec7aaa7c325485acf73655d899a8787ba13
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 48bf0ae95f66..5b712e92fe3a 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -112,7 +112,7 @@ EOF
 }
 
 src_test() {
-	make -C src/ check
+	emake -C src/ check
 }
 
 src_install() {
diff --git a/app-crypt/kali-archive-keyring/Manifest b/app-crypt/kali-archive-keyring/Manifest
index 3b61cc6bdff1..4c8e366f92fd 100644
--- a/app-crypt/kali-archive-keyring/Manifest
+++ b/app-crypt/kali-archive-keyring/Manifest
@@ -1,3 +1,3 @@
-DIST kali-archive-keyring_2015.2.tar.xz 6448 BLAKE2B 5fe0c7d9e6ac145d046e1d7bcd1002c1799aba7224462691a0f940c5ee362c134c47cce9a60b71476f6b66f2cf6937262fb665dd29faed7e40dbd5a8a11f340f SHA512 3f680fb31f0723f0c4b8aa7053488637c23ef2804a688ad307365c6eaa71b9559dba31c8aee6e9804b9f03e24397c077f4f057e58da8f7e06ffc5d36003d23ad
-EBUILD kali-archive-keyring-2015.2.ebuild 388 BLAKE2B d8ba78ce8e7a75bc14501b47f8a049f117aa7a8ff30a69b768b830763ed146bcaca4a9abba08ec5ee4dd77a324e9f89605538386b897729907dbcfb446cc3b0d SHA512 1d4a7d02030e66a0ff1ed69c628477383fe99e6b627d9c866ef80c810a0478f1a157701561799b509ce8a8d6352862260c40bebab20f3b28e7761766a184ece7
+DIST kali-archive-keyring_2020.2.tar.xz 11388 BLAKE2B 134a3351ac0f1b3a899ef16ee1419b93c656200882b70c5f69e99cfc587d35d2e402792070ce5b7176743d1f70972687d2f2d5aaa3722f684a5976fc3be360d3 SHA512 5c2868c03acb7aef85cd8924da40fb80263879de45cafefb9c9e6c68928081d287cf3fc05ee5dd3c0cb1c938843dc831ccc9672bc7a70689a9c535cb22c92d16
+EBUILD kali-archive-keyring-2020.2.ebuild 444 BLAKE2B 6e0c8ad97d9d3bc770201ef31d71b116d37b30508923a85b56e90fd9f40b012819748f40828413f91443c4dbe32cff8d0f9be4291557d17437108c070fb8ea4d SHA512 db1f30296b1a4156e20a5ec9d73d3951962ef73fa04051dd6902d4e3a7e98f2d1c5f5d248332635c10d7c24ca54ecda7419e1dbd70364247d3c0d52246634d98
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/kali-archive-keyring/kali-archive-keyring-2015.2.ebuild b/app-crypt/kali-archive-keyring/kali-archive-keyring-2015.2.ebuild
deleted file mode 100644
index ce982c36e0fc..000000000000
--- a/app-crypt/kali-archive-keyring/kali-archive-keyring-2015.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="GnuPG archive keys of the Kali archive"
-HOMEPAGE="https://www.kali.org"
-SRC_URI="http://http.kali.org/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-crypt/jetring"
-
-MAKEOPTS+=' -j1'
diff --git a/app-crypt/kali-archive-keyring/kali-archive-keyring-2020.2.ebuild b/app-crypt/kali-archive-keyring/kali-archive-keyring-2020.2.ebuild
new file mode 100644
index 000000000000..2562c8db09fb
--- /dev/null
+++ b/app-crypt/kali-archive-keyring/kali-archive-keyring-2020.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GnuPG archive keys of the Kali archive"
+HOMEPAGE="https://www.kali.org"
+SRC_URI="https://http.kali.org/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="app-crypt/jetring"
+
+src_compile() {
+	# Bug #826686
+	addpredict "/run/user/$(id -u)/gnupg/"
+	default
+}
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
index f686e15688fd..266baf86485e 100644
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@@ -1,6 +1,5 @@
 AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498
 AUX libu2f-server-1.1.0-jsonc014.patch 1137 BLAKE2B 84d26d1439662ee15e72aae0f8789be6326d2fc4eb987d1ab961ce3200750414d9e5173c1f6ec16d210ce0a9d7aa4fd274d84967cef611e1638a1f2404da1e38 SHA512 eaeea076939f52f0c28a24825b56c67fb05be4d1c392f1cadf10452cc465edc5c711c998ef836cabf81886b89641492f9df7c9fe9ae03fe2f05bfcda2f65bdac
 DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
-EBUILD libu2f-server-1.1.0-r2.ebuild 1188 BLAKE2B 81a0e4f2a118ebac4a9235cc06eedc090e7581ceb82d37eb829fa21f745cbb70a2b6e9a603562f333c17df9c458ee5b321d61687d94e8e80f564ae7390678507 SHA512 440dcf630b8bd40e7e0eb27d3a2f6dbdd49c59a8941a6a36067895b06046a8c25d06f07da1039096f7558fabb29c5f3a22fb0e8471e5a0f3251f537f672c1683
-EBUILD libu2f-server-1.1.0.ebuild 1174 BLAKE2B 577b4354eb5750d937cf09d0fec86e377efe7723af597e72aa86086e8caba0c3ad24e928b87a755d817f6fe7bafe9c185bbef20d827d6e39e6fea8e89061a0a2 SHA512 3424fa86980abad63a16de3577a951b65bd8973f9df261701cc8c3c5a6634561f77db7f580b146e3e15240369bc0350aff90f3b1ea2e2faff60e6908ab293c9c
+EBUILD libu2f-server-1.1.0-r2.ebuild 1186 BLAKE2B 10eefc1e09710e0e5a35c5f02b5fe21587fecdcde03c63621130713352c81b223d02a9ab81484dd78c625200e78086b9f5f942e7e6cf02c01c23c8ecb282ccca SHA512 1cb17080c07836bde61830bfdf224d8e519c087767f73b3569abd9d3d6f637352b97b813c824381db63c12fb3f14fd9da64d8ca198349e2e39118c08782a7706
 MISC metadata.xml 336 BLAKE2B d2ac3ba73f1a51ab8f2aceaf61dee8f7038891ccdf9cd9dafd5dce3bf3f82a630247d82a587bca97121e89cab4e06078164e71f93b6bc59b0ff94499c0867ea4 SHA512 743488dbe5c72ec0e9fe53d1b2373067bc7fc878eec3e43e623f02d04ff8dddc9ca2ac531990187d1538e6cc65bfd9faf3785150205521deb539b687d23bdc31
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
index 2141848a479b..200110f06d13 100644
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0/0.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
deleted file mode 100644
index b90c56b31204..000000000000
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
-HOMEPAGE="https://developers.yubico.com/libu2f-server/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0/0.1"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	dev-libs/hidapi[${MULTILIB_USEDEP}]
-	dev-libs/json-c:=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-disable-help2man-gengetopt-checks.patch"
-	"${FILESDIR}/${PN}-1.1.0-jsonc014.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	touch man/u2f-server.1 || die # do not rebuild the man page
-}
-
-multilib_src_configure() {
-	myeconfargs=(
-		--disable-h2a # tarball already contains the manpage
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index a94f58983493..f224dcefd486 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -6,5 +6,5 @@ AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25
 EBUILD rhash-1.3.6-r1.ebuild 1815 BLAKE2B 25d7980d3736edd66242acec9de12ef8bc434993a083dd2e12b3f382ca90aefbb42d4e96b35b6c42c106184e6956c8e33aac424d2272e1ae7eb77ead02f4d5af SHA512 15307b2110d89a05d3afdb6ee43a87f3ec33c921d7796cc73831d2d60c7e25df7531a73badb5a9721aa010b58dba74f1536bea7b7c9ec283e2a7ad1e430af1c4
-EBUILD rhash-1.4.2.ebuild 1936 BLAKE2B 881dcdcefc9c332aba1158c9170f14d3669676b6416598e058c88c0f69b1700f7b5c85bb874918ac37c43b0df7d887d751e9f94d9119e5d126da9d74f0b721a7 SHA512 b9c636c3347d32a6660c91199965fafc1eecc9d5c241c1a28af40d421335fe154e63585d727ad70699949831a032d531972ac7325a6b575625dfb6bba3c907fe
+EBUILD rhash-1.4.2.ebuild 2068 BLAKE2B e6f2fe60cddd5a09cf10e6904a71ed07fdba07fb9b9161853bc2afc1d3a0d1554ad5e04ebe464e7027ce0ed0834c3a8b96c5c2b30c050edab6c70e260cee33ed SHA512 af9985b92caba911f6f3a4d57a8ca0bf9884564bc8d773ce27c7b65b8ac6c8c86547ec3020ef5d468fc5f976d5cccf88d404ac74bd38492a5bc30132ddaab68c
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index 0aea0acab044..95bea74843c5 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -70,6 +70,8 @@ multilib_src_configure() {
 
 # We would add compile-gmo to the build targets but install-gmo always
 # recompiles unconditionally. :(
+# (note from sam: this might be fixed in >1.4.2?
+#  https://github.com/rhash/RHash/commit/9e4eeb1268149b24b7fbe0fc0fe91e3a266e6261)
 
 multilib_src_install() {
 	# -j1 needed due to race condition.
diff --git a/app-crypt/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
index 214eacc34e32..481e0c1ac574 100644
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -1,7 +1,7 @@
 AUX sbsigntools-0.9.1-openssl-1.1.0-compat.patch 4727 BLAKE2B 3b47c8086220cf12778bf5cd6018627a30ea349677eeb2cfcd1eaa1b83a25d39499ab21a1a123181a51f4138624c17e574050216f59c480e38d9774936f8b6f0 SHA512 6946e1d67161345088aee3ab54129b6e904b6008f2b275ab4eb55ed24fb2b866029f7d7ca856c5dfe76c395580f04709ad1be974369a1b4954b9e87cf812fd4b
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
-DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
 DIST sbsigntools-0.9.2.tar.gz 56525 BLAKE2B 0bce1f534aa960672eab6a415e287b79ff9f18eb947e2217ad4533081f8b854e160b57828afbb56423b2dcab723d3a8aacb2e6affeb2057d17ce3c1761d96b11 SHA512 060753ed9c8db794e4755cc66c1940a2ccc89f4ddf0e825da1f1e6eaa75fc67c21060ee4b5dfb0c757b69e6f5959bfa68156d9f95a945cf63c6a20f1414a2c27
-EBUILD sbsigntools-0.9.1-r1.ebuild 1308 BLAKE2B 86188ce937c67948e520503f831cc49ead8352a6e1c37f43f10769cd5d8393bf14820753aba6b79c198e7e12100814e3fd0fdeeef6b80a39c4ad570c46094723 SHA512 078581bc3862a571942039e6a0462a95fc17d25316155cecf236521951c69cd811b2f86ae024b58daa1040ea194ae619da28cc7b10ae8a88f3f57407c5fda8a3
+DIST sbsigntools-0.9.4.tar.gz 57714 BLAKE2B 94797af6c98a9c13cb71e52ba6f7ff07de70660af2194b14061e0cb618d6effff52ef7a4dd2fd4e44e75f022b979442d4290b1d65d63017b2fbebdca5951c5c9 SHA512 953d3d9a7f92b837da966eabe3572163a29c5292e792d5ef17cf842d7373ffaa901377cb4ec68006a6ef2f9c97d48db8ffdd3a6d2853be67016d3484a118bba9
 EBUILD sbsigntools-0.9.2.ebuild 1247 BLAKE2B 5f6f3cfcdfeca22a27b8811032fe4233f2e19939d764f2207064094056446d4e0011e992287c08b2b7a7f09ad16fd7ba562c41ca1eef3cc8a72c029883b1ddc5 SHA512 ea07d500700cdf6083ae6fa381b792ef8b8c6418e1339abc1ed1782172caa050954e2953e641d4c6bd84efb1783230a506b6dfec7df8bf0efc8be7ebfa5368c3
+EBUILD sbsigntools-0.9.4.ebuild 1249 BLAKE2B 47cd1930573e0ffd66ed83b1f307f645324e2b6ebd2014ed1156cc9eeaf7ec862d65c51d7830cdd8cabbd7b6b2aedc4b2aa70b05c35def39c70ca383d4641276 SHA512 8ded98418614ba94ba1647f10ed369d7ef6b8d814e771ba6cf911aca6ab79720b018edb75b20f9626a1afeeada7e5d046e760a52a58c359570b0f0fc1b3ef039
 MISC metadata.xml 292 BLAKE2B 590a17ca49fb39917074648d0b2439e707a49055f7b65cc923500cfe354b51aa020c3899b14d7de263c97f281aad36c19695f54747c7652bf46ce26d7a14b5d7 SHA512 230e2b4d2b6858ab067cb5ffe9e59b93fa22abe34bbebe74f0eca9a1f96fcfb9bbe536ed34c1bf8d977e8dfc7b46a6d44feb541d3426e6ada42f35f92ac7c896
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
index 13cc594e34f9..fbf2b68c085c 100644
--- a/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 MY_PN="${PN::-1}"
 
@@ -14,7 +14,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot
 
 LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -26,10 +26,6 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-openssl-1.1.0-compat.patch
-)
-
 src_prepare() {
 	mv "${WORKDIR}"/lib/ccan "${S}"/lib || die "mv failed"
 	rmdir "${WORKDIR}"/lib || die "rmdir failed"
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 6b094fb57b48..334134e7d2aa 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -4,5 +4,6 @@ AUX xca-2.4.0-bug-733000.patch 873 BLAKE2B f63029bf31f69058728db74cb798f641be721
 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
 DIST xca-2.4.0.tar.gz 1778572 BLAKE2B 2e90ef264dc53019cc37700b37d5eb0c48904ca371ae1ce0cfe2ad61be8765951ea918d356c1f2764e73d846693a66c903cba1381df5d1a588aae8bb45f8c195 SHA512 e93e2cf9dc48ed43ee9b51e977f825d81ff08835eb4d77fcbe8f9dc8ce31c77c1da879b48c25ab535717542d1fe84faa6e46c410c116edbee02072040c59667c
 EBUILD xca-2.3.0-r1.ebuild 1480 BLAKE2B a87a7c58d35d2d027e86da61fe682956fb0e20d6905e4fa97f3c2d7a8148c625c8fab62a96d0421b8719921dd1cf878a88c1249d28ef40243beb0ba010b43743 SHA512 c2c21337ae03998a759fcd7601b1f788547766bab9e0d467df71bd467b2294702799638bccf86f018f6558d9b57ef00821dc31e89294c710dfc19e7f0c09c76c
-EBUILD xca-2.4.0-r1.ebuild 1508 BLAKE2B 727ba52d8fe71c28a1e92e2ef583b6e17d62e7eb759a37c5011846fa491cff2e2d39797c6cee948fcf80df9f6b227b7f54b462206f66156b21530c2c0e60880f SHA512 7b4ecdd8e4d98ad23742237b3c43126b6d92f5aae2402ec906ae34109b1379ddd1723b3a29b31f505f5e50008381bddeeb70cbf7b7e846be6d6e7534405514a6
+EBUILD xca-2.4.0-r1.ebuild 1505 BLAKE2B e1d433ee81b5231295e375040d45d4b535d2e41c47bf0e743ce6b07251aba0f1954885539572e03d00987f8107838998856ff8742804d7f0853dad8547f047c3 SHA512 3e53f46ef9154995b5dca4bffc1aabc7d3495362eaaf819b4080b794837103028a4993da05c1c2fd5116b998faa2a651346ba4afffbb44bd0397676f27d7f4e9
+EBUILD xca-2.4.0-r2.ebuild 1486 BLAKE2B 3a86dac17b931ae1c0f8f660efca6bb9159090d313dad3d2fcaf8e7c63dc98d10931d275f023c9ee417146db9d9db1b194cafb533f3da816a30492c88bc3b999 SHA512 f0571363d223c3e8eef0529149f2d8ed4e76eeaf21f3877c489bf628f07f20ac0b1bc230626aa2f8ffb71c9aff964bc990738df189e08059d5d4d508e84a8b06
 MISC metadata.xml 304 BLAKE2B f99e5a2ed991066c1c605ca7bba6669b362e90a96e5a26258caf8d6491f8c5351cc897826bd06dda28ac67cc3813b0fa640b8fe304aeea7ea10b75fa3074d340 SHA512 b8d54115ab45ecc869066e083938a28d075f4436fef33607685e633976843023b3fe4fb65456ba04532f38c4f35b7dc109f68c59c11ad4e73f2332786fee6cf5
diff --git a/app-crypt/xca/xca-2.4.0-r1.ebuild b/app-crypt/xca/xca-2.4.0-r1.ebuild
index 7043f4793b74..5fc4696731fa 100644
--- a/app-crypt/xca/xca-2.4.0-r1.ebuild
+++ b/app-crypt/xca/xca-2.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bindist doc"
 
 RDEPEND="
diff --git a/app-crypt/xca/xca-2.4.0-r2.ebuild b/app-crypt/xca/xca-2.4.0-r2.ebuild
new file mode 100644
index 000000000000..5fcc2c93e237
--- /dev/null
+++ b/app-crypt/xca/xca-2.4.0-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit xdg-utils
+
+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"
+
+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-1.1.0:=
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+	"${FILESDIR}/${P}-bug-733000.patch"
+)
+
+src_configure() {
+	econf \
+		--with-qt-version=5 \
+		$(use_enable doc) \
+		STRIP=true
+}
+
+src_prepare() {
+	sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
+	default
+}
+
+src_compile() {
+	# enforce all to avoid the automatic silent rules
+	emake all
+}
+
+src_install() {
+	default
+
+	insinto /etc/xca
+	doins misc/*.txt
+
+	ewarn "Make a backup copy of your database!"
+	ewarn "Version 2 completely changes the database format to SQL(ite)"
+	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
+}
+
+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
+}
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index baa4e3c694d6..f488f8603b3b 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,5 +1,3 @@
-DIST yubikey-manager-qt-1.1.5.tar.gz 16066508 BLAKE2B cd15950c68cacc3e2904a5e1fbb3a2d98544084717f379202ccfe70082b0971959178730afb9ddbbfa20f436ef8d7cdf820df1e88539f99ce77913f60228af0f SHA512 b019a7cdebd741cd536a18670795f83c7e010e221b4f9c82dcd3c57b0c4bce878865c6605f10c962f4bd5e926c285a894ea97d2925ba091847ece5ffa7ce5bb6
 DIST yubikey-manager-qt-1.2.2.tar.gz 17311287 BLAKE2B 115dbf18ce0bfd48a1b172153d9770a3bde754b1dbef55ee1ec9480128305b9fb0d52af23906a6f6040df71cc4d3d4be216615fc3807395f7e7be1615a5568da SHA512 dbac2d51b198ab15051790e080ad92aaef4b0d44596ad136115469e7bf038d6b56d1bfa78a69d1fda3644543f9762051767b8a1fd46a80f2f62ecf836f7df3d8
-EBUILD yubikey-manager-qt-1.1.5.ebuild 1462 BLAKE2B e97ad56302714c398f04a62780af428952b27b5aac252f460483fe9924125234d4a5b35d445fee4f2103e55dedd5795b20d764ed9b98dca8cbf7087e787bd8ec SHA512 789aeb6cf6bef43dd58e217b759a124432d6a7abf882fd66a4a0262ba07c85fa54f488b2324529967a914cf95c7dd743400c2db24ec05e3bb609ece1a2fd3a10
 EBUILD yubikey-manager-qt-1.2.2.ebuild 1404 BLAKE2B fbcde0488a57a420ce53ef489d951a8f54c81f60556378ca518e76fcc7767c10ab491e15cba42eb0f20d1bd889bb420008d1d09cd1ab1821dada35ec2fa7553f SHA512 ba8b2e124571ba95cd9ded09e6f64a7160c7d84eb14c926321127652eb4fa57eb1d97aff2cf619618d57204d8ea3467e39199933e6daf96f5d23dbf48c44e1c3
 MISC metadata.xml 254 BLAKE2B dab829460548990cfd2b33646889a135275c0d7c839f79a5385117c32282800042079806fd3e773c96ffb6d396f46bd01b948af31abdb291e2e72b2a2051996d SHA512 6277c743ddda198fe4bc57bf9468533b5d08709b88ba95a1405ad4cd2ffc46421f897d68c73170e8d40886a3baa717ef10df52a00438625fb3fd7689a890b668
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
deleted file mode 100644
index 7454fa78fae8..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit qmake-utils python-single-r1 desktop
-
-DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
-		<app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-	')
-	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtquickcontrols2:5[widgets]
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
-		-i ykman-gui/ykman-gui.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	domenu resources/ykman-gui.desktop
-	doicon -s 128 resources/icons/ykman.png
-	doicon -s scalable resources/icons/ykman.svg
-
-	einstalldocs
-}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index fa87c831d419..808781e3d47f 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,9 +1,5 @@
-DIST yubikey-manager-3.1.2.tar.gz 116728 BLAKE2B 35b592a26bbe1c2a1c81ddbc5fd5de2693b01dbadd04dd317baa14e5f9c5556ff8622bc36e31983947b4eed272be16d8ae1d55c6e30fe5532c20605c784411c5 SHA512 e7ad46536fae0476ae7ea4d7115ba9ddb0fe158fcd1e1d548524860b2033996f5487f9c948df85586d5b7ea690b51ad8d5b43261a56aa8820940226e0b18acaa
-DIST yubikey-manager-4.0.0.tar.gz 137438 BLAKE2B df50113ed46c531032785ceb95ee130a2440f88677b088f70095545528cbceff55db483bc299654beb8d78b3cea94a9c8507751a090a8488cc609680167ec8d7 SHA512 f1684122a9ee8d57fa3644ecf140e39973c822dfcb7cc1d6578a2ef9b09ff9b0078e6e4ab3f0eb6522a08703d095027f9f24bc8ca6fff8b6874f7a9b5e99f1b2
 DIST yubikey-manager-4.0.5.tar.gz 142197 BLAKE2B c48a9c6ae5f2d54b24888b750c6263eb501e68be56beb9fb964e8b9ea5131a608786b2e67d0d092ebcfacb15b09cae3eec19f4271893ac77eba70eee28b6d06d SHA512 f8bddf3121c0c509fcacb56500f1c1885354aff5c00b3347d9ca84cdf1df65276ed744209d9653474909b6cba7595bc5529cd4b37ec34c35d2d2c3cf2ff850de
 DIST yubikey-manager-4.0.7.tar.gz 143622 BLAKE2B 1ea768b4b95a65dc2cbc34f1e796a1012b534495154f475c7deb9ec7dbc807ff688d864abba8001752d3717034acbf39cd1cb17f147842fc38d27a83cb8c8ddc SHA512 7ba11488cddcc7d4bb15e673b7d8d82d8e85c52d8a4a3a13c6681cc494ecf33b88eb54556785783e6ec458292f155668bac0bb3a38a2df1702a24f623f8b084e
-EBUILD yubikey-manager-3.1.2.ebuild 1460 BLAKE2B 245167a792b93078529190fbfbd45bef1c80fc4d1fcf8ce0e6e72e9a2fef4c317708e5c1433dc6bf585e6821aa21511268e7e1191860b329961e1a8863c0a994 SHA512 19b3084bcf54261aaf1537ec8d13721aa5eb1701375c749428f1ff23cf6c586cd94faf9a45fdd6565c2fd8843af9858741c3a19ac3fb9abef67aca66ea178157
-EBUILD yubikey-manager-4.0.0.ebuild 1324 BLAKE2B f15e7265610bbff0ad64940db32e8455893c67382f81c1b5f1e918a279fb409cfbe9392314850383f5e353fbc29d7e6fe1514c0826775becb1e34749b3c25ca3 SHA512 b215021993fa42925c730c84a66e04b502cb2afd5a4c7a152f337e778c01dc2e1bb26f5071e4ff8ebf4c8acde5ac60ab4dba3b20136a9194b89d88f965ceab85
 EBUILD yubikey-manager-4.0.5-r1.ebuild 992 BLAKE2B 97f3f6c6c731a99c73c0a8c138cf3245a35003d4fab8bfa03908d91183ba8c60f62125e153cd71706c8746f089d77b29d99a1b685cb2db199ac66570d182ca80 SHA512 719cab973ed71b98c2ba156ee072d7c2a524fc259c3d80420925512cb19aebeec1df4306113f8dd8675ad46f4bd40c289a155822c88c38721417f8d954c4da51
-EBUILD yubikey-manager-4.0.7.ebuild 994 BLAKE2B 49a325598ffb2d676614db3c0d5058cb4800797ab2fd55a420687a4c6f92a15725133e1b33eea7d048e467b22469afcb6f3ac4374c75329541a32ddc03504089 SHA512 aadb4bbd45ea9318c756de8e473bd8edbd83705f6ab0d022ba954a7fd629e63e8df7006ff82a13b62b43da7094e12dbb3e00140e92452e7670035d20d02a92a7
+EBUILD yubikey-manager-4.0.7.ebuild 992 BLAKE2B 97f3f6c6c731a99c73c0a8c138cf3245a35003d4fab8bfa03908d91183ba8c60f62125e153cd71706c8746f089d77b29d99a1b685cb2db199ac66570d182ca80 SHA512 719cab973ed71b98c2ba156ee072d7c2a524fc259c3d80420925512cb19aebeec1df4306113f8dd8675ad46f4bd40c289a155822c88c38721417f8d954c4da51
 MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild
deleted file mode 100644
index 8995c052f7c9..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-3.1.2.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/fido2-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/fido2-0.9.0[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sys-auth/ykpers-1.19.0
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOC_CONTENTS
-
-	distutils-r1_python_install_all
-
-	DOC_CONTENTS="
-		The 'openpgp' command may require the package 'app-crypt/ccid'
-		to be installed on the system. Furthermore, make sure that pcscd
-		daemon is running and has correct access permissions to USB
-		devices.
-	"
-	readme.gentoo_create_doc
-
-	doman "${S}"/man/ykman.1
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild
deleted file mode 100644
index 46d392c70cf0..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.0.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test" # Tests require non-existing package makefun
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	local DOC_CONTENTS
-
-	distutils-r1_python_install_all
-
-	DOC_CONTENTS="
-		The 'openpgp' command may require the package 'app-crypt/ccid'
-		to be installed on the system. Furthermore, make sure that pcscd
-		daemon is running and has correct access permissions to USB
-		devices.
-	"
-	readme.gentoo_create_doc
-
-	doman "${S}"/man/ykman.1
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
index 6409b45b5cd3..6ea12c8bda01 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 RESTRICT="test" # Tests require non-existing package makefun
 
 # app-crypt/ccid required for
diff --git a/app-crypt/yubioath-desktop/Manifest b/app-crypt/yubioath-desktop/Manifest
index ddc71705b23a..287215c9ae74 100644
--- a/app-crypt/yubioath-desktop/Manifest
+++ b/app-crypt/yubioath-desktop/Manifest
@@ -1,5 +1,6 @@
+AUX yubioath-desktop-5.1.0-bin-installdir.patch 548 BLAKE2B 3ba3286ace20e64dd543f377631dcbc30e2e83c52a9e62954518ab06cbef1609d559092f49fefaa4f37316bab793511712e52817107d1e98b66843cd2cb88038 SHA512 d570d4484ea394413fa365a5a2e29a32a54adf703f83ca918ec0eef474adda9e95f7ab0048e2977f11066bd6884567e50c3787ddb1d3c356df6eeee8d9fafd17
 DIST yubioath-desktop-5.0.5.tar.gz 5659179 BLAKE2B 31dd1a7e9b8a5034e916f38c7893572b6b7e75fa0bc45b5b807c89010ac0e4a01a446f03d1591dd6323a015fc8fb17861fa60dc5a5e4eff40b5261fb6e3f7088 SHA512 b5a0df306916896e1fd84d6a794a43365b0e0a2cecd97ec1dacc6312507dd2e4dd55fc12b0de9d72d1d0a1b40625330373b7c74dacb2ec37a24ea3e1fd2d4ff7
 DIST yubioath-desktop-5.1.0.tar.gz 6322224 BLAKE2B e1fc93bd38af3c6937f390c738248e43dbd17052df5103a0e25547adf7b34eca60ed8b45c9681568202d01802a5d8503cf2a5bf53d57c7c18ee2ee53cecd8d51 SHA512 152e27fca3c082c996c96fb05ed66781a52a47f30d8c5649d43937cf87c566f09c1fcb6afd65402b5f7fbe2a1f71872f10c8b456bd8a9b240c360018defd48c9
 EBUILD yubioath-desktop-5.0.5.ebuild 1292 BLAKE2B 8cfc49d3f1068ebc2c730ae1b2ea0c38a1272f3f81e361ea8c3fcd1b500988776f99a82e9bb9b91d5025f368a37001e3e498f90360d1d66d8d8dbda9acf1bb91 SHA512 ee8a4a17140221e486d85f392499f8f41ecdda7c9f0d747fa10d33cb8e51e9497f7caa632cdbd601a6e445e8886d960f586af7e6eff563671ceafb27607c4d5f
-EBUILD yubioath-desktop-5.1.0.ebuild 1338 BLAKE2B 5ab32f86942969f53800512509a39a6cb6365a0977ed156f46968c9466cefb7eb17848a1be91164c20855a813225d30757376b969bc283414f9337528cb834ef SHA512 2108ce8fa01982c7199ca33c2668c313e4ee703d06f8c32fb6ecd5465ff5a8a6772c5921da8fc4aac11078271e19c522a156d746fa9404e47d6212c6cf3c0f73
+EBUILD yubioath-desktop-5.1.0-r1.ebuild 1295 BLAKE2B 96e64598fc30cefe50ba8ce721da8eadee5274fd243ad7c7dd2dddbc09b1d94ad8dd4173824ec82a30357bed2a17d7bea0fcd60df8697d31f73d9aa9080a518b SHA512 d713c1583008a9beff8cae8c2313a687db7a3b4f17a9b5795c61669912b0449a07ffa66a0335b73f8631c881087fa7bcfc41750c44eafc6313592d35120922de
 MISC metadata.xml 351 BLAKE2B ab6920491637edc42b25934202cf24529718ef72b907364a09939a6c73b2667872698da96534a624db98ac33bb9c7933413067c9eb0ff79563e289e73aa4587a SHA512 ce8b9a953eb1d0c88eb2b6dcc54a28e7e6df5ca3f9dada0619ea7d10ae4d2d5ac0717b7a0158331475c5e7cbeb576ed9ae177941892549be687c17340f3af88f
diff --git a/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch
new file mode 100644
index 000000000000..749533ba31ba
--- /dev/null
+++ b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch
@@ -0,0 +1,22 @@
+From 9ae1ef710d5b070e128597a0fad3bd4ffa94b0aa Mon Sep 17 00:00:00 2001
+From: Dennis Fokin <Dennis.Fokin@yubico.com>
+Date: Thu, 7 Oct 2021 10:18:33 +0200
+Subject: [PATCH] Set correct install path
+
+---
+ yubioath-desktop.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/yubioath-desktop.pro b/yubioath-desktop.pro
+index 551416ae..c0ef9bb1 100644
+--- a/yubioath-desktop.pro
++++ b/yubioath-desktop.pro
+@@ -75,6 +75,8 @@ lupdate_only {
+   qml/slot/*.qml
+ }
+ 
++# Set correct install path
++target.path = $$PREFIX/bin
+ 
+ DISTFILES += \
+     py/* \
diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild
index e2f85896c574..c2f7b927166a 100644
--- a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild
+++ b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild
@@ -34,12 +34,10 @@ RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '>=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]')
 	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]"
 
+PATCHES=( "${FILESDIR}"/${P}-bin-installdir.patch )
+
 src_prepare() {
 	default
-	sed -i \
-		-e "s:python build_qrc.py:${PYTHON} build_qrc.py:" \
-		yubioath-desktop.pro || die
-
 	python_fix_shebang "${S}"
 }
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /app-crypt
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)