gentoo resync : 17.02.2020

56 files changed, 482 insertions, 63 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0c756cc4f328..97b40c173d40 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 81a843093ee2..267013dc3c10 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,6 +1,6 @@
 DIST acme-tiny-4.0.3.tar.gz 12662 BLAKE2B 6a17d0597731a5c8c1b260fa47396cb5bf8a223f44c8e498532b6e90a2ded35c5fcae058a8682e59ab060c1eeb27e09c8db8588e1d72cfd75b65f867d3e94f9a SHA512 bd37d4f878f2851c8e88acb78699b855cfd306928e2d70ef1d35dc9883d44dae3c7622e2114b1d5c4e0c5865b61ad3958a776467ab45eaedb0cf612530ca5dc7
 DIST acme-tiny-4.0.4.tar.gz 12667 BLAKE2B 6177d639a2d65080f84ca93400405c01ef18cb3c8d18ef5e7e57af1eede9d6f1e105ca7f6f89014e79c5cb1d865d3c81f590abdb37e8caa6b9699ea20064f698 SHA512 e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4
-EBUILD acme-tiny-4.0.3.ebuild 1129 BLAKE2B a90e88b0d9aa256dd435ff6619c3336dba1e7c1ee6f4e68234c3ccee93da61f72dd92883c834054a1a2b785e76f77c9a489a82d35bba88d31ac3199627924a85 SHA512 55d9f05c54468dd556be7d56735a581a0d9facf5ddc6a94cb105c5c99bb14af989d929c0347da4a09099f5fb77f9c9ffdec10f710885b41f541d1a24d7eb876c
-EBUILD acme-tiny-4.0.4.ebuild 1127 BLAKE2B f80651dd7e9e0ff02623275796cc1f2ac83296e92d7d3339e0e9bf2b35c38de312c81f6ac62f96914fedce077ead1e0bfe6bf3593c8e1efa182821bf2b19ee1d SHA512 cdc2c7887e6a3c48aea39aaffefcbdd76859376bcc72ad6f6dac5a3a4142386c815bd8d6d08144ebc874770bc451d413dd33b2eb7eb4fa05fc48711d50153737
-EBUILD acme-tiny-9999.ebuild 1123 BLAKE2B 1de921f8dfb96218434c6f8fb9cf0534dd2d98333a84e422af27e2b31deead44ceae42173f4b10496c35207471e7ce9336c840777ec7dcf086b6d4856bb3db3f SHA512 b902e95fbcbd85994682033cc86e9998332f256ef8c7f0a7c949e9d92f08e602c9e867cc47093005eaafc9c5cd4140d251ccca40888f5393b1a235ea468b13ea
+EBUILD acme-tiny-4.0.3.ebuild 1123 BLAKE2B 27c3ea165ebe0b1abdad69b5df4d30444944d0a0faca430531cd37004ed6500a96c37f5dce4d67bde8a5515174ba6ce4102a29af0939cd1cd7669a2a8d23a998 SHA512 222524941240eba758287e370ea9181cd75b4a57b7ede697fc254f9eda0724a48334c6a8d519b0b50e10c520a0765e5ec9645f2555569a89482905236b364bf5
+EBUILD acme-tiny-4.0.4.ebuild 1123 BLAKE2B b2eeaab3c586da0a554d7707a82d426573e91c876231d9234c8de20b1635360ac0ad57a0a025efc4bbfabc61853e1f4be6965421312ebe96f997ea5a90370864 SHA512 0aca96327d05bcacb6e960d69bb6972a234cb7d1316eb89021f42f06f756ed454033879e58dc9dc726043221a94c990635b54f9a26b08264e5aabf88e7e480a6
+EBUILD acme-tiny-9999.ebuild 1119 BLAKE2B da97a138852c81eb93e58ed071350e3a718291da3a59abe2d6df0941a3b1cef8af434527d5179699b052f3a94ef29e0926188fb0e59ba9007cd70351cc0fc1ff SHA512 077a62a16009f100e1d5945572734b5acb5fecd5c56efed161b4ded75d072e5544f6f850ae42e045a47275660e642a50fe39df4987272a87abf5389d26bc4d54
 MISC metadata.xml 429 BLAKE2B 101ebd6c130b6955951254d1c7e759dbf7d5dc08d899c2bf1793e3e73ad2aec4761782d9bcbd708a42a0217cda22255fb645cc6f88792aa0a5445c6b2df79289 SHA512 7c0ff5126424ad18a75bd73fdab208397aedf79df6c6a3fc776efe1000ac9f41e3cd056e65da68fbba507940328c0308074ce9335c4be38a8197f7545728d9da
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
index 678610b6a6a6..fd2b028b0f39 100644
--- a/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 eapi7-ver
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
index 560940108678..73e586b47f1c 100644
--- a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
index 8a95c21a2a9f..4d15c1d8601b 100644
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 37ff63ceadf2..bb6a5b907804 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -2,5 +2,5 @@ AUX 3.34.0-fix-desktop-files.patch 2102 BLAKE2B a733e4c0c62d8d80229663efe81d5d56
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 DIST gcr-3.34.0.tar.xz 1454244 BLAKE2B fc84e5eaa3b2822d1c04fff3b8b343de2655cce34317327a3594b506172c703a9d4b1d5562ed213bc1ae7df5d31ac1c5ab3c5733cfe8e5edf85e334ce7ff85f4 SHA512 9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093
 EBUILD gcr-3.28.1.ebuild 1871 BLAKE2B fce62eb9dbbf5f51545d7506ec2f439ae3d2991c077b4fdb00ed6f0e47d1b8310437843c3e291d8661c487e75bed955404c23fff8c4bc46b014934c93b74f63d SHA512 8af0259414d7777538fab1dd68da4c39f9c68cbe37bc9ce5f01c833530673db4f2d4d92c259e9c3589918256a43175f0c59acabb747b29d9f567263a7fd2fe19
-EBUILD gcr-3.34.0-r1.ebuild 1897 BLAKE2B 547c94084e23f342d15c7fe24558bd63608734ebec1430800ad719591be1f91bcb8388f6d3ca2ed3d2b8307b0be6854e6daec1289a5601fa971f0852bb57f9f1 SHA512 e9df77eb782b097d0376a6129bb43915a1f76fd2f731dae57a688fb749a452ae0a9f1d07db0c613a0c34b38f306e9ed656af0c89646e68d77746a405a912a86e
+EBUILD gcr-3.34.0-r1.ebuild 1896 BLAKE2B 0f142bf0900f7cfca657437b7f6cf5cf05a7fc66600a84cc6590fe3442fab15531287db9fcf017e5d8275f048cf78c6731ada958d93e93b537f9ced6bbc3616e SHA512 17943fdc6de4fa8431298089015b0534eae5d03808d52ddfccd40661ddf05ecb88c68f7b2a37980e62b69d192e5bf5c6aaa691f892ca89c9ab45b69547ec2b4e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.34.0-r1.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
index 45860e2fe1a0..e217990941b5 100644
--- a/app-crypt/gcr/gcr-3.34.0-r1.ebuild
+++ b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="debug gtk +introspection +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 61ce2cf5d92b..e3612b87c070 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,6 +2,6 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
 AUX gnupg-2.2.14-quiet-sending.patch 1225 BLAKE2B 3165d5b8242a0bad7913881dfac66433bcea9f5d97a58f43999166ce682671060a934ea1618fd90c7b892b4f3565ae0c3e57ad2f8f7b200a52145452d56ad8bc SHA512 f61f029ac72626e0c7d3bf29d483fd313ba723ae47bd7659b4fa72252ec9b5f329510d37ae92c41dd7dd45a3b99e846ae3d83a7bb37825e95e6d10f29b131853
 DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9299237f15ce93aa47b676cc1fbf0691cf2112dd5b55ba5fc9d2a6988f999415dd5026d44c5cb4bfef9f99189cd SHA512 a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
 DIST gnupg-2.2.19.tar.bz2 6754972 BLAKE2B fc1b9afb398ef78a6d239c62fc88cba7148679b1b666ac39dbd9644847e99de1a683a7938bc112cb33adafe555472319dde4f64860071446a66cd79934f7d69c SHA512 d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd
-EBUILD gnupg-2.2.17.ebuild 4527 BLAKE2B c0bf1d5e921aae616e71f502f07393eaf2ca08ade976508e641ef7c433d3ecc679f6e99717660268cf4c2b50fcc122b8275456ccc49b979f0078d6a81b48e994 SHA512 2132540fdb5cac7b8a254a78eea6bcff7acdc869fdce06502ff736a559304df0672b01efdc19d5996f0ebb1d6be6c2e864d67a4fd17f62933c784a18add7ccbd
+EBUILD gnupg-2.2.17.ebuild 4527 BLAKE2B 22eff1b198b982b48fbd54ab68f5ae265f67cc098abf22cc76d98824688ca8ee9b80d6f20f552c1452dba5a12f19c86fe94dd2d526a3062fc421a687d5e2a573 SHA512 99ff0cb81c5ca29942178851e0ebb58cb719985354bfffba78deacac844c78f5af48b88616ece4a52c124a1625bb062dea93ac68142c67052632c38f7d7dcdb2
 EBUILD gnupg-2.2.19.ebuild 4489 BLAKE2B bb208c75fd25593169ab9683837ae8e1eaf2b804bc5e9ef0603d8b1f4419ac004b2e98efcefb11bb06a8b36a9cb4d2d3117b9333c329a1c2dd2998fd6abe5a20 SHA512 773032d850e56b525332b5589f564b79b85c2cab7c8909f5fc945b0e4a5cd33364f56eec6b2655d34f5e8ca034bea1e484d218f609787c652bc3336012417f9f
 MISC metadata.xml 1212 BLAKE2B 36bd1e7478abbb579b33292418dc621c65869151cfd0cbe9cb7b553adf92b606273f415db763ec5c3884e91f29929f79de1cbf15cc47626b1115b168d567790e SHA512 646ec87262b7069808976e17fae4b2101f9a8aae7ad5bbd10abce6077a5e4e741eb5692997af4383cf8cd3e6b03ded83f9dd5245ed112533c6a6e4c752b1060a
diff --git a/app-crypt/gnupg/gnupg-2.2.17.ebuild b/app-crypt/gnupg/gnupg-2.2.17.ebuild
index 62dc562e7bf2..b121681e8046 100644
--- a/app-crypt/gnupg/gnupg-2.2.17.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest
index c1f0eedf5130..d7fdc2c9ef67 100644
--- a/app-crypt/gpa/Manifest
+++ b/app-crypt/gpa/Manifest
@@ -1,3 +1,3 @@
 DIST gpa-0.10.0.tar.bz2 782455 BLAKE2B ef663432cbe20fb5c543696627f448b3970099b6a0f8f68b57e3d87af03550597adcfe4c27c2774d1f278cfc9d07a089652f42ef4f8c3cbc0192b645c465ac0e SHA512 87004fb0806e76012bc194f95afe9ef6044aec890b26e845f45c314e1bd8864f056ba5e32f9ef2e15b24b50840235e6e548a5e3006b255b4f1c20e0fd7710a3b
-EBUILD gpa-0.10.0.ebuild 818 BLAKE2B 8bc073b2a475f7673fc7742e65233b67df919bb790430ff0b923b64fc31eb4952b4f1b4fb0cf406b29a0c430c74a968ed7f19ea47c8325e512dd5323c4c73fe7 SHA512 17cf1c0dc7c09b81f6b0c3f03e5fb41da6ee524670c7161173b5cc4077a5b15c9b8c365da0b6d5b08df782738ff81c9c92837ad44e0b7ba6815f1353654d44e1
+EBUILD gpa-0.10.0.ebuild 818 BLAKE2B 987f2737c3d974f2e2ae5270cb6442d87e4cb0c24d190601dc1105730584f5dbfb22d79d32464c7d02ed5e6e32fa9160478d9f8d808b2bfb92c7a67fe2cddc14 SHA512 177b81e88c02943187cb5c915dce013e01f9b0b3274e4049c834e473a6c327b0312d3045fb5ae2cda3c85da443ea0acdd63fa57d7912001e51be182367001c34
 MISC metadata.xml 251 BLAKE2B d75781c46bd2764ba6a64a2ba01f0098ac80664dff29e71d7804bf2687cb04d0255c6f0f33f29cec0aeb5507307be34d78de33f308a032990759bca2ce26108b SHA512 bd4fa9d3efc3d892de2b5912049b96e4c55bb081c85d032e1cb84f68e7e22acbca76b82b20c9dae524e9c7a7802dd0b7dfed9a8f7521e04bd8c0c115213f4346
diff --git a/app-crypt/gpa/gpa-0.10.0.ebuild b/app-crypt/gpa/gpa-0.10.0.ebuild
index 1f194ba4974d..c6f4c15315bd 100644
--- a/app-crypt/gpa/gpa-0.10.0.ebuild
+++ b/app-crypt/gpa/gpa-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/gpg-ringmgr/Manifest b/app-crypt/gpg-ringmgr/Manifest
index 078b130f71a9..2a8f321e0b88 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 8fc6aa28b1115e02d41c32fbf13e0877603c48079a5c2290ce9041ba63edf61ed4d6a2d38a37f046af7effb099950a0dc4abf55ddfcc2c96bbbb6e8a25f8fa9c SHA512 cb92cd1c33072398e94e4e3d3295dd2d9f8a79a2c65244587fd0e9871b78b0b4a3c5ecba357cb9905d19fa9c654435bf391cc727531a8f4f99f49ebf035cb15c
+EBUILD gpg-ringmgr-1.12-r1.ebuild 625 BLAKE2B 548f255f742a2aa2428c9d3f9689c59f35c24aa5e247aec96dd04d9769b896075dd2888f4a9406e27b86e080dc530f7d64a3a21dd091c39d71a95efe0cd8e8fa SHA512 7d5a00a831ee4927a0aa5f7e502f7f652e75c3dd1baf8d00140d2fa81af5ebf0ccdd3e539c80badf052ae6de9c91165e5f706ec147a02e868bf7eb85e9f6b765
 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 d1bd4ee90e8e..ab7ee800973b 100644
--- a/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
+++ b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 2a13ec447f3a..6fa1c32708dd 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,6 +1,6 @@
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
 DIST gpgme-1.13.1.tar.bz2 1759616 BLAKE2B 17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70 SHA512 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8
