gentoo new year resync : 01.01.2021

44 files changed, 64 insertions, 236 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 5977686d8bd0..e1e9c6b324bf 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index eab0ec5198c7..76e8df64ed45 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -6,7 +6,7 @@ DIST easy-rsa-3.0.7.tar.gz 3863830 BLAKE2B e76db344912296d4659ae61e094595a0ebb30
 DIST easy-rsa-3.0.8.tar.gz 3864366 BLAKE2B 8bbb16a8885a2141c59f590882002f5e4fa5c52c77130ac56b7ee5b1817a6c3acdecac2d8db4f4f4bce39f62b469afaf60b5d56f46c1ea9472afe36a5fb7a818 SHA512 db23262ba2cd1b7fec17340ebe11504741baff23098ea9b4b1118077abf8ff3091b1299f9624a6dd788b2e1c169d9820ba41d11b091949f3f6c96ee8e0509231
 EBUILD easy-rsa-3.0.4.ebuild 818 BLAKE2B 842533554129c0442ae6c872e279ad762d381d1805ec3d61d91cfd0f957f4db49f5a066e4e9cab35101e88f00be3901911f247282e129417ec6c880b6674c489 SHA512 599e7a6088cf2d3e7daaa528aac0fcae6b3a797a9076caff7795848198c046470f13c1c31dd3f5a5f5d7e91e52781a28fcb4bc92c6426c0899b55d1b567a7f5d
 EBUILD easy-rsa-3.0.5.ebuild 792 BLAKE2B c1afdd8045bc6cfe7a467ca042d9475928451218114c379ac8b2518c2e1e0646ffb7187faaf0c9b4de66b4fbd7f6986762f43861ed2c36397882c6058529c524 SHA512 7a79c86e97c0ca33e23527fccbf307af79ce60f36b535ef8edd252f4b817f05307a5856ee7632c73281bdffb3a077b4feaeb3217f4f93c245000ad973cfa900f
-EBUILD easy-rsa-3.0.6.ebuild 791 BLAKE2B d68b6a13c50c4361cf91388dfb7bc2afaad68299d685deb092375b0dd56e9b0d5b6a722e752c66dc3fd50efbcba4fe2c0f2280ad5ee27b86dd71ac3f495ac7c4 SHA512 5910378725f1f1c9a89093497a30de627cfbbc15f78a7de339c8c57f15f44f8b3123839182b3d4877fbb28fd0ea97eec7532ea12751b909b8ee6de8d1484cd8b
-EBUILD easy-rsa-3.0.7.ebuild 791 BLAKE2B d68b6a13c50c4361cf91388dfb7bc2afaad68299d685deb092375b0dd56e9b0d5b6a722e752c66dc3fd50efbcba4fe2c0f2280ad5ee27b86dd71ac3f495ac7c4 SHA512 5910378725f1f1c9a89093497a30de627cfbbc15f78a7de339c8c57f15f44f8b3123839182b3d4877fbb28fd0ea97eec7532ea12751b909b8ee6de8d1484cd8b
+EBUILD easy-rsa-3.0.6.ebuild 792 BLAKE2B ea919f22e17844da40de89c2fb0d7ac019b2ade879ba1e98c2a21654db09c907c8820506d120ce1320cf73a0a3e5907cc870626846dd78e8722873047652100e SHA512 409f63bc92450e2f7645d9536729b8e0e6d70b03c6d2fa47ebcf1256abf0cd5bf82aa8b44972c2ee26395f99f783a3b1ef694a651505e7ad5562f3f9cdf3869b
+EBUILD easy-rsa-3.0.7.ebuild 792 BLAKE2B ea919f22e17844da40de89c2fb0d7ac019b2ade879ba1e98c2a21654db09c907c8820506d120ce1320cf73a0a3e5907cc870626846dd78e8722873047652100e SHA512 409f63bc92450e2f7645d9536729b8e0e6d70b03c6d2fa47ebcf1256abf0cd5bf82aa8b44972c2ee26395f99f783a3b1ef694a651505e7ad5562f3f9cdf3869b
 EBUILD easy-rsa-3.0.8.ebuild 799 BLAKE2B 66ffdfb46e299d5c192e83ad39bbf80c0370a225bb853bedbb494151a976efa1e3482ce527777cd63b391eb07521c659ab25f5892ed655a60b1bb0a3256bbced SHA512 1e1ff3516be3c69011ec66e7a1a27f067a78636a4a292f40b828568db96db8e550ec1b2ca58fec2e26d2bff77130969557886046fae87edd169080f30ea4b0a3
 MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
index c506a0e1a230..65cade88a186 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libressl"
 
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
index c506a0e1a230..65cade88a186 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libressl"
 
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index 785859b54543..a9826586f039 100644
--- a/app-crypt/gentoo-keys/Manifest
+++ b/app-crypt/gentoo-keys/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-keys-201901130136.tar.xz 57124 BLAKE2B 93963930743ec3b6497b90de7080c5796af90601b311a0ad1d0049f945ae63e384526c3858bb1b209e2ddcf26a862f6ea3b474fc69ed4a22f1ec5c2be4ae952f SHA512 2c87a85d2c5e2c51af8f64183a0cc4d372dd84af9aa3d7e92ae0d9dc804c5109c0c7121419503213eba3fcb8f7fa81ccaf0550418991f8d6b4b43560e02f777b
-EBUILD gentoo-keys-201901130136.ebuild 550 BLAKE2B e25eef3da6f77936f24927569a5a2a4b4e992a738acdcbc719b8ffa95434b5e74611fb5c3c4b4ff08995eb5828f969de5d3808bb4367a061dbef2376b47d29db SHA512 6df025d1af65509e7e2227923b69f9f7a536d74dc564a080dd5261c066187b743fdaed660c6eddce4dcd55957f74975a4d9f115a4b591b0ce37071edc7450a78
+EBUILD gentoo-keys-201901130136.ebuild 551 BLAKE2B d31ef04d7890cbe24e493005e2b117a6cac1db7fc38a3e3fe979771b04f52fda14f77d47ec1a7e1786ebc405b4a2d953d7e2f79515dfc24ec34eca4c2cca5de8 SHA512 a387b710e2a2f3bd2a1a1f1e1724a2065a0821b66b71dc02a067a58adecaea42bd75fd1166e73042a22770401520676ac37b1259721d69362e0889d4e3e8e820
 MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
