gentoo resync : 15.06.2021

5 files changed, 10 insertions, 44 deletions

diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index a99768bda6dd..143fce08d1f4 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/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-nginx-1.13.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
-EBUILD certbot-nginx-1.14.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
-EBUILD certbot-nginx-1.15.0.ebuild 935 BLAKE2B 1eed182016c7f44b8ed6339e2adcfad6789663f04dcbbfd76239ac0b43a84388c05f3e73af0b7a76d2cd25710ea8f260a93022e1e81efc55d4c039b144fa469c SHA512 9199c62a00c96c4e839774a78e4a7477e95621574a78415110755ad5e856ad5ecabe957cf1c19a2c263e03bf265724f224c31ee7a43cd2cc00561e1a57de7340
-EBUILD certbot-nginx-9999.ebuild 935 BLAKE2B 1eed182016c7f44b8ed6339e2adcfad6789663f04dcbbfd76239ac0b43a84388c05f3e73af0b7a76d2cd25710ea8f260a93022e1e81efc55d4c039b144fa469c SHA512 9199c62a00c96c4e839774a78e4a7477e95621574a78415110755ad5e856ad5ecabe957cf1c19a2c263e03bf265724f224c31ee7a43cd2cc00561e1a57de7340
+DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+EBUILD certbot-nginx-1.15.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
+EBUILD certbot-nginx-1.16.0.ebuild 935 BLAKE2B c658bd5e5c2aae786e6e41cf77fc840c61e2fd1b7470706bb4cd573edf2117344ab29173fb24ab370e9ee3a5f28c644d4cb12a4bafc5cedb72ad4282627939ca SHA512 c3c33b250a0e830d4498a5864643b117d0b2c29b4130795aafb135d7b369754836a65704cdc437828a5f8991368c2b03bc5b11963328e5c6cf826c92d42c5f80
+EBUILD certbot-nginx-9999.ebuild 935 BLAKE2B c658bd5e5c2aae786e6e41cf77fc840c61e2fd1b7470706bb4cd573edf2117344ab29173fb24ab370e9ee3a5f28c644d4cb12a4bafc5cedb72ad4282627939ca SHA512 c3c33b250a0e830d4498a5864643b117d0b2c29b4130795aafb135d7b369754836a65704cdc437828a5f8991368c2b03bc5b11963328e5c6cf826c92d42c5f80
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
deleted file mode 100644
index 2ae43ed4bf96..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
+++ /dev/null
@@ -1,32 +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
-	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=""
-
-RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
index 52c50cecd71f..2ae43ed4bf96 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
@@ -11,7 +11,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-nginx/certbot-nginx-1.13.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.16.0.ebuild
index 2ae43ed4bf96..b4f61386b477 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.13.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.16.0.ebuild
@@ -11,7 +11,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
 
@@ -25,8 +25,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 52c50cecd71f..b4f61386b477 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"