gentoo resync : 09.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
commit: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree: 047fc92023c520d07f13ec5ac96e094d1b312a7a /app-crypt
parent: 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)
35 files changed, 253 insertions, 91 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index abd2318dd8e3..3a204f5e03b5 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index f672e875681e..a09ae0a77334 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
-EBUILD acme-0.21.1.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 EBUILD acme-0.23.0.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
-EBUILD acme-0.24.0.ebuild 1205 BLAKE2B 59bf7d798bdd550ae5981ed9bb9df3d4c8d64e93a4b7157a170cfff19f95ae8d98d257f664cb043bb9ea26e508e0831d3bbb3ad52050917fc91e356af7b2879e SHA512 eb44ba59c75ea4068fdde0ba3944a5c3b906fc225713da4dc96ae3b74167242ac974d3f753df2adef9c11e8ce99ac4837ae6fd469fb57d7152c8fe4fb5b9a964
-EBUILD acme-9999.ebuild 1205 BLAKE2B 8c9ee00ff6505c592a3c1ae4ab57e4abf9c6f49b5dd7737cc4a081645edd808f3bf3422a59fbda1597f31176d003e51aa784886ccd8cb5e5862c2823339f51ee SHA512 164272884c2301b9e2a5252ccff8c87678116bb8007527cd064af9147d536a266c5ed8910b711bd242f384298b903f620ad9cf9431c4e26ec65b7e34a8c20767
+EBUILD acme-0.24.0.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
+EBUILD acme-0.25.0.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
+EBUILD acme-9999.ebuild 1261 BLAKE2B fd84623bd4510a088e0d27017f4e30a9b5214d1983298905163a4d944fb63bb1240b650a0ae1079398ccdd3c232fa58672b80f260deff64da0d62ef72c9d6a6f SHA512 0da048ccbf900d3dbde6b3d175a435e1337316d29bb900127c0429c434585a0f864aea1ba8af8262c1878ce77203d52d032614ca9722c063d7bf73607ea41cc0
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.24.0.ebuild b/app-crypt/acme/acme-0.24.0.ebuild
index 610350856377..1011932ad110 100644
--- a/app-crypt/acme/acme-0.24.0.ebuild
+++ b/app-crypt/acme/acme-0.24.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 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.21.1.ebuild b/app-crypt/acme/acme-0.25.0.ebuild
index 1011932ad110..7c82dc6d67c0 100644
--- a/app-crypt/acme/acme-0.21.1.ebuild
+++ b/app-crypt/acme/acme-0.25.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 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 3a1dd1461249..d408adeca31b 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 9bb7e2f5869d..aeb6640be81c 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
-EBUILD certbot-apache-0.21.1.ebuild 1070 BLAKE2B 19111adc28465df1a887eb5d6215cae16aa6910f84343e10e400de534ed1c65347be43f4a0dc4a2ab63f28dd1cfe3b39bc21717fc234b3123796db48461738ec SHA512 28d7f90580a2efa136bd246b01833017be2f02c3a5634f06170825dff037ec9f352bffadfd46e059f70fb91d51171a6b71f8d5342341edaae3a1632ad064f5db
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 EBUILD certbot-apache-0.23.0.ebuild 1074 BLAKE2B a5f786cf12bd0b6bfdafa4f7fb1d2b89666e82f8adecdaa002a6ddc815fb6e84991f197efb2368f9dbf50fffbf38bf856b934b143e6b9e14316902f1cd2b67ff SHA512 5de3ed6d1e4f28a32cd8844c358d1f7a6bb20106afb9f1fb01985a355129d20743183e7619575b3c47aaefab839230cb729e50926e54ba1d52bfd5f9de490825
-EBUILD certbot-apache-0.24.0.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
+EBUILD certbot-apache-0.24.0.ebuild 1074 BLAKE2B a5f786cf12bd0b6bfdafa4f7fb1d2b89666e82f8adecdaa002a6ddc815fb6e84991f197efb2368f9dbf50fffbf38bf856b934b143e6b9e14316902f1cd2b67ff SHA512 5de3ed6d1e4f28a32cd8844c358d1f7a6bb20106afb9f1fb01985a355129d20743183e7619575b3c47aaefab839230cb729e50926e54ba1d52bfd5f9de490825
+EBUILD certbot-apache-0.25.0.ebuild 1075 BLAKE2B 9348daf5bb723ad14a97eabb5cfb751a141a705164efc7926998388b43eb66c8c69355aa189b4813d4aff5b995bafe34c69fe8d4d6002401ef5634ea4a719351 SHA512 3eb9691a553afa71ccbcfa0878710a04925c9f9cbed44b414548206668793731a10179b931081e590cbcbe209de9786aa75f03075b995736a32c7da71b25c561
 EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild
