From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 app-crypt/certbot-apache/Manifest                  |  8 ++---
 .../certbot-apache/certbot-apache-0.38.0.ebuild    | 38 ---------------------
 .../certbot-apache/certbot-apache-0.39.0.ebuild    |  1 +
 .../certbot-apache/certbot-apache-0.40.1.ebuild    |  2 +-
 .../certbot-apache/certbot-apache-1.0.0.ebuild     | 39 ++++++++++++++++++++++
 5 files changed, 45 insertions(+), 43 deletions(-)
 delete mode 100644 app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
 create mode 100644 app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild

(limited to 'app-crypt/certbot-apache')

diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index d5ff1bcc8971..6a447e20271a 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
-EBUILD certbot-apache-0.38.0.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
-EBUILD certbot-apache-0.39.0.ebuild 1078 BLAKE2B 116199201215bc8abda5091dd5e44c1277b6d765df2739949b612a2c37b82a2718c0053f8b474bd11571213f95de2e3269ca57213b805cd84702635342bf6c55 SHA512 368acc54017803b685a8d4bb2378004b9a6c05b0bfe6167f193d9cdc859dd8512a785e62e8b547350e9d8f5eb413df023aaa31573ec05aec7bc7bde16cb5a856
-EBUILD certbot-apache-0.40.1.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
+DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
+EBUILD certbot-apache-0.39.0.ebuild 1105 BLAKE2B 4b4ea8187891be94a40a1cd6da4a23a5c1729eef07570db9f134103f40fca4059eb6441b0002cc576b078189a04183a96bad0223135279ce1a1cb10b470387f3 SHA512 c0059f92f82015b641ed9ca61f9242ca625b71e4d519127bcc4067d063b625c64526e41bedaa36fd2afdc4ab8d346a4c3f0f54b6c0519c4d96f1de4d682e2490
+EBUILD certbot-apache-0.40.1.ebuild 1105 BLAKE2B 4b4ea8187891be94a40a1cd6da4a23a5c1729eef07570db9f134103f40fca4059eb6441b0002cc576b078189a04183a96bad0223135279ce1a1cb10b470387f3 SHA512 c0059f92f82015b641ed9ca61f9242ca625b71e4d519127bcc4067d063b625c64526e41bedaa36fd2afdc4ab8d346a4c3f0f54b6c0519c4d96f1de4d682e2490
+EBUILD certbot-apache-1.0.0.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
 EBUILD certbot-apache-9999.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
deleted file mode 100644
index af3177274026..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,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"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.36.0[${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.39.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
index 492ef9bf4862..c45e7e40dd95 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
@@ -22,6 +22,7 @@ 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-0.39.0[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
index b14f7a5ac825..c45e7e40dd95 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.40.1.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
 
diff --git a/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
new file mode 100644
index 000000000000..b14f7a5ac825
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,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-0.39.0[${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
+}
-- 
cgit v1.2.3