gentoo resync : 03.03.2021

38 files changed, 212 insertions, 305 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a42cff037901..9439f03a4693 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
index 765f4d57d6e6..dba3f74cc4ce 100644
--- a/app-crypt/aescrypt/Manifest
+++ b/app-crypt/aescrypt/Manifest
@@ -4,5 +4,5 @@ AUX aescrypt-3.14-iconv.patch 1104 BLAKE2B a6b9a8f41e86c9ac6fe16427752ae20da7177
 DIST aescrypt-3.0.6b.tar.gz 28272 BLAKE2B ce5347b77d974c76dadaa820b5b90a56015019f846bbc61560c33032adad08576d5e5ddd7d9e1020878e35b40173a2c5e29578e2f6e98631725442beac6f19ac SHA512 4c88abc9bff50ae5d310be7dad8f29843941843f9b484d9846b08dc76c605940adbb375f7e8ffefd6e8236f35ff860a745f89226e9c171bfa70c28c16aa6626a
 DIST aescrypt-3.14.tgz 38742 BLAKE2B 7122cb0246e28fd1301c58c13145c47ea3e20c8af61efc4115eec8a7ade720ecf2093f2e0156c05eb6cbb6e403bbeb3624745609f0ec1f2fd477edbd876e3373 SHA512 ac06604e2121f0c0f098e87d43c493b7285c58ac7419c284e6a93218dfa7381d4ca69ee775842fde89226092e05978d662eddefe734afe38f67b28df68d87b68
 EBUILD aescrypt-3.0.6b.ebuild 607 BLAKE2B 1a411ecfc29f0de364a6d16ff86c8e9ad486cdb42d1a8137c3391bb14549a76df170140eea42d317b1d16301bbcd38a5076f8447c403a4f01d149debc3641fe4 SHA512 0fdc84b108ec79790601d14444543b5e3821e64fb02dc8bac46ef4e763d11c09f2f2181a38b2da255935ad068b86206a0e0214db98f836a48c1b999bae2201ea
-EBUILD aescrypt-3.14.ebuild 1598 BLAKE2B b6067d5911f838081f86cffbc382818151f9811aead73403c06bcd1c23295b0529ad26848a61fffc5b3ffe44203e6fd4d445bd39f38d555c0785bc5a517885ed SHA512 fca32c9baf3264ee15dafebd30d3ec9e9f737819ec0d7ba14cc9c85ce528acfd99bc972795508c4543eeb613bad4a5b975ffc3a0c512b0f8f1481aca52b45047
+EBUILD aescrypt-3.14.ebuild 1605 BLAKE2B 1464d3609f29b7d468b5419691d917fa52847cbb734a7eaf771a2ccb9cf47111445e4080855edc5e2b95d828445003eacad75abc0d5ca8acf88a385149a1ce31 SHA512 0743249ceede209664999891de2f5652970d08d7b7bfea2fb703555ea036a0d71c36fc2c7c0f661e9bfe767ccd11716971dc8f66b841963971a201411b461189
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/aescrypt/aescrypt-3.14.ebuild b/app-crypt/aescrypt/aescrypt-3.14.ebuild
index 78142e9a9dcb..c40e124664a5 100644
--- a/app-crypt/aescrypt/aescrypt-3.14.ebuild
+++ b/app-crypt/aescrypt/aescrypt-3.14.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.aescrypt.com/"
 SRC_URI="https://www.aescrypt.com/download/v$(ver_cut 1)/linux/${P}.tgz"
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="static X"
 RDEPEND="X? (
 		|| ( gnome-extra/zenity kde-apps/kdialog )
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
index 601ddabb7b8d..d37e74ba369b 100644
--- a/app-crypt/debian-archive-keyring/Manifest
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -1,6 +1,7 @@
-DIST debian-archive-keyring_2018.1_all.deb 57392 BLAKE2B 3262a1f49af9792ce378a0b6219287ac868d3483783218f55a0ab3d37b9fa0a857da2dcd4c83742d8b47ce4a2df5ecd985d2345d5367908f2f353e8cc0a6a5e3 SHA512 7bf98cda5b9639d68538a8d47e35d422e552bd8afa067e844f0e8e76a366f9d5e503e0f47dd646789fa0264a47b77d0bfcc22559ad09bdc95453e4a5c2169f0f
 DIST debian-archive-keyring_2019.1_all.deb 75088 BLAKE2B 54411c4bde02990670baba608e239f1630394f52e877b62b4683c85c5a45a618cece0f429a35472eedce3768dc8a097049b4cd9dd808cc167c5baafd1e8fe9d1 SHA512 051b8507c9deba0d13dc0137ff43ae9db27b20b78c3437ca680046ae9b1c81ac505dc0a4460d4a83c4b256a04a2e57d1280eb2e8a3afb2a58f150ca6c37d0d63
-EBUILD debian-archive-keyring-2018.1.ebuild 475 BLAKE2B f10d5d944aaaf7a76c60e56e82b469deece91b9c5756874890696bad485bb21f3a53d77d2ed6cde678a2c3ae0ce8e1d78317f189d3df6221cd41daae45d696d7 SHA512 f80c382c04eb60d953f8a3ad1e87211adbff5a2425b9e6be6ce4644c22fbefd0a63d044c429b6379903184ab7ee6045a8b0b790f7fc8c4287ff82fa1c1514655
+DIST debian-archive-keyring_2021.1.1_all.deb 93592 BLAKE2B 8e17e16b2f0c670a1c486e8d139bf3da68ee7606052b219dd0b0bdc1334434686fe1920a33fcaf8e51e5b162c375e3528c3e565b99313f55e3dc9517eae5f4c5 SHA512 64575ab9f23b69ca98f13d535e18574b6d7805add0d56238e760b9e639c9990f3f3d865460fdaf86480c3905a3f3d7637b56e2998ae60f2f05e2d08e148ddcc7
+DIST debian-archive-keyring_2021.1_all.deb 93572 BLAKE2B 0566017cc02c9ddc03e6ba7a0fdb62856e8a8d5f31508b6fdba8c206288a8c4c0165f88bfaa3515897e8b88fa16ee459a5fca67e2f6364f1048c465b128e8d96 SHA512 20aeb3460bdfaa47aad0c069c5d39a2e385b0394d39db9ea76ad5a7e6fa6421c8603eb2241d2cf4ba82754291097ae416b1ec2a04c16a6065c5f0d04eb8d8946
 EBUILD debian-archive-keyring-2019.1-r1.ebuild 573 BLAKE2B f8a443e81c0345a37286f9b30d2293e2274c48c549b9005005e4db8dd513fec05962ea6ca9ae999ed953ae4ddc0ca89469fe825e78fbfd3fae860bed65407734 SHA512 23cc33336c33fa8275e97a9f235b40f23859c8c2406d9d461b5eb06f461093286ea6804742ce3299e3b3977a4402b7f2f1146093796c120036a3b982f2b5b66a
