gentoo resync : 05.04.2018

19 files changed, 221 insertions, 36 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c74fe40397a1..4f6fe1605972 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 3f119e38047e..c0de2f37dae9 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,11 +1,11 @@
 AUX 0.22.0-fix-client.patch 2178 BLAKE2B 5befa9f229c118fdd19758b7f3da05570ed685fdc7ceb733a15a0a64e6865ecd51f2dc792db402ca1c8dbd5f8ee586ba9bbf620c4c94b2b2b0545c8c3abc23ee SHA512 5fde6c834b96116a8c4c94d95d5e75ccde7b8345108862730834cfa265f6a58f4ed39a57de0961b9ca4904810313771c43a9a90809e3faa5d1c95105f34c6ea9
-DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.22.0.tar.gz 1128134 BLAKE2B d4874bca6ac9f992d54b8fbab975bc020f448ed83896d0088c8ba0f1547fbc02a783038992408b9090fde4ad8386c81d85511094abcd42bc79b8883f05d4600c SHA512 406810e29a2637c420b9a8a3feb3a2ffb77bd740419cbcf46d10ab152a7252c765c058481b2a1f9a96cc426a9ae018bf90540fc0ebd54be1c8822c528cf1b605
 DIST certbot-0.22.2.tar.gz 1128517 BLAKE2B 0b95ee9ab6b69b5d511b737d1cfc1eff543f1f0abeba9e60429dfe2dc389b39e19df10c77ea7c90ad8795640ae7602a7bc239c57cd1734863bf19d1f0c5eab67 SHA512 ca26be78d29728fc5c20a5290f2dde4d1f2090b7e2829c0b312acac4741ef56440cc21a9db77e3e0cfe59ce0f1f0ab2165cb6823af8a4e2a4528060ad683ffe9
-EBUILD acme-0.20.0.ebuild 1196 BLAKE2B 6f3277f312a2d4178feb12874a72cf00c29f78bbf5a664cf3e3c6900a8945e871aba74cb291bc81ae4412c4fa2ccccf1b06d3241f6a8562d8b5afd042af7a39d SHA512 1ca1a31c541cbf073141b5b4afd0eb0080eb5543c96570497fd107832a72e8716d136f51eed1fe9021c228858ba6b1abf67ef2f268004cd3279ec9b402e64f99
+DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 EBUILD acme-0.21.1.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
 EBUILD acme-0.22.0-r1.ebuild 1256 BLAKE2B 7527d7a2fb97118aaebc16e2a83bc7b2232e9d9db1fe205d6657f2c458b637f367aaa403f948270dfd5fa9c57912ac08649421c4fa455941e7d0d316c990a06b SHA512 165a936127bb921f6dbf5f971cfd454e90bb36ca8a82b43ffebafa9e49c3462f10355749cd5264e1ebdef88d60a91ca379ea2bd8f6beefb274a899cb5ce5912f
 EBUILD acme-0.22.2.ebuild 1205 BLAKE2B 59bf7d798bdd550ae5981ed9bb9df3d4c8d64e93a4b7157a170cfff19f95ae8d98d257f664cb043bb9ea26e508e0831d3bbb3ad52050917fc91e356af7b2879e SHA512 eb44ba59c75ea4068fdde0ba3944a5c3b906fc225713da4dc96ae3b74167242ac974d3f753df2adef9c11e8ce99ac4837ae6fd469fb57d7152c8fe4fb5b9a964
+EBUILD acme-0.23.0.ebuild 1205 BLAKE2B 59bf7d798bdd550ae5981ed9bb9df3d4c8d64e93a4b7157a170cfff19f95ae8d98d257f664cb043bb9ea26e508e0831d3bbb3ad52050917fc91e356af7b2879e SHA512 eb44ba59c75ea4068fdde0ba3944a5c3b906fc225713da4dc96ae3b74167242ac974d3f753df2adef9c11e8ce99ac4837ae6fd469fb57d7152c8fe4fb5b9a964
 EBUILD acme-9999.ebuild 1205 BLAKE2B 8c9ee00ff6505c592a3c1ae4ab57e4abf9c6f49b5dd7737cc4a081645edd808f3bf3422a59fbda1597f31176d003e51aa784886ccd8cb5e5862c2823339f51ee SHA512 164272884c2301b9e2a5252ccff8c87678116bb8007527cd064af9147d536a266c5ed8910b711bd242f384298b903f620ad9cf9431c4e26ec65b7e34a8c20767
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.20.0.ebuild b/app-crypt/acme/acme-0.23.0.ebuild
index 91d9aa0f2d69..610350856377 100644
--- a/app-crypt/acme/acme-0.20.0.ebuild
+++ b/app-crypt/acme/acme-0.23.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
 