-EBUILD gpgme-1.13.0-r1.ebuild 2888 BLAKE2B d03cdd1c7d7155a12ede43e1a2dc926ff02f8683939851f223429667a9f098aca9b81212c97a4ac110a36796329188a9fc81179ee12c4a012d4e6ac34e7fb559 SHA512 4a96c42c9ddaa716b23a7ef6ae0bd19be5841192b8b690000d13b647481877228a2df7647e594891e04f1d887018042b4075e67e19690071f3d081cce51526a4
-EBUILD gpgme-1.13.0.ebuild 2879 BLAKE2B a81453f31b8ac12f71f775c3e15a106c19568a95a100c2011325e930808178f7c49c3c329511ca024bd08385ccf6c5432cd8404d3189a3ca489bdec382057a36 SHA512 93f9151ec400608c96a20d9d41b72ca894eef83d6e4ff0ac853f99732736fd8154393bb62cb891aa3f75b408c9277ea34214553640186b33206834cea8fe0876
-EBUILD gpgme-1.13.1.ebuild 2888 BLAKE2B cc7ea42c3837b08e11b84052027a9aea30a5f817a91af70a5d7561b1c76e77429aeb75eb447d4efe3c728e1e38100b4c5c6e382015769bef3459afbecc3bb660 SHA512 9775783dfcfabc5988e680d03575754ac855666bfe87a12eb121ab4ec81dbd2e486a5dc1b06da1ec1e9e7af5688762670371e98d14b4dbe8a35b69c4ef712793
+EBUILD gpgme-1.13.0-r1.ebuild 2878 BLAKE2B 2da91bd9d625f1165df0abfad33810e1b007a029e7b48d491d72986cbe4971d3e7c0ae8bfabfb203a0c284e39c8327d3dba4a6dee8f954ebdb0d8d5ef7b21b9f SHA512 94548fcefc1d5828385b7efdaf611f39598750077c0f4858f1c562fe76a17b65735344b16612dddae0fdea79bf09274d80c5b4af84ae0617178b9aab4b7b7819
+EBUILD gpgme-1.13.0.ebuild 2869 BLAKE2B c1d9063718585de62adbc334c9da2184e5b546f41e61dda7e22f5c966aea7f9229507853952c28a6af9e8ce2b9895954f8f3a7eea4c0d8523af3ddddefb4c379 SHA512 ec8fafe2070633be382cff3d09393b87b3a15fe018e58961d6525eaeedb98ddc94ba374d157c9e8e4a87cbf09e80c0b65148ccb271a89e36de5f017e91756576
+EBUILD gpgme-1.13.1.ebuild 2878 BLAKE2B 4023fe243cf0df209c1a408e7f635a06cf30c4e0e96f19b8f797a4c5aa899fe301bd97c264fe1a0f009934faf9f3bec29a25c5d88b9c7601a35c9c538cddb2bf SHA512 c442573cbbbd40906634f1a736e04837c3a3cb19e957808b68ba5ae4998f42c0e3ed4d3cd61ab8af2ef96fbf23af85cfc263ed604c89246cd6568e617d9be322
 MISC metadata.xml 438 BLAKE2B c080438b3f22dbb803acca5a47dd880271b97c2def132cb0fefbc3d3e30c663d02be6bc7553393ab1d33932313026ade3f3f0c576fb572938f0b5fdc6f07210f SHA512 5a5c496db2115e5bc4ccb81aa69995c85a6b967c3acaab1423f94d22c55965f8e9377711e8c3a4e359ae661ef9d6137959058500a6cb036656a5d14fb88d0bac
diff --git a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
index 7b29d88b4f88..ab42a52d09e9 100644
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
index bf39f0b5198a..6166bcaf0672 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/gpgme/gpgme-1.13.1.ebuild b/app-crypt/gpgme/gpgme-1.13.1.ebuild
index 490dea035333..1f2c818fb516 100644
--- a/app-crypt/gpgme/gpgme-1.13.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/hashalot/Manifest b/app-crypt/hashalot/Manifest
index f0b0fe5521f9..f2fcd2fe935a 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 389 BLAKE2B 9ec61c9e00b8e3de23b34e91e3168f7359cc42ea5b179cb13cc70476b1b4d617353d4e7bb5b4eacc7968fbf76d9b07b0a3dd3a14dbd2edc1d9a88627b2f98979 SHA512 e765d474ba6c318b517df8db4540eeb1dc1ca8ca5a10b194e49241931ca1a91db83840c1058f8d8020771114eadd4606e20b65528535be44c0d584692baad3fb
+EBUILD hashalot-0.3-r2.ebuild 389 BLAKE2B 2a8c4a71f837e333cf52303145c5a5390f45479ec61ace56ef5f7b040368bd8e937f8cd4c0d9672811051239d2e6335a58a56ecbf09ec471a731da82579417ef SHA512 abae4c80230483dc333c5f3900c7e30c61463bbb2192b539442f7abd5c7a076397cee87c6b2a5f8a072e2fa0b3fc681c1ae1dd47b6a068835c964e2b6aa4c6d9
 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 7a9be62b874f..5b8635b6fee8 100644
--- a/app-crypt/hashalot/hashalot-0.3-r2.ebuild
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 8391d88a67fc..11e0b19498b1 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,3 +1,3 @@
 DIST jitterentropy-2.1.2.tar.gz 24112 BLAKE2B 9328fcc6ac09b79765d53248e4d6d01be47348c6f22f660175de888a884ea9e65253cc2e6fd3620a96f69dd0051b97ea3c46462a24c8e0c94d2bba19afab059e SHA512 b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
-EBUILD jitterentropy-2.1.2.ebuild 1009 BLAKE2B 1f8127f94b0c3c79afb1c4f9344320fd7a62c89596f1caa4ef84fc60c62200d67cc8fce06ed65e065172ed892ef028d040e925a826873e94b49fe6be36fdf3ef SHA512 0ce333852db58648d251019e79df22374f37c56d3c9489552e99e4bdddec97820264d8b58a9fa98b8a805cca1963895445ebf92dfaba83051d129587388eea56
+EBUILD jitterentropy-2.1.2.ebuild 1009 BLAKE2B add24d730cf3f4364431b3655213b763c1d2af6eb249e09cbdc92606f7a8f0bd2c9a06b68562a6777f99d07544b67d0e61b425a0d7122629cf459d8ab66241ea SHA512 34e415f35b2c82532ae23bf2b32e99676113c5731f48aa9e95429d80f955d68eca3fc517a10f6fdd37a23034a22fe738428f12922cf128469e5c1e70acd49874
 MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
index e516259e8f5b..c5275e0b8b0c 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 2e55aeaf2ce7..59947960aca9 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 60162946037ffa62b151caf235712ad2c0e25c7dd7c5384b29bde7dafbd623b417fa1244056af9b64d1494010d0f583078c9b3afd32f6db14806f26a6c4faec8 SHA512 b2674e7a04676cf8f40a1d9144bebacdaf30e222f3fada1f4ff77d5a457d80078832bc94c52aa0432b2aceb7168092e8d8e1dc8a438f153de8b402ed25e21f6e
+EBUILD johntheripper-1.8.0.ebuild 3206 BLAKE2B 0dcdb1ce7ba47f88ec3bc426f4f34adec68a9b26b5adb81fb87c88ecc4957305f553b06b8b46b6094de147b699ccb1fab79f74fdf99cadfc3c0e7dcf1fd51bc4 SHA512 af4df33b332afd0e72ae6cb77a41152802d4fb8453fed4676bcdc1cbb8a8d75aca44fa64a928a8c1f5dc4b976478c46b94e53cc537f3136bfad139b3583ffbaf
 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 065ead99d83c..80b376662452 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index dbea0ca66812..a24b056f285f 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,4 +1,4 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