index 2f2c9cd3e8a5..600149c82dd4 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.24.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 ~x86"
+	KEYWORDS="amd64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.25.0.ebuild
index d49cea753975..243b9c52b64b 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.25.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 x86"
+	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
@@ -23,8 +23,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 
-RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+RDEPEND=">=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
+	>app-crypt/acme-0.24.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 80471d9e013c..f7a219eabedd 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
-EBUILD certbot-nginx-0.21.1.ebuild 1010 BLAKE2B 31d97f3e848c653447dcdb925a45f5d2d503e367a78f352d1d8bcd7afa84a2ddf8f86238c2ad861bcfcc9ae9f5af951f5a6ed19a2066889eda390b0eb11d29a1 SHA512 6b40179511b4132810140b47b92b728ec3e186682569e9eddf64d35aa1b6150b6e92d1eb4ca19cc8e503304ee5497f9a264c3b478b5c759e7d94ba3a49cb36ba
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 EBUILD certbot-nginx-0.23.0.ebuild 1006 BLAKE2B fa6f8d964f53d9c2e27f7d7392ed5694d0828f7820518a4505902842a41b69afd30345c33d439a412b9ccc501c3524f5478b2f6ed5cda733ebbc2aa10fade0de SHA512 92201d17d53635f1978dceb67bca39abaa529da052fd4d49480041496b6511cebfa3e1d56e242b0cfe294caa154997126c0fbb705e0cb50ae9ec4758f5b828b8
-EBUILD certbot-nginx-0.24.0.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
+EBUILD certbot-nginx-0.24.0.ebuild 1008 BLAKE2B ac4f94a0747dd797fb853dda9bb1a48791e030c027776cd65bc2f0bc491c5753b19392d77454c12fd216e6eb7ad087fa1ef03323e7cdcbb334684ef8e20b91d3 SHA512 319deb49333190fe536ec3ac8b97ecb78c10f9987fe6f725188b0a357e2eedc7ea83a84e1c80efb3c1deed328b97feed049b461a198fbd87327dd46695b3fda6
+EBUILD certbot-nginx-0.25.0.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
 EBUILD certbot-nginx-9999.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild
index dd9e6e8b4372..57e3232d555f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.24.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 ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.21.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.25.0.ebuild
index d8d4c6b6a24f..dd9e6e8b4372 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.21.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.25.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 x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
@@ -23,10 +23,10 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.21.1[${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 a26f3beadd9b..10f33a31ca8c 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
-EBUILD certbot-0.21.1.ebuild 1519 BLAKE2B ea147ef2b73b71a49bec0d1704dde1d16effd9f932fe3efc01b17cbb7d5053adc852be4eb0d6d1f287640a8f434ff3c680766ed009f4dbf5575f64b2f3289f0c SHA512 ab4972592fe9359bda29822033de9547429ff2dd093882123f8befdb3f3d046bda39ec6cd3b6ab7b567375f24fdae1554e383f3e7d471ee8f28cea77abd8b8cb
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 EBUILD certbot-0.23.0.ebuild 1551 BLAKE2B 83b35abe2b04e6375e317dc1d7e02385cadaa6b688035e4754b171f65abe8859ad82d5fed76540c1c6db352cb3b50150f333ec3d3b7536537672cb382152cca2 SHA512 59275447bd956db66b5c6b8e51600337827cf621359a77e089ad2d1e804b77097637e49e94c84881cac3dfea38dfb76c9ddc13289a012a956f1d78046ad50db5
-EBUILD certbot-0.24.0.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
+EBUILD certbot-0.24.0.ebuild 1551 BLAKE2B 83b35abe2b04e6375e317dc1d7e02385cadaa6b688035e4754b171f65abe8859ad82d5fed76540c1c6db352cb3b50150f333ec3d3b7536537672cb382152cca2 SHA512 59275447bd956db66b5c6b8e51600337827cf621359a77e089ad2d1e804b77097637e49e94c84881cac3dfea38dfb76c9ddc13289a012a956f1d78046ad50db5
+EBUILD certbot-0.25.0.ebuild 1553 BLAKE2B 5ebfd6bbb0a4f13b9b81742322af2e71907039a63168dc6dcc46f97e00840beba308e113bf4188c7df03c18212339ca508f32cdc6408822683233983a1316117 SHA512 c5541ddcfb5b4e018a78b9f5184dc0cd05041b46b7eedd96d761478822e3e8a7251877790b35d641c692705512d22dfcd6d24dff2914b9893648f400cd8d6a16
 EBUILD certbot-9999.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.24.0.ebuild b/app-crypt/certbot/certbot-0.24.0.ebuild
index f21b72555c81..ba4271ffa17c 100644
--- a/app-crypt/certbot/certbot-0.24.0.ebuild
+++ b/app-crypt/certbot/certbot-0.24.0.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 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.21.1.ebuild b/app-crypt/certbot/certbot-0.25.0.ebuild
index fe734acd2c25..cf9f45f6fe8d 100644
--- a/app-crypt/certbot/certbot-0.21.1.ebuild
+++ b/app-crypt/certbot/certbot-0.25.0.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 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 fi
 
 inherit distutils-r1
@@ -21,13 +21,14 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>app-crypt/acme-0.24.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/josepy[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index 79e23c2a56b5..ee728fdb267e 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,5 +1,3 @@
-DIST cfssl-1.3.1.tar.gz 6865684 BLAKE2B e7ecf0f8e2f489e4e0bd9064523a90255bf2c85d0edd62f346f90aa27cd5c68bf80432fd77bb8fc64954b75c7add26b8f3230a43c3f82265632079ef699542c4 SHA512 1c33527d1d0c08cac39647e7c6237e655569c474a872b144b962af3e7c39c420d002e719875bbea1f5b502fa640483e63d9a7061bed7875c64565d3f6c15cf47
 DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
-EBUILD cfssl-1.3.1.ebuild 754 BLAKE2B b7e10271d0901f3caf57b8549aa6f1d8c9ab5dec8061552f1dc51fa60d671ea8b309db06717dfc74867e61560e7243850e36b4d7ef13515ef78c72b84ec3b087 SHA512 878de06fbe027df328ec2af15bbf0b7a526ef03acd4e754028403b6d338d182d7711da861d4336a028d7192f744d176e5ee14b236a773efa9e0b69f5a4bdc916
 EBUILD cfssl-1.3.2.ebuild 754 BLAKE2B b7e10271d0901f3caf57b8549aa6f1d8c9ab5dec8061552f1dc51fa60d671ea8b309db06717dfc74867e61560e7243850e36b4d7ef13515ef78c72b84ec3b087 SHA512 878de06fbe027df328ec2af15bbf0b7a526ef03acd4e754028403b6d338d182d7711da861d4336a028d7192f744d176e5ee14b236a773efa9e0b69f5a4bdc916
 MISC metadata.xml 326 BLAKE2B 519dd19dc05c50ee2b35580a1ca47b6be4438fcd5737775b098f2bf7cebd7ec3ff88a3d5c9c27a256cedaaddac4b6eeb20f1dfb442d651a7ec31453c309c7c52 SHA512 11be8680812e220202583bd324d756909056b58b9fdc74c769bd1beacc97292c9dc0d7a396bc6018c77d050081654726dfc659b43efc957175d2e2fc57039ffa
diff --git a/app-crypt/cfssl/cfssl-1.3.1.ebuild b/app-crypt/cfssl/cfssl-1.3.1.ebuild
deleted file mode 100644
index 6b1f640b3abc..000000000000
--- a/app-crypt/cfssl/cfssl-1.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Cloudflare's PKI and TLS toolkit"
-HOMEPAGE="https://github.com/cloudflare/cfssl"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="hardened"
-
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	pushd src/${EGO_PN} || die
-	dodoc CHANGELOG README.md
-	popd || die
-}
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 1ec70041d790..8ad74531f11e 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -3,5 +3,5 @@ AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 EBUILD efitools-1.7.0.ebuild 786 BLAKE2B 8a842f23c5e7ec1afa535dfd7448503a1313cd026eaab72961a517ca223d04ac521cd6ce7c98c920de079c33549b164aa544b44fdfe73c76bd46e7444da2fb28 SHA512 40132fc48114b2baebb590e1b6ac4a32961c1ab6d7393ecf80223fab6bffb6cccc8da1123c67f967602982a23ecc82a1f106856d39ba73862ce5ddf2162d3e18
-EBUILD efitools-1.8.1.ebuild 1030 BLAKE2B 869a7a8a299dac60eeedd0ccb990f96cb151cab36ca68cec602f5f5424609be59fc5c4bfb4b90e42a045bc552ae47f0a0ac8cab326ba5d15fed0460ebe1fb2a5 SHA512 0df50584ba254e4f8f18f852b7c43c461ea10f0dc4be8d597979a657011c3485a0410e2bc746ec46dc9449578adccd692d8530c76d66267e3f3c55d7ed213a45
+EBUILD efitools-1.8.1.ebuild 1348 BLAKE2B fedfa56aa7e7397104b0ad32484e145a2cf1a1cf9caa7cec8e8d84d6c861a2c4f705d6b43998b27eebbce28de04a47c73c8dfc9dd7653079ea07c58ef02ab51c SHA512 9edd70850f64534bcd8c48d7d87ae5dba074f8bae0b884208ed888055853832e2452550e302963e509c89185f10010b5d22081b07ddd92ca7db73951292e1216
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
index f18e8b8ea271..6ede95860eb5 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -3,31 +3,43 @@
 
 EAPI=6
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.8.1.tar.gz"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libressl"
+IUSE="libressl static"
 
-RDEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	sys-apps/util-linux"
 
 DEPEND="${RDEPEND}
 	app-crypt/sbsigntool
 	dev-perl/File-Slurp
+	static? ( ${LIB_DEPEND} )
 	sys-apps/help2man
 	sys-boot/gnu-efi
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" )
+PATCHES=(
+	"${FILESDIR}/1.7.0-Make.rules.patch"
+	"${FILESDIR}/${P}-libressl-compatibility.patch"
+)
 
 src_prepare() {
+	if use static; then
+		append-ldflags -static
+		sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
+			Makefile || die
+	fi
+
 	# Respect users CFLAGS
 	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 888bf9332ed1..640bf43f9f11 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -8,11 +8,13 @@ DIST gnupg-2.1.20.tar.bz2 6456128 BLAKE2B 009a8b8163701f5f5e269caea315a81f4c90c3
 DIST gnupg-2.2.4.tar.bz2 6571487 BLAKE2B ec678470e574fdc9f057cc727cbb902ce525f76adae740722731e318032707d0f72873628024c2070a72c21321f2b8da16153edeafcb4ddeba72de59ff5c73bd SHA512 3d5c93b7662433103e9549d066a6b1a0c09d595851fab712d2ee844a55157e952a8a2dd5deff70fa8dd6817481f81c3fe5135603bca03206857310d04c1067a8
 DIST gnupg-2.2.6.tar.bz2 6605028 BLAKE2B 2de6f8d32e551a8af5c41b7e6220a43645472b3b7f25b168a54343c4279f412d5d8f7a5142451504192259b3fe4a3e3242d12520dadc385f466dd701a803073a SHA512 ad0861c86c1886f701ae05e7cd439449cf0684a7bf461ca2b729c5e93833ee36f8438cd4d7f73a4c60e57060f3d8f4890a809b2bbc31b083f9f61d2f66ccacc4
 DIST gnupg-2.2.7.tar.bz2 6631100 BLAKE2B 81a66a8f738fc2b42d923ccda7d6cbfffc8e938970c04fe02c0146202f2e97fa88d5263aee2f3051e141169f4f02f72ccc53ac831bb57d42740130e3122fa454 SHA512 f858b275876d38b9d3a60e5428574f1008a73a948f67a2fa43bcf1970a5dbb60ec3f0e2b2271243229465eb9b22124e216894f0b3d72004acf3ed0c3481da33d
+DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26c0fbb65dc6a36034314985bbd405cb22cfaf9bffa4c7928657cbc63d363f16b77d00bf86737b73c73ffbce4f2 SHA512 24271ec2663b941ed5e72e2179b48ac73d5cd838292aa9d4954952b11713f4b466f30e6af632b22c9e7c284350e300a07046d41d0ab73dcbd1639b303cd09007
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
 EBUILD gnupg-2.1.15.ebuild 4570 BLAKE2B c88be887786ba1823e7950828039432d08c51053886ac187b3e0d86470e67fd9731b940ae54f25f46c7484d0fcf52db485f1368b56ccc9aa66baa99f0510a3f0 SHA512 385f5c40a42559e3b686d16dedc2ca442dd0a075514184e67eef97624cc419bd0bfc7f7ca6fdd3dc549cb4e3beafce656b725adcf201d27b151dab6456346875
 EBUILD gnupg-2.1.20-r1.ebuild 3102 BLAKE2B 7e63763d5989d876aec29eec09fe9bda9a83a26a0bdda97bb1c2a2bf95b7e7c2d6a727b068b8e6dedc7b07c747486c1f00badf603c03a5ec97cee6747b4138ec SHA512 68eafca6339bab0f118c5ff9119a984ee2b7432942929d429a430c053da568ed7729d13a507d073bebc8a273e74eb40f66585ef84cc9b83181f2ea5d6990d615
-EBUILD gnupg-2.2.4-r2.ebuild 3271 BLAKE2B 1437957efa7c625fc0a4c2eab776645043dfc80651424cd6f72dc1eab7cd530d30313a89baa1bba546ec5addad19c30aea1ceb2afc7252418ce0bbc2fe15e101 SHA512 b39114f09d04fd2fe3657171e703fad10f18687ac70315f15fd3e125a7979324533849fd743c8404e5fcc4d2b1ede9d2749d054c287757afaebf9a0891da8fbc
+EBUILD gnupg-2.2.4-r2.ebuild 3270 BLAKE2B fe28baa02fab59b834d43a932539aef99319438ac841454a95bcf0bebc867aecd514ea7f65b7fbdc0a3c87961852bff6628cef93128faf78332620e110db1d4e SHA512 dfe66cad026daba6b56096e99da472ead7aabcc8e1bfaed76e8891a860fbf9d6ca1560f32eaa02ca3f0dc687aa1826718cd2823ccf10da6f1ff0bc30fd003045
 EBUILD gnupg-2.2.4.ebuild 3202 BLAKE2B 15937df613d5f8c91cf186643983659f431c8f25dbcf0d69db6dc4f02145d587c81cd6a1a62053d492fbe59f2efa921147e72e588f3da52c0a94d7b8e27cc95e SHA512 180a4dec88ac9b800db26cca8a98dba57f8624d08c2167221e90b16ad873f2c113385b98a1abe716ac3eb752d159f8f5cd95a2c69d4150ffa03cf34b7534ee79
 EBUILD gnupg-2.2.6.ebuild 3219 BLAKE2B 1f481af4f31c3298ea6aa3a233c6ca183698957636490bf92737558b936798ae0c06110bc1e9d37f7975fe1a69974a6d06cdfc9e2d9e2c378e5ab644bee9ce2d SHA512 8a8320f58a40f6dd2504346d91474568c40c6527d018e48dacfec81723697dc204d399fa1e7caaef598528132d8d0d8e268590fcb859ba4aeeae72c7b35ef119
 EBUILD gnupg-2.2.7.ebuild 3219 BLAKE2B 1f481af4f31c3298ea6aa3a233c6ca183698957636490bf92737558b936798ae0c06110bc1e9d37f7975fe1a69974a6d06cdfc9e2d9e2c378e5ab644bee9ce2d SHA512 8a8320f58a40f6dd2504346d91474568c40c6527d018e48dacfec81723697dc204d399fa1e7caaef598528132d8d0d8e268590fcb859ba4aeeae72c7b35ef119
+EBUILD gnupg-2.2.8.ebuild 3219 BLAKE2B 2dd09e94733c03b6ee8e1bd2fcb949bc1a5b861698dff5f2176628fb360a14d40318fc678b16d8ace0fd403f6c96b334bb3ad1c4399a4c5d8a7b89855dcbd7cf SHA512 01f76f52f46977ded9ef667d372b30ae53d51e53c5572ab126c84db0e074acd8174538eb68e17c43238d898e8d7f7fb36d677147b3dbe0de3cf04f59375353ae
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
index 2f16527b85cb..7cb0b0782823 100644
--- a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.2.8.ebuild b/app-crypt/gnupg/gnupg-2.2.8.ebuild
new file mode 100644
index 000000000000..d53de1b71258
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.8.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit 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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 wks-server"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.28
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	virtual/mta
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+	!app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+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 smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	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
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable ssl gnutls) \
+		$(use_enable nls) \
+		$(use_enable tofu) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		--enable-all-tests \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 774899d1c20a..4943dfec004f 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -3,6 +3,6 @@ DIST keybase-1.0.44.tar.gz 31729876 BLAKE2B 945700824e630591f7b79dd5e8253156ee8e
 EBUILD keybase-1.0.41-r1.ebuild 1406 BLAKE2B 98696edcda23f847bbae3bafba3746cab2ca20b63b097b9609fbe89f563d23273039cc0851314d28df3367f002392cfd27dbb0a47a6fb2770e6f3618f1761924 SHA512 8b2c29ff8ebc3c942c1d9bcf0a14b45381853ad72593a18f0c92123e2d915c62ab4b92ed61f121c9c23f0397d966423eb2b2fa2636f591f6cf73a5b490b2c1ce
 EBUILD keybase-1.0.41-r2.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391
 EBUILD keybase-1.0.41.ebuild 959 BLAKE2B f94747768552a47f9ca7f9d786d6933caa3fb8df52e183cea08f953cc5e611e94e16bcf107d086a0c625ae888e907d583cd43af1147da5ab0d46eaafd148fb75 SHA512 6c8f0f09c879583bda20b6a693fee84d7ac8434d01c2e60131bf85ceec27eea91874870543b5c1b26e133ef7afd0e7f185ed582b4d49ff669cfa2cc1e0f76db7
-EBUILD keybase-1.0.44.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391
-EBUILD keybase-9999.ebuild 1386 BLAKE2B 4809768de299ee735c36c3f0dee89b7f76d9a9492b767793561b98bd92b54f834dfc8c9cec2cb35c99d3aa75772bea47b274db08ba7f88053b0518e1869979cd SHA512 d809d8020947746f1a48f37cf6b3f96a4e3dce60c8f21eba4daaea992ee468eda019bfebfa75fec06be914c78337036317cd852051a6c9ae3edfaa6ae23d8bbf
+EBUILD keybase-1.0.44.ebuild 1594 BLAKE2B 45c65cd0f7b749d8d07a06426b6ab9d7fe16acadeb7b0616b87edc4ebc490f66c6cfe0155ac4d409dc782273a063d144de19fdece9498f9723e03873cc2b95f3 SHA512 b6d0c8ea90998229f934b02b3822565f2368b72f828b6428528fb41649bbd62256e5396171568eadbf2ff9e2887e9322424afa6767889bde316850144b0eaaa3
+EBUILD keybase-9999.ebuild 1570 BLAKE2B 4c8878853bee91128b71b4d37f7e4d3853a9117f9945e15b60405d99efb0e4abbd10d200170ad96d5d6df4a0c61e1ba59119dead1b62dd5ef25472cb0e5743ff SHA512 d7b401bfa1fbb0eeb65b829bc8c7df2d68c3d3e35513f74685e59d8246b59cbf168e55aa91ce6646c2d78254770e19edc0b0bbc58e036119024a3176c11fe3dd
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-1.0.44.ebuild b/app-crypt/keybase/keybase-1.0.44.ebuild
index afb357189ce5..505b2ca3eb20 100644
--- a/app-crypt/keybase/keybase-1.0.44.ebuild
+++ b/app-crypt/keybase/keybase-1.0.44.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+suid"
 
 DEPEND="
 	>=dev-lang/go-1.6:0
@@ -49,8 +49,12 @@ src_compile() {
 
 src_install() {
 	dobin "${T}/keybase"
+	dodir "/var/lib/keybase"
+	fowners keybasehelper:keybasehelper "/var/lib/keybase"
+	dosym "/tmp/keybase" "/var/lib/keybase/mount1"
 	dobin "${T}/keybase-mount-helper"
-	fowners keybasehelper:keybasehelper "${EROOT}/usr/bin/keybase-mount-helper"
+	fowners keybasehelper:keybasehelper "/usr/bin/keybase-mount-helper"
+	use suid && fperms 4755 "/usr/bin/keybase-mount-helper"
 	dobin "${S}/packaging/linux/run_keybase"
 	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
 }
diff --git a/app-crypt/keybase/keybase-9999.ebuild b/app-crypt/keybase/keybase-9999.ebuild
index 05206f40c35b..181e16cb154b 100644
--- a/app-crypt/keybase/keybase-9999.ebuild
+++ b/app-crypt/keybase/keybase-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/keybase/client.git"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+suid"
 
 DEPEND="
 	>=dev-lang/go-1.6:0
@@ -49,8 +49,12 @@ src_compile() {
 
 src_install() {
 	dobin "${T}/keybase"
+	dodir "/var/lib/keybase"
+	fowners keybasehelper:keybasehelper "/var/lib/keybase"
+	dosym "/tmp/keybase" "/var/lib/keybase/mount1"
 	dobin "${T}/keybase-mount-helper"
-	fowners keybasehelper:keybasehelper "${EROOT}/usr/bin/keybase-mount-helper"
+	fowners keybasehelper:keybasehelper "/usr/bin/keybase-mount-helper"
+	use suid && fperms 4755 "/usr/bin/keybase-mount-helper"
 	dobin "${S}/packaging/linux/run_keybase"
 	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
 }
diff --git a/app-crypt/keylookup/Manifest b/app-crypt/keylookup/Manifest
index 751c1490ab6c..48f637596a77 100644
--- a/app-crypt/keylookup/Manifest
+++ b/app-crypt/keylookup/Manifest
@@ -1,4 +1,4 @@
 DIST keylookup-2.2.tar.gz 13188 BLAKE2B 63d1c218fe5fc6a69baa73d58f1cd491125e5718745fc932d802e378c9b0038da12d5f9edac73598e3ecd94b0ed057273c813c3723446d045e4719621d735c3e SHA512 e9aa931bdf33a720b1262449d63e7e9592b375526eb33832ff966968a20dac1a0362e0db0e4444dba868ee4ad8c3e553e9cc3f3c60376d95b8a303e05d722abb
 EBUILD keylookup-2.2-r9999.ebuild 372 BLAKE2B 8d6a21ea93d9883f6747c07eb86d2b3270fc62771773d5daff03f9a73743bdbb0c5c023da682140f4a5f869578a9d3d9a4a344fd13f0e87aaa099cf8f55c8cef SHA512 885d14d1a10e7ddf7d326d2e507fd4d4557fb75e0f854c7348f84a9b97d86c777c7897f15395b609097df0506b4310c2b6a1d4af5e0696a5f83bd978f2e240b2
-EBUILD keylookup-2.2.ebuild 496 BLAKE2B 5288bc57117371c6a6da9f754b332b4188ade1da1df1f0039787daa7b27fe1f2524e3f5ec44e9b933770628e8b55f9ed4e48afb9db1f83f73827832b19c24657 SHA512 874b838d000652793c0f9151daf1a6de46dbdc694fac708a06004653e83d0fc7a7f9d0bc88f100f76949674625416185bf7c582b61ec80e4a7a3b0c33d40eb08
+EBUILD keylookup-2.2.ebuild 486 BLAKE2B 69dc89735a4986f4aa483f9dcc5aab7a894da84af3535b3bee3a0dc07bac436d42c8863ca84b3375dcbe906ca591602c60151cd49a579e3979f7d29c03f12dcc SHA512 7a58431179b681bc02e54965f60004d95ce412363c872d303c717c99d78b973d72e32e986def388184c03ec1e2a693577552454b44f156d932cc81a456bf703a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/keylookup/keylookup-2.2.ebuild b/app-crypt/keylookup/keylookup-2.2.ebuild
index fbb475b11fca..4f441c7cff56 100644
--- a/app-crypt/keylookup/keylookup-2.2.ebuild
+++ b/app-crypt/keylookup/keylookup-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="A tool to fetch PGP keys from keyservers"
 HOMEPAGE="http://www.palfrader.org/keylookup/"
@@ -16,7 +16,7 @@ RDEPEND="dev-lang/perl
 	app-crypt/gnupg"
 
 src_install() {
-	dobin keylookup || die
+	dobin keylookup
 	doman keylookup.1
-	dodoc NEWS TODO
+	einstalldocs
 }
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index b3d8c05cf34f..3e2f8c2b743b 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -16,6 +16,6 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.16.1.tar.gz 9477480 BLAKE2B 16bdd7d6d03ddbd4b070663c3a7a3d2331d54e8590b24f1dc162be2531bfbbbd65878d426a160c65ffc1ba4751f16bbbd177a8a91c01002fde0e886cc1bd91b9 SHA512 fa4ec14a4ffe690861e2dd7ea39d7698af2058ce181bb733ea891f80279f4dde4bb891adec5ccb0eaddf737306e6ceb1fe3744a2946e6189a7d7d2dd3bc5ba84
 DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
-EBUILD mit-krb5-1.16-r2.ebuild 4215 BLAKE2B 5b8d1df734687258802cdc5d170cb99cfa27897ebc74deb7af55da09c23a2f3e644f602711f9e48d6af268fe51bc11a6c008440224bb2978ba20bdf3afafe0c3 SHA512 9987324870011391499c4d6d35c6df258172ec423095388b66f097fafe5718c74f8eaf2975919624456b574fbc155d6cf19ec42ebc14ce301e6d92113ab5f4dd
+EBUILD mit-krb5-1.16-r2.ebuild 4214 BLAKE2B ac413ca0883587250f12f17d52eeea4a4f3721abbd2199356418ec04d3e7b4fe30afc23f2a4f50d925bd4021fce47987fe9ea7885292575ed0f50a384a5b2c11 SHA512 ef882f5e38656f9c88f5413ce54475f4dbfbc0bf68de2e3763aaa58bd85d6e156ed6973f29ae6c82fe3a3442d20e3baaf674c0ab3377e263bd19011ae00dcb78
 EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
index 063a8ccbc126..2940175e9edf 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86"
 IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
 
 # Test suite require network access
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 29a4ab32821c..8b99dd4504bc 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -5,7 +5,7 @@ AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 BLAKE2B b9e7aa8f87615
 AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
 DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-EBUILD pinentry-1.0.0-r2.ebuild 2886 BLAKE2B 27f6057b0d5d0d474397660d755c90ab8dc025a80d5573e44c71093839efee3c0a126fb5dc10fb53083946c46989cdb63aa1baf6e75f40c2e3aef6bae558bfef SHA512 32cc1cc04357afe5f0b84f1bd75af877e1b849d3a4fc70d194e627a32da883a05037d36d15b25cea67d2963563402c13d125a928278f9326fda8463b5951eb3a
+EBUILD pinentry-1.0.0-r2.ebuild 2885 BLAKE2B 2338a3aaff93a76c8a2e6d621cfd011447f81eb21a5d957468504f4d4c2e77a7acf71c6c80ed8babb9f20879e603a87ffd3e3b88ef706cd06f70a9ec204cb38e SHA512 252e068bd96c9a9c406ba358a69e7f6b9ef6875072236a3cf13995a27524903f2bae1860c65ced27d2ffd532e8797a3ed8cbb180a76e80f2442d56f02010929a
 EBUILD pinentry-1.0.0-r3.ebuild 2958 BLAKE2B 350c3f20934857f72ce46dad5d8a047f5b04c10dbf4f398e346a5b1339a81fa1263296859a240fe717970840ed81b2f271a902d3e26b5d93f108bbdf3117cc20 SHA512 10c088dd6cd0efab43430856615cd795986c127765fbb47c0d324085aac9474da85bd317a8ec23aecc05fafba19f14392ccbf59b1820590223be0eb57855a2a6
 EBUILD pinentry-1.1.0-r1.ebuild 2809 BLAKE2B b67fe9e2549179f6a035e7b47a2a5041e97e2924c381a66f889d656176c1ee464ab023297801f7f0442390565f5697f2e5fb67a54d7a4c3cfb8f5a4aeae23288 SHA512 e27748277d88402c8c46251ab95f7852fc6ff0499b00823cc1a980ebc222568acf6c31d6ebe92a29b414aba0a6f1796679b43ec279e36bd423183a1a25431411
 EBUILD pinentry-1.1.0-r2.ebuild 2876 BLAKE2B 00a80e0c23694d45c5ac529e086934f1ce28be2c46594171d6de17a2eeb7904df1ab031f4ba4c76d00e61944d229feabf204643ceb5a806b98c56566e262096c SHA512 9eccbd9d41ebf030ad823fa66f25509b6f68b29c5ea85a772453dd81a86c35d0734fbdb4b1d24970a7d0e3851dedd9357bf0c804d3f3987f7f34eab86674f923
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index f1444b26ed32..84e0c01de1e3 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 534da53660ad..be83e6fa0f12 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,5 +1,6 @@
 AUX qca-2.1.3-c++11.patch 3555 BLAKE2B 68b9e4a9e13543b2f98c564f19deef32090be25bb425d83bebf78bc0141411bd447223562c920aea80765811084360fbc964afb7841291081f80cc94060070b2 SHA512 605a602d184c86426d6d875954ad2cb3bee19252ce56e6581df7574a3e324f97ccfcb919fef32f6ff8a393683b8375d97586ed886ae01d87fbe015f2f83f0e3b
+AUX qca-2.1.3-deps.patch 1040 BLAKE2B 4bf0179bf2383328dd97f365c433ee40a87e465b8c0b5396d4cfde07f27a4aedfa2d229900e630606fc43e5a5a35042ffce999f59401c34439e656b0b6f1bf0e SHA512 e20a3a06fef8415287d8837ea5fa2acf3ef60f8a1da6aec7c994987f63336e52ac2460fa76694b82b59f30aa1d59cd22decac246423adbef8ae1658a7f7db78f
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.1.3.tar.xz 686340 BLAKE2B 60ebf9add907632ed17426ee53c6c35a9aed279a4492012f1c174608cbe9579d366feb7ff7bff551d2e9e4ef2f271e8f340fcb4c9e1f67f209657d388567d44f SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a
-EBUILD qca-2.1.3-r2.ebuild 2145 BLAKE2B 2e9e467c1028b5eb4ea9b60e48491adbf28c62beee2f22a7af4fbc47672fe17395b4cb659dd2cf7223826880eab0c6b2b6b1829ebb60e84dbd9c30bbd30ce465 SHA512 20cf442c8a8ed86177c940be5e284c29444f4db8ac960b68f4cf2c32b579c8454cab1b5d1b6c9bdcb1c282bd737461853556b5de0c0cf2e4e11fbca07b3b0cea
+EBUILD qca-2.1.3-r2.ebuild 2180 BLAKE2B a74a2d7378bad48e8ad20c30ae91416b79e6f79393566e499a7821cf6fc904f6966c36751b285da4320da5a541fefadaf35df6df192ec4338dfc363323e20469 SHA512 ebca007f517945d9f26ca4fba9536418371013764c95f668774da8f23c1dce722ae1954e2e5505ea5b87446576ac757e2248f829ca515db7249c97d28e0d83b1
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/files/qca-2.1.3-deps.patch b/app-crypt/qca/files/qca-2.1.3-deps.patch
new file mode 100644
index 000000000000..e1ef2e5c0e7e
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.3-deps.patch
@@ -0,0 +1,38 @@
+From e854f357f4037e2c8c781ebd04ec5164a882b9b3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 12 Apr 2018 00:45:50 +0200
+Subject: [PATCH] Make Qt5Network conditional on BUILD_TESTS
+
+Summary: I did not find it in use somewhere else.
+
+Reviewers: iromanov, sitter, rjvbb
+
+Reviewed By: rjvbb
+
+Subscribers: fvogt
+
+Differential Revision: https://phabricator.kde.org/D12129
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28b0169..65b95f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,11 @@ if (Qt5Core_FOUND)
+   message(STATUS "Building with Qt5 support")
+   # Got from ECM
+   # Distros have no ECM. So I just copied required cmake modules.
+-  find_package(Qt5Transitional REQUIRED Core Network)
++  if(BUILD_TESTS)
++    find_package(Qt5Transitional REQUIRED Core Network)
++  else()
++    find_package(Qt5Transitional REQUIRED Core)
++  endif()
+   include(ECMQt4To5Porting)
+ 
+   include(GNUInstallDirs)
+-- 
+2.17.1
+
diff --git a/app-crypt/qca/qca-2.1.3-r2.ebuild b/app-crypt/qca/qca-2.1.3-r2.ebuild
index fc3445a32dde..a1d5bbb0df5f 100644
--- a/app-crypt/qca/qca-2.1.3-r2.ebuild
+++ b/app-crypt/qca/qca-2.1.3-r2.ebuild
@@ -33,9 +33,11 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	dev-qt/qtnetwork:5
 	doc? ( app-doc/doxygen )
-	test? ( dev-qt/qttest:5 )
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 	!app-crypt/qca-cyrus-sasl
@@ -48,6 +50,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-disable-pgp-test.patch"
 	"${FILESDIR}/${P}-c++11.patch"
+	"${FILESDIR}/${P}-deps.patch"
 )
 
 qca_plugin_use() {
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 1688536a5697..45bccad62707 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -2,6 +2,6 @@ AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc45198
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
-EBUILD rhash-1.3.5.ebuild 2691 BLAKE2B 55cc1850b0f7d66510c349fdfda73fd9729f261ac00d6835e80cbfd56eb7c99ff891b1afb4cf86f8b28a518e95362b28dcec7cf7129084938c58b40b8d515371 SHA512 173c9ec7b77b7f6f39abcf00349a45d92d32463f1482c97f0cf8493e804246427b93e5b3eba34891e46936298e8240db036c1351b7045dba0b92413feca12f86
+EBUILD rhash-1.3.5.ebuild 2696 BLAKE2B bcaedcbbf9641101617be2014b44a0ab0155f856f6382090e7195154e5a15a0709478eaf14ab1e79962da2ae2d9b5fbad7e9ceeee3f344293b678c6a032d7a05 SHA512 2c0553f10b23946c4edc61ef9db1b1f9fc99eed8dff2bbfaca85cf85929aec4c31df308cbafa94dd2c91f86a380933d79ffb5a4b46901dcdc4399272639f759f
 EBUILD rhash-1.3.6-r1.ebuild 1813 BLAKE2B e8093c62235027d5083b7af10c63138d5e39928637c98568d08057292a7fa52474fff68fd6431079b7289fe327320fb44e23af7bea8c7114ccd595412bb6e891 SHA512 04290c4db196edeca5b88a994d83af7e519ffc97a6faad31dea34e233f410f528325d6b1637b83e49789d45937da8331eebb126ad62fd8b537915ff95f664f30
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
index dd34f36efb70..b086054c04a1 100644
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
commit	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree	047fc92023c520d07f13ec5ac96e094d1b312a7a /app-crypt
parent	7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)