@@ -25,13 +25,13 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	!dev-python/josepy[${PYTHON_USEDEP}]
 "
 DEPEND="
 	test? (
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 8fc4fdf35107..e51df43247db 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,10 +1,10 @@
-DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.22.0.tar.gz 1128134 BLAKE2B d4874bca6ac9f992d54b8fbab975bc020f448ed83896d0088c8ba0f1547fbc02a783038992408b9090fde4ad8386c81d85511094abcd42bc79b8883f05d4600c SHA512 406810e29a2637c420b9a8a3feb3a2ffb77bd740419cbcf46d10ab152a7252c765c058481b2a1f9a96cc426a9ae018bf90540fc0ebd54be1c8822c528cf1b605
 DIST certbot-0.22.2.tar.gz 1128517 BLAKE2B 0b95ee9ab6b69b5d511b737d1cfc1eff543f1f0abeba9e60429dfe2dc389b39e19df10c77ea7c90ad8795640ae7602a7bc239c57cd1734863bf19d1f0c5eab67 SHA512 ca26be78d29728fc5c20a5290f2dde4d1f2090b7e2829c0b312acac4741ef56440cc21a9db77e3e0cfe59ce0f1f0ab2165cb6823af8a4e2a4528060ad683ffe9
-EBUILD certbot-apache-0.20.0.ebuild 1070 BLAKE2B 19111adc28465df1a887eb5d6215cae16aa6910f84343e10e400de534ed1c65347be43f4a0dc4a2ab63f28dd1cfe3b39bc21717fc234b3123796db48461738ec SHA512 28d7f90580a2efa136bd246b01833017be2f02c3a5634f06170825dff037ec9f352bffadfd46e059f70fb91d51171a6b71f8d5342341edaae3a1632ad064f5db
+DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 EBUILD certbot-apache-0.21.1.ebuild 1070 BLAKE2B 19111adc28465df1a887eb5d6215cae16aa6910f84343e10e400de534ed1c65347be43f4a0dc4a2ab63f28dd1cfe3b39bc21717fc234b3123796db48461738ec SHA512 28d7f90580a2efa136bd246b01833017be2f02c3a5634f06170825dff037ec9f352bffadfd46e059f70fb91d51171a6b71f8d5342341edaae3a1632ad064f5db
 EBUILD certbot-apache-0.22.0.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
 EBUILD certbot-apache-0.22.2.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
-EBUILD certbot-apache-9999.ebuild 1072 BLAKE2B 6ec71a794ac98f33ce0d71fad86006da09d13ebfd708ed734f2b1376eb67ccb81252ff010648398aee622cca7e63f2667a56efc54abe36901d63fd76039c70e6 SHA512 bd39dfef6a1993ecd2d26fadbfddaf1794dcc93a4ea030bd162b51b1125fa1f32c6c4d605a93e0ad9e3825cdf11feb0f37997312e63ad1d593222af8000e6852
+EBUILD certbot-apache-0.23.0.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
+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.20.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.23.0.ebuild
index d49cea753975..2f2c9cd3e8a5 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.20.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.23.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.21.1[${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-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 6dd43da7e5b4..2f2c9cd3e8a5 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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.21.1[${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 318bf7597409..e21403f1cb01 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,10 +1,10 @@
-DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.22.0.tar.gz 1128134 BLAKE2B d4874bca6ac9f992d54b8fbab975bc020f448ed83896d0088c8ba0f1547fbc02a783038992408b9090fde4ad8386c81d85511094abcd42bc79b8883f05d4600c SHA512 406810e29a2637c420b9a8a3feb3a2ffb77bd740419cbcf46d10ab152a7252c765c058481b2a1f9a96cc426a9ae018bf90540fc0ebd54be1c8822c528cf1b605
 DIST certbot-0.22.2.tar.gz 1128517 BLAKE2B 0b95ee9ab6b69b5d511b737d1cfc1eff543f1f0abeba9e60429dfe2dc389b39e19df10c77ea7c90ad8795640ae7602a7bc239c57cd1734863bf19d1f0c5eab67 SHA512 ca26be78d29728fc5c20a5290f2dde4d1f2090b7e2829c0b312acac4741ef56440cc21a9db77e3e0cfe59ce0f1f0ab2165cb6823af8a4e2a4528060ad683ffe9
-EBUILD certbot-nginx-0.20.0.ebuild 1010 BLAKE2B 31d97f3e848c653447dcdb925a45f5d2d503e367a78f352d1d8bcd7afa84a2ddf8f86238c2ad861bcfcc9ae9f5af951f5a6ed19a2066889eda390b0eb11d29a1 SHA512 6b40179511b4132810140b47b92b728ec3e186682569e9eddf64d35aa1b6150b6e92d1eb4ca19cc8e503304ee5497f9a264c3b478b5c759e7d94ba3a49cb36ba
+DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 EBUILD certbot-nginx-0.21.1.ebuild 1010 BLAKE2B 31d97f3e848c653447dcdb925a45f5d2d503e367a78f352d1d8bcd7afa84a2ddf8f86238c2ad861bcfcc9ae9f5af951f5a6ed19a2066889eda390b0eb11d29a1 SHA512 6b40179511b4132810140b47b92b728ec3e186682569e9eddf64d35aa1b6150b6e92d1eb4ca19cc8e503304ee5497f9a264c3b478b5c759e7d94ba3a49cb36ba
 EBUILD certbot-nginx-0.22.0.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
 EBUILD certbot-nginx-0.22.2.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
-EBUILD certbot-nginx-9999.ebuild 1012 BLAKE2B 136068938950b35a57ceb8b3d20bdc479c44209e968283257bab20a5541b4741ea92212d8955873a7fc303718a8743d85972302833d58efb9d343ab7679848a3 SHA512 c6bfe9fbcfd4f037e90cd32618e3b345332c8993bb3a5bebea70ba914b80ae226cae5c1b3bd3ec0c13eac26b751260ac6dd48ae05474d916cc24df4ff79de346
+EBUILD certbot-nginx-0.23.0.ebuild 1008 BLAKE2B daa9345efea4bf75277216ae37bf29cd586e929b0d7d5c451427f8010e3016aca37ae7876395369b7c7ca4a9a58c6ee425d88b883b2e2360d839c9cf285d68e0 SHA512 df606ef2fc97f6de1c30abb27d20cd9b585fdae124f655d5a52befcd4d600cbfe801b06aae1a45afed6d02ec9d0e75a3c2b06b02eb34df9fffdc25a91a9f8b01
+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.20.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.23.0.ebuild
index d8d4c6b6a24f..ed87fab21a9c 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.20.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.23.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/acme-0.21.1[${PYTHON_USEDEP}]
+	>app-crypt/certbot-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-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index d267c60f7750..dd9e6e8b4372 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 01ba992de7f0..09b8a35d6715 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,10 +1,10 @@
-DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.22.0.tar.gz 1128134 BLAKE2B d4874bca6ac9f992d54b8fbab975bc020f448ed83896d0088c8ba0f1547fbc02a783038992408b9090fde4ad8386c81d85511094abcd42bc79b8883f05d4600c SHA512 406810e29a2637c420b9a8a3feb3a2ffb77bd740419cbcf46d10ab152a7252c765c058481b2a1f9a96cc426a9ae018bf90540fc0ebd54be1c8822c528cf1b605
 DIST certbot-0.22.2.tar.gz 1128517 BLAKE2B 0b95ee9ab6b69b5d511b737d1cfc1eff543f1f0abeba9e60429dfe2dc389b39e19df10c77ea7c90ad8795640ae7602a7bc239c57cd1734863bf19d1f0c5eab67 SHA512 ca26be78d29728fc5c20a5290f2dde4d1f2090b7e2829c0b312acac4741ef56440cc21a9db77e3e0cfe59ce0f1f0ab2165cb6823af8a4e2a4528060ad683ffe9
-EBUILD certbot-0.20.0.ebuild 1593 BLAKE2B f59bf64316d9f8834ad592a20542c36e825b49ba7f80972e888efeae7a09cee36a3e5005a9ab8ed2ad5ac66b497cb0bb0aa15c86d38e5b2fda83da7c2c6371b2 SHA512 746e799bf353167035a9f12e52d814e5fb9208182ef3aaf023d890d0512ceeb8a07f7d41f203e5cbd2dd95e3a8f2110b0032662c84854923482df043e6203781
+DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 EBUILD certbot-0.21.1.ebuild 1519 BLAKE2B ea147ef2b73b71a49bec0d1704dde1d16effd9f932fe3efc01b17cbb7d5053adc852be4eb0d6d1f287640a8f434ff3c680766ed009f4dbf5575f64b2f3289f0c SHA512 ab4972592fe9359bda29822033de9547429ff2dd093882123f8befdb3f3d046bda39ec6cd3b6ab7b567375f24fdae1554e383f3e7d471ee8f28cea77abd8b8cb
 EBUILD certbot-0.22.0.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
 EBUILD certbot-0.22.2.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
-EBUILD certbot-9999.ebuild 1521 BLAKE2B 023aa5f5a8ce9fde2fc521880cf6d6a4992bf36ec4c057df0d78811111be786dde21598d374b069021ac84be9b1adff567c07b582a4756a5d3e2385d4d9f4a8d SHA512 72897b2d8a3256d5ffb5fe11fabccadcc13dfb4963f3a8030dbe19d942c97f6d26225441467a8ade644fdc732c7c4dd737d62ea6383faedec75a4f156330e893
+EBUILD certbot-0.23.0.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
+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.20.0.ebuild b/app-crypt/certbot/certbot-0.23.0.ebuild
index f67006191db9..f21b72555c81 100644
--- a/app-crypt/certbot/certbot-0.20.0.ebuild
+++ b/app-crypt/certbot/certbot-0.23.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,19 +21,18 @@ 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.21.1[${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/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 10f9b67afa20..f21b72555c81 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -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.21.1[${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/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
index aaacef6d225e..30c0eda83303 100644
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@@ -3,5 +3,5 @@ AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1
 DIST libu2f-server-1.0.1.tar.xz 268648 BLAKE2B 9c6c2e5bafb2a95fcc5c2773de49b4db197ee6283e90cf0e4e62ff3982bdde8a51635cd9771e4dd35d27c71634367197d3b01b9c26d8a3847fccf1daf676f04b SHA512 51020722f49f787c793808b667e91923bde46e9137bfe5065106f83bcdb678e8d11cca12cb605d9622cafc15a9794c9080cf08e2a704293a791ab6f27ac47f47
 DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
 EBUILD libu2f-server-1.0.1.ebuild 1141 BLAKE2B 940d5c772e94a0e77a72b56330a1c013da2588d573edb999a2d0af4cda5c8b62f07ea92eba0b45fb763200f6c7edf7f47bd115cf8bd4972e1681a6b0d9145bcc SHA512 6050266c78936ca416549483ded7beeb8866a23ca7cdebf0b5a973191bf27af0ece5cecf27c784c4abe8d1edbcd073baa7150236531d45dba18036dd20315459
-EBUILD libu2f-server-1.1.0.ebuild 1189 BLAKE2B 60714dc0ad14aebecc66c7053c87da0cca583e381af7435ada3a3cf8de4883042cd7c0ef55e0130e55ba97cd04da6df94ee4200a98e7e6fa9e69fff079dc7f84 SHA512 bb2effcb226d6e00c234678613d1b17b9cd498eb51b27bbf907f941b7bc2555ca9824a2c4b0a9cbba3defbdbf781523c658bdfcb0e9e0c456ccbe0a42f2a65eb
+EBUILD libu2f-server-1.1.0.ebuild 1188 BLAKE2B 59052e3f17f8f791706fdc0a1965ace969e642405130eb70d843bbd7e0d1af313a7300cf07b8d5a270d45f6de9cad7899ac41f0661d18201498b619104049f21 SHA512 437f7d002ece509e16b0ffde1d30f751699d4024f570699fc36846a352753fe9b33d3e11f7bee5bfcc35b11b1379b4e774e41f11ed8d5f60c243a46b79ab1b9c
 MISC metadata.xml 471 BLAKE2B 7fcdf8c4250dc67abb3e25e21dc602281b4030f38d3c2ed005685d0f9e1446bde39b451bf1240b3f1ee21b1622a01bd46ee838a03159eab24d3ac49a9c828688 SHA512 fd084dc4df2cdfbe25c7818605264e89e430a84f4c74ab1db5d798f510848a1d0208f178b5536be2f86ce3dbd8ba028f34e342363dffdc09f01544f748799db0
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 b2ada443d400..28f5dc9b445a 100644
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0/0.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libressl static-libs test"
 
 RDEPEND="
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 85489b3b709a..0bdd9c033f7f 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,9 +1,12 @@
 AUX veracrypt-1.19-execstack-fix.patch 1682 BLAKE2B ce050f900ac6504242941322b910c74c79128d132a372b89070cf6939b5b55c6853617a8c2e49019d4cc4bc1eb872b0753c9287b3e500613bef63f74ef5ba48e SHA512 df7e64a7badfdf97447991cba7c7f87c291c89735b1ffc72b2cc882da05b2df2e2c31ee9aef4415c4d0316bc6e0a9c6c10e01406c00bd0f032931e55cd6465bc
 AUX veracrypt-1.19-makefile-archdetect.patch 743 BLAKE2B 3eda2de96eb095cf51a806d7a8b06a79edeb03425ad6106a6ec72de0d76da8988dd953e58b4b5b321ee64d3d810ff8d312efddaabea0c8083b858430525a7ae0 SHA512 aa805312c5e3782452ac936a3772a0877e866e1116f2da56747b72a6f585538fd1e45a7c7531c426ff0245b5b3ac4964065e1196874aea4c11e91ac59bd6fffd
 AUX veracrypt-1.19-remove-packaging-from-makefile.patch 2098 BLAKE2B 7588a0de42a5e561dea67c04b0056bd483ffdac0e407a640440d0b7d2723a66368c1eeebaf10c95e31a0114acd013e4d24d138a4aebc876fae51b2da0c9bcffe SHA512 e6485ce39ca009cfabe5656b3ed81cd72ca0207d9b1c310738be60705e3c94f2364cacf393b7f1d0d3e79a1ee58794dfda1d01aaa03778597c149a9dfc5634dc
+AUX veracrypt-1.22-sysmacros-fix.patch 1190 BLAKE2B 33130133b9bf3708eed0d2fa304850e216db9918c326be1aa78d06fa6ace1566fb03928731b096948a5dd9ee47accd10698496f6b1f1626acf2c6eceeefad9df SHA512 fbb1d411755669849fc343c8dd729cb804ec70f0ff1736faf864850e496628b6697dc3e4a821f31e31462e833391c30ff7c8883d014cb5b4ff3b853c6769fc15
 AUX veracrypt.init 387 BLAKE2B 7f16dee40bceed81ca092a3be6a2cd71f24f5cc8b4e4b143bd6ddde046e1ecce0cd674f52e7adb406893ef57c5b73462157832ff279114a2079c0ff84839e0dc SHA512 986b52c454abd9a64a6e8eb93247983c48d9524c396f253bc16f68894fed0abe87614343ce9c9127f8fb180f12912b21f57063f8f3b43bdca5344c130eb6c72d
 DIST VeraCrypt_1.19.tar.gz 23235780 BLAKE2B 0d02b3c6783d233f7cc64956eef58077e8a125fd5db28c1374921d8f2ca6dc9e1cde5402917c1ed4e4a626901e24c566ee834a12e41b6bcd150b8d64851f1ebc SHA512 ebce681099e04d938ff0dc10a1af848c82dafd80b165b2431ec355d64e29be4e60d1d63f0d5c9fd1182394080d00f0f573e3ae90f3e2167533dea2b895bd0164
 DIST VeraCrypt_1.21.tar.gz 24106162 BLAKE2B 5afe48830bde81d91d16f0bdf16010bdbdb885df84b9cd3e48191e468be51a485dfb3fc4f95da71d6d973a2f22dfbb92ee2b912dcf019921b37e1d4479c8c8d8 SHA512 5186d339f8fb0d88acfc35b1e7a916f797e30be93e8f252cca542b6d5c1cd916110111ef7b859d66b1790ce05d7d02bc72def26857eb003ea114a911fcec6c41
+DIST VeraCrypt_1.22.tar.gz 24820384 BLAKE2B 52fb822d07af96a9f47c17f8aacf13a949fb5a7c5d064a720e003e6d1bfbb5f221a5823720527e1f2c82f08547d77349cc90bc839336a622efcf1836dd97bb88 SHA512 83cdaf673bc9cdeadeb70b2beeabf87a2a9a65d3b0b0cc7fdf9c87671714af1e207ddd1db716302919e2d14414f5d4dd9d8f5203847d72834f53544a04c1a62a
 EBUILD veracrypt-1.19.ebuild 1988 BLAKE2B 20e3a4725dc5b8d319a11cb44d5865afcdcc6f956ff8c3390ed225f605e01b01537db1af5aa1c82deb7c236b27eea69cbc0c29b2f2f4b770fae4514360c45a2d SHA512 b9829bad13c5ba781d9ec2e8353ed72f30a23459d3e9eaa7384a5718be051f1eeff70c3c097225c8f557c57634d7b14b5db83bb189671630c673568667e67da0
 EBUILD veracrypt-1.21.ebuild 1921 BLAKE2B 1adf1a612afa33dc2cdbed7f0bc971e84e3ec45236ee6d7d7bf317c00a6b03a57eda5b30c85f8aeb4684abbd9879b9dab40b9dc2ceb6cffe36946a74ba1544dd SHA512 1766b6db76015cc6fb6f147a8ba1f75795b7038d402c38129c60cbdb09831dd0aed2241d4ec9d403cffa8dfe38f3481085c64ae653a49362be39c08f462de1dc
+EBUILD veracrypt-1.22.ebuild 2066 BLAKE2B f092deec3e48e6b0dfe50d8c5768770b1aaca5e2a65adffd8ac4a7f86ff458f8927267f36b53b7a3e2878920b3f1e393476f9b3bed7bd52cdcce9fa5cc19d09a SHA512 1a455b646f8ebe271f8e5493113a82007562e1cd7f7fca6ec984da95229674a9dee068b4778f2f07a399a491f2272ac20953d82edb574d4c767903a8332a4fd9
 MISC metadata.xml 726 BLAKE2B f70a62997301172fd3e6928dd694720fe1e7a8a41a2eb842800a220bed3531828423e2b4bcbb6c6d7f2d1d8ec96f74d1a987fac64390323662028efe57fe5d72 SHA512 7898d7a419ba57600609578ae308d558d2aacf6b7dcc625adb6adfadca9b6f580123650d63ed8a618131459f71fc9a1b2b367745e2f07da75cbdf6ef9c1595bb
diff --git a/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
new file mode 100644
index 000000000000..702e8f702ecd
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
@@ -0,0 +1,36 @@
+From 0a50becec3a3cca71e575dfec35d69ab295c85cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Tue, 3 Apr 2018 23:06:20 -0400
+Subject: [PATCH] Platform/Unix: include <sys/sysmacros.h> for major/minor
+ macros
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with glibc 2.26, macros "major" and "minor" are only
+available from <sys/sysmacros.h> [0]. The build fails with the
+following without including this header:
+
+Unix/FilesystemPath.cpp:84:49: error: ‘major’ was not declared in this scope
+Unix/FilesystemPath.cpp:84:113: error: ‘minor’ was not declared in this scope
+
+[0] https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
+---
+ src/Platform/Unix/FilesystemPath.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Platform/Unix/FilesystemPath.cpp b/src/Platform/Unix/FilesystemPath.cpp
+index d6c9cd2..7c28af4 100644
+--- a/Platform/Unix/FilesystemPath.cpp
++++ b/Platform/Unix/FilesystemPath.cpp
+@@ -15,6 +15,7 @@
+ #include "Platform/StringConverter.h"
+ #include <stdio.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ 
+ namespace VeraCrypt
+ {
+-- 
+2.16.3
+
diff --git a/app-crypt/veracrypt/veracrypt-1.22.ebuild b/app-crypt/veracrypt/veracrypt-1.22.ebuild
new file mode 100644
index 000000000000..98de71aa6704
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.22.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
+
+LICENSE="Apache-2.0 truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 +doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+HTML_DOCS=( "${S}"/../doc/html/. )
+DOCS=( Readme.txt )
+PATCHES=( "${FILESDIR}"/${PN}-1.22-sysmacros-fix.patch )
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	dobin Main/veracrypt
+	use doc && einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest
index 6ec68250860e..8f421d3290a9 100644
--- a/app-crypt/zulucrypt/Manifest
+++ b/app-crypt/zulucrypt/Manifest
@@ -1,5 +1,7 @@
 DIST zulucrypt-5.1.0.tar.bz2 1610597 BLAKE2B 3b77676912f0cd8990ba307ff04309f308ec29cf76cad37ac28ebb317a7e42ee93ffe9deb1db12a80c4d5b235c2a83bc8e5ddeb6082e5f1be9d91425d06f4334 SHA512 b916d43f8c889f1593c506d95360b195f0639024463eb77b5b21b544468f99719b877d8c94725504305f307efe5cb18e203dc8f9b015bd55825dc1d4fffb42f0
 DIST zulucrypt-5.4.0.tar.bz2 1704452 BLAKE2B b0ef9e33b7261087b97186dd49672ea115c4792c04a64700cba5caa9c9e63d84818904c078a4d6663c6f420bbd19b0593af84210010821e2b8bae5f19947ffec SHA512 65361ef885b68a13f435704e0e1dbc9b7ae4df9525900ab60665c29e24574dcadb4afb27a7c595db33021c07086de92332f1a52189cfd674991b95e208040074
+DIST zulucrypt-5.4.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
 EBUILD zulucrypt-5.1.0.ebuild 1025 BLAKE2B 8852e894526d6b4db119e06f5d903226bb7c30aba504dbebde4bd93caa16162fc1f0562f314922de4f4feb3ea447c83659b5daabe35104f5182211c7a35b1106 SHA512 4f5411bfdfdf7c2f1b73602df3a9b1334f1f833cf3b4685d51381ca017870b02f270307447f8ea996b280d017f43b5d759f0ea087f600b54927ed314cddba96f
 EBUILD zulucrypt-5.4.0.ebuild 1082 BLAKE2B 8c5f7ebad6b607bb58580b74e450e7449c09a53a1ba43dfa3f39e3cd7ddac08f3a553d1da16ab1074a4aa3585ddd9ce0611a8ee3f5e26516fe7f368e5f72ee51 SHA512 98da7b2cbd5c8b270bd7dbb6f8dc018489682fec0409f9cb00df476ca03514952bfd622a084fc14295d06f5536bcaa861e495fec71bd1485ffa4dfbed20b4e72
+EBUILD zulucrypt-5.4.0_pre20180223.ebuild 1143 BLAKE2B c4e505eba9cdb13453dabbb4cff8afba36f0d86d60a3cd906ef658db26d5feb97af00bdf5a935f7e2655ae818f424f607e7cffebf320193a3c8ff823b4d175f9 SHA512 72e9617b6b5f98374d404cad23df38347e804ac9f13130e72c061dadef54ab809715e67bb0fbc8f8723d4c1875567f108fa5d5c093352d3aa1b889743d2cc086
 MISC metadata.xml 809 BLAKE2B d4767573d6ce0d1bab6f88185e9da74e6d4551a55f9cd56f8b762609b7d8b74a87cef5cb5b8332950906e722e1c82df4a2546a99da53d5feb11a5e2e673fcfb6 SHA512 0a4482ec6bd63bb8da89a94be28eb536e59285191c084b132d43c5e6c395c8e26b38fb64c61852b3b891eb5e3ff80ada06314f67c29ba7162c1f22339cac1eef
diff --git a/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild b/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild
new file mode 100644
index 000000000000..934b576d92c1
--- /dev/null
+++ b/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Front end to cryptsetup"
+HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
+EGIT_COMMIT="76637bb05af13744bf1734b56f67d6d5cc2343b1"
+SRC_URI="https://github.com/mhogomchungu/zuluCrypt/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome kwallet +qt5 udev"
+REQUIRED_USE="kwallet? ( qt5 )"
+
+CDEPEND="
+	dev-libs/libgcrypt:0=
+	sys-fs/cryptsetup:=
+	gnome? ( app-crypt/libsecret )
+	qt5? (
+		dev-libs/libpwquality
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		kwallet? ( kde-frameworks/kwallet:5 )
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	udev? ( virtual/udev )"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/zuluCrypt-${EGIT_COMMIT}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_SUFFIX="$(get_libdir)"
+		-DNOGNOME=$(usex !gnome)
+		-DNOKDE=$(usex !kwallet)
+		-DNOGUI=$(usex !qt5)
+		-DQT5=true
+		-DUDEVSUPPORT=$(usex udev)
+		-DINTERNAL_LXQT_WALLET=true
+		-DINTERNAL_ZULUPLAY=true
+	)
+	cmake-utils_src_configure
+}