-EBUILD libb2-0.98.1-r1.ebuild 1745 BLAKE2B fa1c845f66d5da854e35c06b31d779371522d694f8c572b8cdfae676e280291ef7176b9d385c7b93abae9789d04dc87ba83ecb6cbcfd37cba4ad7b9f4dd821b0 SHA512 1984a848544ab9a4793f72335230cc6b5ce5c3b0b3f1bcf38b8b3ac733757413b4b6dc193ed50d594bd48c5b0d17e01d01be6acb17e3009f9ff34e1f4dabd7f9
+EBUILD libb2-0.98.1-r1.ebuild 1745 BLAKE2B 2871f29a58b7db64b7b6aadf4ecbc6a1dc1ac9195cccb0ec5220f289216990d8e678e338cf50e2e34aa64dcfad11682d6601627fee28e7d7355d6b48e277000a SHA512 59da6021a50d21e0d526cf7f5b9500083d21e1d80f934c70c2771a0e3bea6ae8d67af50c44e5da86a255cfc6eb717f37aa09b027f35a40cb956de633caafca4a
 EBUILD libb2-0.98.1-r2.ebuild 1809 BLAKE2B 2d5c467c920014e91a4204466ff77bbbec319396442557821c9b4ba2ee004bf112b4a05ab775260c8dacdf5c8b7eb8588f77d99d40cd25f0eab4d316c4e2a03d SHA512 e7969e74044073ab89ba2cfa39b9a8dd9b4d8f824400d092688c96d2eca7a9c9da9c934b57628ea6a9e502d9d5bcc2e5fb6be0511f92c277624e44b62222e20b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
index a2cb33d64b4e..7b03915a2f89 100644
--- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index ae1ea39a0654..707b76bba20b 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 1422 BLAKE2B 1d715cb421a4694e3cf9cc6649da78ea19330f8b22a92cd202b85650cc5b5b02e957da30ca0bc0f5eaec1785e19238c0bdf1289c954e8f0dd6d581d577a47e44 SHA512 29288a21b9ed382e56d8cc7a22063e642c5a2102685faa98e61603e5ebe569e70b17ed4fa32cd3beafc7f34125d9e2554b01ac5cbc678e64d5d34afc6f5a31d5
+EBUILD mhash-0.9.9.9-r2.ebuild 1422 BLAKE2B b79864f08f42858bc53e2548bb93ea096829bea0e455073689af4d0c0a93b8b276a58a85cdd3bb20f1244aed03199b8284083074074697695d127f276b9621a3 SHA512 c3f935d5aba2d43e6d31e13ce9397c7b1de75571b17249ce3fafb121aeb4b9475ad57d3838e942343d582fde45ae94c79c7effbc453c653c7ee116f90f6a8609
 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 173a90f1fdb8..05f66c43cb2a 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
index d3ec04e1117f..80bf0c9556d0 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 575 BLAKE2B e79cbae98ea7848bbe11f0aeda1f192d51bb1b9440952d0b8606d91b0fb8dd6d1057c4eece722112a3a3bcd26596868cf534d49f4bf5dbfeee227b16f8adde19 SHA512 076f34d70f43ae34fa6bc5e23171b2b31f579812527b7f78ba40ac3fca0cd92000b8caa40b8773bd2f9cc3ce0f6bcc6815f83422d5f8d320d34c4feb580231ab
 DIST krb5-appl-1.0.3-signed.tar 634880 BLAKE2B 0341ce0f3845bbf49ac2c43dea95d1bf196a9e6fb07a1bb4e8d1eac9ef74765f4b02b7f6e2794cf55ce6c7a7e2623bd325457dcb60f94b7e30bdc65a370751ad SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
-EBUILD mit-krb5-appl-1.0.3.ebuild 1643 BLAKE2B b379fecaf2c01b1a358cf315c557aa6454be87d3a424948e23024c23fe99a51bc27235e608eb5cda81f67038f40c3ca0ebc043b50408e710d114624df8107d98 SHA512 8cd50da2790e8c175adbe220b72e32be6cb638007cacd7cf36564471adf36d0764214e0085e488a3010406441b2a07a3f78dba407b1ba78a5f9e01e19ebf60b7
+EBUILD mit-krb5-appl-1.0.3.ebuild 1640 BLAKE2B 56817c958689c52e49eafccde1b5d940472de498a88bc19820f68d5c673d44e0d5541b781b192791f6b8d44bce1cb1dbc4a5b85bb011930060e2c0fd3b55e037 SHA512 7fabd89b01aecf2ab50176dddb5355512950697463c6aaae2d55736b111f25723484abfb3ee3fa21ec00fa3419a506af3db1cd598e3aaa22b5d0b0958e9f2604
 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 622e0b15f0a7..a0a005a7ac4a 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 3f4835a44c57..6ece1cbd61be 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,6 +1,7 @@
 AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d4282bc88d7b33b317a202d57df0bb4a2b47113f0d38cb508614e122e4a3bb7dfd2397e2daa3178396 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f
 AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
 AUX mit-krb5-1.16.3-libressl-r1.patch 3815 BLAKE2B b3ad56fee5fd5ace5e5ef0b1002c2f69c14383ca156182c65f4b1d2a5b8010d30677aabab271726c0fa9cbccf4734a3dda54cc492c9b1e5e1bdc7e8757292a73 SHA512 1298cadf15e5f1512af66c6584cff99b1d8f7c9764cb91e1e606fd331da1747b5fd7080c928a373369ab3817acadfa214121fee694a0ac515c0f4d6a623fb834
+AUX mit-krb5-1.18-libressl.patch 1495 BLAKE2B d57e6a9694a3ad97d08b4b7130c8d08308c2b275389949a4b53b6690d13890f74215d4b95026fc47423f6e9c9c71365efb983f6d55d17e53a978e7803dc6ce83 SHA512 63ef239b7f2e5823a3449f48c30904fed451874e7cd7bd14ffa681ce1ad1681fcd51414227c1c837fc5a01c7fe79b1259ed6de2cf4ee07d3de76e5be17b62a2d
 AUX mit-krb5-config_LDFLAGS-r1.patch 458 BLAKE2B adf95690d6bb698dbdb6bf9c4220f3498a332186b059986c5a699aeec81b3342931ca664244fbcb76a61f9a5177972f0e47535035dbf88c949691d5d80d58084 SHA512 4c7ff3f63c9615dae1dbbf03795fede34d54d043acfd91f77f7fef7534253ea308a59657fa93d09f99d1d5ff5d21b58eb6b86bfbe6d65aa82ca1fa187b65d1dc
 AUX mit-krb5_dont_create_run.patch 369 BLAKE2B cf4883eb5af298b586774c41de53c5dfa3c10dd4297a499e9e036cec9df627776ca370ca905404bd2e94c4ff65e4b52b2516db9cac8629ac5723732c797f4f71 SHA512 0201954234551144e94644c61d19e5729c2f1d11636b39fc387ac8e8c05e3305c7af3378f431bb09ad3d9227fbb44f172508f41e28e8305a6cf2f70e12757734
 AUX mit-krb5kadmind.confd 76 BLAKE2B ca69357a77ddaf67e2f9c104b17d49af5da9891b13bd855f8b04d54bfb6ccf07ae8c5cb694f65a47646675c844c8f8c7224e8487081df678c73c554498259516 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3
@@ -16,6 +17,8 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.17.1.tar.gz 8765399 BLAKE2B 46be864e2db9c70d164532d82776195bf57342ce4f1fd7dfcf3cf6bd72a3639a69954f742607a2b8950b4dea8acfac5d633aa379d669de20bafe54b407bab94b SHA512 e0c3dc0a6554ab3105ac32f3f01519f56064500213aa743816235d83250abc1db9a9ca38a2ba93a938d562b4af135a013017ce96346d6742bca0c812b842ceef
 DIST krb5-1.17.tar.gz 8761763 BLAKE2B 76f636836c67e9eefca91c9417118efdcf4437c1220691f43f3d246daf3eabd53b40a30956f0e57703c3fde5d7193b1d86b68becf3ae1c0c803d2462e79d3014 SHA512 7462a578b936bd17f155a362dbb5d388e157a80a096549028be6c55400b11361c7f8a28e424fd5674801873651df4e694d536cae66728b7ae5e840e532358c52
