gentoo resync : 15.06.2021

5 files changed, 8 insertions, 46 deletions

diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 3c8b7ed6bacc..d708cf4c5d47 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
-DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
 DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
-EBUILD certbot-1.13.0.ebuild 1150 BLAKE2B 7a15d3853c2820587c808cca3817262417220af4433930273b8acf79ffc71a133fe6f70d26a068e1c0b138ad0f1b4a310f3f7373e636c1a15704c7dca6a7dbc0 SHA512 1062c0d646822f8179a5b054d2ccacbb29b0c2ca3b7d0ae4481a02133baa3752d9c6d2f4a56282e634ec58b1691001fe490e0b3b21e6e0c41d639d3b69097d6e
-EBUILD certbot-1.14.0.ebuild 1150 BLAKE2B 7a15d3853c2820587c808cca3817262417220af4433930273b8acf79ffc71a133fe6f70d26a068e1c0b138ad0f1b4a310f3f7373e636c1a15704c7dca6a7dbc0 SHA512 1062c0d646822f8179a5b054d2ccacbb29b0c2ca3b7d0ae4481a02133baa3752d9c6d2f4a56282e634ec58b1691001fe490e0b3b21e6e0c41d639d3b69097d6e
-EBUILD certbot-1.15.0.ebuild 1152 BLAKE2B 427c31271d42843567d0d985b66079a85854a596e8da91142634bfc160e0b2e3fcf78af602a53bb3e9643d5c80068d37269f79e25e1b1fbdb8752f9dfb7c507b SHA512 3e32d7ad4e129d87d05d84365aab483bf7715eb10a730b1e195495461ac03d1cada5705f0c68477b56621761431dbdd3989e81929f99f453d91734de74075aea
-EBUILD certbot-9999.ebuild 1152 BLAKE2B 427c31271d42843567d0d985b66079a85854a596e8da91142634bfc160e0b2e3fcf78af602a53bb3e9643d5c80068d37269f79e25e1b1fbdb8752f9dfb7c507b SHA512 3e32d7ad4e129d87d05d84365aab483bf7715eb10a730b1e195495461ac03d1cada5705f0c68477b56621761431dbdd3989e81929f99f453d91734de74075aea
+DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+EBUILD certbot-1.15.0.ebuild 1150 BLAKE2B 7a15d3853c2820587c808cca3817262417220af4433930273b8acf79ffc71a133fe6f70d26a068e1c0b138ad0f1b4a310f3f7373e636c1a15704c7dca6a7dbc0 SHA512 1062c0d646822f8179a5b054d2ccacbb29b0c2ca3b7d0ae4481a02133baa3752d9c6d2f4a56282e634ec58b1691001fe490e0b3b21e6e0c41d639d3b69097d6e
+EBUILD certbot-1.16.0.ebuild 1152 BLAKE2B d30a158dbe17a5706583ce7de83f152e5627d5481318b82a0ef2fd9dc5b99c0109a65c819878dc86fbc715d42d707e9a6556fd7ab9a599264209aeae7f7823f2 SHA512 15f463ff5a385e639ab8abe14f064e1c8da5ad14255200cf21ea90083eeaccb75dde1e054be2b193452e81af25f6ccb9f4933343cb5071a3d920390af9073de1
+EBUILD certbot-9999.ebuild 1152 BLAKE2B d30a158dbe17a5706583ce7de83f152e5627d5481318b82a0ef2fd9dc5b99c0109a65c819878dc86fbc715d42d707e9a6556fd7ab9a599264209aeae7f7823f2 SHA512 15f463ff5a385e639ab8abe14f064e1c8da5ad14255200cf21ea90083eeaccb75dde1e054be2b193452e81af25f6ccb9f4933343cb5071a3d920390af9073de1
 MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot/certbot-1.14.0.ebuild b/app-crypt/certbot/certbot-1.14.0.ebuild
deleted file mode 100644
index e131af1788ec..000000000000
--- a/app-crypt/certbot/certbot-1.14.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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
-S=${WORKDIR}/${P}/${PN}
-
-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"
-
-RDEPEND="
-	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${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/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/certbot-1.15.0.ebuild b/app-crypt/certbot/certbot-1.15.0.ebuild
index e2450c428f8d..e131af1788ec 100644
--- a/app-crypt/certbot/certbot-1.15.0.ebuild
+++ b/app-crypt/certbot/certbot-1.15.0.ebuild
@@ -10,7 +10,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 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/certbot/certbot-1.13.0.ebuild b/app-crypt/certbot/certbot-1.16.0.ebuild
index e131af1788ec..bf9117a89b96 100644
--- a/app-crypt/certbot/certbot-1.13.0.ebuild
+++ b/app-crypt/certbot/certbot-1.16.0.ebuild
@@ -10,7 +10,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 ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
@@ -23,7 +23,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 RDEPEND="
-	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index e2450c428f8d..bf9117a89b96 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -23,7 +23,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 RDEPEND="
-	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]