gentoo resync : 02.11.2017

22 files changed, 48 insertions, 438 deletions

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 3f41f197c61e..ab06e434cf68 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,15 +1,7 @@
-DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
-DIST certbot-0.16.0.tar.gz 992700 SHA256 9abac759d7d72b520693ff806479e87609059a1546bb6ea26416267ebeedd25b SHA512 4cb6ec06c6ec71cd6886a716100f269de3922f17a582c8c20ec40327b65e1c16347a5b33d44131e56a7667233ebba88ff36a4e854beedd13e848897ba09a7e64 WHIRLPOOL 34dae0b20d472b4020986d0768ea6757c977fa4626666a9f81711007c051e76f9ad60f5a3bc77c768975e71a791f20e5ca2bb6f2fc41d809ebe2541129c975ef
-DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
 DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
 DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
-DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
-EBUILD acme-0.1.0.ebuild 1234 SHA256 8720192872d7fa7f7d40bbfd8bcb47da11c9ee53ef5491436844f907f087b2ed SHA512 a86535b4848749ad221269f2cc8494bd61cf7ae3e0352ab1d4d60c2d0b56b34dc2d0fad77786d49dfed08eb22c48cce936cddca97b9fccb946b7f9265695f5e8 WHIRLPOOL 5d8e66b8eccaf0cdc5cef94ecb0206b9e70f16d375775603a2d0322c09983c5218264468ec09f5e7265c367f8ea06debe1b138f1c4d50f43ac1221d16dc785ed
-EBUILD acme-0.15.0.ebuild 1088 SHA256 3901459c800d46b169a5c26ef8ccd97c8f7b0f08583f1181e4cf675d965561ec SHA512 4368b0a3b7442122bdeb5295988f3151000048c708cb86f8faa552670fee8d54a314c27a900bc14adf46545799ddc6560df2807263eacce9ae5c20e6361ebc9b WHIRLPOOL 9da58a0a770583d3f3c7b36682bf47a6a842927c5fa89eb75df2fa674bc4532f6524057e96f6d4ab5fbd7056f53501e6f9058377e3491b0fe8dc65b50d10da63
-EBUILD acme-0.16.0.ebuild 1088 SHA256 3901459c800d46b169a5c26ef8ccd97c8f7b0f08583f1181e4cf675d965561ec SHA512 4368b0a3b7442122bdeb5295988f3151000048c708cb86f8faa552670fee8d54a314c27a900bc14adf46545799ddc6560df2807263eacce9ae5c20e6361ebc9b WHIRLPOOL 9da58a0a770583d3f3c7b36682bf47a6a842927c5fa89eb75df2fa674bc4532f6524057e96f6d4ab5fbd7056f53501e6f9058377e3491b0fe8dc65b50d10da63
-EBUILD acme-0.17.0.ebuild 1088 SHA256 3901459c800d46b169a5c26ef8ccd97c8f7b0f08583f1181e4cf675d965561ec SHA512 4368b0a3b7442122bdeb5295988f3151000048c708cb86f8faa552670fee8d54a314c27a900bc14adf46545799ddc6560df2807263eacce9ae5c20e6361ebc9b WHIRLPOOL 9da58a0a770583d3f3c7b36682bf47a6a842927c5fa89eb75df2fa674bc4532f6524057e96f6d4ab5fbd7056f53501e6f9058377e3491b0fe8dc65b50d10da63
 EBUILD acme-0.18.2.ebuild 1095 SHA256 64e48f47a416b6fff4fc89f734fd798d81cfefc818cf0a6e8f7e5ab20a9b8971 SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4 WHIRLPOOL 4d1ece95d63fe48939ef8ea93ea0f15626ed2d39b72ac14fcc31c1904bc12d399239177f511e8c3d992206081aab1ae2871af38e905ead350be61a82c7eb2585
