gentoo resync : 09.12.2017

3 files changed, 63 insertions, 7 deletions

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index b41fe900d19f..e7f14c24575e 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,8 @@
-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 certbot-0.18.2.tar.gz 1044019 BLAKE2B d198252c1e3e24a80bcadeecde7fd133e454036df6bd782585b31234ddd8d393fc2ab792e60f381eabd9fb453ee2a57d132ba7d41254c8acd9cf64dbfb94fb89 SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4
+DIST certbot-0.19.0.tar.gz 1061557 BLAKE2B 4f1c623276cbcc88d414dd9d135b65f472d1e35cfef74901fb8031d40d414266870229b6aaf60a4bfde983c7e930819e5e7326d5cfa3cbffb155e3a9c724883a SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b
+DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 EBUILD acme-0.18.2.ebuild 1095 BLAKE2B 2b9a678884bd1a89c38e09fdc9dbfd850fd737f138b6ed419138e5e6b539762f45b80882e4cea4b036a7ef210fc4385a605c8fb69dcb9b4ac94dbffcb1694d5e SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4
 EBUILD acme-0.19.0.ebuild 1101 BLAKE2B dd7bc65a98f4b8168f2bc341ac699f68ab65a8a911b4a8fb409fe3ae78e8553c168b55a5a304b3d7cf697d34c58b32d751a87d6d04303a39a11e6eadbebd4be0 SHA512 73db02807520cc53e8695f112e3ee75841bd0aaf9ec9935db7b3e812010f0f9947ed805bd8300d602c0757a5a18b1b4bf1665ac92494791915c09790c10953be
-EBUILD acme-9999.ebuild 1103 BLAKE2B c78896a90ada07aec26758c9476596c88d2714e54ff3541e104856584dd340941f2ccc7b14e71bf3eb6893317311bc30511cb12956af7275bce1abcf93cd9879 SHA512 37c78b40124c666e76d6579c14b03e47ac54d0fd2157a42cf62405e2f485e05ab9d0416cc9ddb2db66786f5524b392cdf7d38a59ceba1dff577d795abd8e9aed
+EBUILD acme-0.20.0.ebuild 1160 BLAKE2B 5cab784cc64156e26fb12b662f0d5d209dffce77011436c9ae1de8a891537b7567c07460334754be5e83fbcd1a17b051ec87affcc115e3b04faad73387de5953 SHA512 05ebf726ac5c68b3be47bb9dd90729b17240c010119c3ae017fb0ca478fcbd8ecfe163eb95d83b195923f2666530f9ff8b2ac09d3b60b04e66f7ada181c3a1a9
+EBUILD acme-9999.ebuild 1160 BLAKE2B 5cab784cc64156e26fb12b662f0d5d209dffce77011436c9ae1de8a891537b7567c07460334754be5e83fbcd1a17b051ec87affcc115e3b04faad73387de5953 SHA512 05ebf726ac5c68b3be47bb9dd90729b17240c010119c3ae017fb0ca478fcbd8ecfe163eb95d83b195923f2666530f9ff8b2ac09d3b60b04e66f7ada181c3a1a9
 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.20.0.ebuild
new file mode 100644
index 000000000000..b02dbde82a94
--- /dev/null
+++ b/app-crypt/acme/acme-0.20.0.ebuild
@@ -0,0 +1,46 @@
+# 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 ~ppc64 ~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-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index a8fc5d0ba458..b02dbde82a94 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -23,15 +23,23 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 
-RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+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-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
 
 python_test() {
 	nosetests -w ${PN} || die