gentoo resync : 06.08.2019

4 files changed, 55 insertions, 3 deletions

diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index be0e4a9565df..32a57cd5299d 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
 DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
+DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 EBUILD certbot-0.36.0.ebuild 1364 BLAKE2B ab2063ceac5ae1024f2b8ac83c01825fa230f8f34aa1d75f56543e699493b8db8b6baad88c465530c649d80cafec64037333c97c18ebf5ef69012178ee33e1ff SHA512 2cf17f2e0506c4e34db9aa2174fd222d3d74f3bd40f35d2e3ee9c40f8e51e610f850d89535eaf1c24be07ad9619e1671fa46eaa3da88feb43273eaf97b814b16
-EBUILD certbot-0.37.0.ebuild 1366 BLAKE2B 81a7df13ee1e1abcb0dfff63995fb752a5e0a3d6bebebf45ea11f476715ed96e5417fd667dd5f4faf0ad446649ad03e4c45be33b035cfecbe023aa2a1044e1d2 SHA512 2bac9490ac0be45fd39696c5befc5f63436a6d8f6238fba0ba1ec07a1a892f3887f49ed23499df4e07bd712666bd579d9d035358bbd70465a7ff2fb4231dea0d
-EBUILD certbot-9999.ebuild 1366 BLAKE2B 81a7df13ee1e1abcb0dfff63995fb752a5e0a3d6bebebf45ea11f476715ed96e5417fd667dd5f4faf0ad446649ad03e4c45be33b035cfecbe023aa2a1044e1d2 SHA512 2bac9490ac0be45fd39696c5befc5f63436a6d8f6238fba0ba1ec07a1a892f3887f49ed23499df4e07bd712666bd579d9d035358bbd70465a7ff2fb4231dea0d
+EBUILD certbot-0.37.0.ebuild 1364 BLAKE2B ab2063ceac5ae1024f2b8ac83c01825fa230f8f34aa1d75f56543e699493b8db8b6baad88c465530c649d80cafec64037333c97c18ebf5ef69012178ee33e1ff SHA512 2cf17f2e0506c4e34db9aa2174fd222d3d74f3bd40f35d2e3ee9c40f8e51e610f850d89535eaf1c24be07ad9619e1671fa46eaa3da88feb43273eaf97b814b16
+EBUILD certbot-0.38.0.ebuild 1411 BLAKE2B 11eb25aedac65f87fa9de601afa3e6d74791ea657e5b766f6345f0d128555f3899b22cc5dcac09b1dbdf1bf4eb213139522bf16ea750eec6f157ff3725c15901 SHA512 60bf2b405388dcf6d1bbb752b02428da55350d32c2963ebf1002364e13877c4d7a529917b9b47a6cbc2f27ab528e45c96b797011d673032518a5e2c1a67e2530
+EBUILD certbot-9999.ebuild 1411 BLAKE2B 11eb25aedac65f87fa9de601afa3e6d74791ea657e5b766f6345f0d128555f3899b22cc5dcac09b1dbdf1bf4eb213139522bf16ea750eec6f157ff3725c15901 SHA512 60bf2b405388dcf6d1bbb752b02428da55350d32c2963ebf1002364e13877c4d7a529917b9b47a6cbc2f27ab528e45c96b797011d673032518a5e2c1a67e2530
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.37.0.ebuild b/app-crypt/certbot/certbot-0.37.0.ebuild
index c55679793511..4ed99381a016 100644
--- a/app-crypt/certbot/certbot-0.37.0.ebuild
+++ b/app-crypt/certbot/certbot-0.37.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.38.0.ebuild b/app-crypt/certbot/certbot-0.38.0.ebuild
new file mode 100644
index 000000000000..0e7b7afdc975
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.38.0.ebuild
@@ -0,0 +1,49 @@
+# 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
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index c55679793511..0e7b7afdc975 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]