+DIST krb5-1.18.tar.gz 8706395 BLAKE2B d2b700c2f869733a7fc9ac735ec27e3973868efcf62c6b130fb5ff33aaaed0571816af519123e9077fc0bc240ee71a6179e87a4f724ae06dba8a70fd1d594b9a SHA512 36a01ea310b4b3d0a3d209b641739575239e1ca5e93b3de99cb1fec83e82f9a70ad0761dd6eb77cda5c18c53044ab80168b00725642a0c2dfde0e492c42af6a9
 EBUILD mit-krb5-1.17-r1.ebuild 4315 BLAKE2B fa6f1affce66e5927d3a6307397d18c9d8e3cc79763715949ad4038de3c1dc1e264fae078defe3cce640b77ba00c4c02a69b810c2cd2d16880c79ffa38eeab09 SHA512 dd48612e5fbf22338260aa87e822107e91475cfa51cdc2727cf27becac7becc8ee1c3ae533294294c416f1a01d3029e1891500ba11b6a698e723bdfe5a80400c
 EBUILD mit-krb5-1.17.1.ebuild 4352 BLAKE2B 65e6ddbc25974f57f3784d8df09aa98e2de165451517eb1ebe93fdd2ef745fbef909f846af8fc32eeaaad3c3917b07b635f366f5882ffc38dcad9273d5daf6e6 SHA512 e7c330e5d490a59d7ba933cc8cbd030b41bc1e47f19f65d686b3ddac919ac1d180986030ee61c9da6ca13b190c32b4d97532a2715a085d116cf15d2c32c03345
+EBUILD mit-krb5-1.18.ebuild 4363 BLAKE2B 6bef161cbfe99d2dd098d58e106015933353935d930dcb330a405554df490af07c52f4d834050eb7c3cd48b5ad013dfcd570b7d5d3fd0047d7a8a94739132fe3 SHA512 d830d2c2d2b406566020de009c1e89b98f6920ceef25273e4126b910911866b91c152aa8437d65a32934c44392230b254842e176d8e03f2f289fc939445b1250
 MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.18-libressl.patch b/app-crypt/mit-krb5/files/mit-krb5-1.18-libressl.patch
new file mode 100644
index 000000000000..1522d42a730f
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.18-libressl.patch
@@ -0,0 +1,42 @@
+From e3e3bc2a20795becda6e130d511fe59f04635624 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Sat, 15 Feb 2020 10:27:20 +0200
+Subject: [PATCH] Fix compilation for LibreSSL 3.0.2
+
+RSA_PKCS1_OpenSSL() is provided in LibreSSL the master branch,
+expected to be in the next release.
+See: https://github.com/libressl-portable/openbsd/commit/3a8c41f3a84868337fde01ec1122198ec60bdc8e
+
+Bug: https://bugs.gentoo.org/709640
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ tests/softpkcs11/main.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/softpkcs11/main.c b/tests/softpkcs11/main.c
+index 1cccdfb43..a5099fbe4 100644
+--- a/tests/softpkcs11/main.c
++++ b/tests/softpkcs11/main.c
+@@ -47,7 +47,6 @@
+ 
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define EVP_PKEY_get0_RSA(key) ((key)->pkey.rsa)
+-#define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay
+ #define RSA_get0_key compat_rsa_get0_key
+ static void
+ compat_rsa_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e,
+@@ -62,6 +61,11 @@ compat_rsa_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e,
+ }
+ #endif
+ 
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
++    defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x3000200fL)
++#define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay
++#endif
++
+ #define OPENSSL_ASN1_MALLOC_ENCODE(T, B, BL, S, R)      \
+     {                                                   \
+         unsigned char *p;                               \
+-- 
+2.25.0
+
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.ebuild
new file mode 100644
index 000000000000..2c9031b2e109
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+RESTRICT="!test? ( test )"
+
+# Test suite requires network access
+RESTRICT="test"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_run.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index c51d6b608f19..0e40c78d23ab 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
 DIST gentoo-release.asc.20191030.gz 23981 BLAKE2B 307ceab69e309a53c2db191cf9d7a484318e852af648d93d9ad4bb2422737ab8de9257b457e5f201d86d226b348447acfbe57d259ce436150f75ccfb9f6ed60e SHA512 f3fbe0198f80f37784613c2a390c29f55e5b6291c44ee64d676806a26745017f8a9168573e13f6fc2fe93910927846c584b9f5cd017c4eac1cc875d7ed30cb8c
-EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1158 BLAKE2B 686c914e8c52f68d42f8043dec06a07eb51dc9ad83ab03403076851a89c859b4c6f51be1ead307b3641696966dd5ba6006d9a735741da3f30f2ed7da680381bf SHA512 c39f14ee54a230c27410755ce56ad280dfed24ba473f11b272482f679f4fa409197e14f5aa2e01028439333d305150f61857aba5c136e66718856ebe0e516511
+EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1158 BLAKE2B 792d25b033a69870ceb382d4cafd7e99114be942b70479124160072ae882f64d2c0f8f165fc5ad4e9fd6aadbb33434ff48a2b26e3ab71441704780d57ffb0940 SHA512 9b534869f3d3ba668e69a0c9928ca3ce103669f70dba00fd1983eed88f0cfd761c03155f47035763191318727326188b9dec765d9b124ed0fefcf91fe19019fd
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
index a1a2967262eb..93dd7682d7ed 100644
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index cb5a781baa3e..ff6071b8a5de 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -5,9 +5,9 @@ AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 BLAKE2B b9e7aa8f87615
 AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
 DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-EBUILD pinentry-1.0.0-r2.ebuild 2853 BLAKE2B acc433e7e359a3d187277800307c6b797be25fa82502918fc5d5d0b213c0c16e5e069509dcfad5f41bc564896e933e7b3b1e29507cce5e5fe15ac534a1006537 SHA512 e42f443f11cc1ba135f0a2dfef2de5b2713e2e3989ec487dec3b334a7c62f5916e125b92a18e3c57b5b61b45ec40754655559f1fb0a8316641dc754512b81bb2
+EBUILD pinentry-1.0.0-r2.ebuild 2850 BLAKE2B 961a96c1bb2d5530b68b2798bd96ed46b8c4d4b1782d02d2c817e5e0b6772e5b7201115dfd27925313ec1f3403d627a00101e6e7efc2d8be19f8e2957dafc939 SHA512 00cecc53fe9f14f078f57a60130fc3ddce7dac6a41c456027b1c9e9a8a0b711c886ab0a79d3cf18bc1f13b2bcc20be5a6e54372384012f13812ce9d5d3a62112
 EBUILD pinentry-1.0.0-r3.ebuild 2925 BLAKE2B 6395fd2629b3756dd29cd2cb73d8465481f09cd4a46f123bc5fdd447a0d107f4a594e173ea816ae5a38d0048cbc394cf15f713ecce9932ba4627db8f2e0fd209 SHA512 dbe1b6ea9fc43c622bc821bba895b4a42c3777c351a237b4280711ccf0e7ab71e7a49c61cb6ce70f3c7ea1ffd9c2c0d6e71152c0ab2d85dec4a11f6e49c88d65
 EBUILD pinentry-1.1.0-r1.ebuild 2776 BLAKE2B 8c2a58060317dbc497e396598c9abdaba565c8b94bd35db14e85663c25db88335cdc3a31b5619673fc309ee8aa38811e79e0ebb5408a4b5eb53bc25711530874 SHA512 903a3f232db86c47cef9b3bab8efcbd9a9fa636e6f59af02c6c31ce84d263c445188d470acc47e43709e39492128a20182b496c3f863521291d887495ad26890
-EBUILD pinentry-1.1.0-r2.ebuild 2830 BLAKE2B ad1ee872216d51c40b7680d7705c4c7cb158423ac60f274892be7a30390d64afa100f749dedb1cdf62d11eafd5729e355b3feb0ec863ab1ec06c209c752e958a SHA512 bbfdd422aa8c8be5deb0a275ddd95864ba4092edf3b384c1942609d3f38924dc042e05e905604c217bf58b1a3bea5ef2363d2cc49e9038c7e981d808dedd5021
+EBUILD pinentry-1.1.0-r2.ebuild 2830 BLAKE2B 12b8c2ed9d55ca86b568854388eee24d368ae23001cce3cc7666343b346e23980015af1ebfa97503d34f87a38f092265692fa432a5d48508f893dd79ad112b20 SHA512 dfc1286dbff99a28af929c67c022fcb292dc59f24754862b4693f1fed63582b59dc36ed7347f7d7777cb941e7772c90687515fd2e041716f3a96c149166e36b0
 EBUILD pinentry-1.1.0-r3.ebuild 3096 BLAKE2B afaad64b37b29a769630c65db7fe84c402cdeae104282634452426a884a8be84a64c9c3515ba4b12280edf58d6708627ff2958eaf0e4d78f75ba30f544a74caf SHA512 e2fd6f68e03f566a4ad9ef35f9893b92fb3191cb669d8175df27cab7a0d068223270907db623727dce9c4e821418dff900bbb9589e014c9bcd84f2148d201b1a
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index 46333e1bdcef..c1faf2681509 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
index a9d3d5c14ee0..00477b8968e2 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index a5c526e16d39..07315dc35ee5 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,4 +1,6 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
-EBUILD qca-2.2.1.ebuild 1945 BLAKE2B 9808a992be6521cdd6f163cd7dc146f0db8781d78afc435ffa5f71aaad354d97fcd929221854e3b5c678e30e0bf3377e3a15e46a8588939ee3756f4894776b30 SHA512 85ce5fa36b35c2880799ca19c7722aa7e51991e7e13353ce5af483ac9f5d86f7d2b509aa3bb0c29996a9edfb62a81c54976f8648ea0449b9d62392d925643834
+DIST qca-2.2.90.tar.xz 729488 BLAKE2B bc061118afa7912d249317dd4af9d2f4619b339ec892e33d1c757dc11a4a8b06db96d2437f08abeb48e4a1277cb399d8b3d60d8e2645b2d81cf9d20735ac3cb4 SHA512 5c431b66f898786271881c1275883e332fbfecd62ee265cae2ad345a13ff74ca36fc9b3e93972dcf29c4333f1c8049488ca52ca809c977553b422b9a27b45b7c
+EBUILD qca-2.2.1.ebuild 1833 BLAKE2B 64c2b736ebff641da4e54b6a46babee9076299122e7ca930d359c657f5f486fe4410856bafc6e862f2de110bc61be81073b4ecb62dd669dfb73e3374bdcf5fcd SHA512 38d71d80a624012431f6ff8b160fd9abbfd66db36119fcf72b20c4b3f5b0111d833f80c66505a1dbbe690b4736299373668ad63b829f92e3a11ca9b97ac45213
+EBUILD qca-2.2.90.ebuild 1750 BLAKE2B 9e2a252c6c5a416411537e5c6d4371a1b83d5b4612940355618d80fb6c75f7bbd28753a0e01d3097761e20c75353aff5fce9c8f8b7d085736e2d237a9a7a8cad SHA512 8706723bba0dadc89e4b9fdf5f8f11406a16ee2ded2e24f6a9a45be2a2cdaf72bc7c3af896e4cd42a9886dc2bb89b9763e4d6d6e452e4f34a4889e39dd529c5c
 MISC metadata.xml 745 BLAKE2B ff8e25b082d3c642fce099df1a218a4936bdc862a96fd237303d040c477544cf6368d23cc5de414d95f021e9c6ec475879225ab201f7c6d6711c04153ac53140 SHA512 6b82494b8dfe0d36da9818a6dcf775252dbb7051430232ccc2519c449cc2877da6478ca98f5b7a982a7660a869a0b8ae7a814fb18108ff42fed9712a9253e867
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
index d2bfa334dc7d..0f23610c98fb 100644
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -26,15 +26,11 @@ RDEPEND="
 	gpg? ( app-crypt/gnupg )
 	nss? ( dev-libs/nss )
 	pkcs11? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		dev-libs/openssl:0
 		dev-libs/pkcs11-helper
 	)
 	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/app-crypt/qca/qca-2.2.90.ebuild b/app-crypt/qca/qca-2.2.90.ebuild