index 8b7661e76d87..cbadedf42bac 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux"
 
 S="${WORKDIR}"
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 8dd4d627051d..8422d19df8a5 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -4,7 +4,7 @@ DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62
 DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
 DIST gnupg-2.2.25.tar.bz2 7195857 BLAKE2B c930edf9259a0e1c508af8d76a86f979860adfe2c525020b37d3741679200f96483f0ad8bc1f72e2dbf7fe77696cd04d4272a2ee23e4c4abe1ed6ba88b95f365 SHA512 ab1d7cc9d8be3e7189bc4bea431b9d5db313cbd1739823950f32fbb611b2f4374889f444efbf43ce1fbf498b9865d7e6e953cd4c86d58fd688f63923c434ea2c
 DIST gnupg-2.2.26.tar.bz2 7189254 BLAKE2B f51dd18f6fe327573769d1581ab49bfbca6a56973f6115a68d11e79f52f4b9bdd717ff027800cd1d52fca56abcffa80ee025b49a6af3914f60decdad1e1585ba SHA512 5e9482e126c32c836064b125a18b109f0d3c96892474d3fb47dd791350cccefc56f9a5dfbd54504716487a93d9f71de2493bdfef92e29964b5bfe28b0053c265
-EBUILD gnupg-2.2.20-r2.ebuild 5003 BLAKE2B 31faf0cf6a54040f50e08d0cce7d731af5dfc51f172b8db43157f226a9c8aab4e0397f446495aa5c7f603f92749c6f5ce0631047818b777a7a3dae2945a1586f SHA512 66cc2620e242ce5541ec8251b486f1c4bc4496474e19fe23867be64a3f38d333c882bccb134a99dd0e893b318d93bbf908277f8cd9e64e51ac7ca12f2c858247
-EBUILD gnupg-2.2.25.ebuild 5321 BLAKE2B df6dddadc18c0db45bb1e1870b826797e6464dd900d12aa38863bba2c72ba0df3384817e1d55f6f3bbc1c48fb09d6523c5be085cb6a0ba68762af3d82416de49 SHA512 98d0de26ef5ea20d0e7c6c0ee385e3130da8ab8ddf1db82e2ed513c299fc3bed3e7ec7230760744ff79e852d1f8197cc3575ce10b1f1d91fb271903719944937
-EBUILD gnupg-2.2.26.ebuild 5196 BLAKE2B b933b933f1f48678723c02898940aa7dc3f34cf0bce9ce6ff13e4174774f8de0d4c6ff247da7f526cffabe90ddfa2ae569523a4259fd3b597661b8c81f554ddb SHA512 233bcd94003424f9fa778248bea06f318000de1a60201ccae0e06046b04113886d40abc21dab5fa5a2b523e79ba720feee120a3c77fb95cb93bb5b7282e514fc
+EBUILD gnupg-2.2.20-r2.ebuild 4977 BLAKE2B 05485cfd7f5e7ade790b5364e777059fa29b44cb13c49268962b7ec9266cc6b98507451ee2a002899c1de7caef9ecbec22443997a8afe34cc1e08f010899b1bd SHA512 a857f8acfa6960d1884e4a9f354e169875b2d5f3304b6716b995814b17acea2206fa80d987c80750c7c9169ddbf1f877f68b5fc0183140aac241264c2b043f6f
+EBUILD gnupg-2.2.25.ebuild 5295 BLAKE2B c28c7545f52ba5d51f0387e4621768ece8cd3673ce2e43637c8b3e78ac2cb6803d37d30caa94b1b640191e139d56f216d5d52d6d6c7db35285311c1ff0c3a42a SHA512 2b598d92c6e43286d94e175c0ddc5a66d3ff837c623c7e82eb0acc214c6f1207fafc30e2af6609f77e0aad4c8130d5b73bed1718aaa6e14d0411e332d8c9a1ae
+EBUILD gnupg-2.2.26.ebuild 5187 BLAKE2B 92429b712e519b1b70dc28462ee187c917a0ce066038c77a71f8dd2905460a246ebf9be282c864e482731c71fb39c982f4c764939528fe18dc6ee532b42058c3 SHA512 836712ecdfbfa08ed563734fb1f790261f1824efc361292ca8d462d3b708f784e2875a77dca4542e952cfb7261831c6e09e5b07b3efd879a87b3bd544d1eacdd
 MISC metadata.xml 1379 BLAKE2B e51735e46f2b9ade13d8aa53c1354b1285904933c260efef8e0d6d66e7b8a36199f33ab48cc98006e75e566a21422883dc3694d91e1dcbf1e7c413ba7dab557f SHA512 cd71918f048d081e7a223b9b09b0089b3e015aef674ef233c2aff43e1325ac61a3bd2bfa828071dd157fea0f5ec76ee719ccd339cf94539e3702d48ba6ecd5d4
