gentoo resync : 15.01.2020

6 files changed, 18 insertions, 71 deletions

diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 6282ef969346..fed5e018bf9e 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,9 +1,8 @@
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
-EBUILD certbot-0.39.0.ebuild 1436 BLAKE2B ab2270b182cddde0f711b62f12c4615ce7847e32364dcc1efe5ce4dbbea989e24e2ff3ad2cfbfab354d835b1da57c319c470276ce6d6427756494fb7107b7f8a SHA512 79bf323f59b3f6109def173277617b91b8548910f4822b4577f4f0bde1fe6568ea20381433096b5ce96036a86d4b620fd0921dcedf24f7d650c814af02f7f658
-EBUILD certbot-0.40.1.ebuild 1436 BLAKE2B b550a22df071d4ecd5c66bbb57bc72be2f47c21917512903c58084c65e75447ada4308e7703f667335d981fa438902244ea78c8510707861bf99656474762d8a SHA512 879b6e7cffb40eca653e2830e402b02ce4b25e5b9aa03ee9d32d09bd5e1109d98229340e4b8f048a2a4cbd46bf3098bf309575f095579a3a5159b0054e66a408
-EBUILD certbot-1.0.0-r1.ebuild 1499 BLAKE2B 4e247309ed6cb2b75c76612a0ea223307a1ec0de10f795cdf8c484231eb8dffbb8ed4208bcee19b879f9772d72686ea9637897e6918901634b1f0c25195e37fe SHA512 3563bf9bd484c0d1f5f4effb23a8aab7a4a0f7ccb94d48d5a60edee41964c4a63bd59d1d1185b9e0b14b9876f95ff679062382dd40abb2453f43e83057bb80b5
-EBUILD certbot-1.0.0.ebuild 1499 BLAKE2B 4e247309ed6cb2b75c76612a0ea223307a1ec0de10f795cdf8c484231eb8dffbb8ed4208bcee19b879f9772d72686ea9637897e6918901634b1f0c25195e37fe SHA512 3563bf9bd484c0d1f5f4effb23a8aab7a4a0f7ccb94d48d5a60edee41964c4a63bd59d1d1185b9e0b14b9876f95ff679062382dd40abb2453f43e83057bb80b5
-EBUILD certbot-9999.ebuild 1438 BLAKE2B a1d6c6e1c9e43263c06bb16c2b1095253a63e25863337963452790b8809f2f488f0caece08df387b01f9fba531e2051bf265c1df7e83e169fd6cea6c1adb5fcd SHA512 a910e3f910b6b42a4995d2e0f69f446844e58a22b8d75b5a12585595e98976b9958d061197b5c139c43d1d9f083aebe057190e50b43a9cdf2e9bedb40d435286
+EBUILD certbot-0.39.0.ebuild 1432 BLAKE2B 67d86895ea48efc41c4027ed1ded1a9df8ec9d47465737c72755848b8cf256f00e7f9f9c48d6031f462f375cad7e3458531731befed92b2428e413097f0ee30d SHA512 bb2dea6370c5736b2ec1ae45f063d9e934ef796a5a57d0e0d389183391254e536135d32c8d01d63884ca49677ed3075326cb30504156f0d4447d10dba59d6663
+EBUILD certbot-0.40.1.ebuild 1432 BLAKE2B 0fbe7131796c2adb6d6ba5e598cdd9099029b90aedc643f9cb02707bcd3e77d68346317370b511fcc08fd7257339cbfd6e112a16ae2dfb6faef4555aa317fcca SHA512 b75782ac4f4281f22cf52525891ea0b256a3c97e7f082c5c897c4bca713076b53370be98f82f382e4beb96f1acf1041911a328e35a8f623202ee6c44a2c6495b
+EBUILD certbot-1.0.0-r1.ebuild 1459 BLAKE2B 4922cdb95f523e70d51e8f2ea52a50f29e5293caaf8b024d0d56bc02047565acfc5cd3584e602a38192c5a96e41e5bd8d436f8e0b9cc6d34bb3ae80df5d0c9b8 SHA512 a4f0003e86bc27fdb734b0551762d915f1662da62ebcf4af69bdbbaa256fc4d37f7206161bd73b8fdbba1a354cc32c387977fe573708c98e0726fc03458f7cc3
+EBUILD certbot-9999.ebuild 1459 BLAKE2B 8786bdd75cf34ba205d6df9eaab74946dc3253bb1aa087183181e440f9a79dee26ce35c9a61fbe6ffc8581d08fe30c33a376a3189cab8e8146326574ed5b37cf SHA512 49c5da10cc52f8ffa40f71ef4bd33ebade098dd9692e99ed669a9a49e1c5602bd171d3ab3a5a48b5e37e1ba79967d14a55aad30c56fe1da6d50c664a5719cabb
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.39.0.ebuild b/app-crypt/certbot/certbot-0.39.0.ebuild
index 33e7e1409f34..186da7592eca 100644
--- a/app-crypt/certbot/certbot-0.39.0.ebuild
+++ b/app-crypt/certbot/certbot-0.39.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/certbot-0.40.1.ebuild b/app-crypt/certbot/certbot-0.40.1.ebuild
index bf95047b3dfa..308bd367bff6 100644
--- a/app-crypt/certbot/certbot-0.40.1.ebuild
+++ b/app-crypt/certbot/certbot-0.40.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/certbot-1.0.0-r1.ebuild b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
index 37c17aa225d3..23177e8bb65c 100644
--- a/app-crypt/certbot/certbot-1.0.0-r1.ebuild
+++ b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	S=${WORKDIR}/certbot-${PV}/certbot
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
+S=${WORKDIR}/${P}/${PN}
 
 inherit distutils-r1
 
@@ -47,6 +46,6 @@ DEPEND="
 
 python_test() {
 	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R acme
+	rm -R ../acme
 	pytest -vv ${PN} || die
 }
diff --git a/app-crypt/certbot/certbot-1.0.0.ebuild b/app-crypt/certbot/certbot-1.0.0.ebuild
deleted file mode 100644
index 37c17aa225d3..000000000000
--- a/app-crypt/certbot/certbot-1.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	S=${WORKDIR}/certbot-${PV}/certbot
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R acme
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index e59b628d2009..e3c2f890315a 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -11,6 +11,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
+S=${WORKDIR}/${P}/${PN}
 
 inherit distutils-r1
 
@@ -28,7 +29,7 @@ RDEPEND="
 	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
@@ -45,6 +46,6 @@ DEPEND="
 
 python_test() {
 	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R acme
+	rm -R ../acme
 	pytest -vv ${PN} || die
 }