gentoo resync : 05.02.2020

6 files changed, 13 insertions, 64 deletions

diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 814d3df6a92b..23325d756aac 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,10 +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
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
-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-1.1.0.ebuild 1459 BLAKE2B 8786bdd75cf34ba205d6df9eaab74946dc3253bb1aa087183181e440f9a79dee26ce35c9a61fbe6ffc8581d08fe30c33a376a3189cab8e8146326574ed5b37cf SHA512 49c5da10cc52f8ffa40f71ef4bd33ebade098dd9692e99ed669a9a49e1c5602bd171d3ab3a5a48b5e37e1ba79967d14a55aad30c56fe1da6d50c664a5719cabb
-EBUILD certbot-9999.ebuild 1459 BLAKE2B 8786bdd75cf34ba205d6df9eaab74946dc3253bb1aa087183181e440f9a79dee26ce35c9a61fbe6ffc8581d08fe30c33a376a3189cab8e8146326574ed5b37cf SHA512 49c5da10cc52f8ffa40f71ef4bd33ebade098dd9692e99ed669a9a49e1c5602bd171d3ab3a5a48b5e37e1ba79967d14a55aad30c56fe1da6d50c664a5719cabb
+DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
+EBUILD certbot-1.0.0-r1.ebuild 1455 BLAKE2B 91ae921207d96441d709b1115cf23339bb2bbc2d425af09d49f7ff355671b3ec828ff9149e00741090fcbc4437f61391a8fa0b2855e7597df746f2ea0829fd61 SHA512 fe422a4c25b7425f7060a6e11dad6accd665fcb749ed0212d6e77fe38bd99e54492aec2fe53c1e07b702a1eb7b94d0613fc925cf9bdd86ffe744179395230120
+EBUILD certbot-1.1.0.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
+EBUILD certbot-1.2.0.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
+EBUILD certbot-9999.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
 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
deleted file mode 100644
index 186da7592eca..000000000000
--- a/app-crypt/certbot/certbot-0.39.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 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"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.29.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-1.0.0-r1.ebuild b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
index 23177e8bb65c..6b8dd39904dd 100644
--- a/app-crypt/certbot/certbot-1.0.0-r1.ebuild
+++ b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{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.1.0.ebuild b/app-crypt/certbot/certbot-1.1.0.ebuild
index e3c2f890315a..ec673774775d 100644
--- a/app-crypt/certbot/certbot-1.1.0.ebuild
+++ b/app-crypt/certbot/certbot-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{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-1.2.0.ebuild
index 308bd367bff6..ec673774775d 100644
--- a/app-crypt/certbot/certbot-0.40.1.ebuild
+++ b/app-crypt/certbot/certbot-1.2.0.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 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 ~arm64 ~ppc64 x86"
+	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
 }
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index e3c2f890315a..ec673774775d 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"