-EBUILD debian-archive-keyring-2019.1.ebuild 482 BLAKE2B 716ab76abb537b1b44543ae8056ed68be13dbf9c3bb31e293ae955477c534a253556f8a8d6d7399a2f18ef8ae1182ecd9e3d1dab05d4c94854360c9d427162ba SHA512 1643060e07bfa3938f9c20297e3c4eb1800e8d5a953b1c2d16d8fec35b47dff7eff552ed70432053fb03e8b577c75db1cf4a50966c8956c8a8428065a4fb38fe
+EBUILD debian-archive-keyring-2021.1.1.ebuild 573 BLAKE2B 22fa551113dd20c5be3726464b9dbe9f0060136b16d35819e7c80e6a98b659743ab9a71d15acbed61eeef641f9234e26de1382294d4b229dc0fe0103831152e4 SHA512 47783fb36ce1e9a731e3ff3c0a9e0c9d1167943ea327d3f386f0779140380e2251395f69d0c394377dd585049fc4ce32d7250edab4ee594e61d041ea95a62285
+EBUILD debian-archive-keyring-2021.1.ebuild 573 BLAKE2B 22fa551113dd20c5be3726464b9dbe9f0060136b16d35819e7c80e6a98b659743ab9a71d15acbed61eeef641f9234e26de1382294d4b229dc0fe0103831152e4 SHA512 47783fb36ce1e9a731e3ff3c0a9e0c9d1167943ea327d3f386f0779140380e2251395f69d0c394377dd585049fc4ce32d7250edab4ee594e61d041ea95a62285
 MISC metadata.xml 255 BLAKE2B 4c7bf34bcfa727317b7cc808eb50bbfd3d1aae64fa098b599480cc8ae6cfc527956a0d593db2ecc55b1b3cea48c5ce46642b64cda5b40753d6fe5e883129147b SHA512 92faa797311ee8b7bab9f5f5070d5fa6b75ca5f3a07643f8fc4d67a28d50d746e904009b7fb1a8214c4b0fc296b4b3ab3f695786103dc6c26479c5542165a587
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2019.1.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild
index bbb643c8e5f3..bbf259a150b6 100644
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2019.1.ebuild
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,5 +18,9 @@ S="${WORKDIR}"
 
 src_install() {
 	doins -r .
+
+	# https://bugs.gentoo.org/729142
+	gunzip "${D}"/usr/share/doc/${PN}/changelog.gz || die
+
 	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
 }
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2018.1.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.ebuild
index f9d5bd12a13f..bbf259a150b6 100644
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2018.1.ebuild
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,12 +11,16 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 S="${WORKDIR}"
 
 src_install() {
 	doins -r .
+
+	# https://bugs.gentoo.org/729142
+	gunzip "${D}"/usr/share/doc/${PN}/changelog.gz || die
+
 	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
 }
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 9bbccb410c61..3ee83c0217d4 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -3,6 +3,7 @@ AUX ekey-egd-linux.conf.2 266 BLAKE2B 387aa2985ddd362f2c0d9eedbfcd23b24a52b210d8
 AUX ekey-egd-linux.init.2 456 BLAKE2B d4e7900bc0e2a089744cc1bf49084cf83c2d8f8ade84bbdea39d6c21f7896bc22e8ef7b650a2efb198b19bea5abb983b20dbafde019d8fc1ec3d57171f491a9f SHA512 55e7be6464b685aa5b290bd310020f4a01926d07a9cb071fc117081bc751a902ebbb9db51a81a5168a34cebc2ecc02360b4917356e25a2e205f57491739ff190
 AUX ekeyd-1.1.5-const_char_usage.patch 1094 BLAKE2B e19d837be0652844c95cf87af8381a09f1913471609616ded55e6e3d7e0876f8996d31909e72c0ec759b324e54cc785bbde77c4eaf4f87e81935521d71427176 SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5
 AUX ekeyd-1.1.5-enoent.patch 863 BLAKE2B ec953667eaa23dcf91b15b01689c4be6315641dadaf9021240d67039ed88f651a3fe131581b60e71da8a4d9776952bed9db144c1340c98cf119e5746b53a16c9 SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50
+AUX ekeyd-1.1.5-luasocket.patch 2995 BLAKE2B f27a794eec6bbcffd1510090f39e336e6af770895766e0ea0e8cfaba32e99adca2f77702976909f563ddd2c28fee97fc37da9c1398656cd034cc1d1e3a8f5efb SHA512 a83f5a8c93bcf48d4d2a1658b8c425bf6c0b7c3f1e511d5621e1b2746c7f71e28e1e5427b1117dac10b396841a78c4608e53d8b3ee24a35f34505ea11ba93995
 AUX ekeyd-1.1.5-makefile-lua-libs.patch 355 BLAKE2B 89c73bb607a3a31d783027a3dff7feb2ad72e20041b76e54c656523323e017e7be12d29a628d808cc09208faed213ab2ea9b5982f138c24bc02ca3d95b3ac4e7 SHA512 a6c4a72760ec7b52db32d55d58e72e87e6d16a34a8a54bed410f17099249db044dcddf50c70b374fa71767184922bfb0bfc29d5603cb13177b652a9459aa7d9d
 AUX ekeyd-1.1.5-misc.patch 1245 BLAKE2B 555c6406461226ec8867f226e88bb9ca4f39d0a726c241c1638dd3339434b9f1d34620319de42c62e034da12cabebb739c92cc5df96ec9d3c79b339be839d6a2 SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04
 AUX ekeyd-1.1.5-path-fixes.patch 1918 BLAKE2B cf29e1f7fbaef728d0c4db2b71b1ac611ba5905c16b20b511f282a649359a0e458d44e0ca9b46db9b9abbd1da8935caa5605312314fb6027589ba03aa23f9759 SHA512 aba7b1cba96e678725fc8b47b56d815d59ce015ff6a4f72eaaf5fe8b7a99ddedf05ef3534a51772330209fb3cef235d76207103ee1e7a1f3315f4a52d2c0c2be
@@ -11,5 +12,5 @@ AUX ekeyd-1.1.5-udev-rule.patch 2325 BLAKE2B 5617dd160c6f3617bb93dc97755f22c535e
 AUX ekeyd.init.2 699 BLAKE2B 4ce17a42ffc60b49232cc0bb5a19d36fecc55071df699a7ad7da6a49de352a599b8f0f11fc05fa4159d8975245e7b6181e96303182870519a7f57070a6b54da4 SHA512 3c1fe923e6f08d83d02b9559fa5b817e9abdbc97a50815ab01c7c17e3e953f54701eb1110340dc164bb67ef67905041054cd4fc98c11ea5932a539f4330c8b71
 AUX ekeyd.service 157 BLAKE2B d7976301d7eb0d9be05de574f3b25c13ed3767629dff7024e7621a2d29686045cfd7664e2127a87b92d32e719b470a2795159e45c310bfdcfffa75897341213f SHA512 1082a1dc58b820882015c4f09d5154691d9d8810bfe953049a6853ea5025ec7cff2377ee931ec8ceef295241083c162e582a75fd0b134f7e8789f6d470285445
 DIST ekeyd_1.1.5.orig.tar.gz 101366 BLAKE2B 7edd6d291f7553864c9aa96ee3d9533e33b6c94989b2c6b1a56eda42f61afe1633af5e7c3c8f5f57920ac0577f8567d1b09238eae35138ab2023600f01096466 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a
-EBUILD ekeyd-1.1.5-r100.ebuild 4898 BLAKE2B cfef82e459b492409b1e4622d17f10806c924017922437d3229db2c583aa1f1f03330418a24cd13d127c7be41df113aebef99a69df75cb905072b9ab6c8281bd SHA512 c4d880416c9fbbcac5f45d3f2a039b256ec900873079ba9a0f3e570b4c15b9e08fc19872ec297f6a6b5fd1b19f362820fbea92543208ebd3e1fe17ba1fad427a
+EBUILD ekeyd-1.1.5-r101.ebuild 4934 BLAKE2B 9900c445c49ca14a4a4281ba37fcf32a04fa5e0bbbc8c751ca2f5d621281e8cdae814cd7ad53f496512fedf72d2ba969340844e321ebd87ba4b0aaa62bafcb78 SHA512 9fdf7b20e9ab86398d3978a98befcc9c569b4148de9c922985e2d688987f012b101e5b008c117c1c1ee07cd6d5f1a3b64000a2c411d136ab29d78f160dc72237
 MISC metadata.xml 775 BLAKE2B f20c01d6a705492bfeeb4788f3f2950ac5f3a012abaaacb4e526ff7b5685475515c229f8c14ca7961ad946497a3636d02e6a9e4ee4e6bedf5cbeee39af6c4a27 SHA512 7a202bbf5b18e938f16ecb0773fdb80ec72d00d3d88f396632e552cfa3c7e7c4104362e34aec356833800833b7b531d9694906dd1174ee76f06ad8ef09758b03
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
index c3a1d948e95b..a1a139660f3c 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-remove-werror.patch
 	"${FILESDIR}"/${P}-misc.patch
 	"${FILESDIR}"/${P}-makefile-lua-libs.patch