diff --git a/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
index 8fdea955e0be..f803fc146a9d 100644
--- a/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-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.
@@ -74,7 +74,7 @@ src_configure() {
 		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
 	fi
 
-	if use elibc_SunOS || use elibc_AIX; then
+	if use elibc_SunOS; then
 		myconf+=( --disable-symcryptrun )
 	else
 		myconf+=( --enable-symcryptrun )
diff --git a/app-crypt/gnupg/gnupg-2.2.25.ebuild b/app-crypt/gnupg/gnupg-2.2.25.ebuild
index 919565475201..142bda909b5d 100644
--- a/app-crypt/gnupg/gnupg-2.2.25.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.25.ebuild
@@ -14,7 +14,7 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-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.
@@ -104,7 +104,7 @@ src_configure() {
 		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
 	fi
 
-	if use elibc_SunOS || use elibc_AIX; then
+	if use elibc_SunOS; then
 		myconf+=( --disable-symcryptrun )
 	else
 		myconf+=( --enable-symcryptrun )
diff --git a/app-crypt/gnupg/gnupg-2.2.26.ebuild b/app-crypt/gnupg/gnupg-2.2.26.ebuild
index 4f4f9118835a..ba1dc86689af 100644
--- a/app-crypt/gnupg/gnupg-2.2.26.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.26.ebuild
@@ -14,7 +14,7 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-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.
diff --git a/app-crypt/gpg-ringmgr/Manifest b/app-crypt/gpg-ringmgr/Manifest
index 2a8f321e0b88..a9a808980ffe 100644
--- a/app-crypt/gpg-ringmgr/Manifest
+++ b/app-crypt/gpg-ringmgr/Manifest
@@ -1,3 +1,3 @@
 DIST gpg-ringmgr-1.12 9378 BLAKE2B 673b1f6719dda0019c599a8ebc1d38e748c7749f07c8145f48dfff81515574080eec0b208868f89aa9f32b225d6efa4205e60a6298bda8151eb4a7d6cfb86df0 SHA512 f6aedf0db58c15163f6f08b37a5fef43a80655f5602d8ee856764177a33e2f5eb4c0b8a09e9f3ee5b36544039051909d48397be5793243eba5002526652dd194
-EBUILD gpg-ringmgr-1.12-r1.ebuild 625 BLAKE2B 548f255f742a2aa2428c9d3f9689c59f35c24aa5e247aec96dd04d9769b896075dd2888f4a9406e27b86e080dc530f7d64a3a21dd091c39d71a95efe0cd8e8fa SHA512 7d5a00a831ee4927a0aa5f7e502f7f652e75c3dd1baf8d00140d2fa81af5ebf0ccdd3e539c80badf052ae6de9c91165e5f706ec147a02e868bf7eb85e9f6b765
+EBUILD gpg-ringmgr-1.12-r1.ebuild 626 BLAKE2B 7564864f521dfe14e2fa9414ec9177bbe12affc4d62726b5f3607eb5e329b36a51ca4f6f81eb5a480e46790e7c24afc8d65999ff0bdbb08ae20e7e1436a1bdc9 SHA512 40d725cada0ce51789af31d7ba994b66ec4910da907996603be1ca5100f5bfbfa37297e075842f8e7e8e0afae830b77ca14bfdc9874e012e4d080f9633ca0625
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
index ab7ee800973b..68a9440d45c2 100644
--- a/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
+++ b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${PN} -> ${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-crypt/hashalot/Manifest b/app-crypt/hashalot/Manifest
index 8b4c9f827a05..186e62c27c2c 100644
--- a/app-crypt/hashalot/Manifest
+++ b/app-crypt/hashalot/Manifest
@@ -1,3 +1,3 @@
 DIST hashalot-0.3.tar.gz 80284 BLAKE2B 1ec902f917a1e3e5babb24ea8763360fff8d41ab0baa6fac8053313c2115bc03187fb805f6ae6c013eb7a4f8eb4111bc781d5ac04c275fdba87658f0346aa8fd SHA512 c9ee39cefce5cc73b9a3a67b240616db9b66cde94fa351e6ebd4d13fd0f9195de9021c07d223809107e50b0a091d0d55e4caf2f71bba93f6d0da86af10632145
-EBUILD hashalot-0.3-r2.ebuild 388 BLAKE2B 36b1da313fc7321b6783439c0e5b44e92970eda3e984a08d8259770f87561f506c057963724c1f6a0bd264a3aa00216f8a90a4c098a2b9e3e0fb59e8dd35ddd7 SHA512 2df1ff180866e8940ea45906c55b1ae69dea4c14592e4727589af6457add24fb04b4945aa9e19fab7f7891b983f0682959158c06beabd7326c426f1dd5d89cf1
+EBUILD hashalot-0.3-r2.ebuild 389 BLAKE2B ab11a9b6355761c2049324a7fe306f364fa5a879f6a8dcd34b8d2d284498fd283fbc1afaec9a964b978abd2590e093e120a9ec042a26f085a88b596a56091504 SHA512 35b83a76963ec216dac542a19cbe00bd05b767e807eba67666f6be0bf2bf4c1cb2286e6a301f2676a438bc860511e4f50277f7855d1f3ad702897e1b8b9c81ff
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-crypt/hashalot/hashalot-0.3-r2.ebuild b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
index dc6b1d37b001..765bf733551b 100644
--- a/app-crypt/hashalot/hashalot-0.3-r2.ebuild
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://www.paranoiacs.org/~sluskyb/hacks/hashalot/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 6eee7d6a8882..56f3533ea6f3 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -14,6 +14,6 @@ AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.6.0.ebuild 4515 BLAKE2B 2e703f6d2c54621ac5f630759ed7d58a2f37f2a27a0398bbdde4b18004c9036ff439a0c590324269577f0b62f171b5a11d4ccdab28990b8cabb39a178960725a SHA512 762ae8f768791a57a4896d60ab568a89ca27d7ea48e78ad8a2ff04f289cb1c9f283e735ca4c975db64037bc481e2aebbe8093a24fe000b3f8388ded882017b2c
-EBUILD heimdal-7.7.0-r1.ebuild 4516 BLAKE2B f4ea159e8a1fe01aa1a759e0f3744d6f5694c5f02bc8fb31374ace7f8772d1468725fa02a855d66482fb82e72210494ba7e135c9752a4de2130f87224af388ef SHA512 484fc65e63c1d6698e46beaf02fb8e5a102491523930385b3d113a216c5bf44912f76e99081dff3b00baa7aec6857beca5d3b25116ec2c88a13277d47ab9e580
+EBUILD heimdal-7.6.0.ebuild 4516 BLAKE2B 80a8c18e0e5d93010956cb12ab97439515d70d2b872823fcc3025f8bae14ace57a5c6a58b12456e8b2d3bc193c4248751bcbfef24d01e593ab6a15ee97167ffb SHA512 9748d83779ff348640a87045f4aafdae19566ac734b67d93cb3ac01b5fc28c4d3d777c8f5ff2f1617ddf3b7bbae0d50955f01c5568358534956f77d3a0e903c4
+EBUILD heimdal-7.7.0-r1.ebuild 4514 BLAKE2B e2ed5e52756bb4fc98669c67ac4ef87685724a29825a62beaacbf889045d017a1375737701b2164f38168b1fbbf6bb4be8fb8780cd6559841c9e2ff845c6fa2f SHA512 fd68802c2328ed2e87b283a3558e37ac1c1c82918d1409e052954d2da5716deb7f3730962468edd2ff8d5bef03b58fbe6b3392a3555c9b4d89584de7a3301c71
 MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index c29a63646f0a..9a0046830b6e 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index ad0fc3116a22..52af32a12e6b 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap libressl +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 59947960aca9..a02426983dbd 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.ebuild 3206 BLAKE2B 0dcdb1ce7ba47f88ec3bc426f4f34adec68a9b26b5adb81fb87c88ecc4957305f553b06b8b46b6094de147b699ccb1fab79f74fdf99cadfc3c0e7dcf1fd51bc4 SHA512 af4df33b332afd0e72ae6cb77a41152802d4fb8453fed4676bcdc1cbb8a8d75aca44fa64a928a8c1f5dc4b976478c46b94e53cc537f3136bfad139b3583ffbaf
+EBUILD johntheripper-1.8.0.ebuild 3207 BLAKE2B bcd98a80243246655b8421edf5bd47b83257a8f71d6cb07a6a044c93bc1736376f7066480f8c66958bd8ca7132740379090844220ff5eca97e8e6d6b60318ad9 SHA512 25c324d29e0b7c547115b042de3891b77b222938d393dc85f3c68571a196e08e2ef6636c69016712de872e16f7b98893904bd46d5c5dc89a234ea25aa51ef4ff
 MISC metadata.xml 408 BLAKE2B 061c3b13a1528247c36a3c97dda9b4eb044a06abb953180723a83b7c069e6b40decac9e12605a17d9a6ed4d896ada27acbf8d2c42044872e64efa4cb895b609d SHA512 cb3df73a8466c79899cc1a8c2ed2431a84300fe09dd2a930c958c9d1fd68004191f2384722fe8a96ccca305be50143170b2722c672ec807971c9265064ca0d35
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 80b376662452..aa12fcaa1a5d 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index 3891df131ab4..3fc4e4342d86 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -7,5 +7,5 @@ AUX mhash-0.9.9.9-alignment.patch 579 BLAKE2B 2865e4d035a145f84de68730fb86929e33
 AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6eb922e3c9956081505066a01ac64a3cceb8d5eaf802a125168f2f6c5d7c3d2a0e18cb6913a33a66d66edfe1e1336edf3bca173 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454
 AUX mhash-0.9.9.9-remove_premature_free.patch 464 BLAKE2B 89569b1addc287dc6ccce15142ca2d7f228b78ff0fa3412482dbe1aa98e3dd20c1e6e360934018cdf605330b9c0480989bf898ff110d9a9236fbe3ae63e4e226 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1421 BLAKE2B f31786522a2ed7df411312a7beaca704fa0a24f36ca720e6a32c7a9991628bd62aaea4ae500f60040ebf50b34867289cef46dffbd3d61ec3a45dc1040c4bee7c SHA512 91b82ec7b584d7eb440fe024a8b5a73933765aac3fef6ed07166510819434e18369522a8c9e7b4ddd430b81e07b65e006690fbe9ad7f37234db6b89b65f84311
+EBUILD mhash-0.9.9.9-r2.ebuild 1413 BLAKE2B eb9e28079c63199ffbe39989771029e87ef50285cd751b0622e69f097c923c8d7bc705ea398affa48ab33c74051f3f48b9b19e2318fadc39ab53f0593b19c2a8 SHA512 00a2587dd4d163d6aacca4038788574cbc6ed9e8e26f82a84a7d6e5c2cd311eed64cea3950b3e29b73523e39112233b3089304f07874899b517a8f5fac4d4d99
 MISC metadata.xml 240 BLAKE2B 930f7f4d63cd589f337e5fb82f0fd568e7b12917c1fbb663af43acb523311b683b7bd3e144af0673749143a5d7fa86f57e8bed96f87c32e054c28ae6bf8d768f SHA512 46b4040c549d189f732ec0752339b86521d8351f8d5529f272050722cb466e161772e5fd05db097e29a528786150aea5d78d80232d84cbf99521f4ff697d7a4a
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index f65cb7282db5..649d9885c142 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl" # pod2html
diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
index a072caa98e89..ec16c092e21d 100644
--- a/app-crypt/mit-krb5-appl/Manifest
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -1,5 +1,5 @@
 AUX mit-krb5-appl-sig_t.patch 1411 BLAKE2B c2a34ada3f811459d006c1be6e79cb0811b0ab6ef7a1eb2fa6372db5b52b7db06e1cb94d7cbcd9b883fa14d9e0cf704ebfde7a441e7348728be9511ff2b6dae5 SHA512 a25ca113d8cae969ef370aa28b274dc4573964eb78e340a86ff4e3b130c6f7a73c97a41e657a5fabb634604a3bfb8f5a04c8925a248a8f9e45a22979fd8395f3
 AUX mit-krb5-appl-tinfo.patch 579 BLAKE2B 8db4885b88e2eb155ea80ce8d4e7f320ae39a9183e70de452081a452c51ba9ae3dfad4ea000582b3f3f361e17de02b0720cd794473c974c5551b69afde869445 SHA512 3b90b4f9539b94ddc8a0483dc156f61d33b436a01d32d8e66de13a82e653ec51c7996e3e5b4f5d8e1edf6a21d6c4fe09f4a4382e2f918edff070e71bfcee0951
 DIST krb5-appl-1.0.3-signed.tar 634880 BLAKE2B 0341ce0f3845bbf49ac2c43dea95d1bf196a9e6fb07a1bb4e8d1eac9ef74765f4b02b7f6e2794cf55ce6c7a7e2623bd325457dcb60f94b7e30bdc65a370751ad SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
-EBUILD mit-krb5-appl-1.0.3.ebuild 1635 BLAKE2B 192ab9ee291f87518bfecb86a565636470e0a7c3112da5327f9c8654e67d51b695d7e0b1dd9659f4bf90f3eec9d07ca90d50d57929575f504ad06754579fe19a SHA512 865cb3867f641a6bb1cd8a1e9afedf786a788241f6f93676f68822b20b4f57c6312684005ff85ad3a374920f787c49968df78ba8b297fd4f777b8822cb430eed
+EBUILD mit-krb5-appl-1.0.3.ebuild 1636 BLAKE2B c6a456349986849b75890b03361b8c02c5330a28bb2f73c41142680f89d17e205723788cfbb581615140cb8b4727fbd7926f918698fd081567adce406cce2c7a SHA512 7fa18a7de8759ac38e7bf77c34f1f96187acce8b3bc0e97ee115908d15052117a0cdf9c63c39575c47ea38bdb9933358278b711d9318c59925f5e9c66753d1bf
 MISC metadata.xml 240 BLAKE2B 3a20174df7c37c40098c716b97f64079f86d511e3740e43865ba8e1b1fe52de971091ee51a510543cb2a49373cff87e790f71fe397975f61eee2b308b0729e66 SHA512 57354970f719cd4e3a27f6024addadbb81919a5eaaefef094d3d2b362c44b5ab5cec740090ffce89730cc52f469bc93957c129865a71a4583e0309a93e6f970d
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
index 6493b2d6f54e..cda72695ac4a 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="openafs-krb5-a BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND=">=app-crypt/mit-krb5-1.8.0
diff --git a/app-crypt/openpgp-keys-linuxcontainers/Manifest b/app-crypt/openpgp-keys-linuxcontainers/Manifest
index f74c0e742825..b4fd269551cf 100644
--- a/app-crypt/openpgp-keys-linuxcontainers/Manifest
+++ b/app-crypt/openpgp-keys-linuxcontainers/Manifest
@@ -1,4 +1,4 @@
 DIST 64792D67.asc 91149 BLAKE2B 06c03b71dfd6242d8b33c4a2eeac02099a0a5139aa9fc7d82e2fae0dc78473b683bd5aa89ac4289576bb05d45dbb183007d7b488bf1c4cfaff4e307f75198af8 SHA512 838d18d84f3dd1199c5f811beedd083d2b704a99c5647dee543386f9c8cb05eadac3f987247aa11db240e5cd285dc2ef5c6f708a16f36abab41debf2a442b73b
 DIST FEA93624.asc 62695 BLAKE2B 93aee7b0a6a0eedc5c0695c5389122b4daed62a5c1c875815a798d844c89f82485362ff157a82c29a6b252956734ba88b55482376fe19a9ef8875cdd964fcdde SHA512 1b7f48fd145243773a0523e7b6d3f834377c299c06a2675da308d1b78b36c48a09277ec438b92bb55ca579dfb923f01f08df7471a7155532cbd60415f4db0430
-EBUILD openpgp-keys-linuxcontainers-20201014.ebuild 724 BLAKE2B 2495f462670599133879c09dabb68ed5aa3af8e57fdd4d4a030abd2837ef23120f4475da30b8fd370c8d004f345f5e1790d872abf04f093745dbf5d9a1febf18 SHA512 844cbe3db94495c4016d6e3d49357762ee38ad22b5fa81509ab658fcaeaa1a5d46da0091c4b6e1fc385889b0cb8133b4a75513c18cf2b2e819f577c6745faeb2
+EBUILD openpgp-keys-linuxcontainers-20201014.ebuild 725 BLAKE2B 364b07895e52f4078becaec690e9357e8b3587fb6df7acc3a13a4f409cfabb85f2f4b04656ec6f0cc608d3896f7ea8a5d409eb4383fac11722bac3fcf981b7ea SHA512 13617a215bbd78addf1588af54ddacbcbcfc01d0007c0cf457d4f9ce870ed44420b4a5ae6771694a32b46a1b02f534c5728704d8561abe5b074ac1f905822e5d
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild b/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild
index f34777f8ad63..c9e6d6f18da6 100644
--- a/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild
+++ b/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x4880b8c9bd0e510
 
 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/openpgp-keys-voikko/Manifest b/app-crypt/openpgp-keys-voikko/Manifest
index f3d691476c70..f5b7f2247190 100644
--- a/app-crypt/openpgp-keys-voikko/Manifest
+++ b/app-crypt/openpgp-keys-voikko/Manifest
@@ -1,3 +1,3 @@
 DIST 4AE3942E.asc.html 5476 BLAKE2B 22b3acf6d4360b1686890596e7c8de2a3a38e739aa0ea4ae7fa7e09295127c7196f5af5750bd30d5260365206e08397e3bda970a4b7cdfb2d0827f80f2810758 SHA512 025bafbfe98e2437a3919f4651e7583a5fccd60ff110904189969ce5fe1770ed4222c60a530065b7720a0e233d1a138b55cd7df4c8f28337b9e953547434429c
-EBUILD openpgp-keys-voikko-20201013.ebuild 636 BLAKE2B 75730a6ad9788b46c73ab33a406d09f148be98b3d80cffd89e0ddfadedbe5ccd1e7e02083351ce4fcf6c10f41aed2f911ad8dcac890b3f0a5df372e456240538 SHA512 1586c99910475426dc12a022e0499272d11dfed50c5ba81ebc82fac2ce55e7070ae685c4f719394a50d34e4f9605644795782afa0199af02ab91f8c5d9eb6475
+EBUILD openpgp-keys-voikko-20201013.ebuild 637 BLAKE2B 88d2d478effe108204319ad508fbba81acb98ae876178b46db66cb106897397ffa0943fde4926188b7c293d1ba77acf38f404091efc5b163c9e633b62c52c424 SHA512 01dd7683c0ddbd3b89290ef33be7ac9994afd0f2237de44e13274eef1b2663dd846dc6926b843df684ce85442588974cf18ceab07d8685467419872136990435
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild b/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
index 3b026f706808..c9c2da1126d9 100644
--- a/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
+++ b/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://keys.gnupg.net/pks/lookup?op=get&search=0x3D309B604AE3942E -> 4A
 
 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/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index fa7a9ff24e89..7beca4f2ec81 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,4 +1,4 @@
 AUX ophcrack-ar.patch 242 BLAKE2B f268c2a0c0900c3ea6a3e4fc1c99530a090e413fbba9e4ff7c339ae6b5db49ad546eb58cd42a64f81d669c38ed9a4de25cfcfb29ee17af1c88b4372aee4fda51 SHA512 bb4f8154abe676ccec48536b50513b45253828334db040f28fe71e5b9d3d7abb6b34693ec234f10ce8c26592d07ccdd678a68b96b6a80ca9137c18a9e0598bfc
 DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
-EBUILD ophcrack-3.8.0.ebuild 882 BLAKE2B 98a0bf51f95e19d284ebc9a3a56fed37b9db7f9d04951498610d606896bae03ae5da9e0f4c18bdaeb26664e585f4e9eeec656433b45dd3d71fe9d00aa3c79809 SHA512 19321484299030303e4e64433d3609d3155f823f4055b760f9668c3a5f3d14cfd48e50c028d20f361d1b1d1ff55add6ae7c5e134255d938449fe3e195d7b25b7
+EBUILD ophcrack-3.8.0.ebuild 931 BLAKE2B 0ac696acd38741fdbc42d4c3094730aa04ec453cf58309be136ba976ae4393f8eccc2ecadf5d0d6704abb670234aba49e82600888e91f0afde58261d78f9a916 SHA512 762251c25d3f189d275402b2205de6f644011c530e2b283ce9237592d5d9c8f59867127cf82777801e396d4ed1ee89cc20d3baa6f67b586b1d3ef2bd4b746ac7
 MISC metadata.xml 474 BLAKE2B 06c67b21ed59a24074d06b4003873ef05bc4ef8632d4602e3ac5f0956698c40e8a7662b6aeddb7bea28055ed03e27900a3fe4f692d765cb25ba5d9c3ca62722e SHA512 3381c3cb01e39377a085137392802e0666cd4dd421cdcda2db6af2cae01d7b0a7319886699d99553b9a4aed732b402d923c51a0b053cfa564d2228de605991e3
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index 02782e377781..d3623f2b5da6 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit desktop toolchain-funcs
 
 DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://ophcrack.sourceforge.io/"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,6 +17,7 @@ IUSE="debug libressl qt5 +tables"
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
+	dev-libs/expat
 	net-libs/netwib
 	qt5? (
 		dev-qt/qtcharts:5
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 117c80985cf6..bfa6b7cde3c3 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -2,5 +2,5 @@ AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f
 AUX pinentry-1.0.0-AR.patch 326 BLAKE2B 2a05565287d2a3ff9423db1365af6ac1d2d0e0e5b3b7db49ee927eacd480cfbd29abd2313d84eb764e9d7eccd4654e2173fbf8be4508dd88f14bf12f0f9dab39 SHA512 3a8b13ddaa2af8c793586cd73e44b59828e769c3861b2d328273bac991e7e171c8714e2098674a9ae8a77c9a68098012d217e67dde8872df154a1e499837de52
 AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-EBUILD pinentry-1.1.0-r3.ebuild 2960 BLAKE2B 00edfd8ab672d78f279abc494ad1ea523f20b3b2f261a2fab0dd03c11179773977280f3e57a78bf2f67bb992d558a003f5449e851170e029a634e9fdc581b7f5 SHA512 6dc0e65560a78a239b5fbafc8f6623a79baac24f5bd23e6fca9017f308826b485b5ba4a4e3ce895d35c9bf5377507bef9c6f8132d07355596270c0d005ed478b
+EBUILD pinentry-1.1.0-r3.ebuild 2951 BLAKE2B 20bca1978bb4164ad07bb0fe96d614a97b811f19880f38190442b94d2b9c8924553c1ef3a7009b8b86cd6ec0f1f2d990c183ffe28fa0cfd54ed0e308e114103d SHA512 16fbee43dadd7454ccdfe92cc5c71d4d59ca9da82dd833a0747a4b9601e62525ec7e39f02cf9f790087a27e072c2c8f904d9a9fa314c6f7b674c38a3675c6a9a
 MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
index efc797548a00..0a6eb6d4c569 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -11,7 +11,7 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5"
 
 DEPEND="
diff --git a/app-crypt/quickcrypt/Manifest b/app-crypt/quickcrypt/Manifest
index 323681013241..e92c8b125456 100644
--- a/app-crypt/quickcrypt/Manifest
+++ b/app-crypt/quickcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST quickcrypt_0.9.2b.tar.gz 2927 BLAKE2B ee5593ef6ee4f2b48b08713f98616220ab9170cf36ad8664fd9fadcbcdcb64ba9cc33689e9b5e79ec67493a5728de24a6cc9b86a2ff1e579b9a4c77f0ad177e7 SHA512 7b0efbe5aaf9f878233885470ed053124dd3c14fe2630902517388f3ecefda1bc89f3ec9a7edd6d7582f4108bfebf421d593f4b37ed66a7692e955c65003523e
-EBUILD quickcrypt-0.9.2b-r1.ebuild 561 BLAKE2B 7c7526f5809d573df10a5c04564e5113668d489df9a38f58143a401024eb67b67488b9cd5e526d4524f796a66922f6f4284eee364c4d343324062d78e24fa953 SHA512 499534dee58ef84d786dd19c1b6f2763cc2a5f0cb94f2dc5b5a9c6cc6e898f523c3bd0ba85e3d730a5c8d7fb02ba758fa1011734ee1f2227d4b6fec3ece88b73
+EBUILD quickcrypt-0.9.2b-r1.ebuild 562 BLAKE2B 3e9e0d2e44ec1e62197c846c6b5c60ebe994eb7e5600129b780cbb068356fd0bf6ea0de597afb61b678c5a010050547cb712808ed47e23f54671c41c04c059b9 SHA512 fd39d2d141cd8882975ab6c9fc89d01568b45e86ea9a5df6e35b67a5b3a950f968164e4c6591b483ea1e3e68177fe29df32e76d1b0278bac9c65f34f19274833
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
index 7ae632b049a3..cf3e384b549a 100644
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
 
 DEPEND=">=dev-lang/perl-5.6
 	virtual/perl-Digest-MD5"
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 5ffc3af941f4..4a17c313c9f7 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -3,5 +3,5 @@ AUX shash-0.2.6-binary-files.patch 898 BLAKE2B 892a6bed771a8906b5b00a47b1b13df37
 AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb900687627f1f51ddefd60b814aa1195daeb6c8026ad1dd55f17fa78ef54fc592b94e9704440f66a47a1c7a70fea0172167e0d7 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04
 AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
-EBUILD shash-0.2.6-r3.ebuild 937 BLAKE2B 89412a67cd61f33d382d312e8daa5dbc60e77b835ae368e6eff27407878582bcd294d8d40edb155b4b561f0896ad8140925e71037ae287b1aed9da0d24c82b7e SHA512 19ff1da2920d3b2142b7188f138a5718a1588d5d8a94b011bc9fa72ac926bf0aaef019f6161bb718574f0329ebecf49b841cbcaa1b7fc991e911db2656fce6ce
+EBUILD shash-0.2.6-r3.ebuild 938 BLAKE2B 6c6d8179ced71c372c313861ca1afa40c4146bf51415445809c08e105b26cd207df60bf2276430b3239923beb2d48caa9b98498c55a0422095c7b7d989021984 SHA512 e94b8a6f1cc6f36be42f6ccfc9eae4ac504a08402fbc27f8e54263f42147d39c37fa59ebe82c325ae2f43ad8686fcd5e44c685d63a6d3c2845a34af3bdab7840
 MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
index af1aa02378da..dbcb2f265749 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 247a992788fd..9320dd2e8f11 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,4 +1,3 @@
-AUX tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch 531 BLAKE2B 45a14e0d23b1dcba9eb92465fb6d6a57c3c97f1d574a987214475c40403c554066076a16432ee68ae1a58677c22c72612c08bf91e8cbfae98d941580c0a3598f SHA512 0840be27e1742d5999531cefbc20a661136e44d44728ee5b968d96a7d82baf1d14e5e4e671f8f34fdaf37a0214dc23bd5286c914f6f579e8f4d1dd959779a5a1
 AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
 AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745
 AUX tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 0739aa873be6b3faa025fc38ab562da07afc0a7016856bc99f5b1fdd9202a24124d8f5789de0381ec136480cf24337754ae795f84252d8b38ead94dee1362317 SHA512 d94fab5dca4823a5839e54a1a284331dda449b7a76b01de390cf21535e88531b002b433ec0b4b8246c0f16417b2116ef4a6c63863c0aaf151f1885f0bab66945
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index 81c223df9576..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 85683f9b..986d4c8d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -582,8 +582,6 @@ EXTRA_DIST += dist/tpm-udev.rules
- 
- install-data-hook:
- 	-mv $(DESTDIR)$(udevrulesdir)/tpm-udev.rules $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
--	(systemd-sysusers && systemd-tmpfiles --create) || \
--	($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
- 
- uninstall-local:
- 	-rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 46ee05d3ca8d..30bf8ced630d 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,5 +1,3 @@
-DIST yubikey-manager-3.1.0.tar.gz 115010 BLAKE2B 1b27b9af7f3adac87a1bca58929bffef2ae397b359f70580a07193d2bd2f8cd4d2d867053f6494f1e262668443388d79dfe3775f2c3d0a5528840df8826cdf91 SHA512 518eedb52cfcf725c13114c433f848b97f711e94fa9c71685916fb8cb20e5bfc431f648b0ec710ef9ebed2bc8ddd8722ca1c9865d7a1b29537b719e167ed5f60
 DIST yubikey-manager-3.1.1.tar.gz 116632 BLAKE2B 252c419280143fa6f44daf3de8ec27bbdc3218e4552e39799e1daca5b46939c4042ae1d43abeab110fe1abaf2e87d94c270442ee6fce05e26927add5b34e9f66 SHA512 8229d5442ddf89fe90abb0153aa005cb0d149a84634b994dc283f7cbac2f72d4b913c238c277c6aa07f431aed8905008aeb11e594e730be71c9ca88150a6ef68
-EBUILD yubikey-manager-3.1.0-r1.ebuild 1454 BLAKE2B 620f4df65c9115f64131536cab3683fa2e618b2b4d5b5e979c846b5ba94363ed4f6dfbc207d42e8fe5e981a22ef2a74de13ba0df86db65be0e66c87dc2097d7a SHA512 ab36bb4dcc1c8b04b62f435a7b36d729351d476259cd49ff3a0cb0c77f942f6d8c62ae85b5ab062066c85b8ccbeefa34836a0ee7f8b1875dcb8fd2f6a37870b5
 EBUILD yubikey-manager-3.1.1-r1.ebuild 1460 BLAKE2B fe0769ccfd53bb0cd7ad43ee4e48217522876a4368290c3da1a9884b6da2986a6c532e6ca433e51532f184889a6fabbc04d2beb7b885aceacb424b2111cb0c1f SHA512 fc407556248ff61b861c755939ae630380ce11022758a5addefe9911f4e4838bc4454459b5883945b2e75d313cc5e7c26a406459695ad308ba0830b2b241d1e0
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild
deleted file mode 100644
index cbd62bf2dc9d..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-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.8.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/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest
index 918d3f76b73f..7cb32a93b180 100644
--- a/app-crypt/zulucrypt/Manifest
+++ b/app-crypt/zulucrypt/Manifest
@@ -1,7 +1,4 @@
-DIST zulucrypt-5.1.0.tar.bz2 1610597 BLAKE2B 3b77676912f0cd8990ba307ff04309f308ec29cf76cad37ac28ebb317a7e42ee93ffe9deb1db12a80c4d5b235c2a83bc8e5ddeb6082e5f1be9d91425d06f4334 SHA512 b916d43f8c889f1593c506d95360b195f0639024463eb77b5b21b544468f99719b877d8c94725504305f307efe5cb18e203dc8f9b015bd55825dc1d4fffb42f0
-DIST zulucrypt-5.4.0.tar.bz2 1704452 BLAKE2B b0ef9e33b7261087b97186dd49672ea115c4792c04a64700cba5caa9c9e63d84818904c078a4d6663c6f420bbd19b0593af84210010821e2b8bae5f19947ffec SHA512 65361ef885b68a13f435704e0e1dbc9b7ae4df9525900ab60665c29e24574dcadb4afb27a7c595db33021c07086de92332f1a52189cfd674991b95e208040074
-DIST zulucrypt-5.4.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
-EBUILD zulucrypt-5.1.0.ebuild 1026 BLAKE2B bfe0ea6f75dfc510f6eff072ebe0b1044b8939100579a4eafcb018e2d1e6dcf807880429da953bd7a4accea790b24ef9ba1d25b5ffe8671921ec815f5e9abee2 SHA512 d2eecbd4d4369acd7037fd3f318ff8c7a30965d0a8166c9fa1e8a4195410d0197a1cdb57f59cf606cea720939e9bf5f6dd923e114f9a971d56458dd4d64cead3
-EBUILD zulucrypt-5.4.0.ebuild 1083 BLAKE2B 0bffbf733aa810c08c599a8fdcf004ffe12ecac1f12ab92cbf499acc6fd852465224aecdeba8935ec906068c038d209b96a2a4a5caabc03b92ccc180e9d011e8 SHA512 8afff3e935c2ffefd2133dcaa8f9c9ec17a68f11b8ffaa83f99d97dc8e6542c14933e16b034a906d42ffacc820669c8da5b3298534f91e095c93403341e8afe6
-EBUILD zulucrypt-5.4.0_pre20180223.ebuild 1144 BLAKE2B 6653aa2a2519aeb567f95a1f77b70ec1fb134a3277dcb2a668bb0be5a995e914a7260c73c2f31b2fbef1b60ee9c69617ddb29a6c2d0bb2c1a640d052f94b6528 SHA512 aeac169cc31a0da4ef03add49543f64a943f9b5dddea719e531a4387ac04c3ea2650d573798acdb3d808442415e2864838eb2f1f98f53bc477e1a3af707faded
+AUX zulucrypt-5.5.0_pre20180223-fno-common.patch 524 BLAKE2B 7abdc51e78c112ac8787c16278903e02bc05c7066f03fb2fe821311c6830000b81531bb9bdb19d7ca2d3c91b7d85642c943ed839012f612170a4da7466150361 SHA512 71808d1dce262ac0ccd834c5461e01115d80153f3b4ad6274575bb190e89a64ddb34a3c5c66701c5f2b1a83e1ccfcb495df1772dd1a13c6155b55188acc3cfb2
+DIST zulucrypt-5.5.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
+EBUILD zulucrypt-5.5.0_pre20180223.ebuild 1132 BLAKE2B 1245f868fd6fff5c010d03ac6c41b441de23b6d8a5db046d8748a2827ff0f64c84338006d8a95bfe27799c9e44c747de8577f099eff9ad3415586c22df418964 SHA512 ef29713207100695fc5e5b5c4d49707d165f01ef2e823818f9ba1c561b4cd6428c58bc74606bb662230fac48634b368083b300ffd2310bc6de02bf8150ffc0ba
 MISC metadata.xml 697 BLAKE2B 905f662853dcdf92e5ab202e0bc832665f75827638a3217bc9a45ea3078ccc3ba5f9b6a95b2caf36d1d6d87f9617e69e706dafd06ac8758bb93c46bcf2eb9399 SHA512 9e1ed2f8bde794ea6b21e3129f6952a715e110cd06227a385dd3655fa7c0e7fe300f4aefbde827f842c9972ed39d1e908dd80d5bef5cd5c18bb27779006e09fe
diff --git a/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch b/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch
new file mode 100644
index 000000000000..ea5bcd7a6d18
--- /dev/null
+++ b/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/zuluCrypt-cli/bin/security.h
++++ b/zuluCrypt-cli/bin/security.h
+@@ -35,7 +35,7 @@ extern "C" {
+  * set the function to be called when an attempt to evelate or downgrade privileges fail
+  * zuluCryptSecurityPrivilegeElevationError global variable is defined in security.c
+  */
+-void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
++extern void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
+ 
+ void zuluCryptSecuritySetPrivilegeElevationErrorFunction( void ( * ) ( const char * ) ) ;
+ 
diff --git a/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild b/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild
deleted file mode 100644
index 8f783bd0f8ee..000000000000
--- a/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg
-
-DESCRIPTION="Front end to cryptsetup"
-HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
-SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome kwallet +qt5 udev"
-
-REQUIRED_USE="kwallet? ( qt5 )"
-
-CDEPEND="
-	dev-libs/libgcrypt:0=
-	sys-fs/cryptsetup:=
-	gnome? ( app-crypt/libsecret )
-	qt5? (
-		dev-libs/libpwquality
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		kwallet? ( kde-frameworks/kwallet:5 )
-	)
-"
-RDEPEND="${CDEPEND}
-	udev? ( virtual/udev )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/zuluCrypt-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_SUFFIX="$(get_libdir)"
-		-DNOGNOME=$(usex !gnome)
-		-DNOKDE=$(usex !kwallet)
-		-DNOGUI=$(usex !qt5)
-		-DUDEVSUPPORT=$(usex udev)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild b/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild
deleted file mode 100644
index 81296f712ec5..000000000000
--- a/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg
-
-DESCRIPTION="Front end to cryptsetup"
-HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
-SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome kwallet +qt5 udev"
-
-REQUIRED_USE="kwallet? ( qt5 )"
-
-CDEPEND="
-	dev-libs/libgcrypt:0=
-	sys-fs/cryptsetup:=
-	gnome? ( app-crypt/libsecret )
-	qt5? (
-		dev-libs/libpwquality
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		kwallet? ( kde-frameworks/kwallet:5 )
-	)
-"
-RDEPEND="${CDEPEND}
-	udev? ( virtual/udev )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/zuluCrypt-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_SUFFIX="$(get_libdir)"
-		-DNOGNOME=$(usex !gnome)
-		-DNOKDE=$(usex !kwallet)
-		-DNOGUI=$(usex !qt5)
-		-DUDEVSUPPORT=$(usex udev)
-		-DINTERNAL_LXQT_WALLET=true
-		-DINTERNAL_ZULUPLAY=true
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild b/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
index ae369a3926e1..c037845c99d6 100644
--- a/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild
+++ b/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg
+inherit xdg cmake
 
 DESCRIPTION="Front end to cryptsetup"
 HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gnome kwallet +qt5 udev"
 REQUIRED_USE="kwallet? ( qt5 )"
 
-CDEPEND="
+DEPEND="
 	dev-libs/libgcrypt:0=
 	sys-fs/cryptsetup:=
 	gnome? ( app-crypt/libsecret )
@@ -28,17 +28,14 @@ CDEPEND="
 		dev-qt/qtwidgets:5
 		kwallet? ( kde-frameworks/kwallet:5 )
 	)"
-
-RDEPEND="
-	${CDEPEND}
+RDEPEND="${DEPEND}
 	udev? ( virtual/udev )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/zuluCrypt-${EGIT_COMMIT}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_SUFFIX="$(get_libdir)"
@@ -47,8 +44,7 @@ src_configure() {
 		-DNOGUI=$(usex !qt5)
 		-DQT5=true
 		-DUDEVSUPPORT=$(usex udev)
-		-DINTERNAL_LXQT_WALLET=true
 		-DINTERNAL_ZULUPLAY=true
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }