gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-crypt
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
98 files changed, 850 insertions, 672 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ed2560d88987..fec87c9fdcc5 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 282942a77c34..1b9318dc4373 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
-EBUILD acme-0.38.0.ebuild 1721 BLAKE2B 3b07ade5ac66c854fafa0f17fac36db968f4e39decc60be4bd2849de87d84c2e9bf0aa2fb5f7eb0d7b55d36b5c6f12b136a95e5601880f986fe430fe08c328ae SHA512 095dd2b679f056c77694c7b0e673b0aaeab779c7e012bc07ca0709a0043f9c4b1ee72ae94f3d9d2994c341803f6f603ebfdc5387ba73ecec8d2317c01a5cf1a5
-EBUILD acme-0.39.0.ebuild 1721 BLAKE2B 3b07ade5ac66c854fafa0f17fac36db968f4e39decc60be4bd2849de87d84c2e9bf0aa2fb5f7eb0d7b55d36b5c6f12b136a95e5601880f986fe430fe08c328ae SHA512 095dd2b679f056c77694c7b0e673b0aaeab779c7e012bc07ca0709a0043f9c4b1ee72ae94f3d9d2994c341803f6f603ebfdc5387ba73ecec8d2317c01a5cf1a5
-EBUILD acme-0.40.1.ebuild 1750 BLAKE2B ccf351cdc02809191fd1b2f9bec0ab79e5e710b685a7e2c8ad9555096b109b27c8db327681b4c3bee8e11dc48c627b194d56eb292f0fbe530834ddf932714f8a SHA512 b3eb0461905002ecc5cb7c53a1c43a01fe5c121200749a02a6c783bc9d91f77e65e7dcaf8a299663e3c0820578c57d98830a3cfeef309168f6941e63bc9b0702
+DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
+EBUILD acme-0.39.0.ebuild 1748 BLAKE2B 5b7e165bd8bfd93fc26043da5c5b9786b07e5209455a3a2ddb2fa7598d885dc5996a4ba0497d4dde1adfe5b9cce2b94208d7dc05b9415157984fd66951f38036 SHA512 139af0225c89eb0b35a26dd20e4099ea0c3960defa2592cb48796d9a5cce50b62d43cb42af3ef79b00b68784e19673c9f1963f9d61df4c587544000ded15faac
+EBUILD acme-0.40.1.ebuild 1748 BLAKE2B 5b7e165bd8bfd93fc26043da5c5b9786b07e5209455a3a2ddb2fa7598d885dc5996a4ba0497d4dde1adfe5b9cce2b94208d7dc05b9415157984fd66951f38036 SHA512 139af0225c89eb0b35a26dd20e4099ea0c3960defa2592cb48796d9a5cce50b62d43cb42af3ef79b00b68784e19673c9f1963f9d61df4c587544000ded15faac
+EBUILD acme-1.0.0.ebuild 1750 BLAKE2B ccf351cdc02809191fd1b2f9bec0ab79e5e710b685a7e2c8ad9555096b109b27c8db327681b4c3bee8e11dc48c627b194d56eb292f0fbe530834ddf932714f8a SHA512 b3eb0461905002ecc5cb7c53a1c43a01fe5c121200749a02a6c783bc9d91f77e65e7dcaf8a299663e3c0820578c57d98830a3cfeef309168f6941e63bc9b0702
 EBUILD acme-9999.ebuild 1750 BLAKE2B ccf351cdc02809191fd1b2f9bec0ab79e5e710b685a7e2c8ad9555096b109b27c8db327681b4c3bee8e11dc48c627b194d56eb292f0fbe530834ddf932714f8a SHA512 b3eb0461905002ecc5cb7c53a1c43a01fe5c121200749a02a6c783bc9d91f77e65e7dcaf8a299663e3c0820578c57d98830a3cfeef309168f6941e63bc9b0702
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.39.0.ebuild b/app-crypt/acme/acme-0.39.0.ebuild
index e5015f90babf..f0658af138c4 100644
--- a/app-crypt/acme/acme-0.39.0.ebuild
+++ b/app-crypt/acme/acme-0.39.0.ebuild
@@ -22,6 +22,7 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
diff --git a/app-crypt/acme/acme-0.40.1.ebuild b/app-crypt/acme/acme-0.40.1.ebuild
index acacc42fc78b..f0658af138c4 100644
--- a/app-crypt/acme/acme-0.40.1.ebuild
+++ b/app-crypt/acme/acme-0.40.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.38.0.ebuild b/app-crypt/acme/acme-1.0.0.ebuild
index e5015f90babf..acacc42fc78b 100644
--- a/app-crypt/acme/acme-0.38.0.ebuild
+++ b/app-crypt/acme/acme-1.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
@@ -22,6 +22,7 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index d5ff1bcc8971..6a447e20271a 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
-EBUILD certbot-apache-0.38.0.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
-EBUILD certbot-apache-0.39.0.ebuild 1078 BLAKE2B 116199201215bc8abda5091dd5e44c1277b6d765df2739949b612a2c37b82a2718c0053f8b474bd11571213f95de2e3269ca57213b805cd84702635342bf6c55 SHA512 368acc54017803b685a8d4bb2378004b9a6c05b0bfe6167f193d9cdc859dd8512a785e62e8b547350e9d8f5eb413df023aaa31573ec05aec7bc7bde16cb5a856
-EBUILD certbot-apache-0.40.1.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
+DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
+EBUILD certbot-apache-0.39.0.ebuild 1105 BLAKE2B 4b4ea8187891be94a40a1cd6da4a23a5c1729eef07570db9f134103f40fca4059eb6441b0002cc576b078189a04183a96bad0223135279ce1a1cb10b470387f3 SHA512 c0059f92f82015b641ed9ca61f9242ca625b71e4d519127bcc4067d063b625c64526e41bedaa36fd2afdc4ab8d346a4c3f0f54b6c0519c4d96f1de4d682e2490
+EBUILD certbot-apache-0.40.1.ebuild 1105 BLAKE2B 4b4ea8187891be94a40a1cd6da4a23a5c1729eef07570db9f134103f40fca4059eb6441b0002cc576b078189a04183a96bad0223135279ce1a1cb10b470387f3 SHA512 c0059f92f82015b641ed9ca61f9242ca625b71e4d519127bcc4067d063b625c64526e41bedaa36fd2afdc4ab8d346a4c3f0f54b6c0519c4d96f1de4d682e2490
+EBUILD certbot-apache-1.0.0.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
 EBUILD certbot-apache-9999.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