+	"${FILESDIR}"/${P}-luasocket.patch
 )
 
 src_compile() {
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-luasocket.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-luasocket.patch
new file mode 100644
index 000000000000..604913bc5cb2
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-luasocket.patch
@@ -0,0 +1,90 @@
+From: Courtney Bane <debian-bugs-4450@cbane.org>
+Date: Mon, 23 Jan 2017 20:30:59 -0600
+Subject: Fix compatibility problems with Unix domain sockets in newer
+ versions of luasocket.
+
+---
+ host/control.lua | 14 ++++++++------
+ host/ekeydctl.in |  7 ++++---
+ 2 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/host/control.lua b/host/control.lua
+index 7b9b1b8..22d700f 100644
+--- a/host/control.lua
++++ b/host/control.lua
+@@ -38,11 +38,11 @@ local PROTOCOL_VERSION = "1"
+ local dos_callcount = 0
+ 
+ -- Libraries we need
+-require "socket"
++socket = require "socket"
+ 
+ local have_unix_domain_sockets = false
+ function tryload_unix()
+-   require "socket.unix"
++   socket.unix = require "socket.unix"
+    have_unix_domain_sockets = true
+ end
+ 
+@@ -521,14 +521,15 @@ end
+ 
+ if have_unix_domain_sockets then
+    function UnixControlSocket(sockname)
++      local sock = socket.unix.stream or socket.unix.tcp or socket.unix
+       -- Add a UDS control socket to the set of control sockets available
+       -- First, try and connect, so we can abort if it's present.
+-      if socket.unix():connect(sockname) then
++      if sock():connect(sockname) then
+ 	 error("Control socket " .. sockname .. " already present. Is ekeyd already running?")
+       end
+       -- Okay, clean up (ignoring errors) and create a fresh socket
+       unlink(sockname)
+-      local u = socket.unix()
++      local u = sock()
+       assert(u:bind(sockname))
+       assert(u:listen())
+       addctlsocket(u, "U:" .. sockname)
+@@ -554,12 +555,13 @@ end _ "TCPControlSocket"
+ if have_unix_domain_sockets then
+    function EGDUnixSocket(sockname, modestr, user, group)
+       SetFoldedOutput()
+-      if socket.unix():connect(sockname) then
++      local sock = socket.unix.stream or socket.unix.tcp or socket.unix
++      if sock():connect(sockname) then
+ 	 error("EGD socket " .. sockname .. " already present. Is ekeyd/EGD already running?")
+       end
+       -- Add a UDS control socket to the set of control sockets available
+       unlink(sockname)
+-      local u = socket.unix()
++      local u = sock()
+       assert(u:bind(sockname))
+       assert(u:listen())
+       addctlsocket(u, "U:" .. sockname, false, egd_ctlread)
+diff --git a/host/ekeydctl.in b/host/ekeydctl.in
+index 9292ac6..802cf38 100755
+--- a/host/ekeydctl.in
++++ b/host/ekeydctl.in
+@@ -1,11 +1,11 @@
+ #!/usr/bin/env lua@LUA_V@
+ -- -*- Lua -*-
+ 
+-require "socket"
++local socket = require "socket"
+ 
+ -- Try to load the UNIX domain sockets support
+ pcall(function()
+-	 require "socket.unix"
++	 socket.unix = require "socket.unix"
+       end)
+ 
+ 
+@@ -98,7 +98,8 @@ end
+ 
+ function connect_to_daemon()
+    if __unixcontrolpath then
+-      __socket = socket.unix()
++      local sock = socket.unix.stream or socket.unix.tcp or socket.unix
++      __socket = sock()
+       local result, msg = __socket:connect(__unixcontrolpath)
+       if not result then
+ 	 error("Unable to connect to ekeyd at " .. __unixcontrolpath .. " (" .. msg .. ") Is ekeyd running?")
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index 34db87e46a73..cc2e13bffee6 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,7 +1,4 @@
-AUX hashcat-6.0.0-missing-not-fatal.patch 1515 BLAKE2B 2cf28447a83df00db96f73380195a5a86648cd068a14adfea65d6eacc7a760f4b1513a35b524d7bed087ad5375f5c439adb71216c00b6c85a788fafb59fa6ca2 SHA512 bb8f51febbf46b2318af8ee230fa686cce9a340b2d59068fbf64c2236df467f80bb44c5fc172f5d99da0e2ed32eeb6d9c5498408cb6c077a18f2f294b2217664
-DIST hashcat-5.1.0.tar.gz 4266878 BLAKE2B 677554fc5d6c5a93d0f4955c2e3cb6a40913ca2f7d00a89cf0c00bb48cadcaca94d3fdf55b853208f9fda4ce1bcc13fed865c5128a7c429223bcf8b4b825a15b SHA512 90605c2bcd0ec275d2f6ec581899b95cdc320b1494613a19803192c8a08037a7829b3776ed42c58eb6551ec1a746f47f94ab5b273958ca74e0fc57315e209ece
-DIST hashcat-6.0.0.tar.gz 5360568 BLAKE2B 9d44c94d136a4c4cf7254ee11dc978db6bb1159d66ea525777c0a3dae59149983c9e8220f50cdbe6c24e330c757f3519b48f920662582e914f80068723ba5acd SHA512 b508c77e1735c02bb59c427774a3f4fafdea37d09777ef2dcb6e5081cb993d02c4f46a6ab846dc97a8cef2b0f69bbc191e26b8f1608a299bc2c1a6b3d2474f96
-EBUILD hashcat-5.1.0.ebuild 2201 BLAKE2B ba3d5b2652ae0fea0226265a9ae71b93eb6d0c225d9973466a4330b8b2c3c573ad41434f4be1f888e05737b417b7de639ddeb0b447ad910d37d754db79b99079 SHA512 4e6f0fd1b6e5f7451bfeb0408caec1eda01dedf6394b227fb948ab592b70e0fee81a777497baf73b5f67156f4a1c5f57fceae17e984671b8b29be5e96f626a1c
-EBUILD hashcat-6.0.0-r1.ebuild 2351 BLAKE2B d451d10baba0e2555c712ba0aaa344787b31c5884926eaef923171b5129930f2ae9fe158cc2523e150b60c568eabe4546a3527a5c57c1334809c18a31431d947 SHA512 30e9e5392527e0fec4bd0ccd314963540a776f84ee0e908c9a5de0785c2edd9b6a8576daa5f4a5c602526d939b5c691a02134fb3f12afc3ce4120bbaccaac1cf
+DIST hashcat-6.1.1.tar.gz 5385180 BLAKE2B a1a90f691222c7810150a23d513bd1d24bca4682dd8dec2ff5bdc9cc9f82d5a2b00407de966a7c7db131cf1c1709b5f78c97d45176598d6bb7ebd381c38b4ba8 SHA512 788539b488ba55684d6d93ce18f3b05fa822a8cbfcdbcde9c2b54001d8927580dca253e0e9ff9a19f4278045046d732e104054fc743c39f47952ca24d2e93724
+EBUILD hashcat-6.1.1.ebuild 2295 BLAKE2B 851422a617598df23a1a49eb5a5b68b3fefed33332e0f4c78c5607ec20e55b805eef20bd7d8238c6342acf82345f18fd91489e234f7c1eb4a53e0ee02cd58f86 SHA512 535e3b5b010fc6c6b8e3a99e13455952ac15fbe08562009198c1a9ca61b70f60ae273e9f16100982c2efe6f255df05f4cdd9d7c1e13bfe27f4d056fdf076a4a2
 EBUILD hashcat-9999.ebuild 2295 BLAKE2B 4504eab73c1b0fb65d6d9c1c3c93e3030699b234e890374b4a84b9c59743d32c79d4472d0163da2c3bf0b02282ef34c65d48a68d8c38a0ec9b0734626d875d98 SHA512 9e6db642a6a1e38f91b939add0a57b15dc8d3ce95e1c82685c0ebe9cf070a77f500eefccb956874c1ad0cf38a1d421c62dc63d32228918553ae7bbfc8312754f
 MISC metadata.xml 395 BLAKE2B b058a0b0749da5d258660ddc67733d9f6ba09d10acf98ccb2c46b23534d09cd2865a6e37050b96f89dc97a9584e6791360398c41576224905b667a9b149fd3f7 SHA512 1d2ee684f0180752b2dd6eee437ce2714437775a0224a34c6ffd9f9b86ef8c375947b25f5a372358672a4c69516861fe1fc26d1dbd972684f2df725fba87698e
diff --git a/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch b/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch
deleted file mode 100644
index 52120e0e05c4..000000000000
--- a/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/docs/changes.txt b/docs/changes.txt
-index 1527da46..420c2102 100644
---- a/docs/changes.txt
-+++ b/docs/changes.txt
-@@ -1,3 +1,11 @@
-+* changes v6.0.0 -> v6.0.x
-+
-+##
-+## Improvements
-+##
-+
-+- OpenCL Runtime: Reinterpret return code CL_DEVICE_NOT_FOUND from clGetDeviceIDs() as non-fatal
-+
- * changes v5.1.0 -> v6.0.0
- 
- ##
-diff --git a/src/backend.c b/src/backend.c
-index 80fdbb38..7f79879f 100644
---- a/src/backend.c
-+++ b/src/backend.c
-@@ -5185,7 +5185,31 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx)
-         {
-           event_log_error (hashcat_ctx, "clGetDeviceIDs(): %s", val2cstr_cl (CL_rc));
- 
--          return -1;
-+          // Special handling for CL_DEVICE_NOT_FOUND, see: https://github.com/hashcat/hashcat/issues/2455
-+
-+          #define IGNORE_DEVICE_NOT_FOUND 1
-+
-+          if (IGNORE_DEVICE_NOT_FOUND)
-+          {
-+            backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx;
-+
-+            OCL_PTR *ocl = (OCL_PTR *) backend_ctx->ocl;
-+
-+            const cl_int CL_err = ocl->clGetDeviceIDs (opencl_platform, CL_DEVICE_TYPE_ALL, DEVICES_MAX, opencl_platform_devices, &opencl_platform_devices_cnt);
-+
-+            if (CL_err == CL_DEVICE_NOT_FOUND)
-+            {
-+              // we ignore this error
-+            }
-+            else
-+            {
-+              return -1;
-+            }
-+          }
-+          else
-+          {
-+            return -1;
-+          }
-         }
- 
-         opencl_platforms_devices[opencl_platforms_idx] = opencl_platform_devices;
diff --git a/app-crypt/hashcat/hashcat-5.1.0.ebuild b/app-crypt/hashcat/hashcat-5.1.0.ebuild
deleted file mode 100644
index bc8b3fb95c51..000000000000
--- a/app-crypt/hashcat/hashcat-5.1.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils multilib
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-LICENSE="MIT"
-SLOT="0"
-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
-
-IUSE="brain video_cards_nvidia"
-DEPEND="virtual/opencl
-	app-arch/lzma
-	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
-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"
-	#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
-	#do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	export PREFIX=/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
-	eapply_user
-}
-
-src_compile() {
-	emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=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
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	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_XXHASH=1 VERSION_PURE="${PV}" install
-}
diff --git a/app-crypt/hashcat/hashcat-6.0.0-r1.ebuild b/app-crypt/hashcat/hashcat-6.1.1.ebuild
index eab3098c5c18..2f467f39c054 100644
--- a/app-crypt/hashcat/hashcat-6.0.0-r1.ebuild
+++ b/app-crypt/hashcat/hashcat-6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,8 +28,6 @@ DEPEND="
 	!video_cards_nvidia? ( virtual/opencl )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-missing-not-fatal.patch" )