-EBUILD acme-0.19.0.ebuild 1103 SHA256 da323dba2cfc558a07d29a372e95ab0ef7c96764ec719c17739f44b8d49a6c46 SHA512 37c78b40124c666e76d6579c14b03e47ac54d0fd2157a42cf62405e2f485e05ab9d0416cc9ddb2db66786f5524b392cdf7d38a59ceba1dff577d795abd8e9aed WHIRLPOOL dc6a244eee32361d1d6bd9374a89341722417f6515655aec5b2846f82bc405c9cde05613839f22754f5e2d032419d7fcb83f151ec31b63571dc1322b9fcbb22a
-EBUILD acme-9999.ebuild 1095 SHA256 64e48f47a416b6fff4fc89f734fd798d81cfefc818cf0a6e8f7e5ab20a9b8971 SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4 WHIRLPOOL 4d1ece95d63fe48939ef8ea93ea0f15626ed2d39b72ac14fcc31c1904bc12d399239177f511e8c3d992206081aab1ae2871af38e905ead350be61a82c7eb2585
+EBUILD acme-0.19.0.ebuild 1101 SHA256 a0675a8f953972ff8a133aea62ae14cdf00f3ebb7eeb3178f72778ec5739020d SHA512 73db02807520cc53e8695f112e3ee75841bd0aaf9ec9935db7b3e812010f0f9947ed805bd8300d602c0757a5a18b1b4bf1665ac92494791915c09790c10953be WHIRLPOOL e3cb6c03fa30428e071e41c3b463cdb1c61ee88c76de469adaccf90347eafa352d30eca011620f540c222065640b02a73ea09aa263ef94df4a8a5348b04ac74f
+EBUILD acme-9999.ebuild 1103 SHA256 da323dba2cfc558a07d29a372e95ab0ef7c96764ec719c17739f44b8d49a6c46 SHA512 37c78b40124c666e76d6579c14b03e47ac54d0fd2157a42cf62405e2f485e05ab9d0416cc9ddb2db66786f5524b392cdf7d38a59ceba1dff577d795abd8e9aed WHIRLPOOL dc6a244eee32361d1d6bd9374a89341722417f6515655aec5b2846f82bc405c9cde05613839f22754f5e2d032419d7fcb83f151ec31b63571dc1322b9fcbb22a
 MISC ChangeLog 5917 SHA256 bdbadcd2933561b28889bf9b42c7d8863ecdf550db5b65662f3fb9096031b160 SHA512 63e3bf1a22642138436d2c123c9e25c33cd9b17ba6be7953a95babe7541ba0fafe82a1f504b3b1647eb08e19714075c79bb1fac3f7334b94ee6d7a740347b540 WHIRLPOOL 9eaaedda59338c0c9bc3e0188d2dcc08ed17b83adfc49a7afa21c7883d97ea07a4d457be8546c92354ce7eb85bc59dbea905fe09e5a9ea6809e879f2ba915eeb
 MISC metadata.xml 342 SHA256 cb538c63739de15c65069f536cf05b70d203ff46e6782d7671fa465eec4ce641 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb WHIRLPOOL c74a8e573a993be6355b81149e5b4fea5cd67d9cd3d6bbb27df1cc2093e87d78dea1ab0994d1b7e35e17f14cbb2d2b655f86870366dc86e0bd58ad92654960f5
