gentoo resync : 15.06.2021

5 files changed, 10 insertions, 42 deletions

diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 19c1b57f539b..f08c374dfa9c 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/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-apache-1.13.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
-EBUILD certbot-apache-1.14.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
-EBUILD certbot-apache-1.15.0.ebuild 918 BLAKE2B 27d7ede9a9f1e9617833c483492277ccb0fab3715072b826134de1d460701fe5e99f69450d2ad54be818040f7f9315585b454188fb99eea55737e7128e496a9d SHA512 ecc7e71a5e4655d5e6ef3d79099130a30f8be29dc041e3e273c8e22599e8f70b36f32572f3d36b35894e095f55cb11cabf9a654bd315c0622e4edb5c29249294
-EBUILD certbot-apache-9999.ebuild 918 BLAKE2B 27d7ede9a9f1e9617833c483492277ccb0fab3715072b826134de1d460701fe5e99f69450d2ad54be818040f7f9315585b454188fb99eea55737e7128e496a9d SHA512 ecc7e71a5e4655d5e6ef3d79099130a30f8be29dc041e3e273c8e22599e8f70b36f32572f3d36b35894e095f55cb11cabf9a654bd315c0622e4edb5c29249294
+DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+EBUILD certbot-apache-1.15.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
+EBUILD certbot-apache-1.16.0.ebuild 917 BLAKE2B 6664a0470bc7631d492a7aa9b0b04cf0c86d6a60aa8056acae86f2a3bdcf137aae5290a320b18c323d0d6ab6178b304c2d9d2e1bdc4ae21237e7afa6fb4874ed SHA512 4047b9448fc589864019c87d08885480905c3da411f3b86774be9ac806b70db72ee60c01407eaec43f40d44fceaab23accc53d0bb4dec65a201d374d7457f5e3
+EBUILD certbot-apache-9999.ebuild 917 BLAKE2B 6664a0470bc7631d492a7aa9b0b04cf0c86d6a60aa8056acae86f2a3bdcf137aae5290a320b18c323d0d6ab6178b304c2d9d2e1bdc4ae21237e7afa6fb4874ed SHA512 4047b9448fc589864019c87d08885480905c3da411f3b86774be9ac806b70db72ee60c01407eaec43f40d44fceaab23accc53d0bb4dec65a201d374d7457f5e3
 MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild
deleted file mode 100644
index d2e3aeb128a4..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild
+++ /dev/null
@@ -1,30 +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%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
index bcdc453cba6d..d2e3aeb128a4 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.16.0.ebuild
index d2e3aeb128a4..7f0e325d33df 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.16.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
@@ -23,8 +23,8 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index bcdc453cba6d..7f0e325d33df 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -23,8 +23,8 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"