new file mode 100644
index 000000000000..0531711ed4fa
--- /dev/null
+++ b/app-crypt/qca/qca-2.2.90.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde.org cmake qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS=""
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	botan? ( dev-libs/botan:= )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	gpg? ( app-crypt/gnupg )
+	nss? ( dev-libs/nss )
+	pkcs11? (
+		>=dev-libs/openssl-1.1
+		dev-libs/pkcs11-helper
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	ssl? ( >=dev-libs/openssl-1.1:0= )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+
+qca_plugin_use() {
+	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
+		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
+		$(qca_plugin_use botan)
+		$(qca_plugin_use gcrypt)
+		$(qca_plugin_use gpg gnupg)
+		$(qca_plugin_use logger)
+		$(qca_plugin_use nss)
+		$(qca_plugin_use pkcs11)
+		$(qca_plugin_use sasl cyrus-sasl)
+		$(qca_plugin_use softstore)
+		$(qca_plugin_use ssl ossl)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		pushd "${BUILD_DIR}" >/dev/null || die
+		doxygen Doxyfile || die
+		dodoc -r apidocs/html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples
+	fi
+}
diff --git a/app-crypt/quickcrypt/Manifest b/app-crypt/quickcrypt/Manifest
index 987391e92f55..c397b89de370 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 860431d2e36b7e89d4450a2d9aaab17bbe1dd99d1a3ba2e5f617965de7819406c877291f126ad25a52c40a8ab354594e06924e4ba9124c09012b9e62b32cd8b2 SHA512 b7ff8e69cd08097e2c0f192c8ec5d474e4d5c940952486a8237f372aa18216a9ed7fe149c5a8a81921894ba50fdd02ef9dfc2ac35034edec2fe700a58f7ca693
+EBUILD quickcrypt-0.9.2b-r1.ebuild 558 BLAKE2B 3c48f1a046b5a33b6e64851ee9910ec3fa1ce566d4f37f325c3e1a63dae4565ff1bb6eb38f91028a76f37dbbb999ef49e5d2dc7772a9beb521e2b2eee8ed4737 SHA512 c81f922725c722cd5fdf0a661b616519309989522c72d1d372c57b8f93728075e406148546e2c4b4188ac8569516c22e8fe2833fbaf6297ad91f933f99d1464d
 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 7aff236b5655..7b1dcee8dab3 100644
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 1873d9b1a65c..91fadb234e37 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -7,7 +7,7 @@ AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 DIST rhash-1.3.8-src.tar.gz 393544 BLAKE2B c326b3fa6dbc5ea2cce40105dc319456fdcc58140a05e8002bf1d92be921d8bbd27bf670370ba7cf2ff2001ff70ddbeb8efc9712869a7b215c5f51a5e493b5c9 SHA512 9dba4fa4dd49d323f2e440c5b93eac1ef62eb4046ec4ef611f0978c12c1739002f1ac1f1ec5e61bd359dc89e9ed612db71be91a795184ac5d5433280d27fa4c1
 DIST rhash-1.3.9-src.tar.gz 403415 BLAKE2B 49f3b9348485b83521f58fa1de30517b05a8265547cbec3276d89c42b46baccc4ea22d41638764600c76669308a5f7d9d3995b7cec51676c9f8492ba740e473c SHA512 6fae0587cdeb42df59d542c58bad734259d1ff39fba92531c10a469b51310644669ffbe0453e72d85c2cf38b176962f6dca9062a121ac019f1b30f207a176e60
-EBUILD rhash-1.3.6-r1.ebuild 1905 BLAKE2B 58c1e173d2f6e8acb03690a945722cd6649a15158ea39588c08d07b73b97c9625630ec6219b57de0648839420a45d75f8432e67f23ac32c17a34008811005cd4 SHA512 5e240f4761d8a78379a1b268bf25917d1c2a78cfbd1bad5bb0e75a8ab944322e88881b869cddc34873c58197b1d64d6ff5a23b114e78729da3ec3cc5759fe174
+EBUILD rhash-1.3.6-r1.ebuild 1905 BLAKE2B 94c120cf3bb4816a9142f5cd187fb82c6ddc0531f6ba3e8dcab30043fdfe8ca6f5a421ae808b1573babec6b15f9974227c8c15dd022d541e7f9bb9fe6f0aa919 SHA512 c5a95a592996247311c0b5e5979fc641eed99a5e49b64e9e8468a1f638e4e75e66de2c5ca39777e6cfb883306b7f0c0b4da0fad304acee1d1978a0860b1313e7
 EBUILD rhash-1.3.8.ebuild 2061 BLAKE2B f793d773cda3f0ae8274fd5864786a97c5aa2c9e8428d87b9d74e5015b5bcfcb2a548549320c7925cae7766de369f756e065d6fb5395dd9f1a92042235697bcd SHA512 be49c11d4201b92b33ee9c386bedac0378ef5298fc4d0165f30ac3cd088949171bfcfdf09bb28bee6807010896f012f54c0f674b1785df560f373f06d8eedc19
 EBUILD rhash-1.3.9-r2.ebuild 1955 BLAKE2B 7c0920958260b317476dc8a7bf147f38bf1467510dab0d556f8dd6e77bceed51d135b1c4f46dd7989373b938ffb8b1b7142da221dd8ac7051b2e2b82c9a966c1 SHA512 45e23ec2abbe36f4355721259c91c03f1eda855e9e9766197d79eb836cda61be4f81593bbe1b938e75cd7615beb6805cdb746f7b7278efdddccdf20cabe0c996
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index eae26f887c94..b04991265d82 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index 0d2818ca7392..b9cf5d32570b 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -2,5 +2,5 @@ AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb926314240
 AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
 AUX rotix-0.83-locale.diff 256 BLAKE2B a7564979a38ff517bbe0592ba12e2aab92c44fc828180c2587ec4b5db3acf4ffbf71feba959625faf93b9fd997d39c9330e4255e8c875bbc1653b66fe140e1c9 SHA512 7b8c82bac78c48f5d43c0246c41e7a7910f0119cc7b56500789d722d87f00e9d2356150063e07ae281435d5af60f9e15956c5bc0b236ea5f225435886117c4b0
 DIST rotix-0.83.tar.bz2 14685 BLAKE2B 296e094dfef2b35db39041e92d350befc970f3594c7aa2962b4dba0215e99b50ea887d3d636dc2e38ee570b60462bcf8304a6f7ee005315fa115b821ee0f29ad SHA512 1f318e15bd51cc197d9d9fc36e37b29c18fe7a8e8c40654c69ccf97d32b896afa7cc517c562750f6c1262baddbb451bd8a29ada994176e442630d8ed56ccf572
-EBUILD rotix-0.83.ebuild 811 BLAKE2B 3732fa4a6debfedc4d8200713ceee1bae1c702ee81b4550994a05b113980b65722d0fa9f7658f2d823e9f03871fc762c91225cbe0126eeea63020af15f236874 SHA512 b84fc54a2874589f14510b2819b6fa5935dad1497bb5fc5ec528ab4f4b880e99a0f14ccc60e4cc65797c645675fea524f4299b05a3a29a43134924efa612425c
+EBUILD rotix-0.83.ebuild 808 BLAKE2B fd13c0c25c53fd845a8f4d084e248dca7705ae6a687e0466377d0f85a883f4bafc770d49dc8a831ad3571092f78656cc1980765943eb29d46ecfb2a87115dd65 SHA512 8e2efb18dd723d94391ac51115bc6cff05c0ab120d4d38bde956ebc431a0705289f30ad152f4d78d4b065171ba37ce482f731ef692d91a88a224889445e616a4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
index ba5cad60e9fc..a25be97f7813 100644
--- a/app-crypt/rotix/rotix-0.83.ebuild
+++ b/app-crypt/rotix/rotix-0.83.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/app-crypt/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
index 6148c59edc62..79e480109a4c 100644
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -6,6 +6,6 @@ DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B fab9141c7fbfa01ec24f975503ac83be4
 DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
 DIST sbsigntools-0.9.2.tar.gz 56525 BLAKE2B 0bce1f534aa960672eab6a415e287b79ff9f18eb947e2217ad4533081f8b854e160b57828afbb56423b2dcab723d3a8aacb2e6affeb2057d17ce3c1761d96b11 SHA512 060753ed9c8db794e4755cc66c1940a2ccc89f4ddf0e825da1f1e6eaa75fc67c21060ee4b5dfb0c757b69e6f5959bfa68156d9f95a945cf63c6a20f1414a2c27
 EBUILD sbsigntools-0.6-r2.ebuild 1116 BLAKE2B 1e571c2018b72de8a454a380042897678f2308e8afab91b5e90c99eff266950e7374fc099b28d0d22b1a560bf6784eb6c77345c2b92e302f9ed98c80d4f3c45a SHA512 c11a43f77549f884c3a7c55333a62970239142340bc7ee6b85d029e3a07ee47a0b71265878ad99778bc7e48d7b0cee68c0e358bc8d914a0590796490e98aaba0
-EBUILD sbsigntools-0.9.1-r1.ebuild 1299 BLAKE2B 4622f49b8ad458e0dceb55cb363f1838b5fd12e906d017f45135734855d07edf2573ee8c68033aed6b7529f60b4a5be63c436ad8d93db774e37e07bbeb8efcea SHA512 d21a3252f993779b1698e8f5ea5b39afd8415c6f87860c28ba31a5350a41580ef6b6d72f9f0b6f441a4d5f0b4f8db4407a81a68621c67781163f72cf3fd0b20f
-EBUILD sbsigntools-0.9.2.ebuild 1238 BLAKE2B e49fda8ea0189edc485c0fdd119712185739d0f2368fd7c9a46ba528af720ca138a07c1988543aebf5e0e97ac9651f8d8d0a7bd115728dcb67c39b86f1a19a5a SHA512 5a513990b75fcc403059680f6986788a1ba96d263ca15a232b0a33e5aa29cb63758f3768812c5d608f65fd27951901392f8bfec8ecf4243f2dd63b33f1331971
+EBUILD sbsigntools-0.9.1-r1.ebuild 1315 BLAKE2B 1c26e9e3ac83f540fc701f06b85ccbc1d6964f1c86f355694b7ab76d2cab7906426822fd18a5f12f45bb0db123392a3cefb58f83d4f964fa0b5cae0917bdaa66 SHA512 6c97ed18cc616afa98088be44e4eb39efc502f9dc3344cf3323ca4b0a1718b0393c7c4c6e8d480c15440a9dc87a143cd3975e2de3ebed504fdc80f604c540f15
+EBUILD sbsigntools-0.9.2.ebuild 1254 BLAKE2B ac843eafcfe52a3aaf0eefc520ecda1e84dcee28b5a28c087a69045ba736437bb896cc9328407ec7809f85dd56c2aa47d5562456bc0daa8ff9bd0213210ead38 SHA512 0aed75d6d5d073db6749953a3b53d31563f2e6c37b50afe6b09b96476e607dfe26d19e21e17d1ea573f7135333bad2b19ed4e1d39f54ea0d82411a9c8ecf7c08
 MISC metadata.xml 291 BLAKE2B 0aeb75750176d719f10db508a8924d0bf2fe75e8544b275a7c7e11c44320ce4f7819febb093dd3083a33a998a225f2a3b882407a8ffc03d1a57d03cbfc0a7ff2 SHA512 f7a520fc9a216ff983bd3d361c6ddb3b635eb5dcd94ed042e7c5d0beb0b4e10cdb231e2b4ace599ebb93d4bb46e071a744f1a780ec83f451bb2ee6bad4c2d8cc
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
index 3f0fd8ade786..8c6afc71e03f 100644
--- a/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 MY_PN="${PN::-1}"
 
-inherit eutils autotools
+inherit eutils autotools toolchain-funcs
 
 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
index ccb45d15616a..bdc502c29ccf 100644
--- a/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 MY_PN="${PN::-1}"
 
-inherit eutils autotools
+inherit eutils autotools toolchain-funcs
 
 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index a081271249f1..4d1dd039c041 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -3,6 +3,6 @@ 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-r2.ebuild 874 BLAKE2B d896e5071e8f98e8fdf98dfb307fa0d287f66469a32635c896357edbcb2c16e08ab8c0a5c4782ea8accf49f38232076e9780ac8c5eced003cf70655c76a84621 SHA512 388a7a041d444c071e40af5ee84053524e70d6a5acffad317ddfb440ca76969df7f6f7360491bf59889c63e6c6798bde920cf1961ebb5911db4720c78be66040
-EBUILD shash-0.2.6-r3.ebuild 940 BLAKE2B 2ebd8ffee15cf814ba6d6eba81fa1f114301f2b219513b6322b8560a0d694ae685da45307564714c1be8b3e7c10c724b97e9cb0f7f50af62aab8d57e1e80b461 SHA512 a145399e70351861a4032eb73a493322c4e8749a500965e060f0496994f13bc1087026278f0691cdffccc916a500c7d3bdd3a6cafa60c326a301b962889f0dbb
+EBUILD shash-0.2.6-r2.ebuild 871 BLAKE2B 2cb3450aaab5d42f89a03e1168f8880d9a897495aab878273788106cf0fe5cbf6903f3aac081a53957381832e133109ab12b02f1188b753d7a8f9a62a6a30290 SHA512 d6db67dca61798674b516c735f94fbd9cb03fe0c50c910b1cf96688ff6d5b3969ce5eb0fd1ba5740d86ee85d7a7c848dcf1c8f220a7a8928814af9bd0d785b6b
+EBUILD shash-0.2.6-r3.ebuild 940 BLAKE2B 799afad32f6f5af7816c23b8c4cd03c14f28bd4faff4a82dda02317943dcf721735f4d0bce122eb27818cbbb086e028193a46d9fb0f456acf3696cf6b6c5dbfa SHA512 f891f476775db871aca8aa048902d80c91c052183667dcf6fcb069c8f17db85a09a7069c3730e23164250c2f3353e8024a9909f5e20a8aa79491f653ef025126
 MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
index c00189dfb004..b9850e564720 100644
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
index 48a74e0bef75..0763364decc4 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 8810d933905e..aeb1adac06a2 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,3 +1,5 @@
 DIST yubikey-manager-qt-1.1.3.tar.gz 13316325 BLAKE2B 765634b05fff9efdd5ec5e91e0a5de7f04144476b83f7b3ba8a0c8a1bc95ca7132f25e193afca2bec17fe377c683063a14657efc24fb047a64a8f4498c7abaed SHA512 84bcca3f74967ba8aa470b8dd6c8699ff6a93a85ce942934a1d0cd674a4c507ba297d9a5ebb40bae3476ea713965a7bb3816dad1110a045c338f070eb249f02b
+DIST yubikey-manager-qt-1.1.4.tar.gz 13318769 BLAKE2B 4ca85d8f9681f725cf9f8d547d850516c77a618c595814c8add12250677e495952229c966a2e59d449dfa33ac9c6788f6daa8494702137eab937b299f896e8dd SHA512 9e3e85a22d7be4e6ab30b3fd068fcc3406348d2b38f96e1ef8d693bf37edafaf8f16dc408cc9319173e871cc24d2cc4db5853ec3f8a0365221722504dc6fde04
 EBUILD yubikey-manager-qt-1.1.3-r1.ebuild 1470 BLAKE2B 4a6e9ba2ed294b1ff49808fa17d6b9e06cc3be46033365a611844369f1cc571b8de1a51ce0e6199038c4628cbabef2648713a189d087a423eab2ce9933a1deec SHA512 36b25fb8a6ccca5348b4cc8627066621bff2dab4ae8f508d8d9d43dbebf48a412ca38146c6e66b29658f7cff542813ad76cef1f9d2db7ba6aba1d2c0e7527014
+EBUILD yubikey-manager-qt-1.1.4.ebuild 1470 BLAKE2B 4a6e9ba2ed294b1ff49808fa17d6b9e06cc3be46033365a611844369f1cc571b8de1a51ce0e6199038c4628cbabef2648713a189d087a423eab2ce9933a1deec SHA512 36b25fb8a6ccca5348b4cc8627066621bff2dab4ae8f508d8d9d43dbebf48a412ca38146c6e66b29658f7cff542813ad76cef1f9d2db7ba6aba1d2c0e7527014
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4.ebuild
new file mode 100644
index 000000000000..6fb3d2e0e306
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit eutils qmake-utils python-single-r1
+
+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
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 73adcc5c0743..1cae98855174 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,3 +1,5 @@
 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 1599 BLAKE2B 0a737c8dcffadb01fa75041b4341fafbd4e82615a04841def05ea42c0ff275e2aca6b23adbf17c8c5f839ecfe0d4f6383e1e90b7a60f79bb89252c89ecf4c44d SHA512 fcd0fbe3d09128a9e7360371171407bf732a22eccb8216077052f5184820bb4badfe6f0682fd9259257fda5b0f455f34c5c129c18073cce713ad2f094cc9e855
+EBUILD yubikey-manager-3.1.1.ebuild 1601 BLAKE2B f1e8d4d55b6365b00bc1acddfc4eceae2fc018962eabdbee15795ce2ef4cbac6bcae462a19631c8fcc68966b323f985104dd6f1a3e5221319190ac57e7852aff SHA512 e0e4b0c4c5f38f90e478cdd3216b5f60b092b10a73e5625d2cf29bcf1935c8a1e3c8db0359635a4356683e4c483097c859a727afde5638bd8fa0e7ce99f481da
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.1.ebuild
new file mode 100644
index 000000000000..c510503999b1
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-3.1.1.ebuild
@@ -0,0 +1,63 @@
+# 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}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	>=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_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
+	)
+"
+
+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
+}