diff --git a/app-crypt/acme/acme-0.1.0.ebuild b/app-crypt/acme/acme-0.1.0.ebuild
deleted file mode 100644
index efb7cc2d870d..000000000000
--- a/app-crypt/acme/acme-0.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
-	inherit git-r3
-	KEYWORDS=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S=${WORKDIR}/letsencrypt-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/ndg-httpsclient-0.4[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.15.0.ebuild b/app-crypt/acme/acme-0.15.0.ebuild
deleted file mode 100644
index bf3eed8aaa75..000000000000
--- a/app-crypt/acme/acme-0.15.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/cryptography-0.8[${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[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.16.0.ebuild b/app-crypt/acme/acme-0.16.0.ebuild
deleted file mode 100644
index bf3eed8aaa75..000000000000
--- a/app-crypt/acme/acme-0.16.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/cryptography-0.8[${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[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.17.0.ebuild b/app-crypt/acme/acme-0.17.0.ebuild
deleted file mode 100644
index bf3eed8aaa75..000000000000
--- a/app-crypt/acme/acme-0.17.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/cryptography-0.8[${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[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.19.0.ebuild b/app-crypt/acme/acme-0.19.0.ebuild
index a8fc5d0ba458..13f5e31382c3 100644
--- a/app-crypt/acme/acme-0.19.0.ebuild
+++ b/app-crypt/acme/acme-0.19.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-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 135b289d3d81..a8fc5d0ba458 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 8966874f91f5..251b29b72c7a 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,11 +1,7 @@
-DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
-DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
 DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
 DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
-EBUILD certbot-apache-0.15.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
-EBUILD certbot-apache-0.17.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
 EBUILD certbot-apache-0.18.2.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
-EBUILD certbot-apache-0.19.0.ebuild 1072 SHA256 45e3b66baa7f79ec27b58391edcb1791e0611985c43253772e98818bccd47a3b SHA512 bd39dfef6a1993ecd2d26fadbfddaf1794dcc93a4ea030bd162b51b1125fa1f32c6c4d605a93e0ad9e3825cdf11feb0f37997312e63ad1d593222af8000e6852 WHIRLPOOL 0566a894f3381c2f90f86f8273164f3ae40484efe02d098fd84b893f22c78eaec83f6198fe252fa8eabb3ab085b87af1b50d4ccf0fee9b2151cd3d7f89d86bd5
+EBUILD certbot-apache-0.19.0.ebuild 1070 SHA256 0dc1cec573907188537cb75134a9ce07722dcb33417d7d0beb10235c4c5a3b0e SHA512 4f99ca73893eaf072f62781a3d740ae9a6836c53b20104d9f1673eae9f6dc5255c58c3e54dcc27d65cef710030a44fb4b8073788579db8ffa4fcee801594b781 WHIRLPOOL 1fb9eb56f2e8e4b509eba74722b708de9bd9f4ad670b3e0d372ed13ed5fd099bb087893582683173d1335467a40149929b07b60da550e5eca06628200e237ff8
 EBUILD certbot-apache-9999.ebuild 1072 SHA256 45e3b66baa7f79ec27b58391edcb1791e0611985c43253772e98818bccd47a3b SHA512 bd39dfef6a1993ecd2d26fadbfddaf1794dcc93a4ea030bd162b51b1125fa1f32c6c4d605a93e0ad9e3825cdf11feb0f37997312e63ad1d593222af8000e6852 WHIRLPOOL 0566a894f3381c2f90f86f8273164f3ae40484efe02d098fd84b893f22c78eaec83f6198fe252fa8eabb3ab085b87af1b50d4ccf0fee9b2151cd3d7f89d86bd5
 MISC ChangeLog 650 SHA256 0ceb4da791e6e05a4380d4db4297da391135e1ce24d0658b3697a0598bffbf75 SHA512 c841c9a2340dbb950dd8fa0861a84c18744cce90c4c6bc0fcb5a1a4caa087c9ad69ce0e5b4d344107f3eff6fa579a60ec054fc3c159318e872413fd968b6a85d WHIRLPOOL 2bea921c94946c02aaccfa5b1be5d05e3103a3927d71425b68acf46762a6e20a8a023789b920136d30bede21359deee5c3746306d0ad7e1022db8dbe3e3a82b3
 MISC metadata.xml 334 SHA256 e1059ce7794fc4edc2c39a6a55932cfaa9e6d4b6de59d4b9dafdfa8f6f790084 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f WHIRLPOOL 8a5d0b99f05b3f8097607db4c03ceedea11dacf064a1acdbc9b97f8ec3a7379e487e9470977cf61ef2cb21ccc29959b371f3f7caec322648091d84f95d7db5d8
diff --git a/app-crypt/certbot-apache/certbot-apache-0.15.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.15.0.ebuild
deleted file mode 100644
index 93bc95551953..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.15.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.17.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.17.0.ebuild
deleted file mode 100644
index 93bc95551953..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.17.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
index 6dd43da7e5b4..1e1d358701c6 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.19.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-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index ddb857820682..eae101069021 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,10 +1,6 @@
-DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
-DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
 DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
 DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
-EBUILD certbot-nginx-0.15.0.ebuild 1007 SHA256 92328a779013918cd7e37b929e5d37ddb613f59d0fe818cbf8d1a39ddfc4cfb5 SHA512 580e0d41237668b9d97d675743b6b80d7ddf7ad6baa62513224a6c79cbda3c197c8562a8f3548066216543eede2c0e21158363f8d545782920811aa01d6c4e56 WHIRLPOOL a1f69031ab8bd1062cc1173939b2f7b626bc0bea5e72429434d96c56b1b8e3c5953ec42096b7c3ed6231cbd27072bfacc81d14ab938a0a3c8402f04670fdea52
-EBUILD certbot-nginx-0.17.0.ebuild 1019 SHA256 4684022d68c2d0723af47361ad0d1810f0417e817719f4fd1cc6f1bae57f1184 SHA512 fd46383fc11f3d538d92341ac2ead040bb3e1f6dfd1d8bd05d415accc4321f7bd111d9b7217884cda7a54283ffd1d164e00776f8058e2e05f852e68576d36964 WHIRLPOOL 24a2761f1d9c09e8a08d3966b3fc4df84a58ae818cddcd140af3996be109be5977854836e6c6b3721d32de3be7b211c63e589f8c62db74dcf3fe2ed3eea7ebfb
 EBUILD certbot-nginx-0.18.2.ebuild 1019 SHA256 4684022d68c2d0723af47361ad0d1810f0417e817719f4fd1cc6f1bae57f1184 SHA512 fd46383fc11f3d538d92341ac2ead040bb3e1f6dfd1d8bd05d415accc4321f7bd111d9b7217884cda7a54283ffd1d164e00776f8058e2e05f852e68576d36964 WHIRLPOOL 24a2761f1d9c09e8a08d3966b3fc4df84a58ae818cddcd140af3996be109be5977854836e6c6b3721d32de3be7b211c63e589f8c62db74dcf3fe2ed3eea7ebfb
-EBUILD certbot-nginx-0.19.0.ebuild 1019 SHA256 4684022d68c2d0723af47361ad0d1810f0417e817719f4fd1cc6f1bae57f1184 SHA512 fd46383fc11f3d538d92341ac2ead040bb3e1f6dfd1d8bd05d415accc4321f7bd111d9b7217884cda7a54283ffd1d164e00776f8058e2e05f852e68576d36964 WHIRLPOOL 24a2761f1d9c09e8a08d3966b3fc4df84a58ae818cddcd140af3996be109be5977854836e6c6b3721d32de3be7b211c63e589f8c62db74dcf3fe2ed3eea7ebfb
+EBUILD certbot-nginx-0.19.0.ebuild 1017 SHA256 5472d90db03ebbd3d8915accd45efe618ee198c91ccf49a27d7fe785c6458342 SHA512 3454653979f0756144420c09f84fc7d349d2d6a661d43e3d53cdda0a5734082d65543292bccfc5f49f7a91230fdf4d51fd84a1fc8dd642609298dd1e7f5a2716 WHIRLPOOL f0591fb2bd7472721e8cc1b8346552f5d0963ba02476afd311ed5069742e7afde2ce8928e0d2cdc4e8f4847bd030df53ef559e9537fdbbddab8d802c9ae49847
 EBUILD certbot-nginx-9999.ebuild 1002 SHA256 6789f86bec3256aaaaf8ca42ac94c97660c2c95d99b2d622497aeb4bcea66c4e SHA512 c52f1ad93218421dcd0192605ab8540593bdd9c9ca475691d889662944295cd91228c84bfde9b9ca3af12784783ff17c8511e048ba3ef685bc3a76d9295a6d3e WHIRLPOOL 323f8b85458481b9ae09d1881edf207f3c5141e3e64afd8ab05f3ac3f6a6132e782e00e42ae78d7b6749063725ea61174a522fbd47eaf6e221bf1b23503a64e7
 MISC metadata.xml 334 SHA256 e1059ce7794fc4edc2c39a6a55932cfaa9e6d4b6de59d4b9dafdfa8f6f790084 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f WHIRLPOOL 8a5d0b99f05b3f8097607db4c03ceedea11dacf064a1acdbc9b97f8ec3a7379e487e9470977cf61ef2cb21ccc29959b371f3f7caec322648091d84f95d7db5d8
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.15.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.15.0.ebuild
deleted file mode 100644
index 54f5cf0aa674..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.15.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.17.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.17.0.ebuild
deleted file mode 100644
index 94d8fd922794..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.17.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.19.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.19.0.ebuild
index 94d8fd922794..d79a9681a07f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.19.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.19.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ec01766ec295..4caf3c2d7a53 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,11 +1,7 @@
-DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
-DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
 DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
 DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
-EBUILD certbot-0.15.0.ebuild 1500 SHA256 1d53e382a60512ee5527fb76eaae0d02cc5e9bc03bb853ebfcf3fa4e68187769 SHA512 e338028b2e4357527f0bbffa28d7a1b66798c047a488cf791f26477135513510e11c3e96d19981be372bc7de02f7a2df13bef4d07bbf2185a648fcf04a1a5219 WHIRLPOOL 47fa9b2c46fad4a3b2662e91c4318fc21a75ff15c09cdba6faf5407296468d970695ee9636bbca31136bc5445559487aa7140501cf640e0828cdfc500e535a5f
-EBUILD certbot-0.17.0.ebuild 1500 SHA256 c96ee09cd0f271d16cb0826c187634599746647a39bde38af91ed3142582714a SHA512 0b503c738a4d0ab32ecff828b6437d69e2b05191d641a921a199ee061ac4912530a7ea5362ed9b8307c69c553110f347cfe7284c8de50e4a0b36259ee5b48168 WHIRLPOOL 5e735f8f4b3221b6d62dcd7e946990c9e3785be9d8e682b0d6b01db928c0289fc569e53c728580d173ab575644d6ad4b5e8ea2493a26b8743c6641c752624931
 EBUILD certbot-0.18.2.ebuild 1507 SHA256 3d6ede4ae1fd388cf18137deb6f5fa157081baffd9146c4935f4075ddc48bb0f SHA512 791726c0f1964f2287bdfb04d276abe3650bf70e4826c1b16077b6fc81398e397387e0d89a9d6391dccd2ab6ca330610a689ef1b32f839619af91b7c9678a1b7 WHIRLPOOL 1edc3540fab11b4fb01fe2af9074895adfa07f8fd225101ec64be1203d97070023c14f8463d3a39a1f90e3d2f213cde083bb944acfe14284701afb54d980abd0
-EBUILD certbot-0.19.0.ebuild 1507 SHA256 3d6ede4ae1fd388cf18137deb6f5fa157081baffd9146c4935f4075ddc48bb0f SHA512 791726c0f1964f2287bdfb04d276abe3650bf70e4826c1b16077b6fc81398e397387e0d89a9d6391dccd2ab6ca330610a689ef1b32f839619af91b7c9678a1b7 WHIRLPOOL 1edc3540fab11b4fb01fe2af9074895adfa07f8fd225101ec64be1203d97070023c14f8463d3a39a1f90e3d2f213cde083bb944acfe14284701afb54d980abd0
-EBUILD certbot-9999.ebuild 1507 SHA256 ac6e46c228ed15ac2ae1d4ede6c5ce49e93b594a2f24de6b794d7ba2159bdd88 SHA512 f655df51f9235d44d672ad111cb63af517b04cab347d0d4b541a2e83a483c9ad90aca4461dc27a556edc811f94a8b382e8dc4a214063890bd32b0d5d93b82766 WHIRLPOOL 172ff59b5ae439115855ab1ae093bc8216db23987326f0c38ff7e6b9ab460d982bc6d632ea344427132835dab9d03ec32c9f07ef745df92dda8c3b43200447a6
+EBUILD certbot-0.19.0.ebuild 1505 SHA256 6684027afd454738f6df85e6e1a5d816f9a02fa55b596bda80e2eb316ef6a20c SHA512 a4e0e01665da6a1b93adca2dab9a062ede49e92f05534d23baeca5bbf34e7681d14455d2733f636ab4d08838c69ccb37bf4a228dd5a0abaf8c27a8f1a90b0f8a WHIRLPOOL 8e2df23075029dae201cf948dc662c1a315515e1833f8395ddb7c2ef5cb532514116e6b0bb1391a880257e2c96b47bf357b14532a4b485de921b5678eb3cc799
+EBUILD certbot-9999.ebuild 1507 SHA256 3d6ede4ae1fd388cf18137deb6f5fa157081baffd9146c4935f4075ddc48bb0f SHA512 791726c0f1964f2287bdfb04d276abe3650bf70e4826c1b16077b6fc81398e397387e0d89a9d6391dccd2ab6ca330610a689ef1b32f839619af91b7c9678a1b7 WHIRLPOOL 1edc3540fab11b4fb01fe2af9074895adfa07f8fd225101ec64be1203d97070023c14f8463d3a39a1f90e3d2f213cde083bb944acfe14284701afb54d980abd0
 MISC ChangeLog 1863 SHA256 9d89a7d29808f3035d10942923d1edd5cad4451c6c5b2192ec6a56e54a3a2179 SHA512 dfccd3086c1dd58a1d786c0568183b9b3b1a392682920db4e30d5a11e836064fc45b2bfa4f1f1444e1a876b39922196ca787fa8d830cc3bcf2bc0deb0089b4da WHIRLPOOL 3c8a8db43ccb599e2347ee24a90de65f6cb89d70dd4068950297ff89877dc85792e98d3a0a5fc833aff1f55a2cad78f6bb280c071ff7b4dd07c47e82ebbcce14
 MISC metadata.xml 440 SHA256 16826f65f60dcef99ee83af6bdaddd5c09a9c14ceb2c4b963d057e282cd90910 SHA512 fd75a843ffd978ceaf999883793735d132ab384cbfbba85635b94776866daa1da5500b108fc5a54b56cb8b8d908f0e9f4fa9137912e37c301a8c7c37c676ff5a WHIRLPOOL 0a23fefed8676511a365f97a4522fc09dc3802ccde6e25d51dc6c984985532a83dcfed29a362e4fd088f5bbe122b2e45323c379fa0571ec0a63ef979d5c21b61
diff --git a/app-crypt/certbot/certbot-0.15.0.ebuild b/app-crypt/certbot/certbot-0.15.0.ebuild
deleted file mode 100644
index bb11ccafc1d6..000000000000
--- a/app-crypt/certbot/certbot-0.15.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${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}]
-	dev-python/mock[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pep8[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.17.0.ebuild b/app-crypt/certbot/certbot-0.17.0.ebuild
deleted file mode 100644
index 4075ad538f38..000000000000
--- a/app-crypt/certbot/certbot-0.17.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${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="
-	${CDEPEND}
-	test? (
-		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.19.0.ebuild b/app-crypt/certbot/certbot-0.19.0.ebuild
index d0a136c58375..1f6c1a112d7b 100644
--- a/app-crypt/certbot/certbot-0.19.0.ebuild
+++ b/app-crypt/certbot/certbot-0.19.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-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 925097b6b3c2..d0a136c58375 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -28,21 +28,21 @@ RDEPEND="
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2[${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}]
-	dev-python/mock[${PYTHON_USEDEP}]"
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="
 	${CDEPEND}
 	test? (
 		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pep8[${PYTHON_USEDEP}]
 		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	)"
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index 8dca858bdb09..4fb2bb83a942 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -1,9 +1,11 @@
 DIST codecrypt-1.7.2.tar.gz 446975 SHA256 dfe932b6aa18e85d3f1f5324dd11f1b02a75e2225748d91e07020b31eb721906 SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0 WHIRLPOOL 804980127104da801556a2bc09cd018a215a68c10147e0a2f2380e5f0c92f4063b390533d65a1a4d810e6c27ae912897a345a025d48362d2937c8e8ebfa5d527
 DIST codecrypt-1.7.5.tar.gz 464250 SHA256 873b6849bfb2ac0a530935da43422a763bc5763a01026c467ebe164eb41c3cc3 SHA512 237459ec4387f068d39946c1360e27b02f1cfd34a78eef0d3c3eccf31604f3d27b9e5c9c091b88257231bff02f7bf9fb82f7a9e8a8e8a6bbc27091c83ab1f880 WHIRLPOOL ecfcfaf62e59d1f62000e7c1c4a290483c7731f90e1271b1b0acfbc58cf1ce0799b23cb616f5b4d8ee5fc5a2e670d5c148ea1d893abae63aed18dec87ec843a6
 DIST codecrypt-1.7.6.tar.gz 463999 SHA256 6cb8728d7fee9eafdee1277fae810955f1c418755ccfa69ec8c1e86cac6c9873 SHA512 1bd1432c75985d2ff968095bcb9e23ea2c6e91bd7009c9c50a5ab90123e14db0937e0a945a20a6c7f540a5b52e3f1d9ea2dbf779406d43a203f1d1bcafb94406 WHIRLPOOL af45ef6d548ad5e39268ea408c54e2235a90566a22fe9dc9e38882c1ede093835460a81bae128e49272344e0332c2fe0379fcd6c2858d97f3c9521c9d0259d45
+DIST codecrypt-1.8.tar.gz 471273 SHA256 3be7c2a548aa336dbac706c3cab2071664d02b11652c16c02a8b4fb5cac6bc88 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102 WHIRLPOOL 7fec87cb92be770d2bf4e6a5b6d4c17ee26740b19155bb59ae1e0bef8ddd01922b388bf907207ab575155bcc18eab9e632b65e4f02ae0adc970528d058361ee7
 EBUILD codecrypt-1.7.2.ebuild 672 SHA256 a4c50eaa4a4a054709cd7f17e2e772dbda55f0f4525798ca497abdfc0a4fa5ab SHA512 a43435250a021b7418bf2e5eb1573237bfda0690bd65e6df597700dd9ef3bdf7ac316ae164bded683e8e7412fe1e57bf7428b0f629d6f614f1b2b7ef64d68f5e WHIRLPOOL dc5646bca3bbc30b1265ba74193bd2db1512377b4e4fcab9ad6da31abd3ef2ca60ff34dfaf2038f61d99d0ad7b03ae4089c35c19ee6c5117d82613fc39d3099f
 EBUILD codecrypt-1.7.5.ebuild 677 SHA256 0fd75da8bcc75c0c645bd2a70ca9eaca390cffccd6ae803d46098be602dfa2f0 SHA512 f39a62e22e29a39bde6aad8df33a4741ab6b94d0f797b1c5907511e7f5e5f1005516935e7d0801c246cfd2f843348666db78af3bc822c6cd7a6ed638cbfecf56 WHIRLPOOL 7a409eb23a4dda591c08c259ae55cb8329eea228d9bd484fb54fe4508123c7474a3c8d2aefa0a31f1b3fc199bdd83d09249d225e5ba62ae855a5e41bf234bcdc
 EBUILD codecrypt-1.7.6.ebuild 677 SHA256 4e1f077258fd12fce720408772583494fcd9124f2826b02dbb7cee156c0557e0 SHA512 fd767cde802038e27f375727adc48894bb588ef434e42dfd5e09dc6efb3c98b1048aea533954c5bb91447c7388ddc1c362f8cfd0f394284f935366d1ab72f17f WHIRLPOOL 0a52b0dd89bf3a54658d2df9f711345c56b614a022e012cd7c14d31a22230bdf1cf2e2f8c8cdadc45468484a828c23628660741645155545a031be1822ff8fe5
+EBUILD codecrypt-1.8.ebuild 698 SHA256 61c28ee6f03e042fb2dbbbed9a86d5139f58b6a2d7e1337c79bc2f3de4fe615c SHA512 2ee7d6740af6fd54cc77eb8dd3bb79b787c6a09256cc426a27bdece3c30735fb3d63b8dde6919ddaac5bb1bfe0ed7e1eb347b22f407682fb79f42a2962e7f874 WHIRLPOOL 89f0acef6056373cea9df61194f1b5c5dc55ca79e6c12d23b383703f4d1a283573427e54de3fc34f9e30588688dc3f2eb65aa207224a612a845a1f8fadadc044
 MISC ChangeLog 3510 SHA256 84d50bf3d69a80b6a5508ac4e52aeb5f9cf95c0715f6d5a12da477352946055d SHA512 0e759c05149d11a06b66f8c42b2df4ed437a8746d89b9e31ad72b190da6bc29a9c7969f280e9696b69d8e477b75562b333c9555eb64edd837fc20084628c363b WHIRLPOOL 7c7c9d0986e29f02f60c1eb4305c42e8aa023b8c2bedb421b9e5d9b7e9afa5734d758b99b8e4affe235ebed0969affdd426a9fe4db705dd6e35218fbebb9ed44
 MISC ChangeLog-2015 1176 SHA256 7f17a79d73ac0a615d2a6389bc6265a31ddd94754bd893336813f884f5e977be SHA512 0c873280b142a24e7d4e0edcc669240468962e4a46855421ca795d147fe1118686641577269150c510d5febbcd12191a2ce0b85aba6a6bb1e4cee3531a5ba2f4 WHIRLPOOL 97a0a9db014125b657cc0f499dce29c62693367385408c546fe717e1360d8fc4e64b5efdbf432e1d857c3541ece6067588359d1ca6a8daa32aa1ebde9e6d8806
 MISC metadata.xml 836 SHA256 1445317f37513f33f4c94f9d65a32eeedf21212e46fa45c3832540ddf228a506 SHA512 ed4b650c46107ef4a1ae4d903c525553abb0d1863a438fc72721d0599f404d0825b8e669b33d975838f9f77b494ca131a82b4a528cb68e444f797aad6f66f28a WHIRLPOOL 67fd95af3549eab1beb20283a19234bcd236b1f5502cd50f339f930c227be5b638552bb92fea5ca622dec942b21f1bf7ad9954f3520c6af9eadaf0c5ac51a032
diff --git a/app-crypt/codecrypt/codecrypt-1.8.ebuild b/app-crypt/codecrypt/codecrypt-1.8.ebuild
new file mode 100644
index 000000000000..f885b161e891
--- /dev/null
+++ b/app-crypt/codecrypt/codecrypt-1.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Post-quantum cryptography tool"
+HOMEPAGE="http://e-x-a.org/codecrypt/"
+SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cryptopp"
+
+DEPEND="dev-libs/gmp:=
+	cryptopp? ( dev-libs/crypto++ )
+	sci-libs/fftw:3.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	# workaround -- gentoo is missing crypto++ pkg-config file
+	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with cryptopp )
+}