commit: cffc22d99b46cd6aa1da09d9c6abd5b5101e6889
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 2 23:52:37 2020 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jul 2 23:54:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cffc22d9
app-crypt/certbot-apache: 1.5.0 stable amd64/x86 with cleanup
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
app-crypt/certbot-apache/Manifest | 1 -
.../certbot-apache/certbot-apache-1.4.0.ebuild | 38 ----------------------
.../certbot-apache/certbot-apache-1.5.0.ebuild | 2 +-
3 files changed, 1 insertion(+), 40 deletions(-)
diff --git a/app-crypt/certbot-apache/Manifest
b/app-crypt/certbot-apache/Manifest
index 24d5f717a65..1382bac8a18 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,2 +1 @@
-DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B
57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b
SHA512
8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B
ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b
SHA512
ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
diff --git a/app-crypt/certbot-apache/certbot-apache-1.4.0.ebuild
b/app-crypt/certbot-apache/certbot-apache-1.4.0.ebuild
deleted file mode 100644
index cc570860a3b..00000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.4.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})
-
-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.1.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}] )
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- esetup.py test || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
b/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
index 6a66d185839..cc570860a3b 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
@@ -10,7 +10,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
