[gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot-apache/

[Matt Thode]

commit:     73be75b7f6bb6aa1ca07d1ae1bec21f131dee8c1
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 21:13:19 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 21:16:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73be75b7

app-crypt/certbot-apache: 0.24.0 stable amd64 and x86 with cleanup

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-crypt/certbot-apache/Manifest                  |  1 -
 .../certbot-apache/certbot-apache-0.21.1.ebuild    | 38 ----------------------
 .../certbot-apache/certbot-apache-0.24.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 98470422e46..af62754b070 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,3 +1,2 @@
-DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20

diff --git a/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild
deleted file mode 100644
index d49cea75397..00000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-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 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"
-
-RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${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/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}

diff --git a/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild
index 2f2c9cd3e8a..600149c82dd 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.24.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 ~x86"
+	KEYWORDS="amd64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi