gentoo resync : 25.11.2020

4 files changed, 3 insertions, 59 deletions

diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 13bd9736d15b..2cafe9adffbe 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,4 @@
-DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
-DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56
-EBUILD certbot-apache-1.7.0.ebuild 1064 BLAKE2B 3fe58950165fc3d0cb010051a38ee278c111d2d5f4e1880321614c555b8bb79150e1ec41288749c3c3b6c143b1fbbce95b62d3821a98f355a7727c01960a126a SHA512 9ad5d5d19d19ebd9c10e512ed756813425bd950a48abcb67b3a4e90115b1df4704675728a2f50baa0691c0dd72cbeacee541adb048cbb9793f96628aaaa0da72
-EBUILD certbot-apache-1.8.0.ebuild 1066 BLAKE2B 85b4a24a049dad829b34adcb3099692f9d3a921cbfbb043300b2f24456e30f2156d6e4b73a6b9b1c278732d369b0a50396cbc04f68a9178c08360fdd2c8114a5 SHA512 02c617f14fa3d437b9a17aeaa52f90e9bff5a86bf66ceefc89020e162657a6583991478bb107cca638ff3618eb37d49f0884f2aa1f60f1b75c61dfab7c3d908f
-EBUILD certbot-apache-9999.ebuild 1066 BLAKE2B 85b4a24a049dad829b34adcb3099692f9d3a921cbfbb043300b2f24456e30f2156d6e4b73a6b9b1c278732d369b0a50396cbc04f68a9178c08360fdd2c8114a5 SHA512 02c617f14fa3d437b9a17aeaa52f90e9bff5a86bf66ceefc89020e162657a6583991478bb107cca638ff3618eb37d49f0884f2aa1f60f1b75c61dfab7c3d908f
+DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-apache-1.9.0.ebuild 916 BLAKE2B 366995d48952ab5d4b3b1b9afa68561097b9238c2c56a505a49854c0e0c6126d5092d81b1178d4b45ff690194ec3b8de695f4d6b88455559ea3162dcaf2a09e9 SHA512 13ddca2809910b3c044bf725b58d0d728531314b0a02e7dea7836f047469b3e79d9bf38a729c045dc3f096689c10e9f829d44a14bd647e6687021fe9bf24ec1b
+EBUILD certbot-apache-9999.ebuild 918 BLAKE2B fb5b5acbb7373042f8960130f44e384494cfba7786e4964381631da44651c1e0b88f68c331cb1d7aa614e4aeabdc11bfa38bfa15d96af7cc3ad7cf38fd44ac41 SHA512 5b9d2895c2ced803d962aaf2dfffe8e934131b7d1d6bf09169b1df997baac9e992043804e7d7370ea92440d0c40ee5c2946b80a4e4fb3b4ba26c50146986b4ea
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
deleted file mode 100644
index 3a367b955f0a..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.9.0.ebuild
index 2977a0aff13d..2360a626298c 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.9.0.ebuild
@@ -22,17 +22,9 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 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}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 3a367b955f0a..e52584b7e0c7 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -22,17 +22,9 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 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}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}