-
 src_prepare() {
 	#remove bundled stuff
 	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index f4522f975c05..d88345a92f58 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -20,8 +20,8 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
 DIST krb5-1.18.3.tar.gz 8715312 BLAKE2B 4f6ad4a529e7578e83d82b43c2cada33bce1dca5081ec826ee06a713f82520b783f72ec56d2ce289e10d1ddcfaa079491e43f21c035b214d244bb80e6b2a1c9f SHA512 cf0bf6cf8f622fa085954e6da998d952cf64dc7ccc319972ed81ea0542089cabf2d0e8243df84da01ad6f40584768ca2f02d108630c6741fa7b3d7d98c887c01
-DIST krb5-1.19.tar.gz 8735572 BLAKE2B 940a96f63157679648799ad489041a501d66047e92f7f28feea34b81be556ccc864e7a79bf6ebe755a8fd33bda2d81adacd0e22e34630d09f965d67935523bbd SHA512 99d4e75ff69bffc85698177b48ca430a7a9f077c3b6c4a422ed410b264f9a762a97db5d7e0764812e2530975f1c6c12031a5dabea1154bc01a26470e3ea960a9
+DIST krb5-1.19.1.tar.gz 8738142 BLAKE2B 902dd08fe4b81b1cb0ec2bf1b95eeece0f8a87b87bae865272c7bf5dd028c01997ec4c5d24df605328db85e7cbfe9a38dd804b363b651aefa7b4eaec958a280c SHA512 36bf33802119ada4650a8f69f1daca95aaf882dc96bfa7061f0340a5decd588c31fc10108ddadf1042934e0e2c3bbd975deec565b0a7f0fc2baf8b8cc6d97491
 EBUILD mit-krb5-1.18.2-r3.ebuild 4453 BLAKE2B dbde801fa1451ccb417f4b67ec6d08d45acf19ba31a6d18121af689c06eccdc8f6aa4f2140663be9c03f54e6b246babfa6a7a5837197f538996ff2dc565fa92a SHA512 1f8760c67d84a53551feb56e933913d14b4ac2efc7f574b726eb246e0addb7a9a5671104aca772796c3a9b6bae7a4f6b95a0eed9157c7f6c3aed18b5b948eb16
 EBUILD mit-krb5-1.18.3-r1.ebuild 4425 BLAKE2B 882d05e11f6fac8466defe58176f0c70a67319ab05909f0dec32f5f29d471ea9780b2fa39c6b001488751492a8141cafbbd9dc1a1f0a6146b24f5ad58798e292 SHA512 29caa7dd8a1b3f1cece63cfff348e851809da318dc85550df7c9cd924abdcc3bd1e6a6ef1f3d2d170b4aa2d0a9f778fd298d838862fcc431857e289c93e2d77c
-EBUILD mit-krb5-1.19.ebuild 4252 BLAKE2B 0c30d532e25dda48b00080027a36baa576306e886f359c5248838c5cd2834137c2aebb835eab2a2c4621d5e09eda67859d021ef9ff68db61aebced461a5a80bd SHA512 6fe8ae104ca40c0097f375feab6726b8b1ad5568fe0e9801dd070960e2bad2e6a0b855a686b8b3496c5f0c9ee09cc69e50950f3ae6668e1bb0b7446f8a43c0e4
+EBUILD mit-krb5-1.19.1.ebuild 4252 BLAKE2B 0c30d532e25dda48b00080027a36baa576306e886f359c5248838c5cd2834137c2aebb835eab2a2c4621d5e09eda67859d021ef9ff68db61aebced461a5a80bd SHA512 6fe8ae104ca40c0097f375feab6726b8b1ad5568fe0e9801dd070960e2bad2e6a0b855a686b8b3496c5f0c9ee09cc69e50950f3ae6668e1bb0b7446f8a43c0e4
 MISC metadata.xml 823 BLAKE2B b1e312e7d7d1dde62a6260572d68c5c9df90a00c9ca7d43939df0ce7c6e528ac8dfcf839827938f783c241c19255660e1e7806210aaf407a6e86cbaeef24295a SHA512 844715444284f5c7f1a73ed15c0ebe0b5dd8c96c3aa7e6450f465e2a2086509c04d637f139ede5e427972d4b1bb298255388f50978b41de875b47ee40251451e
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.1.ebuild
index 614baa64fced..614baa64fced 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.19.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.1.ebuild
diff --git a/app-crypt/openpgp-keys-python/Manifest b/app-crypt/openpgp-keys-python/Manifest
index d0082fbb1f67..2686c100db02 100644
--- a/app-crypt/openpgp-keys-python/Manifest
+++ b/app-crypt/openpgp-keys-python/Manifest
@@ -3,5 +3,5 @@ DIST a035c8c19219ba821ecea86b64e628f8d684696d.asc 6884 BLAKE2B 3cb0826e3ccce466f
 DIST c01e1cad5ea2c4f0b8e3571504c367c218add4ff.asc 11972 BLAKE2B 56a943a1a6f0ed45d7d891f22092d15ac13f0e31adf430f47e970e9f2a1d93223362c35e72e8e5107acab5fec345134980e4826a8a4cf50362faba3bfa340e8c SHA512 6d1bf0ae7bafb34aa7080bed468fcec09d9b279beeedcc91be6180e52026f1543e27f3fec159fafc38ab433af23c928bfd2fcae7571bd099170cdef9fefe0605
 DIST c9b104b3dd3aa72d7ccb1066fb9921286f5e1540.asc 3403 BLAKE2B 8be2e6de6dbd4150a9167ef12eff278107103e4962b6de409959c5cf03cf506ed64c0e1d735856db6e94b812390383f126de8b1fc440f34294adb4b1cbfa994c SHA512 d32322792fb4d1dc0c548ae7158c1c4e368d9c0fa62898f0b5f03b8d57a9497fbf8c5b2c0175027ea5f09afac36886fbb3cf89900c3d3e8f49de70a17228b6ce
 DIST e3ff2839c048b25c084debe9b26995e310250568.asc 65279 BLAKE2B e689213feeef4bc210906feb6cb07eb9478fe8e4856d43a2bb899b0ae24a50b87a478c5ca8df9326cfb848d6502d4d5b8359b29335ff201300dc054253471958 SHA512 4935edb7fe0bd5072f12bc68b31bfb171f0b0dea65786ae3ff3aaa5101694990b67bc0198f84111cf694bdda5900966fd8d6faa32bc8441d3bd8c71a2fbc561a
-EBUILD openpgp-keys-python-20210121.ebuild 1207 BLAKE2B e10ea4a7779d58a8066beabe0502420ebe956fda73611b37028be50a718f5b24d98b50618e27f36efe264340d5bd36affd611811d44c881b7e9f3eee259f28ab SHA512 3f1b71a80cc6680141f0cc27eef1ba69695aabf1ec0b4fe6d22df7496e81e5d47d2108bb4a9eaf80177b0974831d2a61787aa0e9c20f75b033c655775417acc2
+EBUILD openpgp-keys-python-20210121.ebuild 1206 BLAKE2B c87f4f33f9c19b616b19e8adb00add4b2103138e16493ed2155ba0c2e3b030a6dbd0574534af97e78b3745e9bf9655e62ee8029074d895bb43d271fc609f558d SHA512 5b6682db0d430e0d310ccdaa0b761b569f317a1c41d7f0a00c784b74392e08f47560e431f0b69e8b86c07c4836db578c7701ff114da7bf2f5ab2dc2f2736abe0
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild b/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild
index 22d01147b607..a8034804ff62 100644
--- a/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild
+++ b/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 S=${WORKDIR}
 
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 603bd741c0a2..4ac6ced0cde9 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -4,5 +4,5 @@ AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea2
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
 DIST pinentry-1.1.1.tar.bz2 515723 BLAKE2B f257fe552852e6d1ff2c23aeb0c1127b43e3a60e44c78dfa764d569e659ccb78528ce3ee863114af273a4b6f6c24686cda2cb14bb04995eb8c41ccd4541a9fbd SHA512 d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
 EBUILD pinentry-1.1.0-r4.ebuild 2238 BLAKE2B ce1c7b875208ec0fd3fcba08a7ae89439e86980d46c4e945c096d588dbf24d13516909b11473c89111527d0c6183067e97e447a9866201c5356ecba6ad35c24b SHA512 2b0f6ed73c6477c55c85cceaa108cc8f0b633eba49e5dea221664957236b462f782a3c9c1f20cc5c2a582d1258f00e80ad9162ce21ddd6d784fd305fafed6607
-EBUILD pinentry-1.1.1.ebuild 2247 BLAKE2B 10017793a0fe20615bae74ca0e1c139bd9d33aa21d32f61de1b7abdd205f73c5f185a0c9ec6c0537d006bf003f533b78ae958ffdc05f264c20d44aa38eccea45 SHA512 962fadc9e9bc6980413cc9f390b20a014462186f07a865262e2ee37bcbfeca22ccc32b53896d10ff3ada167776e1ca080631796c148bbb7bc14d14076b2dc458
-MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
+EBUILD pinentry-1.1.1-r1.ebuild 2309 BLAKE2B 80c40ab142e6c93c996646c53e7a7c8da31ea7f3a46d9c593109af47f2e97a13d9d1ee3c4aca260ae8e2016fb62c6799d07533fe7e50c1544785cfa40d921081 SHA512 1f2ebfcd055c5a16b5359f6bbdd2751741e842abc92fdd3e0ff60cacae53b0a4b4b715ef7cd91cadc4bbe774d91615db8aef487262d61940dc0f9513f32b63e4
+MISC metadata.xml 333 BLAKE2B a3d540cdc1fbb8efbe14ebfffb080cfd4ee3bc31e494874bfa9b8d042b409a830e6dc9a0ed22f28459d47f7c23f0906cb84a3b2d3cee28be1648e96d6eb13533 SHA512 1076092b801ac09bbbcbdb9af2300268ae60a5061deed026f98e80edebec3fabb15c26b16ef59af03248bd99a6334268f598de94372578d20dc37d10c8371729
diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
index 6698a4ab7883..7aa9e9a300f8 100644
--- a/app-crypt/pinentry/metadata.xml
+++ b/app-crypt/pinentry/metadata.xml
@@ -5,4 +5,7 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
+	<use>
+		<flag name="efl">Build <pkg>dev-libs/efl</pkg> based pinentry</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-crypt/pinentry/pinentry-1.1.1.ebuild b/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
index 5d2943485111..d1e13dabd9bb 100644
--- a/app-crypt/pinentry/pinentry-1.1.1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
@@ -6,20 +6,21 @@ EAPI=7
 inherit autotools flag-o-matic qmake-utils toolchain-funcs
 
 DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2/index.html"
+HOMEPAGE="https://gnupg.org/aegypten2"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 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="caps emacs gnome-keyring gtk ncurses qt5"
+IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
 
 DEPEND="
-	app-eselect/eselect-pinentry
+	>=app-eselect/eselect-pinentry-0.7.2
 	>=dev-libs/libassuan-2.1
 	>=dev-libs/libgcrypt-1.6.3
 	>=dev-libs/libgpg-error-1.17
 	caps? ( sys-libs/libcap )
+	efl? ( dev-libs/efl[X] )
 	gnome-keyring? ( app-crypt/libsecret )
 	ncurses? ( sys-libs/ncurses:0= )
 	qt5? (
@@ -56,6 +57,7 @@ src_configure() {
 	export QTLIB="$(qt5_get_libdir)"
 
 	econf \
+		$(use_enable efl pinentry-efl) \
 		$(use_enable emacs pinentry-emacs) \
 		$(use_enable gnome-keyring libsecret) \
 		$(use_enable gtk pinentry-gnome3) \
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 79f6218da904..9243e69f5082 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,5 +1,5 @@
 DIST seahorse-3.34.1.tar.xz 1271616 BLAKE2B 64956d0ee4f15bc048f42cefd827aad91927b34eecf4a2e53d988c379b3eae1ce0ae29ef469c2ff80ec9cceeaf77a271c57e28cb98dd24ae55c048faff487c1d SHA512 d2dff7d73a0968c1a5a8d39460f08b67f6794f22812200f564ef719354ab5cc2dac2213cba0d4bc10a455aecb9f55de8ff39943db4482beaac9cfdc2ca1012b8
 DIST seahorse-3.36.2.tar.xz 1695824 BLAKE2B e4efb20f952e879b0ff17a9c8664ba61d10c69e377a2fdda52904a8bf5c026d147f9feb9b55c07982f256b366f756dd1567a522d89969c8c5c461f653a130676 SHA512 6a0cb7847fe9917d6d6da31f9b81a4737e425d451fc80604d8e3deb9fa57798f04aa577dae68bc156a15743975f74fbde5ff06a0b05b34228bdc9ef2539b6451
 EBUILD seahorse-3.34.1.ebuild 1556 BLAKE2B d74e2df94472048b48c8df990860d8848bae46774e26184528d5e04ee3de032262c943db32c55177c72d989c49c37ca129dbe93be29bc3cf24d609ef1b63f879 SHA512 9a4c566f6b3801ca42d0dcca75fbd6fdc3efb1a2bd712d5dc1b33d123fecf2b879b4906c127754a79554fcef8aff3c026b078e519648ee1ca03b43d763f5b4d2
-EBUILD seahorse-3.36.2.ebuild 1618 BLAKE2B 0a6b8f2c2636a209580a4c11a702a37dbbf9ad1b3d764ee0126cad75d23acc6af35feed10d4f9c9f00018ba2dd7b04e7077c0161e66841f772d7704d5126b104 SHA512 c70e2995d082a7c71a2743060d11b8020d33f82e8edaa6102629e70432302bebb579aa61543ac2adff977a3fe9dd86dcec6f780c825042bfb735a326c27f351d
+EBUILD seahorse-3.36.2.ebuild 1617 BLAKE2B 74ce0bde4fcf4c6e4206075d5e16db5365ee57f90f32d86e07be2d881e8e4f4fb4cea3f77137450c03504cb63ae6243f4e5840c14756a2cca0d5ad9b478fa9bc SHA512 4c7e8563f478ae8852a1c9dca359fb4e0a731e1f6a5e508d40a3487f9b92ac38894bcf52db84e1dfe35239b9de8659957e6e303ebe05dc058ef744cd016cc91c
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.36.2.ebuild b/app-crypt/seahorse/seahorse-3.36.2.ebuild
index 0634a6142013..857a62597523 100644
--- a/app-crypt/seahorse/seahorse-3.36.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.36.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/app-crypt/sign/Manifest b/app-crypt/sign/Manifest
deleted file mode 100644
index 99728cb1abd1..000000000000
--- a/app-crypt/sign/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.0.7-as-needed.patch 383 BLAKE2B 7f657ee7a64f34769474174c948613fe376e17797d3416ef2bb64ef035790776aaeaa6e7e69e327ca71ed3600b1221e96726cb2966a2b93a1f94bcfb2e0be7ff SHA512 03ee8c34030077030e2a24f58bf7eb180b3bfb22fe92991b8231e3348ae522a34ca8ce9851a1654bbf562214dfb6f569297917ee0ae309c49ded23f6c0b97ec9
-AUX 1.0.7-openssl-0.9.8.patch 503 BLAKE2B 8e8625161458a8c7e46d6f4a4f02fd81695f93c02cc20e1178e19e413f4b735d7d7a19f5785e473f4ad7b8ccdeb09852fe1840f30241e3d772832db82188032a SHA512 ffb9d1390f3fa7cb9189ccb8ebe94a8fb5fc14de3cb487758363c405d44d07e4dfdb8b78b71b4b6e26c459ac8972e2b526316a8a1360db72879997683f592b6c
-DIST sign-1.0.7.tar.gz 28535 BLAKE2B e75811aa60f5408af8272503b7b6909eb03e58ab2f70a72efc73a9827af39aa9d5587e2366bc4be4eb67ca88b583d3c75927a0ab94f9f3441ffc60fb6e0e9d6f SHA512 9adb9e520da654e7196451e20501be8e1b84ee750a26344cb7e1816e56e4e8b88773a76a2707a6428faa7828658807eaaef2073b6940e212435ed915881885c0
-EBUILD sign-1.0.7.ebuild 861 BLAKE2B 6c5f5be4d07dfc84d2e6155eb337496518056fe8c449f043fb04a08d04534f9d58ef0f1aec79b32f5be31265f67001f5ccd8ca36e5f6d5ceaf682c809b700413 SHA512 2e874d30078cffab6dbe3a67941e5a1488b45494c67d11da43d0cd07c4db1c05f9581146574ea60d247cb2e3672721212b1a4299b85623c99b864fc8b0f6a45b
-MISC metadata.xml 548 BLAKE2B 8134e0f90d5a5edf3d879801beb54802689491bf47c5b1a8f0954c47c8549b722dfdc8100a5d0759d6694d42c44484f165f17cd79804b6fd1b4852cd1b9f9d59 SHA512 75eaa714f205bd2a5e46693c51dee25fec89447b4f0db2e8c3723ba8bdb17206fbb47ad667092541a8e186f727ee0063a0a58fc02719bab32b8052e07ff6e02f
diff --git a/app-crypt/sign/files/1.0.7-as-needed.patch b/app-crypt/sign/files/1.0.7-as-needed.patch
deleted file mode 100644
index 56574d7131d7..000000000000
--- a/app-crypt/sign/files/1.0.7-as-needed.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nur sign-1.0.7.orig/src/Makefile sign-1.0.7/src/Makefile
---- sign-1.0.7.orig/src/Makefile	2004-08-07 07:15:00.000000000 +0000
-+++ sign-1.0.7/src/Makefile	2006-09-16 17:21:12.400977608 +0000
-@@ -1,5 +1,5 @@
- CFLAGS += -Wall -DNDEBUG -g
--LDFLAGS += -lcrypto
-+LDLIBS += -lcrypto
- 
- OBJS =	buf.o die.o msg.o digest.o uue.o pki.o str.o system-nix.o \
- 	system-nix-readpass.o util.o
diff --git a/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch b/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch
deleted file mode 100644
index 179efbe77ef5..000000000000
--- a/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur sign-1.0.7.orig/src/pki.c sign-1.0.7/src/pki.c
---- sign-1.0.7.orig/src/pki.c	2004-08-04 04:10:35.000000000 +0000
-+++ sign-1.0.7/src/pki.c	2006-09-16 17:17:34.335535125 +0000
-@@ -286,7 +286,7 @@
- 
- 		/* if it's not a decryption problem - bail out */
- 		if (ERR_get_error() != ERR_PACK(ERR_LIB_EVP,
--		                                EVP_F_EVP_DECRYPTFINAL,
-+		                                EVP_F_EVP_DECRYPTFINAL_EX,
- 		                                EVP_R_BAD_DECRYPT))
- 			goto cleanup;
- 
diff --git a/app-crypt/sign/metadata.xml b/app-crypt/sign/metadata.xml
deleted file mode 100644
index 15e7b65be77a..000000000000
--- a/app-crypt/sign/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>alicef@gentoo.org</email>
-	<name>Alice Ferrazzi</name>
-</maintainer>
-<longdescription>
-sign is a file signing and signature verification utility. It's main purpose is
-to be a simple and convenient extension to a tar/gz/bzip2 line of tools to check
-file integrity and authenticity. It's small and simple, it does just one thing
-and hopefully does it well.
-</longdescription>
-</pkgmetadata>
diff --git a/app-crypt/sign/sign-1.0.7.ebuild b/app-crypt/sign/sign-1.0.7.ebuild
deleted file mode 100644
index a1e2bbeaf1d0..000000000000
--- a/app-crypt/sign/sign-1.0.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="File signing and signature verification utility"
-HOMEPAGE="http://swapped.cc/sign/"
-SRC_URI="http://swapped.cc/${PN}/files/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-openssl-0.9.8.patch
-	epatch "${FILESDIR}"/${PV}-as-needed.patch
-	# remove -g from CFLAGS, it happens to break the build on ppc-macos
-	sed -i -e 's/-g//' src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	doman man/${PN}.1
-	dodoc README
-	dosym ${PN} /usr/bin/un${PN}
-}
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index ba7c51251a4a..be49cf5fc23b 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1,5 +1,5 @@
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
-DIST tpm2-abrmd-2.3.3.tar.gz 573449 BLAKE2B c3bc0311a73a0c69060a4d19517c3b5d09077ee8efdcd6e7d605675111cb5ac568d1e43bf9c329d4fad21fd44fb50b20e502205360461533c68866d329c320db SHA512 2191c7e466271cb85fcb20fcd91c78df80f53030fb055d0b4670db33708939b60a9124955356f27662975abdcb9c8d144df884003986ffdbd801ca4e47edc21a
-EBUILD tpm2-abrmd-2.3.3.ebuild 1170 BLAKE2B 18af00b2e1596539fbc3f4d8e760129544a8912188df9319c6f8d53ea64f9a7f68dc3da265ca8c203cf61acdc0fa5115a99fd9aeb234497d78ba3137a26edda0 SHA512 20d7a6601a5e89f0921761d8b8341e7be729dd991a624ada4ff1ed2eddb36584fddf2560b6e8405872b6a9bdb2edb4e71f2cea794a2d939bd8f9486a1847a85e
+DIST tpm2-abrmd-2.4.0.tar.gz 575440 BLAKE2B 20c1fa772b016879adf28a67966450d64924bc1ac22b3111cf7376706335dc92fa8de97183d89c9d3ff5955dfb2a7617869469e9da61eb05847fd29b4a0208fd SHA512 c2ef05ca2db5a33d3067052779aa4c2485a63bd357d5fd90ef9d4644530b37aa28b906064eed3b15729131697a2a9d6b9cc3f05bea04810fd6601e405af48110
+EBUILD tpm2-abrmd-2.4.0.ebuild 1247 BLAKE2B bcdb64e32ca8c3574dd8965154456d156b280ca5b36ef421b7d774fbccca52967234bf2a9bcc6c21fe362773fc2c261ce3c03150ae894a260482895a8d6df058 SHA512 db9395c665dbc7b66c23f84609da325f39d3518c7b618a922a311c7e713105fb193fa2dab9ede08f3de2e1d76b7e6a6acb40033b02bf2f3731f21f9354dac321
 MISC metadata.xml 458 BLAKE2B 049bd6e5ef39abed2d063afe42162fbd7afa04776d9cae8d35c2704ed9ebcdd7ab575dd87350744d443211d6ed4a7a8f3a8d1a12abc4f0673d0c642d3b9412ff SHA512 c44d5ffb197cca46a7c06e1d7d74351590624a0ac62d2fd41e07c8f2dd51877a3770b7c047c4880f3bbea9ac4488a8045bf5aa364c8faf5e0c9bc030620702f7
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.3.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild
index 53562b771fdc..810e70d9967d 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.3.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,12 +17,16 @@ IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="acct-group/tss
-	 acct-user/tss
-	 sys-apps/dbus:=
-	 dev-libs/glib:=
-	 app-crypt/tpm2-tss:="
+	acct-user/tss
+	sys-apps/dbus
+	dev-libs/glib:=
+	app-crypt/tpm2-tss"
 DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
+	test? (
+		app-crypt/swtpm
+		>=app-crypt/tpm2-tss-3.0.0
+		dev-util/cmocka
+	)"
 BDEPEND="virtual/pkgconfig
 	dev-util/gdbus-codegen"
 
@@ -35,6 +39,7 @@ src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable test unit) \
+		$(use_enable test integration) \
 		--disable-defaultflags \
 		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
 		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 9320dd2e8f11..88d634d1704a 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -6,6 +6,6 @@ DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4f
 DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259
 DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 5bf24cf2c36e579388f62eea06ab3811eab1a89c0cd5d12f6f61cee7f6836487f25fefb864432ff8920931ff37327ca867d1d40fad89e0305d5e1edfb8f0e883 SHA512 54a926db55790250d69c81ac6e436556072057dd7c610d2718689030287dee69d533d4e04b3325dd73d9fc7635dad0bf0a7bfb082957bb51cb420efdb68efaf8
 EBUILD tpm2-tss-2.4.3.ebuild 1706 BLAKE2B 8093b404fa89ac49f22375f59b4f9e4f77e6f73fbb63841734f02413ce26d78c5f689630ee085419e3abb70e0b27d9bc341ca10ed329c5f0e676fdd65a760cbb SHA512 96e2af5daf4e0ad4ac2fa98afa35438383b56a61da704db591ffe502d35ae092c952674504d93758ddfdf7d39ee1bf91bd8a1b41f807188858a6314d6fc4a393
-EBUILD tpm2-tss-2.4.5.ebuild 1789 BLAKE2B e87e5282b9fffc2a2cc69ec2fe2911abea2ae8b2f339c8f15a1224c3dc747a2762d92ffd708ddc97b20c296ed9d61a7bdf94c60982a7eca8594abaac896b760d SHA512 b998791025a6a3ceff0a874b69bb3fa846462d19f99864a8abdef1915e7f8663ae183ea09c79e8c36f00e37f9d5513a6bb4cfbadb1ee0e4889534484ceafbdb6
+EBUILD tpm2-tss-2.4.5.ebuild 1793 BLAKE2B 3949a848ee2e85414281d45fb91e96148c3b83ea51a25169a5ea439d9b9fec8e46d4ea7eb216ef2d8d61bc49257c20b4979811302817a14d5b7744cd6de1e5ac SHA512 9fb185f0632ebe252c467b3a1c6c83968ae89d78651dea0b9eef75c10b27fb9f68188de0da018f87f30146b17e7eace67799a95685a9ac244fc73829eca6674a
 EBUILD tpm2-tss-3.0.3.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b
 MISC metadata.xml 792 BLAKE2B fe3f4ee796a06707683eb6fab993d34075a23267c4838bec5f063187c323b74e81e4e21c9e314be01d2a07853b7d2bbb0288b379c77053d6f6d2c99c372ba3a0 SHA512 7d1441a4bb5fbeb10fce0673f5b572edd4eef3be89184d2296e019b676cddd39d590da558ee3a83eba31cba56caf0eab6ec4b8bff9bed421660a5688ad38ae64
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
index 67d6b4fa14c7..97b37b3389e1 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index d875a0bdd169..96243ae4185f 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,8 +1,9 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
+AUX xca-2.1.2-bug-733000.patch 1027 BLAKE2B 2bdd30afcfd0f2bf49c2f259ae3f08ea2caba5efbbd19c931aaa3905dd9a4eb7c2937b7b7789a342ff5010a1ffb90abc0aaf6caa61e1ac13355c1d056a55e7ea SHA512 c9feddb9978fbcb2c146fd57ee056fc78904f59e98585a648e7e12b8238d8c499c6c3505731aff0a18b136352bd62d3464110985816f2d88bed77bcf34fa11fd
+AUX xca-2.3.0-bug-733000.patch 949 BLAKE2B 32444301ee1a3e4cd9e31e0911df6fbb99866b3d81ebb880ae46816c9939f8ccf6f3e13bb2052c6619e567f2beb34e903ba438ba6815bbcca03f0cd5a38e4bca SHA512 515e1d1333e722bc22750ef084e0c01056687b28e4b3e78695da2273be3e1e5cb7dc56c5dbf4fb5a6f46bc1835b44a7697d5548223fe9e93c3ad183f1c333d70
 DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07
-DIST xca-2.2.1.tar.gz 1339412 BLAKE2B 5d3e33a711919d85bc3457ddd596f2272f0136d96290aeb31e6d03ea86faff00be3590862e4c96d9214542db1bd536d0d22c6c04cd5071b253bbefe3ab3f4f56 SHA512 90eaf4a859779d57a4c0201dc403d67e005bd540145b9f543e13b8d5c42199f2ea05543de24b071d19a0db8e5b1e9f3bef2aea4bfe9f71f81007a5f5bb3ba406
 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
+EBUILD xca-2.1.2-r1.ebuild 1484 BLAKE2B 11e7c94703b86123a93b7fa7f76f76c8bff680f15307206aec81f00beb26f8eb159eb0ce11eb4064d6a96fcca8298aefb4fc9dd483c998af8f6d818e2836002e SHA512 6d1f1a34562bbd093d99812e5e663b09061d2e5f4619fcc372c0fd524db97651a65da2c48159913b05d580339ab4625e6d4646433645da00090fe42d85a481f5
 EBUILD xca-2.1.2.ebuild 1444 BLAKE2B b349a5611dfffcd352eb3382cc731059424a37c553c5a859eb32c27bce8de5375f96ba4537d2945d96cecd2b0603200f45f8139a512c36dd1e9ab83ff3e25a3d SHA512 a87593bd09dab9e2afb41340f6e8d4383ae68a1ba9f8d5d122246b09c148efb62e25719823409b34d3d48103d4dc45e4d0b66aa3f87390b45d8ab25f5f72cabb
-EBUILD xca-2.2.1.ebuild 1444 BLAKE2B d10ee7eb680077f40b7ba85a39c3f3d835171058d74d3b16f78f84caa588bebe2b7c7b1f483d5903f0d251349ec38fa03888eec6cc80626246375bb1926eaf9f SHA512 c6650b27b3fda7337e3a298eb84a9d0a2cb59e50f9ebcae6f8d08f582f10edccec400bf71cb842a1a4a93a8d7fbb9febd77ced3749480dcd25feb769fe37007b
-EBUILD xca-2.3.0.ebuild 1511 BLAKE2B d1b2054d3a81c62aaa718faaae9f0109fd277f4387691f364b1f9d2dfd501508394aec536b905d4ee99e04ca61ba001593ac50cea9a202a80d0677e85ad990bc SHA512 9f89e3e30481472796403ac8567b87ba4203828d24cc1b329e426cd7e79f3a61c2a5888d75faf71830c758130f47f59afd313dad9df9370a4e38458dfb322601
+EBUILD xca-2.3.0.ebuild 1548 BLAKE2B dcbbccbb3bf824f1024d914fc4f7af8cdb15e34a4da9c6044a159d9a4295bcd0e2f0257380aef995a782b5440171b80aebc9e6414579ca67b2e5e352474bd526 SHA512 d897a1ec8fb0904032b3de376b8b6fb5061e5eb6f5d0df90751d80c06b9e316a8d2c4b8b6a1ca3e02e291afc463bb2c263623c816e488a239b4eb1d631486f81
 MISC metadata.xml 350 BLAKE2B 825e045b03a40c1b9a3c5af631d1748532ad4c84e83d0efd1d4866c5cc1284afab67f1e3e00a2c31a376a19d4e4608404a5830ab1a8a738079a3b6128f5c9bad SHA512 fd4e95bcd679b22bdfa620896e81e0a63bc6f084c60bf42caa853f9dcef2c797ff640801f206caceb6969ee4e347492200b37af4920c50c9764a3bac48910cf3
diff --git a/app-crypt/xca/files/xca-2.1.2-bug-733000.patch b/app-crypt/xca/files/xca-2.1.2-bug-733000.patch
new file mode 100644
index 000000000000..3e17a8aa9a91
--- /dev/null
+++ b/app-crypt/xca/files/xca-2.1.2-bug-733000.patch
@@ -0,0 +1,31 @@
+diff --git a/doc/Makefile b/doc/Makefile
+index 7c9a643..f88c209 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -3,15 +3,11 @@ TOPDIR=..
+ BUILD=..
+ endif
+ 
+-DELFILES=xca*.html xca.1.gz changelog.html database_schema.html
++DELFILES=xca*.html changelog.html database_schema.html
+ 
+-doc: xca.1.gz xca.html changelog.html database_schema.html
++doc: xca.1 xca.html changelog.html database_schema.html
+ include $(TOPDIR)/Rules.mak
+ 
+-%.1.gz: %.1
+-	@$(PRINT) "  MAN    [$(BASENAME)] $@"
+-	gzip -9 <$^ >$@
+-
+ xca.html: xca.sgml
+ 	rm -f xca*.html
+ 	echo 'The documentation for XCA can be viewed online at: <a href="http://hohnstaedt.de/documentation">http://hohnstaedt.de/documentation</a>.' > $@
+@@ -23,7 +19,7 @@ install: $(doc)
+ 	$(ENABLE_DOC)install -m 755 -d $(destdir)$(htmldir)
+ 	$(ENABLE_DOC)install -m 644 xca*.html $(destdir)$(htmldir)
+ 	install -m 755 -d $(destdir)$(mandir)/man1
+-	install -m 644 *.1.gz $(destdir)/$(mandir)/man1
++	install -m 644 *.1 $(destdir)/$(mandir)/man1
+ 
+ app: xca.html
+ 	mkdir -p $(APPDIR)/Resources
diff --git a/app-crypt/xca/files/xca-2.3.0-bug-733000.patch b/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
new file mode 100644
index 000000000000..044575475c89
--- /dev/null
+++ b/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
@@ -0,0 +1,28 @@
+diff --git a/doc/Makefile b/doc/Makefile
+index d481c5a..dc5b49a 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -5,13 +5,9 @@ endif
+ 
+ DELFILES=xca*.html xca.1.gz changelog.html database_schema.html
+ 
+-doc: xca.1.gz xca.html changelog.html database_schema.html
++doc: xca.1 xca.html changelog.html database_schema.html
+ include $(TOPDIR)/Rules.mak
+ 
+-%.1.gz: %.1
+-	@$(PRINT) "  MAN    [$(BASENAME)] $@"
+-	gzip -9 <$^ >$@
+-
+ xca.html: xca.sgml
+ 	rm -f xca*.html
+ 	echo 'The documentation for XCA can be viewed online at: <a href="http://hohnstaedt.de/documentation">http://hohnstaedt.de/documentation</a>.' > $@
+@@ -23,7 +19,7 @@ install: $(doc)
+ 	$(ENABLE_DOC)install -m 755 -d $(DESTDIR)$(htmldir)
+ 	$(ENABLE_DOC)install -m 644 xca*.html $(DESTDIR)$(htmldir)
+ 	install -m 755 -d $(DESTDIR)$(mandir)/man1
+-	install -m 644 *.1.gz $(DESTDIR)/$(mandir)/man1
++	install -m 644 *.1 $(DESTDIR)/$(mandir)/man1
+ 
+ app: xca.html
+ 	mkdir -p $(APPDIR)/Resources
diff --git a/app-crypt/xca/xca-2.2.1.ebuild b/app-crypt/xca/xca-2.1.2-r1.ebuild
index 321c828980ab..28e0f2da477f 100644
--- a/app-crypt/xca/xca-2.2.1.ebuild
+++ b/app-crypt/xca/xca-2.1.2-r1.ebuild
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+	"${FILESDIR}/${P}-bug-733000.patch"
 )
 
 src_configure() {
@@ -50,7 +51,7 @@ src_install() {
 	doins misc/*.txt
 
 	ewarn "Make a backup copy of your database!"
-	ewarn "Version 2 completely changes the database format to SQL(ite)"
+	ewarn "This version 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."
 }
 
diff --git a/app-crypt/xca/xca-2.3.0.ebuild b/app-crypt/xca/xca-2.3.0.ebuild
index c13f1050b141..c7ef3f20b62d 100644
--- a/app-crypt/xca/xca-2.3.0.ebuild
+++ b/app-crypt/xca/xca-2.3.0.ebuild
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+	"${FILESDIR}/${P}-bug-733000.patch"
 )
 
 src_configure() {
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 52a08f051336..bb4544f04608 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.4.tar.gz 13318769 BLAKE2B 4ca85d8f9681f725cf9f8d547d850516c77a618c595814c8add12250677e495952229c966a2e59d449dfa33ac9c6788f6daa8494702137eab937b299f896e8dd SHA512 9e3e85a22d7be4e6ab30b3fd068fcc3406348d2b38f96e1ef8d693bf37edafaf8f16dc408cc9319173e871cc24d2cc4db5853ec3f8a0365221722504dc6fde04
 DIST yubikey-manager-qt-1.1.5.tar.gz 16066508 BLAKE2B cd15950c68cacc3e2904a5e1fbb3a2d98544084717f379202ccfe70082b0971959178730afb9ddbbfa20f436ef8d7cdf820df1e88539f99ce77913f60228af0f SHA512 b019a7cdebd741cd536a18670795f83c7e010e221b4f9c82dcd3c57b0c4bce878865c6605f10c962f4bd5e926c285a894ea97d2925ba091847ece5ffa7ce5bb6
-EBUILD yubikey-manager-qt-1.1.4-r2.ebuild 1482 BLAKE2B 4b33e06b32816465ff2841610bbdd43fd4f5339ee17ecd3c4d3a4733aaaa339027e1ef455ac9696ee8d812202a813e0e089de1caa1ee56051bb659525d96a04b SHA512 b349eda4858d6494617f4b8d8b115136967184f9d20da283e017ebf0e830a5fde2d2df603a88e074acde26f256972f5be6255b795c1272bc8edb6feafae3f163
 EBUILD yubikey-manager-qt-1.1.5.ebuild 1489 BLAKE2B cbdc19ea06672e4eb5d6905fa93dcb10f22161f44091c032382173780e4dad9ce5ed8f39a6e68f325a5f0873b4ceba7da410ba2c0a02f13d76e0a1a249494b41 SHA512 3b6f3d43f3f938f2cd12526a66db850e2f14e76b9cbcf0835cc02cfbd50481cc41d0d3eccbab279c0cd3ae66c962115ee759c36a3282fdad08c8b644521db9db
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4-r2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4-r2.ebuild
deleted file mode 100644
index 85569c2e16c2..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit eutils 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_MULTI_USEDEP}]
-		<app-crypt/yubikey-manager-4.0.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_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}"
-
-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
-}