index 492ef9bf4862..c45e7e40dd95 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
@@ -22,6 +22,7 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-0.39.0[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
index b14f7a5ac825..c45e7e40dd95 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
index af3177274026..b14f7a5ac825 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
@@ -22,9 +22,10 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.36.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.39.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 279460e65581..9c2a2f46e83e 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
-EBUILD certbot-nginx-0.38.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
+DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 EBUILD certbot-nginx-0.39.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
-EBUILD certbot-nginx-0.40.1.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
-EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
+EBUILD certbot-nginx-0.40.1.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
+EBUILD certbot-nginx-1.0.0.ebuild 1012 BLAKE2B 927625b9f13a84ae5829a68bc2dbe1606ac3dc543429e804f28e4eabef8b54bf27edd9cfa6f65496e2daae152e384fa61ae1927fa24fae35421a2c1031582b64 SHA512 9c99b8da1d6934e0a6d160fa735389262db7d8d3c057d0a99f5fb58ee1a88a7d84409acefd40673cfc7d81e1aa15ffa0e28be9f1b00030a6d80add9143b8305a
+EBUILD certbot-nginx-9999.ebuild 1012 BLAKE2B 927625b9f13a84ae5829a68bc2dbe1606ac3dc543429e804f28e4eabef8b54bf27edd9cfa6f65496e2daae152e384fa61ae1927fa24fae35421a2c1031582b64 SHA512 9c99b8da1d6934e0a6d160fa735389262db7d8d3c057d0a99f5fb58ee1a88a7d84409acefd40673cfc7d81e1aa15ffa0e28be9f1b00030a6d80add9143b8305a
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild
index c4f2df8684e9..73497ec2cbd3 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
index 73497ec2cbd3..145d96dcb8f9 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
@@ -25,8 +25,8 @@ IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.35.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.0.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.0.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index c4f2df8684e9..145d96dcb8f9 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -25,8 +25,8 @@ IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.35.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.0.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.0.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 501d9b82049e..6282ef969346 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,9 @@
-DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
-EBUILD certbot-0.38.0.ebuild 1409 BLAKE2B 898f091d39092bbc439535beb4ca5779b63ebe66a1e6490e941b5efb5a2185718d870c24f4365a76f91eab363ce9687028df95acfd2d2d5f0b3e4c7da456ff69 SHA512 9e8f33e0b9c8fc8ca32ce08a52e623aa6a9346eadf81b421a187d51235dd11f2b9d5e1564609371fe937020110c4c2a6ba82eda8cff287d39f99acf34012cc90
-EBUILD certbot-0.39.0.ebuild 1409 BLAKE2B 898f091d39092bbc439535beb4ca5779b63ebe66a1e6490e941b5efb5a2185718d870c24f4365a76f91eab363ce9687028df95acfd2d2d5f0b3e4c7da456ff69 SHA512 9e8f33e0b9c8fc8ca32ce08a52e623aa6a9346eadf81b421a187d51235dd11f2b9d5e1564609371fe937020110c4c2a6ba82eda8cff287d39f99acf34012cc90
-EBUILD certbot-0.40.1.ebuild 1438 BLAKE2B a1d6c6e1c9e43263c06bb16c2b1095253a63e25863337963452790b8809f2f488f0caece08df387b01f9fba531e2051bf265c1df7e83e169fd6cea6c1adb5fcd SHA512 a910e3f910b6b42a4995d2e0f69f446844e58a22b8d75b5a12585595e98976b9958d061197b5c139c43d1d9f083aebe057190e50b43a9cdf2e9bedb40d435286
-EBUILD certbot-9999.ebuild 1438 BLAKE2B 01ed1780277605210ddaedc7692a0b14a3dce68bd8e93939c9359e5e025fb22cc32512d7557dcb5d95b5a030f91319c51321c88d5fe6c64056f8a2f434eedbbe SHA512 1c76cd41494efae54731bc5fbc77edcb589f30127afef11bd6f8d625648f57b5df251e4a5b06adebb82c0502c431c8b150ac036c66312d6276db13590731991f
+DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
+EBUILD certbot-0.39.0.ebuild 1436 BLAKE2B ab2270b182cddde0f711b62f12c4615ce7847e32364dcc1efe5ce4dbbea989e24e2ff3ad2cfbfab354d835b1da57c319c470276ce6d6427756494fb7107b7f8a SHA512 79bf323f59b3f6109def173277617b91b8548910f4822b4577f4f0bde1fe6568ea20381433096b5ce96036a86d4b620fd0921dcedf24f7d650c814af02f7f658
+EBUILD certbot-0.40.1.ebuild 1436 BLAKE2B b550a22df071d4ecd5c66bbb57bc72be2f47c21917512903c58084c65e75447ada4308e7703f667335d981fa438902244ea78c8510707861bf99656474762d8a SHA512 879b6e7cffb40eca653e2830e402b02ce4b25e5b9aa03ee9d32d09bd5e1109d98229340e4b8f048a2a4cbd46bf3098bf309575f095579a3a5159b0054e66a408
+EBUILD certbot-1.0.0-r1.ebuild 1499 BLAKE2B 4e247309ed6cb2b75c76612a0ea223307a1ec0de10f795cdf8c484231eb8dffbb8ed4208bcee19b879f9772d72686ea9637897e6918901634b1f0c25195e37fe SHA512 3563bf9bd484c0d1f5f4effb23a8aab7a4a0f7ccb94d48d5a60edee41964c4a63bd59d1d1185b9e0b14b9876f95ff679062382dd40abb2453f43e83057bb80b5
+EBUILD certbot-1.0.0.ebuild 1499 BLAKE2B 4e247309ed6cb2b75c76612a0ea223307a1ec0de10f795cdf8c484231eb8dffbb8ed4208bcee19b879f9772d72686ea9637897e6918901634b1f0c25195e37fe SHA512 3563bf9bd484c0d1f5f4effb23a8aab7a4a0f7ccb94d48d5a60edee41964c4a63bd59d1d1185b9e0b14b9876f95ff679062382dd40abb2453f43e83057bb80b5
+EBUILD certbot-9999.ebuild 1438 BLAKE2B a1d6c6e1c9e43263c06bb16c2b1095253a63e25863337963452790b8809f2f488f0caece08df387b01f9fba531e2051bf265c1df7e83e169fd6cea6c1adb5fcd SHA512 a910e3f910b6b42a4995d2e0f69f446844e58a22b8d75b5a12585595e98976b9958d061197b5c139c43d1d9f083aebe057190e50b43a9cdf2e9bedb40d435286
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.39.0.ebuild b/app-crypt/certbot/certbot-0.39.0.ebuild
index fc61e30313d3..33e7e1409f34 100644
--- a/app-crypt/certbot/certbot-0.39.0.ebuild
+++ b/app-crypt/certbot/certbot-0.39.0.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/app-crypt/certbot/certbot-0.40.1.ebuild b/app-crypt/certbot/certbot-0.40.1.ebuild
index e59b628d2009..bf95047b3dfa 100644
--- a/app-crypt/certbot/certbot-0.40.1.ebuild
+++ b/app-crypt/certbot/certbot-0.40.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.38.0.ebuild b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
index fc61e30313d3..37c17aa225d3 100644
--- a/app-crypt/certbot/certbot-0.38.0.ebuild
+++ b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
@@ -7,9 +7,11 @@ PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/certbot
 fi
 
 inherit distutils-r1
@@ -20,11 +22,12 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/certbot-1.0.0.ebuild b/app-crypt/certbot/certbot-1.0.0.ebuild
new file mode 100644
index 000000000000..37c17aa225d3
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/certbot
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 39028621e8f0..e59b628d2009 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -25,7 +25,7 @@ RESTRICT="!test? ( test )"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index a48cce0844db..cd97c39100c2 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,7 +1,10 @@
+AUX cfssl-1.4.1-build-fix.patch 587 BLAKE2B 74651f5b21947cab2a004e25ca4b30cc6f33a7a5a7089c7d25929d0792f497139268c51ab3f1054dfdba0db073b2f57c0e1807f50b3278527611d17c4942951f SHA512 606d410d70f9b457fe83f2933bb0f335256ddbb1898911984a220da2ed635b732f5a04ad4902de42913aa987793165974117855a6b19857853478d9e7394fa9b
 DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
 DIST cfssl-1.3.3.tar.gz 5005924 BLAKE2B 81e7ec1f27a6597d69f16254a5ded672b9b3ac0bc8dee0f5bb00939e86147b1ed0389d38ea406fe671f3de052ac2e88fe320ffbf6065a83c2d9627ac3c497740 SHA512 39b42f3f8c22e254fa8ed4079308ecad1b0f77cdb56e57099e434389866e58863687307d6cf0f5ec8e4664ad4743ee8728f47a6a1375f3f74f8206a709f0ffc3
 DIST cfssl-1.3.4.tar.gz 7092440 BLAKE2B 85a7a73ae5b18ae0e4ac02b1a4d5f633d73f2c0f81cb49ef85c39b6a241ac538220a8cebb448af795140a6308f46f6e53003f25a31edad452cb6db39ff95a9b2 SHA512 796f24f9a7cd9966b3586b5b08deb410570cc31ec747b0c834215c105df1b4fea4907bfa223d196ad71fb296724dc690b6ffd298c8ef81db1333ed3e69f1ecd4
+DIST cfssl-1.4.1.tar.gz 5736648 BLAKE2B 581627eb269fcbbbe9ff3afe558c6ddc7afa10f563444899244045baa0ae195d8822b389e7c59bec6c9135b1159b18d2a5e497c83cd26eaa47a3a87de23ce694 SHA512 0aa557708a300e2eaf48a99d55794069530b6842584cdd867a864272b205c89d5abc2acf3a19d34b3b5519a6429b5f55685129638e65d574ad6afe5b7e1e1e8f
 EBUILD cfssl-1.3.2.ebuild 750 BLAKE2B 68a9cb8b12c8f5accdd88c17dfbb061ba9213e5ba3e975ccc3b40bc69d6a16e8b4092462f45c84863e576a3586dca0d2d256b03a0fce8a4dc679f933a0645a76 SHA512 aefe6c912d5b40145a01bcdc273abacc1a93e5c76b12f26b0a04db13e6fccb9041939469fd98ed507adc5ca4ca84ecdf8833422643f87777331ddf27ca9448fe
 EBUILD cfssl-1.3.3.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
 EBUILD cfssl-1.3.4.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
+EBUILD cfssl-1.4.1.ebuild 648 BLAKE2B 3cea9d53516b674e0d0b6e45ed7f346acc6a83398ed80ae5293c0daf86ffadba4c5b86e63ec7b72011fe7b544cc446e15aa14d8bf5625f59a3cd4af351486166 SHA512 e7a35497b87ef52025fb325cab03d6851d11e28d94287f482f4642d441cf902802c3db65ae2635d706c3e6cc97169d70330bbedd6bf6af0485e8071a6708ffe6
 MISC metadata.xml 329 BLAKE2B 5188aa700150b22b0d2972d57ee0db2d1a2239017edbf9547961126b7158060c74aaafd1ffedfa25f76402766a4403d41f3875a8bd2c43d84150177879e35186 SHA512 b56f2d72ad1a5ef0c2531cc1d3524bf13f7089d099bbd774d1774aca5dfb7f8c074b945203ccb80672c154f98d8728cf9d8671e7df9b328c01c2e79cb9ba8be5
diff --git a/app-crypt/cfssl/cfssl-1.4.1.ebuild b/app-crypt/cfssl/cfssl-1.4.1.ebuild
new file mode 100644
index 000000000000..6cec5015d3dc
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="Cloudflare's PKI and TLS toolkit"
+HOMEPAGE="https://github.com/cloudflare/cfssl"
+SRC_URI="https://github.com/cloudflare/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-1 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
+
+PATCHES=(
+	"${FILESDIR}/${P}-build-fix.patch"
+)
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" emake VERSION="${PV}"
+}
+
+src_install() {
+	dobin bin/*
+	dodoc CHANGELOG README.md
+}
diff --git a/app-crypt/cfssl/files/cfssl-1.4.1-build-fix.patch b/app-crypt/cfssl/files/cfssl-1.4.1-build-fix.patch
new file mode 100644
index 000000000000..0435a3c88509
--- /dev/null
+++ b/app-crypt/cfssl/files/cfssl-1.4.1-build-fix.patch
@@ -0,0 +1,16 @@
+This patch cannot be upstreamed in this form. However, the following
+issue has been opened to discuss integrating a better solution upstream.
+
+https://github.com/cloudflare/cfssl/issues/1062
+
+diff --git a/Makefile b/Makefile
+index 10a52fc..7fc019b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,4 @@
+-VERSION := $(shell git describe --tags --abbrev=0 | tr -d '[:alpha:]')
+-LDFLAGS := "-s -w -X github.com/cloudflare/cfssl/cli/version.version=$(VERSION)"
++LDFLAGS := "-X github.com/cloudflare/cfssl/cli/version.version=$(VERSION)"
+ 
+ export GOFLAGS := -mod=vendor
+ export GOPROXY := off
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index 9a1c1ed78c97..2b1f8519248e 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -2,7 +2,7 @@ AUX 65easy-rsa 37 BLAKE2B 4a53c21a6027a9c5857d93e23703651b3d2642f54ce4519e727dd4
 DIST EasyRSA-3.0.4.tgz 37721 BLAKE2B 84d81eb86dfee42f6de935cbd308262d36626170880a24d260dd8ae708d6340feb63866cb1704c9209675112eef4a251399e19948e88067e90b410c00707a770 SHA512 0bc145e510891af022c05427436c3ec7a29fce9d83e022954acd0cc470c88c43f5549af0b6263b46e8dc5fd167621a118cba0c01a514c51032cea8f1efbb9787
 DIST easy-rsa-3.0.5.tar.gz 638366 BLAKE2B 990ef0cc7effd80d06d15dbb2dc3ef9a0a282a4adb501475fbd43c1b50bead374ba78ee9652e9c0f8d2e54354be4da6a0ae302e4ef2d576bd7fd981d59566d64 SHA512 9231ca7fda489a230d8418679d8824503ae680e2de6682d5f2d2fa716597f7df5980b7b88a3f6eb4fa0b7d9bbead59a1e2e4b8f4a5a36bda7f78ffa8f3c23d34
 DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
-EBUILD easy-rsa-3.0.4.ebuild 848 BLAKE2B 9f2f6974e21b91114185a3859d83e6d1274d8b02803fcf9ec949e8e27db807f2efd592f774ceeb0aeb41523f94080420a81a0126f3fa688aaef5637a4a07145b SHA512 3410d194d52040259e599093380d2ba443bc51258a6785505eb53326ebada4981938d533b202e79da67d794836d83aa161298227daedc67eb55ecd4be296d56e
-EBUILD easy-rsa-3.0.5.ebuild 819 BLAKE2B fc974df53e777c3fd4ea955db397bbafffd59ca982cf0dcb74c49ed3601757ec0952ccbce667d01aa7fca855cd0233391cb2d6576d3121ffa5887e5dce05f3df SHA512 1e8f1d0e31e9922206381920128aa9a4eec1c8e9468b23991605cf3efccea128d95e2029864df8f86f0ae7dffa5ba96309d518d627f51bf966010f12fdc71f85
-EBUILD easy-rsa-3.0.6.ebuild 826 BLAKE2B ab7eaa17680e14af15cce6c307649be39994141976f6908013ef7f0164b959beefffb956ecd7aee85b370abcaba4c1b38e8b8f75c84ee8986963855ee5aa3da6 SHA512 b545bc65ca4a44bb4ddc801f2dd5de35f0959babf12a336b5e2d4a27b5f700557edfc51f28fa8150d1f94eab8b8080866936456ea612a63386d71c49418535f2
+EBUILD easy-rsa-3.0.4.ebuild 822 BLAKE2B 2f56ee8b02a4e31e15c175e98e2e74992d73d2e26a9d82c7b26e2d3cecdf9d5f9bd43281812d72e893aacdfd89545d76d0bffe01039c0b4633e41716e6d94138 SHA512 96d5d78a769f22b18b0a49551a07c0f87ed3945184781b3a9200a33174e68ffb73e75fb1f4eb805a041f5b9e041e9276e943a2a2fa7d1e7f34f0b22b04ba60b4
+EBUILD easy-rsa-3.0.5.ebuild 796 BLAKE2B 425e65db93b40a90536753204ff30e052eecd2ddea08a2a291bc48a00789c8c5a9d6a28826047754b2c8b1482ff5bb374219a4035251d7e3714a42fec8a401b9 SHA512 17c49fce4f2caa4a91b7ecdfebe1d427743d2c7da4a97fb3865796e4e600fa531310a820b112514f2f2be28fc7ab27a8f500387dd553625c423baef56ad17280
+EBUILD easy-rsa-3.0.6.ebuild 803 BLAKE2B 5b4f8fee8d79f9a1dc3ff5c9ab67d819359e701419aff3f562488b049f7fab3a9abcf2d0c6694f2710f5ecdde31b4bedac3c43f64fdae9c80f0d80053f1aadbd SHA512 e6b20168c9583a843b9d9034a1eb252f939bc0e404de3a3c392e7676c01800309ddbaf9916d47a232437b25ee5a8485e70f9d90852e9dc68422595c078b81039
 MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
index c5f170979bc0..b5675685cfc2 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,7 @@ IUSE="libressl"
 
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
 	libressl? ( dev-libs/libressl )"
-RDEPEND="${DEPEND}
-	!<net-vpn/openvpn-2.3"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
index 30b1ef4e4b04..6add47e064db 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,8 +14,7 @@ IUSE="libressl"
 
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
 	libressl? ( dev-libs/libressl )"
-RDEPEND="${DEPEND}
-	!<net-vpn/openvpn-2.3"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	exeinto /usr/share/easy-rsa
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 d977a8cc3464..2246b264a3bf 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
@@ -14,8 +14,7 @@ IUSE="libressl"
 
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
 	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	!<net-vpn/openvpn-2.3"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	exeinto /usr/share/easy-rsa
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 55f06acda7af..70b59ca3dece 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -1,9 +1,6 @@
 AUX 90-ekeyd.rules 691 BLAKE2B 8c36ca2a6228e2fd6b203513a5f23f3e9b44193c46127c46def7110b0a3a3e020e6959cb4c3dd8bdbe0c057e389c37326011083aae0104b91f247a2932a3c915 SHA512 12d949e90af31992ac671ae42172a2169592dfba9b921ed684a37e7fe330bef44abb2c0a1a5df63ddde940b00fb10fa9cfba493c69614ce0f10aba4de78ea6d3
 AUX ekey-egd-linux.conf.2 266 BLAKE2B 387aa2985ddd362f2c0d9eedbfcd23b24a52b210d853671e3670819e730648b12658b8364fafc39b41cdd1601a8ba1471c7f23b1c8cd9a330a7169049e890420 SHA512 3e8db66552a5c04045226debbf6a7add01301bf98bb26c48033f4bceacde82f25e449fced2d46667009165e9d2f327134e6c963142295d7ef065eaa47b383393
 AUX ekey-egd-linux.init.2 456 BLAKE2B d4e7900bc0e2a089744cc1bf49084cf83c2d8f8ade84bbdea39d6c21f7896bc22e8ef7b650a2efb198b19bea5abb983b20dbafde019d8fc1ec3d57171f491a9f SHA512 55e7be6464b685aa5b290bd310020f4a01926d07a9cb071fc117081bc751a902ebbb9db51a81a5168a34cebc2ecc02360b4917356e25a2e205f57491739ff190
-AUX ekey-ulusbd.conf.2 495 BLAKE2B 16ff2a3dec83f6623a2ed714e18db8c21885014c99d6409c39ec0745979b3ef10ae693114acdcda6697e1bfce9d9ed3cceed8abb2b4319f8ae29904c6e69a369 SHA512 9d4b5d594790d34ed4b513a00b60518c0770ccba87b159e1f9eaac382275658e53f5274ee24743e8d103bbe4a2351ce865157013e0dfeefa32e37fe4d2348677
-AUX ekey-ulusbd.init.2 900 BLAKE2B a9aa95448ff5d65d18689489bc14a2ddedc8f5ac858d28d569a58ae960196342c86893f903975bbe86fd9ea8a27950bbd36df91061fd8f8e146285bb18d27e51 SHA512 cae15995b8d8b66ef4209fe3cd8a14edcc2645b10dbb6f4da54e929a9347db675abcf9232841863c14a450789768247eda5929667021b5bada041365fbc1470d
-AUX ekeyd-1.1.4-gentoo.patch 6565 BLAKE2B b7fc5fe83eeb0d8f56d2d2a4ed00970502cac53d5c5e4c485b2b25af672b74f3c263c944a4b2abb2b710655f80276ed6aceec59b22ed76d72d6b280ffd1731d6 SHA512 f65a1cef8bd4e280a8dd8ce51f23661286ed3fd688d34943793eb326d417016a53312c6b344aab3465a8930c7de8cd10d6d572bd67f92cf8f65386f2f5ca1875
 AUX ekeyd-1.1.5-const_char_usage.patch 1094 BLAKE2B e19d837be0652844c95cf87af8381a09f1913471609616ded55e6e3d7e0876f8996d31909e72c0ec759b324e54cc785bbde77c4eaf4f87e81935521d71427176 SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5
 AUX ekeyd-1.1.5-enoent.patch 863 BLAKE2B ec953667eaa23dcf91b15b01689c4be6315641dadaf9021240d67039ed88f651a3fe131581b60e71da8a4d9776952bed9db144c1340c98cf119e5746b53a16c9 SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50
 AUX ekeyd-1.1.5-misc.patch 1245 BLAKE2B 555c6406461226ec8867f226e88bb9ca4f39d0a726c241c1638dd3339434b9f1d34620319de42c62e034da12cabebb739c92cc5df96ec9d3c79b339be839d6a2 SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.conf.2 b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
deleted file mode 100644
index 15a641fa3ffe..000000000000
--- a/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2009-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# The userland USB daemon has to know the USB path of the EntopyKey to
-# work properly; in alternative to providing these statically, they
-# can be found by giving the serial of the key.
-#
-# The serial will also be used to set the default path to open the
-# socket to.
-
-EKEY_SERIAL=""
-#USB_BUS=""
-#USB_DEV=""
-
-# this is set by default
-# SOCKET_PATH="/var/run/ekey-ulusbd-${EKEY_SERIAL}"
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.init.2 b/app-crypt/ekeyd/files/ekey-ulusbd.init.2
deleted file mode 100644
index ef52db2a6685..000000000000
--- a/app-crypt/ekeyd/files/ekey-ulusbd.init.2
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2009-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekey-ulusbd" ]; then
-	INSTANCE="ekey-ulusbd"
-fi
-
-: ${SOCKET_PATH:=/var/run/ekey-ulusbd-${EKEY_SERIAL}}
-
-description="EntropyKey Userland USB Daemon"
-
-pidfile=/var/run/$SVCNAME.pid
-command=/usr/libexec/ekey-ulusbd
-command_args="-P ${pidfile} -p ${SOCKET_PATH}"
-
-depend() {
-	 need localmount
-}
-
-start() {
-	if [ -z ${USB_BUS} ]; then
-		set -- $(lsusb -v -d 20df:0001 | \
-			egrep '(^Bus|iSerial)' | \
-			grep -B1 "${EKEY_SERIAL}" | \
-			head -n 1 | \
-			cut -c 5-7,15-18)
-		USB_BUS=$1
-		USB_DEV=$2
-	fi
-
-	ebegin "Starting ${description}"
-	start-stop-daemon \
-		--start --pidfile ${pidfile} \
-		--exec ${command} -- \
-		${command_args} \
-		-b $(printf %03d ${USB_BUS}) -d $(printf %03d ${USB_DEV}) -D
-	eend $?
-}
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch b/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
deleted file mode 100644
index f1491362e83f..000000000000
--- a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Index: ekeyd-1.1.4/host/ekeyd.c
-===================================================================
---- ekeyd-1.1.4.orig/host/ekeyd.c
-+++ ekeyd-1.1.4/host/ekeyd.c
-@@ -209,7 +209,7 @@ open_foldback_output(void)
-     return (output_stream != NULL);
- }
- 
--static const char *usage=
-+static const char usage[]=
-     "Usage: %s [-f <configfile>] [-p <pidfile>] [-v] [-h]\n"
-     "Entropy Key Daemon\n\n"
-     "\t-f Read configuration from configfile\n"
-Index: ekeyd-1.1.4/host/ekey-setkey.c
-===================================================================
---- ekeyd-1.1.4.orig/host/ekey-setkey.c
-+++ ekeyd-1.1.4/host/ekey-setkey.c
-@@ -79,7 +79,7 @@ calc_mac(uint8_t *snum, uint8_t *mkey, u
-     return mac;
- }
- 
--static const char *usage =
-+static const char usage[] =
-     "Usage: %s [-d] [-h] [-n] [-f <keyring>] [-m <master>]\n"
-     "       [-s <serial>] <path>\n"
-     "Entropy key device long term session key tool\n\n"
-Index: ekeyd-1.1.4/host/ekey-ulusbd.c
-===================================================================
---- ekeyd-1.1.4.orig/host/ekey-ulusbd.c
-+++ ekeyd-1.1.4/host/ekey-ulusbd.c
-@@ -100,7 +100,8 @@ find_usb_device(char *busmatch, char *de
- 
- #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
-     if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
--        if (r != -ENODATA) {
-+        /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
-+        if (r != -ENODATA && r != -ENOENT) {
-             fprintf(stderr, 
-                     "Unable to detach Entropy Key at %s/%s from kernel\n", 
-                     busmatch, devmatch);
-Index: ekeyd-1.1.4/udev/entropykey.sh
-===================================================================
---- ekeyd-1.1.4.orig/udev/entropykey.sh
-+++ ekeyd-1.1.4/udev/entropykey.sh
-@@ -19,9 +19,9 @@ wait_for_usb () {
-     COUNTER=$(( ${COUNTER} + 1 ))
-     test ${COUNTER} -ge 10 && exit 1
-   done
--  $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
-+  /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
-   sleep 1
--  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
-+  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
-   exit 0
- }
- 
-@@ -34,18 +34,18 @@ else
-     if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
-       exit 0
-     fi
--    if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
--      kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
-+    if test -r "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid"; then
-+      kill $(< "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid") || true
-     fi
--    mkdir -p /var/run/entropykeys
-+    mkdir -p /dev/entropykey /dev/.ekeyd-ulusb
-     wait_for_usb &
-     exit 0
-   fi
-   # Update ekeyd with device operation
--  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
-+  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
-   if test "x$ACTION" = "xremove"; then
--    rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
--    rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
-+    rm "/dev/.ekey-ulusbd/${ENTROPYKEY_KEY_SERIAL}.pid"
-+    rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
-   fi
- fi
- 
-Index: ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
-===================================================================
---- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey.rules
-+++ ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
-@@ -9,10 +9,10 @@
- # For licence terms refer to the COPYING file distributed with the source.
- 
- # Detect an Entropy Key being inserted and add info values to environment
--ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
-+ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
- 
- # Detect an Entropy Key being inserted and extract serial number
--ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
-+ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
- 
- # Add the /dev/entropykey/<serialnumber> symbolic link
- ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
-Index: ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
-===================================================================
---- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey-uds.rules
-+++ ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
-@@ -9,7 +9,7 @@
- # For licence terms refer to the COPYING file.
- 
- # Detect an Entropy Key being inserted and extract serial number
--ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
-+ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
- 
- # And tell the ekeyd about the device action.
- ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh"
-Index: ekeyd-1.1.4/host/Makefile
-===================================================================
---- ekeyd-1.1.4.orig/host/Makefile
-+++ ekeyd-1.1.4/host/Makefile
-@@ -107,7 +107,7 @@ OPT ?= -O2
- CFLAGS += $(INCLUDES)
- CFLAGS += -g -Wall $(OPT)
- CFLAGS += -fno-strict-aliasing
--CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Werror -D_GNU_SOURCE
-+CFLAGS += -std=c99 -Wall -pedantic -Wshadow -D_GNU_SOURCE
- CFLAGS += '-DCONFIGFILE="$(SYSCONFPREFIX)/ekeyd.conf"'
- CFLAGS += '-DPIDFILE="$(RUNTIMEPREFIX)/ekeyd.pid"'
- CFLAGS += '-DKEYRINGFILE="$(SYSCONFPREFIX)/keyring"'
-@@ -148,7 +148,7 @@ daemonise_ulusbd.o: daemonise.c
- 	$(COMPILE.c) $(OUTPUT_OPTION) $(PTHFLAGS) $^
- 
- egd-linux: egd-linux.o daemonise.o
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- ekeyd: ekeyd.o daemonise.o lstate.o connection.o stream.o frame.o packet.o keydb.o util.o fds.o krnlop.o foldback.o stats.o nonce.o ../device/frames/pem.o ../device/skeinwrap.o ../device/skein/skein.o ../device/skein/skein_block.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 9e17acad7093..c0c4a455ba8c 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,7 +1,9 @@
 DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
 DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb3257aabb26b8834622abdeec29798429b84f88254a1f8b04894f5cac2ef63c2a0bfd47ad32761d8d73cd0b189 SHA512 8d5e650cb369fa889b0adfdc1dc1cb5f8b184881256e6c0a2ed456074a54ceb61d64c0929c093bec66c0d5a15c1718f6e3736a1b25b6d7076081df93b49419e0
 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.20.0.ebuild 1829 BLAKE2B 4cdb4fb25af92ac581d523cb513f4e9f3ad0093e3a76f1aad302c2acf0ca504124844ff74e12cdd6e09033f773dbc73e9a6aac584372e7fc77f8539b191a947a SHA512 2600a29a8235220a14fbfaa97253d9aa879edfcb0551095e2b45aca4879d8ade80bdf7f3dbc6ec1d05fd41b5f287b885a01de88cd55104f01722dacc37db4a1c
 EBUILD gcr-3.28.0.ebuild 1870 BLAKE2B dc9b961d72d84d62909e0b5f6daeef8520dc988d809754e27d9fc647ad15df51201627251a8c5e8ad08084eef23e7491889c5c96d70a80679cc1cdb0496dfeaa SHA512 879eef0405ec069d112152c8a7c2b8c202e81a973869f6ea49589f0a7c51c9c058087b1c060575638485dd9361fdad2aebe5c7e5b71c05d82b39de5b673ca347
 EBUILD gcr-3.28.1.ebuild 1871 BLAKE2B 3e7aa573f3ae68dcb674a7c958b5c32ec1997f31e085e244e1c2ac884d1d4877ddbd652f9a9c961e559c82c7a4dc16e4d576bd20593bda9be08723e806e8a316 SHA512 a679c598da68adb6779040719baab11643acfb7b51b912a0bead6f75d1367c47e797903e502756952589fdef0b1a1361d80adce39dd7e6b2a35dbd0d658b2c0d
+EBUILD gcr-3.34.0.ebuild 1837 BLAKE2B c7c8e60e48caaa36a40622bcb8061f1764f6e0a5e8a8e59d48231599c8e1f5e931603c0fc8be07cd8713a2e5a8f6c5a8c59a32df07b763f296f4fa8871ce005b SHA512 4194a41ad61ba70924daa7951bf7be764d88350d557eac536718ea8562b36e170c26af7c972db242eacc513e410a2b1f953394677ae4fa35aef7d0ebf6702a25
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.34.0.ebuild b/app-crypt/gcr/gcr-3.34.0.ebuild
new file mode 100644
index 000000000000..8c1028f2f520
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.34.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-3
+
+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"
+
+COMMON_DEPEND="
+	>=app-crypt/p11-kit-0.19
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=dev-libs/libtasn1-1:=
+	>=sys-apps/dbus-1
+	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-libs/vala-common
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+#	dev-libs/gobject-introspection-common
+#	dev-libs/vala-common
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid flag changes
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with gtk) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(usex debug --enable-debug=yes --enable-debug=default) \
+		--disable-update-icon-cache \
+		--disable-update-mime
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 569b4f9e2fdb..100c89ca41b2 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,5 +1,7 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
 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 4526 BLAKE2B 5d8955d5d61bca911b9a98f68d2116837eebc647e95c43bccdc818a0a7cadaa1eed3ec8ced1088e6f58ff5395d0a5a848dbb1cdbacc939054e717db6618aa9bf SHA512 bb6fa0405728540c99d57b4e8287c6b7e8cb785536e348641ed146eacbe8c27600a8e37db9150e888f7ce9580445c1fbd731132f02545d60973b5c3d0a8c4c76
+EBUILD gnupg-2.2.19.ebuild 4489 BLAKE2B bb208c75fd25593169ab9683837ae8e1eaf2b804bc5e9ef0603d8b1f4419ac004b2e98efcefb11bb06a8b36a9cb4d2d3117b9333c329a1c2dd2998fd6abe5a20 SHA512 773032d850e56b525332b5589f564b79b85c2cab7c8909f5fc945b0e4a5cd33364f56eec6b2655d34f5e8ca034bea1e484d218f609787c652bc3336012417f9f
 MISC metadata.xml 1313 BLAKE2B 3e9b3fbc3decac1676bda2b09c822ddd723d4e08fd9d63196a7f0c46fe4275a06cd8b87815e1781fc999747ff0da9eb1823db81a0b5dada5482519e2f4c925fb SHA512 d03cfc1b7b44948a594bc2df9c5f79d250dd7601f4579f832f0ac3814b640e399b3f428737a16e7098772b4ae2dee157b6958b612aae2b59c21397e99a5d9aaa
diff --git a/app-crypt/gnupg/gnupg-2.2.19.ebuild b/app-crypt/gnupg/gnupg-2.2.19.ebuild
new file mode 100644
index 000000000000..8a253de4ad99
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.19.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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.
+DEPEND="!app-crypt/dirmngr
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.28
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	#bug 663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable ssl gnutls) \
+		$(use_enable tofu) \
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--with-mailprog=/usr/libexec/sendmail \
+		--disable-ntbtls \
+		--enable-all-tests \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
+		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
+
+pkg_postinst() {
+	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
+	elog
+	elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
+}
diff --git a/app-crypt/hashalot/Manifest b/app-crypt/hashalot/Manifest
index 975e2fccffad..084b727a0f84 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 352 BLAKE2B 448d329f07bd12c021002a3ab44b8f66060fed90a715e47097d7e6f0f70032499331b81a729f4098490523048492dbda3e017919ee9a4ad4d549160af30eb6ef SHA512 215019afcdd76ec66768ef9de7f6478439dcf3396ff8be51dd9e261a428817478c4154f9855e3860df476697258ef3b679e37ec028361da405f5ce01b476095c
+EBUILD hashalot-0.3-r2.ebuild 388 BLAKE2B cca763f4798b93ec43abae0d4c481680259e0644bbebaaf5ede498b032c79a267e4b72a088c86b0d7f5a62d9645b2fde356773211e470458aa6ea4bbfba6c445 SHA512 1586d8450a1d90482c862cb66c428a7913110086484e2c9ef701645e8a9fa69ecd8344438e62fa9e6ae7453535bf80adcf357a938753230475094a1194ac6e55
 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 092b82844216..964b58f8e9cc 100644
--- a/app-crypt/hashalot/hashalot-0.3-r2.ebuild
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-DESCRIPTION="CryptoAPI utils"
-HOMEPAGE="http://www.kerneli.org/"
-SRC_URI="http://www.paranoiacs.org/~sluskyb/hacks/hashalot/${P}.tar.gz"
+DESCRIPTION="Reads a passphrase and prints a hash"
+HOMEPAGE="https://www.paranoiacs.org/~sluskyb/"
+SRC_URI="https://www.paranoiacs.org/~sluskyb/hacks/hashalot/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 39d246bbaaa8..9783e7b0e7c0 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,7 +15,7 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 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.5.0.ebuild 4322 BLAKE2B 79ff4eba6678e07c8bbcc34c52508032451cde194214c85a7a57efa1676c658b72cef1454777fb54fd5a0ea77f9983391356be55918bb18589c93f07cbfdf6e8 SHA512 0bf75bbd506a616e2d849e352fad065903c2804b440a74e193cb81563d1a2c14231a9e5d096f8f684b56b4a93d20fea9cd31f9709044ea16fbd830953547e4f7
-EBUILD heimdal-7.6.0.ebuild 4527 BLAKE2B 306ef70c604a95d6e2cc602babef69f0f4f47c532857aad0d979b423526076840ed7f346d3910aabbd7e8b9cd0a9eaaa67ffb9fcbb464fd6b3d6a542f3976afc SHA512 e1086065104abc80db96c25f21487b9138992e312b881804be299e0ae2424326e61f8421b710eb9582f14526a23a7049c396ad00c566a171a840dd9f0ffef704
-EBUILD heimdal-7.7.0-r1.ebuild 4520 BLAKE2B bdff608fd7fd55587dc8914c323ef2383a89587621b37ca667c47dd45f0710957b0463d4d18123b5d43a35ea86e5c3e760170f1ac1e93ec9870fdcbbee8e9990 SHA512 bae9bd4daff3a6c8e54ce30cd46f4cdf7e9ddd029fc21e07a066e510119f10a334ee45473eaf118fcd45fce3347f5423d0c9497c12456e3e921d3e16f6777ab0
+EBUILD heimdal-7.5.0.ebuild 4349 BLAKE2B 0e0e8f925d391f3100c9b87e696a049e9c4a25653d150876ba86d145c5a11f6b20853c6afeb747061cf3bc9683ab5d4ff95c864c168712c4555d1f1a82bc3d7f SHA512 a2d7a38214626053b96e15170f1a33e29cb5e70ac21dbf8588f0816cbe8dead6e6b4cc35d851e1124566a19a9453a59d08092f607611b2e15ce64576a28db4b7
+EBUILD heimdal-7.6.0.ebuild 4554 BLAKE2B 9e6a574c93ab56f033ff9386ca13f00f0b366eff259e8d488b9e9bd62fead797a9c41f30be26df02b8e55eeb25fbbdc18c4315c9ce23c432a1e6c6b758083bd3 SHA512 520d10a9d350c2398baf40ca1a0cf85b02db4ccfcdc61b174d64317dc448a9d4b7a78112ba490971335c2f90fb3e399635c35e49bb18feca5e94d417c693c05a
+EBUILD heimdal-7.7.0-r1.ebuild 4547 BLAKE2B f3f24342a0bce643340ebe0e47e4ae7fa7e4c155d7f7a071acb58e5fcafa95c476dd238edea6153da694f63edfbad6336a16248dd98f68606535e8d1a6c1635b SHA512 9742266b8dd2f2b6aab2524ffb339c0910c98c3e8d1294f00d92f4c4aaf53a82d3e9780d07cbf184389d384b3a69a62c41bdd5bfb06adb2d9079aed4ad9ab22f
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index 69ed2cbc132e..0ad3f4972ad7 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86"
 IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	ssl? (
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index 3913a7b6e5f7..9fa8c8515999 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sh ~sparc x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-libs test X"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	ssl? (
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 86cc8ddc99fb..21fe1180298f 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap libressl +lmdb otp selinux ssl static-libs test X"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	ssl? (
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 8391d88a67fc..178bd2f5507c 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 1008 BLAKE2B 11ad9e49ba789d89a5214c542a910c93fc32838ef9d67aef46504456c10d40dfe0eba89a9114854963c0c638961b7335e4a2cb4527fcfd1a138dbf5912770e9c SHA512 228488a6e2ab91c01f02b797f04191b067310a7cb8f08fac98894964b2c8422fac8d8dd794672912c2c95607b1baa79d351279c8484c63dcc4b606148a3f5056
 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..a390c21e1d6f 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/${PN}-library-${PV}"
diff --git a/app-crypt/kencfs-plasma/Manifest b/app-crypt/kencfs-plasma/Manifest
index 32345da1e065..c51b8fb34af3 100644
--- a/app-crypt/kencfs-plasma/Manifest
+++ b/app-crypt/kencfs-plasma/Manifest
@@ -1,5 +1,5 @@
 AUX kencfs-plasma-2.0.1_alpha-include.patch 267 BLAKE2B 75755d4ce83b8146efd2a956b44a5f42d936d94189df2157d8be27abf35c252540fd27a7884290a1397b4b9b477a94cab146f3fe21d9e20740ebdc86d8142842 SHA512 74646bab28c76db89d441e7528ad288f44522dc20f53b5b12b8140d1a61c86d9ae0fb9f559d37fe1de912f176a366000d77b67a3fe3657a3428304a2ce2a29a1
 AUX kencfs-plasma-2.0.1_alpha-qt-5.11.patch 396 BLAKE2B 5bd9e8c3c4e93c263bb00e680d485818ece4667a8de3cbb1f69327571ac5187a7b7ab150b206f88636993042aa5f30bb181b762ff26ece18330f60e1eda6e741 SHA512 3b86d1dc9c92dfc8d0c323cedb2c4f34f34a4af0c136baa2d64a4ac3ff0aa35eb7a54e41c7381490f205fb045bf4a2f924fbfaed47009d10b8b114b1ad9b5bf1
-DIST kencfs-plasma-2.0.1a.tar.gz 216580 BLAKE2B 7c8e77e3019d48d37437f2031c5c522b30c89a927ca3a51571e42decaa004a5cfb3c5b84d50ee1c775599943a23cc58a7b994e94e0e316a7539d793004d05035 SHA512 a9093680bb141c18e2d4ed8a966f7176c40c10fa0ee6e5cee25ae26ef3f94e6ffc7e3f0a7b55321640e4ba6e484d75755f901b53688dbfc5c22a1c0b1e01cfac
-EBUILD kencfs-plasma-2.0.1_alpha.ebuild 977 BLAKE2B 2880062dec1da7f43ecd416a408573c1c9932d50849024c217b52e3c16f3204624664ad78d5ea51e0b54661fcc05936e554b2504b3fe51007bccceda40fd2ad0 SHA512 d32e9d8a840803f4fad642be55d905ee135bbff2bf29a9ec5be932415b54b7747fbd3475b37ec4f24fb9db9bf932a5ec10f8fd0ab8d880ebbf8c0c87c9cbd5dd
+DIST kencfs-plasma-2.0.2a.tar.gz 224022 BLAKE2B 281f1db349085ccc69db7e3795eb82a591d83beffb1036de7689939c2e9d07bad6c0677da72a45ef0df5d399bdc768d3ce1157112fa63403fb65bfed84a366ed SHA512 859dfd493b01343960210025ca3dde8bb18a141b48f68e941c0a832c88210eff775d10a6b3eb45d6f1a89ecbc812fe6785077e54e648b1a9ff66e73ea1cebfe0
+EBUILD kencfs-plasma-2.0.2_alpha.ebuild 991 BLAKE2B 5da79d28648cd56a0fa917debb070180eee26de6e4a80560fdc0653113f08857f34ce325513b0a617667136cad4df4c8c3fe286eb93a9840de0744ca45adf325 SHA512 fd617c853757dcd39ec1c8b0c310f076df866df7b35d4ffbdeb2b8948913f08b73e687c860221c0f27b2f2175d230ede153a7f74084ae3e7862b994b91b1aeaa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.2_alpha.ebuild
index 96a0de750d2a..44f1d5472436 100644
--- a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
+++ b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.2_alpha.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P="${P/_alpha/a}"
 inherit qmake-utils
 
 DESCRIPTION="GUI frontend for encfs"
 HOMEPAGE="https://www.linux-apps.com/p/1170068/"
-SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486310914/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -31,14 +31,14 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/${P}-include.patch"
-	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${PN}-2.0.1_alpha-include.patch"
+	"${FILESDIR}/${PN}-2.0.1_alpha-qt-5.11.patch"
 )
 
 src_prepare() {
 	default
 
-	sed -i ${PN}.pro -e "/^doc.path =/s/$/${PF}/" || die
+	sed -i ${PN}.pro -e "/^INSTALLS/s/ doc//" || die
 
 	# fix desktop validation
 	sed -i ${PN}.desktop -e "s|kencfs-plasma/kencfs-icon|/usr/share/icons/&.png|" || die
@@ -50,4 +50,5 @@ src_configure() {
 
 src_install() {
 	emake INSTALL_ROOT="${D}" install
+	einstalldocs
 }
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 600426635066..29870cf9f7ec 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,6 +1,6 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
 EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B b2256260ca7312c87184a92e9b495fb7a7f4fed6353756f3c995c108f71b1abcb9dc304174760a8b624a743c3c39d9e4b275dc50c1daf3bfddfd18d100b0f2cc SHA512 73a90667e0786c443cccc566d43964ad78bfd10cd019f8d3544d2a3842721a58c225d509fedde0b34888da7031e04aabaac5f6311fe3f67ffa6034db646c4f01
-EBUILD libb2-0.98.1-r2.ebuild 1812 BLAKE2B 01c49295346ecf7c2f80f3a689176b28ae60fd577bf0b51e76c0d227c502c93f06d90c2959de77df4c27d9c4f219443f201a4cc43a64e6f3ff35966c65ddcd43 SHA512 d1855184fca4bcf094b0ccbba0d5e5d25df28193e208b9df8208048e841358a7c2d7239635e8bc92a44e1f21ce03cf9b2ebf0161dc2890a92ec15b6c8884f40c
+EBUILD libb2-0.98.1-r2.ebuild 1809 BLAKE2B 2d5c467c920014e91a4204466ff77bbbec319396442557821c9b4ba2ee004bf112b4a05ab775260c8dacdf5c8b7eb8588f77d99d40cd25f0eab4d316c4e2a03d SHA512 e7969e74044073ab89ba2cfa39b9a8dd9b4d8f824400d092688c96d2eca7a9c9da9c934b57628ea6a9e502d9d5bcc2e5fb6be0511f92c277624e44b62222e20b
 EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
index 56d05cc6f86b..629a4ab14619 100644
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 35dbcc218ed4..38aa4747c91b 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,5 @@
 DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
-EBUILD libsecret-0.18.6-r1.ebuild 2646 BLAKE2B d9ebf0afb6c6ad575bb714917e0b13fd82cb61340deb426e093f02a1d26dbcfc31bc426404809975f2c420ebf6cb21d53551d4282fb2fe915b2d5f974466ddfe SHA512 dd4e7a4c5bec6d21500e07637d11eca184a052eafd81a4b49be760c21a94c3a8f2af277a02da6b5eac74276345b1ccf776410ff226027740021f231d8e74fe04
-EBUILD libsecret-0.18.8.ebuild 2628 BLAKE2B b50869bd3374ad2a7f051c40e3ee238f16230fa5643ccd77a13c8459d591fed085407b209c8166acba3c5a781590284fe0dcafc6d3f577248424700130c575db SHA512 51bcb8a3c63cd68c7577ec1b99b3a3a53ed3776e9df3bacf0997555c76e9386000724f949ce32721fc82268dd34cee665ea3cf618ea4a0803903c54f03bad47f
+EBUILD libsecret-0.18.6-r1.ebuild 2673 BLAKE2B e02465d7351dc6c7c66563bbe47cef140e2e311d00691609df703d4d99ae5c3807c5d5531750d1094717e648b1c2a914ceddaf871ac87b56acb212592cb87f67 SHA512 ccfdabc4a356b6cbab1686a2e4eee672a4357411cc763e817ccb1e84397e9a9cf888d638cb6d9e0d82890fba104e23aad265cc8c35af2dbc8b0d999028091e22
+EBUILD libsecret-0.18.8.ebuild 2655 BLAKE2B dd7ab943aa2c8237051676c52310cfd7fceaec88f73c3fca74ecb4150df75ffd82bc4501678dce9e0a539a9021162fc57a6e3ce06abe6f6f6d6b4876e888b4cc SHA512 a8f946a1858ae725ce91a4859fdd5ad71abcc16648459c00906ca33a2a62afd12dacb45f06626f4ca1c56c4ebedd663a544bb4acbb5970bfb21ad37f2de655cd
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
index dd16f40b9cc5..8ba2cb353b9b 100644
--- a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
 SLOT="0"
 
 IUSE="+crypt +introspection test vala"
+RESTRICT="!test? ( test )"
 # Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 5f16a860860c..6a79b234fee0 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
 SLOT="0"
 
 IUSE="+crypt +introspection test +vala"
+RESTRICT="!test? ( test )"
 # Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
index ced12f2f6912..192a52a6bbfe 100644
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@@ -1,4 +1,4 @@
 AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498
 DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
-EBUILD libu2f-server-1.1.0.ebuild 1187 BLAKE2B 27ec974968e6717e3c17d2b89bc616ccf393509e9e247613ab638393d7c1efce5ca3643981c164788b10979b17180c9a87b6c338c0a44ffd58172502e4708fcd SHA512 85d9d2c8170c9566f614247aad94e177ffcea29b7c4e22df52085b5cbf3a65c2f733db20bd6168dc28ec2a0aacc4bb328c296df3d543163a0ce026538f9e08db
+EBUILD libu2f-server-1.1.0.ebuild 1211 BLAKE2B 8061749d02a55b40d4610a977b544c7afb486c0998ce8ef15df0f6ffd7cc3dcfcea5ee48df2b206dca4c860575fc37711a6af4bf3524c8fff5919d9dffb8113a SHA512 4c7feb8946c95f9f8852ec5abffc349528913467b56dbd4a8ada01ff424e235209e2ae025d947957ef526960894bb637778e3884b3e3fe74a3b337a1d2a29e4b
 MISC metadata.xml 351 BLAKE2B 9b08643cd9cfab47436281dd57bca31e713980d3cb0b5d20fcd9a915bc5adbcf589ac4df9f03929a8f57e7a11393602afe05d025d10bb04d425bacc1f4765324 SHA512 6a1aeb9117473d5c2ea5de3a3043de7926bb70e2cc00ac8c13b4d3a27b7fd3c7ca6611bc4f4ed9faeb611f228f5a8ffc657e924fdf800133d62a70b48e408f22
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
index d6f5837efa5a..15c7230119c7 100644
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="BSD-2"
 SLOT="0/0.1"
 KEYWORDS="amd64 x86"
 IUSE="libressl static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 72fab5f848dd..ed69c16cb6c8 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -2,6 +2,7 @@ AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d428
 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-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
 AUX mit-krb5kadmind.initd-r2 612 BLAKE2B ba2a70a7c123d63b9c58f4ec31c3c2366949e6971ff4f203cb38e1efb5a69991533291e118066e680d880c5221168c8eb5b047ec70dac857888330978d1e5a9b SHA512 3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98
 AUX mit-krb5kadmind.service 137 BLAKE2B fcbb450a9bd39407801c93d7ffe050eadb27adbfe3165f27fe9a6ad1b18464153109bdab61a85a6a908dbb8e57b14d577165d9144a6f311d90167d01a92de748 SHA512 65a507b84e8280a9e417e32f8667941f52802f1afe9de513718db5a414ba84569b95a5c4d84eb9d39c232901c4ae1f674e6c95ea2c6895dc0c495b78ec04a026
@@ -13,6 +14,8 @@ AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aec
 AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655dd5170a4f9f16c6a889a4303a4dc276aca09b3a213a1de3e6ab759c66790141708ec95c4393bbbe79e8fb16f SHA512 b7419d1c728eda86fbab2fbf83794ae754e3cdaec7dcdc12c2105e3a75f9903c25fe8fee48f57acf6f0a8c62d27f7934fae81c0cbd67b997541aef7060a4de46
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
 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
 EBUILD mit-krb5-1.17-r1.ebuild 4316 BLAKE2B adf1993cf5479ac7230d02c9652b9f482a772cc2a86dd6bf6fc0b76e84fc4252b19b401772980c8885f5c33cfe2856e098defde2f840c3f24328bc3f275223c3 SHA512 fdd3ac833ec1c0bf9ace7f35b4f2946eb9afaad9c580005a46f866f272178954a5d076591ed21451b3da986c53687823cd50a3a5373dfcd0401cb21c3497bad4
+EBUILD mit-krb5-1.17.1.ebuild 4354 BLAKE2B 99b0f199e2a0f1e7bb7fbe5e0de5c8219165e62be437d1a7fc9b34562cc303be42eb72da6766c01f8c8bf85b3f722e8d6ad7f3400ff46b0cd937677694db9f33 SHA512 9610ab92b3a5b641e94708e810eebf7a242a5ebb0f810b761f75e3c575aef2f5588abb301fc642e651a7e03a521fff68f2498b40d12a3beacbc32660e3838d92
 MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/files/mit-krb5_dont_create_run.patch b/app-crypt/mit-krb5/files/mit-krb5_dont_create_run.patch
new file mode 100644
index 000000000000..d68e13b0675c
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5_dont_create_run.patch
@@ -0,0 +1,10 @@
+--- src/Makefile.in	2019-12-12 10:15:51.674552983 +0300
++++ src/Makefile.in	2019-12-12 10:16:33.205543490 +0300
+@@ -71,7 +71,6 @@
+ 		$(KRB5_AD_MODULE_DIR) \
+ 		$(KRB5_LIBKRB5_MODULE_DIR) $(KRB5_TLS_MODULE_DIR) \
+ 		@localstatedir@ @localstatedir@/krb5kdc \
+-		@runstatedir@ @runstatedir@/krb5kdc \
+ 		$(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR) \
+ 		$(PKGCONFIG_DIR)
+ 
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
new file mode 100644
index 000000000000..ae03d2238a94
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+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"
+)
+
+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.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	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) \
+		--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/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index c1eddd8cbf04..4f78e952f78c 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -29,5 +29,5 @@ DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.2.4.ebuild 1403 BLAKE2B efbdb2fdc154eba3e3dd5a42d025fcd390462277571f660360558dc11932099f9facc44ebdc07fc78e966990f3510a23b3e8bdf260c1fdbdf8a30d2f8c5da2ac SHA512 66baff3f91c7173359de13826734f412cad69f09a0bd0234e5495e65b822326c8e531db5f41eca91394f11acdbbddd28f52c9f6c8719b40dbd83283ce2f8d1d2
+EBUILD nitrocli-0.2.4.ebuild 1402 BLAKE2B 3e917c95333884ef416762718b5a3afe4f2b80653a773330498dfeda6d2fe8e9434e63b28a8123d50b655ef77d9e0d7966781b0dd5cf617f21f659a2abe47dd2 SHA512 017a1925ca93130e14fb14f0f76ef5f5edd991098e989a0b0815cbe3e6309d9c6fd186b88032f173b4474c9886957b58bc061c3b33d12288957707ae95625d08
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
index 56251e3060b6..ff6f4c8d1399 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
@@ -45,7 +45,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 42a9bb096e65..69247e903517 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
 DIST gentoo-release.asc.20190427.gz 59649 BLAKE2B 138c6bad0ec688c515888433256c95cea7d8ec1e76587e0e89d3c11078eb1b85931ba9f6630f60dc8bc168b8303204ebe05b9bad7abe946a74730123b1c36d89 SHA512 1491fb2bcf9c6a29adf8ff08cbf8cd40517ee3de7adc048be29a2300f460e78594548c3e47bd18da68585248c560d868815ded5584ed18929e4072c4933484f0
 DIST gentoo-release.asc.20191030.gz 23981 BLAKE2B 307ceab69e309a53c2db191cf9d7a484318e852af648d93d9ad4bb2422737ab8de9257b457e5f201d86d226b348447acfbe57d259ce436150f75ccfb9f6ed60e SHA512 f3fbe0198f80f37784613c2a390c29f55e5b6291c44ee64d676806a26745017f8a9168573e13f6fc2fe93910927846c584b9f5cd017c4eac1cc875d7ed30cb8c
-EBUILD openpgp-keys-gentoo-release-20190427.ebuild 1130 BLAKE2B 141020be0ce06ed2b2a5125247bac8a6e9d193258b688e20272046c881aa8f5c068e312bf5c5d3a79c2c5f4bb250219ec64ee27bc608343aeb4c2f94d1920956 SHA512 bd60232f414d0f4db9a84990cf959c0b106675e46f03f6911b08c0b9d3643a0b6c819219ca7cac21c429c224074c7ab0a70a6294a58da78a638e5b4c864a6588
+EBUILD openpgp-keys-gentoo-release-20190427.ebuild 1157 BLAKE2B 9ac0c5abb4b57f4ef0df0a101864dc2f3ecb317620d8fefd2960469bd7b66d9828d3f3b05b9772bc4e566d4a2f13291607e30d27a4d4bfca75745155833c47b7 SHA512 e299f23e428461eaf6c33c234d776008148b2980fdcb529946d0125376d889ebee5864ab6c8579cd20b4a4c5f03359b9c193049c0c571afaf93bb81e77bfc52b
 EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1170 BLAKE2B 5bbccc1c7158f42fb51a9f8a7e96a776befe6d16b3109d877a66dab1da8180fcbb57652cd41e5cb2d2e78b97b84b95ed1b809d4717bc707fbabf9bace3eebddd SHA512 28187da54c9d08efa6143b1a61d3575c1abce836aa8832fc5207fe41ca302c50e2ab2eacf693f57e23ca01d0a4d0017264b5d9bfbd10b28dff330565e6f8d303
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
index 37b6a890725b..b8eebbf0047a 100644
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
@@ -12,6 +12,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( app-crypt/gnupg )"
 
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index f0ae0c162cfb..49a890c2e20d 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -2,7 +2,7 @@ AUX ophcrack-openssl-des.patch 3253 BLAKE2B 91bdac930a784eb8f68c9cfbec7f0a41e053
 DIST ophcrack-3.6.0.tar.bz2 288830 BLAKE2B bc2782d08cb84df24b745fdf0e9723e058da614b73a8d25dfe77cfa2ce291eaf8abd83006a9a410f80bdd240eb81fc402d6d5ebd1c9b92b5a7f1785a203c0c7a SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9
 DIST ophcrack-3.7.0.tar.bz2 294045 BLAKE2B f506d29b27b4b90eadfd4d650512aea54db4228c4c63b90827a7957b544ab59dae757fc521fe62ab3be55d97e483ddde2aea9ad08c96b77d156e863a61f26312 SHA512 27e73979ca3d733629b9b34c490488cc27140efb8b90d266f270c0b95572cf40319a3fb658c02448fc7a3b825cf05c18a69f5d91bd0656d8410a30645f8dc8c6
 DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
-EBUILD ophcrack-3.6.0.ebuild 846 BLAKE2B 8d54066d02a3055fe3167a659058b5dd1137259242a566b24bc5154e09aaadea383a8c707657b06737cba767557e9e863c8669a32c5d99fda703839cfa1cc886 SHA512 8e61e377fb4e58bee406516987c4d5514ad525dd7979e6f93911ce60d80a40a26d48b5f9ca76be7eea18316fcfea52107db5657cfbc34c87166e72091463e6b5
-EBUILD ophcrack-3.7.0.ebuild 796 BLAKE2B eb167f52bb137c834a0ce928306858842fe21431f102a6c03ec36e450ca8719a5bdc7e20f9854abbcca6df612cba19ef427399c1ef50bfdb43303b4b172579db SHA512 86b8fbaac65982c84a32df52339d00ee08a0d2a072e14485475e25b7ab0a5d6237b9efe2a65c60e700dfd43ae8eb301e6974ff7e0c27eded1cfe94616422c386
-EBUILD ophcrack-3.8.0.ebuild 964 BLAKE2B 5098915d456088f26eaeafece924257f3657a0cea2edff2805d58f6c92bf29e0fb3994cee9b7af328b54fe559edb139571217228bf6d6d6c8fe35d6e6d49883a SHA512 bbbf006ea530c3b296a01675b84e71e1fd80d7020a0244945ac67e7690500c668c756a74fcb2efd5279cae822f92598ef0020be407d34ea56d681119f51f3b13
+EBUILD ophcrack-3.6.0.ebuild 789 BLAKE2B 2b669ff146298dc6c004511384b7b462a79f587f9f18a17baa1500ba333ef2567b014bb5d2eb92a05a99711231a22375d0062455f61dc7fd10cbcaf8b9388ab4 SHA512 f4d7f623523eed36281a0a95915680a504bab50fb866e9f1b1edee414055e6c44fe630dee9b077f6c242520353019cd141a5170fa862f769378256208d0c11c9
+EBUILD ophcrack-3.7.0.ebuild 739 BLAKE2B 9019a62a463c8f1bbdb7f3d5d90d1d130cfc79c09a87a3a86d4722c6788561cd67ec32f9dbafc08064e2dbfeb2935b63fa3c3ce18d5b7f60f46f0b937d9ef305 SHA512 3f684df8eab1422442e1665cebe987d0d5949d44f55c549930e21a4d585511f070d65fe5552f64ec77ee8a8f7fd4422cc1dd6c62dc5dd1b7de8a56e913f3c219
+EBUILD ophcrack-3.8.0.ebuild 907 BLAKE2B be3aa07cd0440d11d4583f7734d12d875a849b041e7cef419c346029cb128220dad093d31e01dd72cf3f3a652e5529c8ea996732bcc562e1d732d282ec3baf2f SHA512 e13997efd14e685f24040590e1dbbaf5a4a93b343801d852f269a9223d3f7209ee9a1bb40ab5e0649f921442f26fc7ca91687fa7d9dd796a7ddeb35d5a89071b
 MISC metadata.xml 474 BLAKE2B 06c67b21ed59a24074d06b4003873ef05bc4ef8632d4602e3ac5f0956698c40e8a7662b6aeddb7bea28055ed03e27900a3fe4f692d765cb25ba5d9c3ca62722e SHA512 3381c3cb01e39377a085137392802e0666cd4dd421cdcda2db6af2cae01d7b0a7319886699d99553b9a4aed732b402d923c51a0b053cfa564d2228de605991e3
diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
index 1e5b264f0c76..94d9250666bc 100644
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@@ -30,9 +30,9 @@ src_configure() {
 
 	myconf="${myconf} $(use_enable debug) --disable-gui"
 
-	econf ${myconf} || die "Failed to compile"
+	econf ${myconf}
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Installation failed."
+	emake install DESTDIR="${D}"
 }
diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
index 0e985ea1117c..736f3bea8b86 100644
--- a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
@@ -28,9 +28,9 @@ src_configure() {
 
 	myconf="${myconf} $(use_enable debug) --disable-gui"
 
-	econf ${myconf} || die "Failed to compile"
+	econf ${myconf}
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Installation failed."
+	emake install DESTDIR="${D}"
 }
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index 47dd63963818..98ebe5ffe25f 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -31,11 +31,11 @@ src_configure() {
 	myconf="$(use_enable debug)"
 	myconf="${myconf} $(use_enable qt5 gui)"
 
-	econf ${myconf} || die "Failed to compile"
+	econf ${myconf}
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Installation failed."
+	emake install DESTDIR="${D}"
 
 	cd "${S}"
 	newicon src/gui/pixmaps/os.xpm ophcrack.xpm
diff --git a/app-crypt/pkcrack/Manifest b/app-crypt/pkcrack/Manifest
index 4413ea525eeb..cff7ca049790 100644
--- a/app-crypt/pkcrack/Manifest
+++ b/app-crypt/pkcrack/Manifest
@@ -1,4 +1,4 @@
 AUX pkcrack-1.2.2-build.patch 2539 BLAKE2B 54ce5effd250832aaf04977b4baa9a212cc80cf1fb4b50a7629314a7e716c2ced9a758f20631c0c783e25611ece51d19048880b9f63790140a8914a9661f1214 SHA512 48b71bc2d5aa850603eb1872c200465e655fcb527323ebc9d1728311fcf9fa15722f7b80a6809c7960ec0f4fcf3d4e65561880f61feb4dcbe35dedf15c198f20
 DIST pkcrack-1.2.2.tar.gz 174208 BLAKE2B fed476a9d681bb9e565d05ef636f58d6643c4f8897725c56b66e64123e9435f9bf28e550f0249794e81e9f968683ab81c19baa1ee51478e1b91509e8e318725a SHA512 5c64fb9ae09dedc70fb20cd689f432059fcd64f689072b529b4045c3241760fee273ee921da081bc08be2e0594d27101c5d89d99cb2b84e16f80c011419b7200
-EBUILD pkcrack-1.2.2-r1.ebuild 1049 BLAKE2B f9898cfabf8537198fff10b66c5075e23789fcfe73d66fb80a96bb4d6f674191783986a58aad1ad6513bc9c53b89491596bac776129014b72bb83fdd984f425e SHA512 3058ef6d96bbe2851c1cd2e539a96795db66b55fa98e80998e421ad38d1a0447f9aaff5e1e3e972be937a6d5bd97e9ed91ee41f71888e85eb6e4a08e5fa46c0f
+EBUILD pkcrack-1.2.2-r1.ebuild 1073 BLAKE2B 8099424d0b171590c6475a77cba3a79dbc096d98a2cd6382ca85315578600cf69c8550336902a73a37bbd7929ccd99fb4dfbcb309cae1780f664970d0af6d5b8 SHA512 ccde8352eb50adb9a2424ce30569259f692487f29f869298e9f175a6805b8e50fca2fd627188e4f97261ef99ff1132ebde20a9db10e35fabec04dc95c59a2db4
 MISC metadata.xml 370 BLAKE2B 1d584e6fa52911c3d0f099c44193eeb00261e2f46f99dd2924744e9f4ce4af84bddc72b85415f85e3ca5ad11612914bcc022e494b9c4c00a5e95f8c1b5f1d72d SHA512 39a268538a1a2d5932b5295c4727c8769e4648cb94905ccead6b3941a7e8752b3992403f7623497267334f697478dc0db355e42bf2857b415f8ae06baa99d492
diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
index 862cdd7871b6..4354930c7646 100644
--- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
+++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,7 @@ LICENSE="pkcrack"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="!<app-text/html-xml-utils-5.3"
 BDEPEND="test? ( app-arch/zip[crypt] )"
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index ef00eacce11c..11116dcb7d24 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,6 +1,6 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.2.0.tar.xz 691264 BLAKE2B 3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf SHA512 2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
 DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
-EBUILD qca-2.2.0.ebuild 1942 BLAKE2B ea6e809c9b88758a43af827c434a7887782a27efaa4aef9c4ba374e132166b5b082b790ec357997b2fe56ea2369ba9f59db41028167b3dd3c884551bc09cb817 SHA512 d25b39e1aec98a08d095d69144463c3d030850a9213342f78ba70669d02559893b34a0e5f635364e5434e18cc1985a6b6d135d4cfd7bbde3a87da67ae69a383f
-EBUILD qca-2.2.1.ebuild 1945 BLAKE2B f3becbf061387025ee2917a98b03bba388ebd4075f33e0201924d691c9836719ded5844945007ebd042791cd9f490ae6cb2bf6847527e33be47310d0ab4fa9bd SHA512 ba93ca93dc1e2fc46f4a5b8cdfd68d0250f0055fac17a885ebded1a5db2dbf5efce957af0dd693b08959fe7e2df1ce466fc2b2056f573767f67ef039d7bac7fa
+EBUILD qca-2.2.0.ebuild 1969 BLAKE2B 72b78ac7b693525f63cc76e77c69c1024ce60507fd847c8568b90a1b1a0fdc78200fc2b6c5624080862b44336e9d5365a10f626a8da192f94887fec7c7d08030 SHA512 9d7bb0ace76857c671e7c6347c02ebbc903f6624eef7c9dac9cf3e1d98910cd4c514e40d2fb86aed40354531caed6ea613dc8f07932cf8f6e271026de78bee9f
+EBUILD qca-2.2.1.ebuild 1972 BLAKE2B e1f1c12c7745af1c3b5e920465590a7f76f4a16c4c46f45255baf2c4aedb1c45f9b3187eb9232d169171465276d0f8ea9fbc37226825e74d5f1667ce7d86dc9d SHA512 e42997e2308528df8732a0078fa3eb1128e37c527b68b3d7645b5f27538f4e577f76ab83d6da84eb86d0680f75dbac24840b8e900bda0b052e71f8d8adde540d
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/qca-2.2.0.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
index f895b8ca47c8..bacd8da8b969 100644
--- a/app-crypt/qca/qca-2.2.0.ebuild
+++ b/app-crypt/qca/qca-2.2.0.ebuild
@@ -14,6 +14,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? ( app-doc/doxygen )
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
index 40f66d614dec..cbd6b1639a19 100644
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -14,6 +14,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? ( app-doc/doxygen )
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index b1022a311f3b..b79d57eff2f7 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 796 BLAKE2B b3dd71c994b6e5ef8eaa720987e89676828327927f01ac9bb33ada4e0355431357f60ec5677e17d622d7a6a173ad3ae07d5671880205a6ff154f2c0ef8848888 SHA512 e0aed70e10de163f8659e8fede3da520621dd355fbe7efcf1fb50f4b294926a498e58b6bde604106cbafaaa352c5d011227e128d29fedd2f6452b9541fd4db1d
+EBUILD rotix-0.83.ebuild 789 BLAKE2B b8c0b8bf50ac5a4d2aafba90a2ea896fe673767939445e76058cf26ac63092a52fe7cb6370e31b782003f9bd5499abdcf500e1502e31f99aa96c0da2b3f2f0aa SHA512 75654c96d396fe860076066c4b19423f89e830d15b3867f920dd600c26aa75f4634bdd6cfb49ad65006c82695615ad6515450e458f1400a396af4bb422480639
 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 927d06877da1..3e79123b9407 100644
--- a/app-crypt/rotix/rotix-0.83.ebuild
+++ b/app-crypt/rotix/rotix-0.83.ebuild
@@ -28,5 +28,5 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 }
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index b30fefc92692..24bd542bfe21 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,5 +1,3 @@
-DIST seahorse-3.30.1.1.tar.xz 1428904 BLAKE2B 54760362fc452b2ff3f7a0d72b25540568703cb91cd46321fb8cd60c9b51f84c3f48575ae9f6c72080cbe0b29e8a38f5e6afdb6c3120b2783a8a04688bd219c9 SHA512 971b8bea484f456d2942f1d1b407ca5b11c1d431f2ee524e58348a421a235dd9d2fa463e73487c6137bde116b34a5d1c0291b479d8562d4ce03766081e0dc469
 DIST seahorse-3.32.2.tar.xz 1278668 BLAKE2B cd3fe6794ca02b1b0fd4b833a7128b8180137441a788f1f3ec5bb4186517ebb9e7422fabab2d19f60420b36e6b1ecab8b8326c99122aad185b8e45927232708f SHA512 e372f79907fbc5d60a41ea0db3a91575b0b304c1727c6091f94eec28445cd836faa32754582c59fd1eb8ce784986e63b4c8cabbd46d5e4cacec1150d9ca08481
-EBUILD seahorse-3.30.1.1.ebuild 1546 BLAKE2B 4f5dc38fd39950355a8f4ed720eb747e200eaecb1cd117ae32968dcb19eb722af84da6ff1d7212d69fb1fce6ca3f236282d5e8f16a83a4d675c30467bf2216c4 SHA512 9a8e0d9ceb1d281b976eb6d198db40fc00b58efc38dfc8ad8c267d31019eefc2a93e2dbf9c6eca5ef05bf839366df1efffc5926ffb01bfd3ce1afecfbd956fc7
-EBUILD seahorse-3.32.2.ebuild 1459 BLAKE2B f083861d1904a55cc4aaadda7b7b98b7fcade9bdd275f9120be3117b3530247f339fc7ad2ab39f355e83ddc5795751629b1f67a5b1babc39e4d6fa4551c85aa4 SHA512 a07dcf16d4d43addd01e2aceae972746a42c1e9ba0386099ef013a0f82698457311d800c169b94a71af2f1c48c326a003f3ef9dde884d3d3f188fe04169bbde5
+EBUILD seahorse-3.32.2.ebuild 1457 BLAKE2B c427aa81dd70a8308eab8eb59b08a70d44d03b1eae49185afaea88ceaaa1de0d219cc0c849f55fee6cee4c5545f8a939a5b15c8300d4722dc2e4eb96ebf87f2a SHA512 adecf0e83b24859135bbaaf997a564de93d4f530a653f150ae3079e54d24425ca163620ed3694ae43c2cb16c73c66715f1f4acbe2057fb9c82cf318e05ce91e6
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.30.1.1.ebuild b/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
deleted file mode 100644
index d882152db482..000000000000
--- a/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="Manage your passwords and encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=app-crypt/gcr-3.11.91:=
-	>=app-crypt/gpgme-1.7.0
-	>=x11-libs/gtk+-3.22.0:3
-	>=app-crypt/gnupg-2.0.12
-	>=app-crypt/libsecret-0.16
-	net-misc/openssh
-	ldap? ( net-nds/openldap:= )
-	>=net-libs/libsoup-2.33.92:2.4
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	app-crypt/gcr[vala]
-	app-crypt/libsecret[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dhelp=true
-		-Dpgp-support=true
-		#-Dcheck-compatible-gpg=false # TODO: https://gitlab.gnome.org/GNOME/seahorse/issues/217 # assuming gpg 2.3 and newer will be fine for us too; keep lowest version listed as compatible as min dep for gnupg RDEPEND
-		-Dpkcs11-support=true
-		-Dkeyservers-support=true
-		-Dhkp-support=true
-		$(meson_use ldap ldap-support)
-		$(meson_use zeroconf key-sharing)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-crypt/seahorse/seahorse-3.32.2.ebuild b/app-crypt/seahorse/seahorse-3.32.2.ebuild
index ff2d19dfe21b..a23ee02bd5aa 100644
--- a/app-crypt/seahorse/seahorse-3.32.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index 5f16a48f70cd..51bb356f28a4 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,5 +1,5 @@
 DIST signing-party_2.10.orig.tar.gz 222778 BLAKE2B b2225ba3038037a8f841e5f2ee8c5f08f3fe294e617c42396269aadf348965a17151bb31b11a76b2d84806e060cb0eb1093963f72e17bb5549ac6fbec0e332fb SHA512 82e51b91c282a72e9d16d920b87560c66aeafc0219e91615ea47d2f1a5df903fb459201f34368e6fa7ea1e2d2ca46a73096f30a068c8c35322af2f3ea256b269
 DIST signing-party_2.9.orig.tar.gz 222606 BLAKE2B 5c7fd8fdb4945f3155d5dc146716ae402c72ec3cc728feb5b3d009878d88313ed26dbf4461820346bd3340ec84d9a439dfd52950452ad796bf1fbc98a342ff6a SHA512 31a0f15f679c0339753bafbac645609e9e16f3da2c5105c33e87e0f258453b3101f188398a7c1509fe5c005339289ac5465ccb18631a526d231c714f9ed61d96
-EBUILD signing-party-2.10.ebuild 2748 BLAKE2B a1465a40836909ba3d759aca8c65dd188c0e9d4dc497b7df66f8879b93a3a0f6a477389299574241a940a2227a43f63557cf72dc1162ea90847f55a67df769a5 SHA512 749ccc1ce870ccbec3e5ecf0f72ecfba5b6c9835e6f0445af3caac0d8581827ac2e92d480b551fda60f70456e1734dcb9dc13e7e524b96429771d59867f8523c
+EBUILD signing-party-2.10-r1.ebuild 2800 BLAKE2B 2e2525516b9b83358d30bef5651c783b4fcbf846a70106a7d352c1f2c7a8ca5ad93e279971455fe296deb084fedf868640c4de13e9cdffbe7e46c68030e22ac7 SHA512 7d5efe342c29c55c6ac7f46ece06552d152656d3f955011f89f65e64275dbc3f325ed5060127b61aea52ee32dd758ae5e680efc1ad1f1bdd6cda98a23c7dd63e
 EBUILD signing-party-2.9.ebuild 2731 BLAKE2B 173c2cb4d3b371c085bba45252ed049ee3738092b1dea0e3d175c88b585c96713f72adaf35dba82079f45578657f3d6266b38e58e0f28347f591d53a769b7605 SHA512 0c1b0ba4495c199a1a69d287c4bdfc8eec952bfaab3975f7ef47b5d91e6abc48b4652e85aaad2ed78dbe5d04d278f2935de596ae2615cc13740b72565b01d704
 MISC metadata.xml 340 BLAKE2B 9b55569cc672c3f5077b76cd53d557b442db05ac73fe19ace5ebebd26c51ec30fdbf82ef937fd591b112c7ba25188132882f104d317ef57ef435ccd4305619fd SHA512 6625069cb3bad8e5bb3c30676fbc5d3f28f8659c4580d9b380a50b766f5cf3ca6e7a79f42a5c8d24eead14876937abb3c5cca45ed419b80bca02842a78089a60
diff --git a/app-crypt/signing-party/signing-party-2.10.ebuild b/app-crypt/signing-party/signing-party-2.10-r1.ebuild
index 57087ae306c1..3c2e21cb2b0c 100644
--- a/app-crypt/signing-party/signing-party-2.10.ebuild
+++ b/app-crypt/signing-party/signing-party-2.10-r1.ebuild
@@ -104,6 +104,8 @@ src_install() {
 	# sig2dot
 	dobin sig2dot/sig2dot
 	dodoc sig2dot/README.sig2dot
+	# gog-key2latex
+	dobin gpg-key2latex/gpg-key2latex
 	# See media-gfx/springgraph instead
 	#dobin springgraph/springgraph
 	#dodoc springgraph/README.springgraph
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index f140e4677a9d..ee28c2754d5b 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,3 +1,3 @@
 DIST ssss-0.5.tar.gz 17435 BLAKE2B 76aae463ce11341f8b0336526f7d19c9921025cabc05bc9e00005b0bdeb676ed5e069226962232f277de2fecb1cd71bafbd4b2fa0c03ef4faf0f66daa24599d1 SHA512 be8df1666ac61d4097b5fd54f2cee3640db8f85ec21411f1b208a35b671c5699bc692079525d8d313d1cf2500da31bfb03771829a9fdccc0bb6d806749526ec9
 EBUILD ssss-0.5.ebuild 755 BLAKE2B 99d90a6b0ebd25739c177d3b72a1ae62897674b3397393382b845f890c8b7a50dad81050accb76db95fcc7e1f4ac627e436f3c7835caf500d1858157ba118970 SHA512 4d42d16680eb2bc9a752e9574433f52c910902a66075979b6d9ff4fd27bbeb7ab18b3656ce38659359e27d1ef1d3e9bbfc70dff9abf9a305e1e07f1a60517cd2
-MISC metadata.xml 615 BLAKE2B 268173e83a1880bde7f164f9bc93f499654928a537458334dc3a87ed706e3bf31b514582fdf890d107896a04cfe9936e2a4459201b04448d919bcd277f616a26 SHA512 8ddbb48727f79921b79da2ac26f560a56e5e55c8a335a5dc7469f6a6aed8715034abbe7b869467d3bdeca9dca120b07bfbf8b16aee03cd5a730c67b2fef74f8c
+MISC metadata.xml 496 BLAKE2B 0e998a8a5587315750394702193fa739a61bcc5101f38eca3b25f13af0661b54f76ad214fc0e378cc55a7a99192e3c7f75166eedda18ab61c1d9911830f40b6c SHA512 84249ac824f19a308cc20bde7610c829030c363c13c6111bfe30d7d5a219461728a8f6010bb006821be5ede4a2cf02c3e11eee67d782126ef0e1453207298c66
diff --git a/app-crypt/ssss/metadata.xml b/app-crypt/ssss/metadata.xml
index 108893a39ca7..51c92c834b21 100644
--- a/app-crypt/ssss/metadata.xml
+++ b/app-crypt/ssss/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		SSSS is an implementation of Shamir's Secret Sharing Scheme.
 		The program suite does both: the generation of shares for a known secret,
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index e69c3734d01f..fbcfd8fc4961 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,5 +1,5 @@
 AUX swtpm-disable-test-dependencies.patch 774 BLAKE2B 8089885d5b21cea09fb5ec59d69640754671ba27763d57bdb45345768722166d4cd5fa0d890542aa79a90c2b8e609f611ac4ccd58be71ec13128d81daccb50bd SHA512 d803222c8fb04a7909f8a60563dfd23327c842f12138309f3b901309651857d6c545ca8e46c68c9b60b97f0e03ab79575784e242409d41b3d69e6ad8516428e5
 AUX swtpm-fix-localca-path.patch 1197 BLAKE2B fb94a734303e1c71158ffda2958275a377d9c75b98262061b06bb22d2dce6efd3b5d126758b65cbab8141a78549c4ab99d3aa2c241c4870de67f871706840b5d SHA512 c9a0e6ee27f0b38b65f2cad65a48622c3b9e9e8913bba002f0c82168f22162dbc62ed2b104942ed8141889625f225f29516ecbd20ba6ffb5091eb2201df0f107
 DIST swtpm-0.2.0.tar.gz 297419 BLAKE2B 9045cfd127d2f7e8e2e202818a375b4f6398806a097ed0df73abb76426db3af65a0d27f5e7212ce099d796862d3a9b3d421e987cf159bdce8879fc764eb5e923 SHA512 bda54690c0438138ff7adcc212fb125d2bb62618b10305eeced776e014bb135ea1a1dd1271a99fb2c60bf7e418644ded029c3c09ec2c6c1258e5062122cacf19
-EBUILD swtpm-0.2.0.ebuild 1224 BLAKE2B f19ffd5b4e918974c89a03e3ba7274f1264f913103a54c98e1fdff55359c0ae0daa6d077bbfc6d3a1ae2a944bcfd33d54494e352621933f677d7a7d29dcc18db SHA512 e7db96d26f01ae0ac36e6f889ff2dc30bee375240ac18815660f7e5e6acd4a786ecb555e8b7861431561b18a04783b35e5c57f3839bd2fe703a07f0934678daf
+EBUILD swtpm-0.2.0.ebuild 1251 BLAKE2B 67acf31dcb7ef3580688e657a41ce40e90d2b95332eae2e898395b7908aecb27c67501e85cf17c2c2980134150a1a6b672e15dc184f99fd8e053ca255d37fcd0 SHA512 c3db748e00f35a74b9d5fdd1861dce44e1b12e02b49f0ab2e8501fae7e09a542ba60159e27f7248db05040e528a77fcd8021d479170adc337b81142c5ac0cbe0
 MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08
diff --git a/app-crypt/swtpm/swtpm-0.2.0.ebuild b/app-crypt/swtpm/swtpm-0.2.0.ebuild
index 0ee3facecabc..f2e8e8c41fac 100644
--- a/app-crypt/swtpm/swtpm-0.2.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.2.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="fuse gnutls seccomp test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="dev-libs/libtpms
 	dev-libs/openssl:0
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 9c14fe83440b..1e035a3ac85f 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -2,5 +2,6 @@ AUX tpm2-abrmd-2.1.1-build.patch 4350 BLAKE2B 9d8dd854954bb79239a2b443d7d6a8eb4a
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
 DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
-EBUILD tpm2-abrmd-2.1.1.ebuild 1215 BLAKE2B ede9c7f24240bbe5a22f5bdd3dcc7233fcafa38fee77979eaf8103ffa86cd60effed90dd1ee78a32a8de20558c32bb79a3d6b5196ea0174e035a685053723ec4 SHA512 bd3801de3795f6ef7261ea6d373e02eeafc5fefc200542973ee664f15187effb551f8188637d33a6ed339a379ca36c430d1fa7d0d1884ea2f95d8e59c24f4a93
+EBUILD tpm2-abrmd-2.1.1-r1.ebuild 1211 BLAKE2B 1d21d99ed796ba182a8d1188cdeab2f8ed68d107b80223f69d9dd4f76d346dfe593e1912c44b629a408485b1c102d0ce8d643f6721c7f5d5ba0dd0e1e8a34526 SHA512 6d537e4bd4f81d68a954a710c211ea0bf759ff0c1dd7bd4c4462dd57c8f6a8fa72caf274ea5996d29a3049d4ca1677a159d10360c8f0e4e18fb46ba8d700c1e1
+EBUILD tpm2-abrmd-2.1.1.ebuild 1242 BLAKE2B ed68e30994eea41067ee4032d3b31d49eb6121e2fbe46bcde8a1aa7d4fe15fb604acbcc232ae4aa689382488a43e04418c1ff469b477e1d96bf0755e39cb7635 SHA512 cabd1e6c7f107aeb4179fc21b126581cea02ec2648a5214f8e393ebd5505f48b04d0bc50a15da383f1809b5eb90cd57ae2a450d929f166fb357e2701a228388c
 MISC metadata.xml 329 BLAKE2B 32d5f42e0427e9c83625ec972d4b266a1338c1629933628a0a32b8e4afb053468fece7f03916a983cdce9ff0a1d36d9c0f44006e7df4e383817005197a8be9a3 SHA512 920412d7cae5cfe3cd9a96133948b3101595edd966cc0d056934cdf45f9f4c36e1bb8fc79b0ee7146b2d1047d895de9d1fd57a7a753f4957707fad57962a9cb2
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..535dcd41a597
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="TPM2 Access Broker & Resource Manager"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/dbus:=
+	dev-libs/glib:=
+	app-crypt/tpm2-tss:="
+DEPEND="${RDEPEND}
+	acct-group/tss
+	acct-user/tss
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	dev-util/gdbus-codegen"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
+		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
+		--with-systemdpresetdisable \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
index 8d21d2b9b4c7..50c48fc0ff29 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-apps/dbus:=
 	dev-libs/glib:=
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index c9a33f159107..78aea5c3954d 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tpm2-tools-3.1.3-libressl.patch 2589 BLAKE2B 2d949ed3d8470bbfee647e691f03ee4a53cc70230140dddba85424238670f147465eecaf85ce95696782e2cf3e8229fa5233300e93e33f4d48c0d56485f3d0a5 SHA512 e45ba9fa0f758105cccd4ded4422f285fdf3c8bd35240c8301ac911049618ae35ad5084045dc72658aced371a4af807dc521e830fdafe1cf9b71bc0f1a7a1325
 DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B aaaa9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b SHA512 c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb
-EBUILD tpm2-tools-3.1.4.ebuild 693 BLAKE2B eba522790b3417c36f645a70eaed6279d3fa92711d9e9a287f9b987e36851ecfad3c638c622632da6d69b523de269c3364358bb31d0684c2beca8c361e7032a7 SHA512 2ee917cf0ae28faf2108d442e127fba4740aa0f6a8d4facf910e82bbbbd75dc3910db767fa81d960350349f02a4f82e7d3b48f108ff7d04a15d318a3e780bbc9
+EBUILD tpm2-tools-3.1.4.ebuild 720 BLAKE2B 496847fa7e4159f6ef979582e0f5924c7ee2087b245b7eb271a1527f466daeec997befe10c12be9c00ae1f43de83ec3d94f5411da6ed399bc81080c723badc8c SHA512 a1076e0809cbf374ecaaa6dffe6b3f4c6e2c0b928daefc0b894c2f6d0df2215d2957f5fca5232ce4e11eb7d9f44eb26b6505be1f3b20f0b72c65a1851d5e082f
 MISC metadata.xml 329 BLAKE2B 4839966acc6a4c84deaf050a21adaa680d3a93e5cb17ecff79dd6818723264570b215796e9733ef9beb078b17977078bad12deb6716ee3774947502e8efbbd78 SHA512 49d92ff1f240ce29957166befc9af7af18e665a388943f81c5a3c11c6dd12a924b19ed8dfaf2656223028444bfafa63fb15a54ad6c51e7c37b55ff1fe7287912
diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild b/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
index c9391925f760..2e1a75c96bbf 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="libressl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/tpm2-tss-2.0:=
 	net-misc/curl:=
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 0bb11bf31ed5..2e87502e78c2 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,5 +1,5 @@
 AUX tpm2-tss-engine-1.0.0-build.patch 2362 BLAKE2B d1e28ef019da77a9f857b90d9bce7d03a55504e0b74b7aafa2e56e417cc528b55ea8284ca9e2e30b35dd357a829b0329f26e595f9c421315c6b08ec8ac2aba80 SHA512 6a5fa163ccf8e0b24c9f1641b1c29be55d437d2e026343d9f33872fe2f2914a440884c705ec0c679130533ffa67d8ee33d475385568c57ed5d738d84b598c49d
 AUX tpm2-tss-engine-1.0.0-libressl.patch 1054 BLAKE2B 42f666eb44e61659e941758ab48bcf76c5be94be5944d7437db0671b286f038d8cee3e8754ca84fdbb0957b7e964445e798d2c494354c6ca9eff576ce45d7f6d SHA512 9b7c769d6a65ec67a522d78abb56da8c8560074a6bc1efcb300669308bfeeb39340da7c049a4c5d0a446f9e0d4e9fc03ee80ad0db52395c4a81013e11d27796d
 DIST tpm2-tss-engine-1.0.0.tar.gz 382277 BLAKE2B 6580eb83f4e9391a12df2fb9cb86ace385a9e29004a64f6ca9378d9b8f60572a7761f4f486e1010d435487fed28858737d2bb71b08e400e9551a7b83c198bbe7 SHA512 b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3
-EBUILD tpm2-tss-engine-1.0.0.ebuild 794 BLAKE2B 4d5fd45aecaa622ccfd1c53f251c9ead5988824b14ffebb5a23b74ab65a89d8fe3fa9f5fce2593a296660c8315c0cbc27d520ea2217ce905d4cdf05f6f04543b SHA512 fea4780fca65134fcbcda56994c6652e2bd934de7c8c50e26b41578596ab85d3dc4aa075d4542d1527247936b3f440ea59a52c8a0adde2caf3c548226cf58b4b
+EBUILD tpm2-tss-engine-1.0.0.ebuild 821 BLAKE2B 986550cef0aeefccb1e0b123d7bbcecfdefa6c5b41bbc9b2e9afe411578a3ac7192294fb6cda7f54a6d6640a288e24b7b25f211ae11bd08c0bae15203bcb41a5 SHA512 26fd09212feab98c4bf353b37400692d3595fcf1229fc2c19715b07cf84b0dfec5019d300bd2aa3e74017992f2a347cfb32590865dc583f5ca44f453335a3751
 MISC metadata.xml 334 BLAKE2B 8ee81cad095cd2c3f3a31e2b181ab678a4a51316e868bd6f84af46aa6bf87af35bea0a9d6fa0fad368175f55020e23cbdf2aed8af3ccb853bc3085db4ba82dc3 SHA512 0d38a3515c9b31fc64988812c4015a25fa8a7c6550cfe90e78f73bfcecad57d1c043da2843b5c72c7a220db1c77b1790c32cab61fa3ec970b72da7f448e12b02
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
index b42ef4ae8168..45bd390504e9 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="libressl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/tpm2-tss-2.2.2:=
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 8c077b2f6674..4932b209c7cc 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,3 +1,4 @@
 DIST tpm2-tss-2.2.3.tar.gz 912179 BLAKE2B 36b2a462512822dccb3adab605ea9922132f027455a1d2895b6735f6200fe44f08288477c99afd0f6c06b4bff3090104b6412b12ea4a518888cf756fb8ee53c4 SHA512 68087cbf2b7acc33788e90b3825bf2c91faa65cfc04b576790634c88876a8a6930d6943f83b7cf0858e37e5e7307703d0c975b9fc0b0ad1d87f66c74b65bd411
-EBUILD tpm2-tss-2.2.3.ebuild 1274 BLAKE2B 60f825e8f666b4bd89b01a54d9b0c0802bd0e2bc733060e4c1cd4a5d34f881bd19c33bf6e36b7d31795eaf1fa527f9fd30c8618671fad16f020a11f8357ec036 SHA512 50e563c5fe26f5c223e56d7542d92a60ca68134722a662373eba50ae0f70ce2efdee61cb5073ca8de0779d1657579a3b0ad76f967798c15ac0d0440e8c53c0dd
+EBUILD tpm2-tss-2.2.3-r1.ebuild 1275 BLAKE2B 668138a018c9e3d811c941265f555f0b835d2a0f3e35a30efa280bb36fbdd9707193c23728448bc8be7b03f1759133f69b7f718de42b714b11f7af368da264f5 SHA512 f40fe96f4ad6427abe10c8573deb16586c2a48455af487b7eaba427b1cfac00847dfb316037600fafb18fb731fa7fbb631b87dca0a1f8d43e23ca4889d6e0f9a
+EBUILD tpm2-tss-2.2.3.ebuild 1301 BLAKE2B ff9463239c9aca960b72a15340a2b596a1587feef28dee9452cb80d6e8530ca32250e41daca16580e0708d23f91ab41bf942b83fc8db5e994a91e98da00f68cb SHA512 33ec0d577320a4ad115310cdee5fb4f975756c509a0f9d5f714d15b6e6dc79a53263090af851caf78ffd464b0e874966bccf238c02ff8d885067bd3a76f65371
 MISC metadata.xml 501 BLAKE2B be53401663c21ea24b8fd7a898a30b398c5773d86b5f30cf9a8c4b2334736e09b64ea60e2f6069b765d7babc5695b64a8b38aa3020d65ff224910eb633d76ae6 SHA512 901b9e66b98cea1ee90c8f885f402d66d7fb90494d9b95a2028e4834d5750edb4945563275def32f3944f4e28ba5a3aa558abf3ffce935df1af316cb1cb1d865
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..e2b86a17e071
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/0"	# sublot is libtss2-sys number
+KEYWORDS="~amd64"
+IUSE="doc +gcrypt openssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	gcrypt? ( !openssl )
+	openssl? ( !gcrypt )
+	|| ( gcrypt openssl )"
+
+RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
+	openssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	acct-group/tss
+	acct-user/tss
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~TCG_TPM
+	"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--with-crypto="$(usex gcrypt gcrypt ossl)" \
+		--with-udevrulesdir="$(get_udevdir)/rules.d" \
+		--with-udevrulesprefix=60-
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
index 8496a3630e8c..7743ba624f99 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD-2"
 SLOT="0/0"	# sublot is libtss2-sys number
 KEYWORDS="~amd64"
 IUSE="doc +gcrypt openssl static-libs test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	gcrypt? ( !openssl )
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 917f5c721b8f..69de7c626533 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -6,4 +6,5 @@ AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99
 AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
 EBUILD trousers-0.3.14-r1.ebuild 3009 BLAKE2B c0cf45bdd4222448ea82cf8c539908317da6ca42d3ab3efdaf0dc4ebcc10cf57c8ca8ee1962d31be21cadea2cd78de8525ea9b3980f650bc507fae4050e4e8e3 SHA512 14edff453cc4839ab014e4c22006c897f4873eb1949ae69155ec5693a4050590f5fca1be75c7773391f7f86102620d0cf11a76a073dd38c5b29cde66d201817c
+EBUILD trousers-0.3.14-r2.ebuild 2954 BLAKE2B 67d448c9c62f6d42697a69da984b74c68cfde09debbf35d8467c35100a25e41d0376a92d7a2d8d6b423d1135758f7690757955ce5f0b55f60ce7b398dcd4b947 SHA512 50ddb4573571095768267333c56ca0be2bb017f79cfbea5f333da37d9d6d0908b75d8945c4d6a335f02e755175de375df9ac45b5d2a605be00d76ab94a76eed4
 MISC metadata.xml 389 BLAKE2B ba31172c2d03711712dec442f87ef9af448357d14ea90f973284b7d142a052f83798e0ac48d76f35d94a2efce6f050b456b0401562a7fb9d05f055e2defa923e SHA512 82ef49bce01041185282168653e951f7fc2b68e6e00a2e604765640b7a5ab3f3f73244ee6837004415612358d89c7347cc7c19df333539b534d04308d8f1b4dd
diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
new file mode 100644
index 000000000000..384d8736beb8
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info readme.gentoo-r1 systemd udev
+
+DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
+HOMEPAGE="http://trousers.sf.net"
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE="doc libressl selinux" # gtk
+
+# gtk support presently does NOT compile.
+#	gtk? ( >=x11-libs/gtk+-2 )
+
+DEPEND="acct-group/tss
+	acct-user/tss
+	>=dev-libs/glib-2
+	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tcsd )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
+
+DOC_CONTENTS="
+	If you have problems starting tcsd, please check permissions and
+	ownership on /dev/tpm* and ~tss/system.data
+"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	# Check for driver (not sure it can be an rdep, because ot depends on the
+	# version of virtual/linux-sources... Is that supported by portage?)
+	linux-info_pkg_setup
+	local tpm_kernel_version tpm_kernel_present tpm_module
+	kernel_is ge 2 6 12 && tpm_kernel_version="yes"
+	if linux_config_exists; then
+		linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
+	else
+		ewarn "No kernel configuration could be found."
+	fi
+	has_version app-crypt/tpm-emulator && tpm_module="yes"
+	if [[ -n "${tpm_kernel_present}" ]]; then
+		einfo "Good, you seem to have in-kernel TPM support."
+	elif [[ -n "${tpm_module}" ]]; then
+		einfo "Good, you seem to have TPM support with the external module."
+		if [[ -n "${tpm_kernel_version}" ]]; then
+			elog
+			elog "Note that since you have a >=2.6.12 kernel, you could use"
+			elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
+		fi
+	elif [[ -n "${tpm_kernel_version}" ]]; then
+		eerror
+		eerror "To use this package, you will have to activate TPM support"
+		eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
+		eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
+		eerror
+	else
+		eerror
+		eerror "To use this package, you should install a TPM driver."
+		eerror "You can have the following options:"
+		eerror "  - install app-crypt/tpm-emulator"
+		eerror "  - switch to a >=2.6.12 kernel and compile the kernel module"
+		eerror
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# econf --with-gui=$(usex gtk gtk openssl)
+	econf --with-gui=openssl
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/tpm
+	use doc && dodoc doc/*
+	newinitd "${FILESDIR}"/tcsd.initd tcsd
+	newconfd "${FILESDIR}"/tcsd.confd tcsd
+	systemd_dounit "${FILESDIR}"/tcsd.service
+	udev_dorules "${FILESDIR}"/61-trousers.rules
+	fowners tss:tss /var/lib/tpm
+	readme.gentoo_create_doc
+}
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index f0ab0b40c85e..5cd22839a05f 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,7 +1,3 @@
-DIST yubikey-manager-qt-1.1.1.tar.gz 10893572 BLAKE2B 22c37332601986495da8c70d9867dc04ad565ea06b38e219ed465586d741ddcb177ada9d5f74c04b46ddd2a5b7c445f05c3055ba1fd61e0696226541dbfb2bce SHA512 e1460abf024f045bffff2cf17a1b8fde2eb508b99957198d8de251315684c9fd591a93b3ad8063da2509ab7f054dce40a4267c1cc97c9dcc734ee18215070fe8
-DIST yubikey-manager-qt-1.1.2.tar.gz 11175714 BLAKE2B ee30d8d44a8fdec60cd462db7d67689d4206afa778904cbfe3df97b4bca25342cbb9cea5570211842d7feb8194043fcc9507f9c3d47ca7b588ba3d6250344536 SHA512 0e0bc304689170ba73ea41373c3a6a534678b04b638316480d48b7e7a7d415f8a97e2130983a5ff6e696cf271486953c8155589a6eb9ecf5bd33bb0c98fe70a6
 DIST yubikey-manager-qt-1.1.3.tar.gz 13316325 BLAKE2B 765634b05fff9efdd5ec5e91e0a5de7f04144476b83f7b3ba8a0c8a1bc95ca7132f25e193afca2bec17fe377c683063a14657efc24fb047a64a8f4498c7abaed SHA512 84bcca3f74967ba8aa470b8dd6c8699ff6a93a85ce942934a1d0cd674a4c507ba297d9a5ebb40bae3476ea713965a7bb3816dad1110a045c338f070eb249f02b
-EBUILD yubikey-manager-qt-1.1.1-r1.ebuild 1417 BLAKE2B 2e34d6d0166b06dff567cd097ec2392fa99823f839dc4c1abd6dccf69db2ab13abb4e1d110b64e8c76d04fa22cecfe61e308737e66f97a74f707589aa88064e8 SHA512 68b6d44285d4d72b47a000ce078a76a3ba02113e2cd99aa29dfd9d405368df38458250900000d7900f5c122c62e843a9d62e2223652e358e9f111604aca97aca
-EBUILD yubikey-manager-qt-1.1.2.ebuild 1417 BLAKE2B 34b9370be866b7fd7dfb2f9247ffb37146486c5071c8e598666a09ef3a8d0493303bf755998962b0c47734bad921cc1597bc63efef89a9765a0742418860852a SHA512 d18a91af7b9367def839eb2cb4227539c7680965af576a2472c2237b2a91835240ca41b5372a91cddb2468f81fb7dd1258b696c11464bc5206b9cf32ae50af1e
 EBUILD yubikey-manager-qt-1.1.3.ebuild 1417 BLAKE2B 34b9370be866b7fd7dfb2f9247ffb37146486c5071c8e598666a09ef3a8d0493303bf755998962b0c47734bad921cc1597bc63efef89a9765a0742418860852a SHA512 d18a91af7b9367def839eb2cb4227539c7680965af576a2472c2237b2a91835240ca41b5372a91cddb2468f81fb7dd1258b696c11464bc5206b9cf32ae50af1e
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1-r1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1-r1.ebuild
deleted file mode 100644
index 360775f894b6..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,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}
-	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
-	<app-crypt/yubikey-manager-3.0.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyotherside[${PYTHON_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-qt/yubikey-manager-qt-1.1.2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.2.ebuild
deleted file mode 100644
index 8efcc2e7e4ec..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,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}
-	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
-	<app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyotherside[${PYTHON_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 04af54a3b67d..798522511f9c 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,9 +1,3 @@
-DIST yubikey-manager-2.0.0.tar.gz 102078 BLAKE2B a2b8f90dabefb1014881cbe709222bf5cb48c9f409b415a8a2b27d7101c2da6189d0ebfe21a2701d10798c48c44e546659f9424ba6bf9257f7311abb0fc90b9b SHA512 42bebb88ba78bcce00a228109d0b4c815b3242ddbe43fd26c1209ba8666eb033ab77d5acd39a157e8310ce327de8d38bf88cfa0ffaed6273236b220c39e72e3b
-DIST yubikey-manager-2.1.1.tar.gz 101672 BLAKE2B baafce3850c0cbed842508c93ec4ad71e0eebbd0dcc61833b245b6c62f74b7215519cb8b1ec82df3be8c7677ec24447193a0121e0a63e67615453c2c6032fc0a SHA512 2c5990d9421acf93113347e9b9d33af893765ae9c5d9e6c9c4f2db1274b84cd839c15ae74327bdcbe9ec32ebdbcbed95b172b8b13ac00bbeb17eb06b6dd71ccd
-DIST yubikey-manager-3.0.0.tar.gz 138225 BLAKE2B 8506f7cc4d6579c1905d565d5d32a7e745389000ff67786e5b5e6bc54793230321e5f0f4840c625cae0a4d9d2893b75910bebb3207cfc75189d3a4876838a712 SHA512 47ae785356c256f31e118f2df483d3a0d7fb7b5b380fd7cd207334daaa47319855bde41931099f9acb6b310d4ba824540ab5d3008384fd4d6a373da7355b18eb
 DIST yubikey-manager-3.1.0.tar.gz 115010 BLAKE2B 1b27b9af7f3adac87a1bca58929bffef2ae397b359f70580a07193d2bd2f8cd4d2d867053f6494f1e262668443388d79dfe3775f2c3d0a5528840df8826cdf91 SHA512 518eedb52cfcf725c13114c433f848b97f711e94fa9c71685916fb8cb20e5bfc431f648b0ec710ef9ebed2bc8ddd8722ca1c9865d7a1b29537b719e167ed5f60
-EBUILD yubikey-manager-2.0.0.ebuild 1678 BLAKE2B 519239065e438c2a3f0e97a716ee495cbf770d73b12dda8bfd90df1d943236e1c5b0a20c767ced6e5a0c7c771af829e1dc849a0b57bf86a74f79e1e6613ca89f SHA512 61582c69457763de6fe944e901cc9c9d97324b626f69dae985ac623c6d1e7ea7f7d9034f482748c4ad363745daa29d52d7639067ce4409ee8ff0c0a0a596e589
-EBUILD yubikey-manager-2.1.1.ebuild 1533 BLAKE2B 93c2a2dcb1e14699c11a36c771914b0915e4f41e887d2acbaa9c7372a762e0940528da47014a261e938acd2475f599c49841b0efd4e77b0327f6bd6cfb54b69e SHA512 d3233a47e12e149b97184538cb3797db980100378bf2eb2d23a852660c47f3757d6cc36deab88f82fad991df0b076d4e6f6c1800adf98810d8f8f7c90cbbb57f
-EBUILD yubikey-manager-3.0.0.ebuild 1541 BLAKE2B a8bec0a494151e58e745a7668eaec3f12568789f5dda1c5c70508e289fc1d3549dd5b64fdd370c315f16e97ff235c9237c6bf1bda884cccc621e067940076a66 SHA512 7f12544ea492310409574aa7b4c4429d72c9e8eecec3291923813d515ac744488361d518c712536e12263150a771917e7ce7051e6ba4e29c686e2003f194aa46
-EBUILD yubikey-manager-3.1.0.ebuild 1541 BLAKE2B a8bec0a494151e58e745a7668eaec3f12568789f5dda1c5c70508e289fc1d3549dd5b64fdd370c315f16e97ff235c9237c6bf1bda884cccc621e067940076a66 SHA512 7f12544ea492310409574aa7b4c4429d72c9e8eecec3291923813d515ac744488361d518c712536e12263150a771917e7ce7051e6ba4e29c686e2003f194aa46
+EBUILD yubikey-manager-3.1.0-r1.ebuild 1609 BLAKE2B d8d9e956a2f36d37815babd7aca13b030ebbc7244b153f361858dbf5c11865343bf8c6c6ad53b7946a25645c4f24887e652a4dabb5a27c80ab7da703932099b4 SHA512 cd464ea815f1dd1ec643b70b8b60cfe4ec557a256525aa4b6e6973287e8c74b8581081570e3a667564edc8a77bb79ae288e9600e4b1426928e187a42fdc035ba
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
deleted file mode 100644
index bdb00c048da5..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,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/"
-SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}" # <- need this only for github-based SRC_URI
-# Here's the alternative SRC_URI, though tarball contents may differ
-# See: https://github.com/Yubico/yubikey-manager/issues/217
-# SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="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[${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
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.1.1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.1.1.ebuild
deleted file mode 100644
index 1fe93622d5c9..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-2.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,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"
-
-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[${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
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild
index cf74d5ba3a68..64c32a219bbc 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-3.0.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild
@@ -14,14 +14,16 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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}]
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.0.ebuild
deleted file mode 100644
index cf74d5ba3a68..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-3.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,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"
-
-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/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
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-crypt
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)