gentoo resync : 06.08.2019

19 files changed, 216 insertions, 18 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4e62b867f6ee..efc11061ccf4 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index c490b2d76cce..c846c47da5be 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/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 acme-0.36.0.ebuild 1721 BLAKE2B 26118df6502f483bbeb7e0a213ebd5f4ba759712acbc3d99acb5d5452364707d14dbb443bcaed7f118cac84c2e3276b8cc8df5fa9b40fe06ed700ca11277d1db SHA512 4501fe5c2ce4a63b86e4a3898a8db9e5d488e1e00f32b58af36e79a86f35ba399001c630eb3113d764740c62cdc66e212ab8594dc961009c7d0e11bf675e44d3
-EBUILD acme-0.37.0.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
+EBUILD acme-0.37.0.ebuild 1721 BLAKE2B 26118df6502f483bbeb7e0a213ebd5f4ba759712acbc3d99acb5d5452364707d14dbb443bcaed7f118cac84c2e3276b8cc8df5fa9b40fe06ed700ca11277d1db SHA512 4501fe5c2ce4a63b86e4a3898a8db9e5d488e1e00f32b58af36e79a86f35ba399001c630eb3113d764740c62cdc66e212ab8594dc961009c7d0e11bf675e44d3
+EBUILD acme-0.38.0.ebuild 1723 BLAKE2B 2fe38f3a6255c3540a5e5527316cd27dcbd15abc265e3464bcced30b35189422b967713fbf3b5170af7ca27b415c703eae0510685e5bb4231beee8af2320cef2 SHA512 582412c0ff094447f58d1bd973d2c678e29fe64c2cf38496360080790c9c3c57c6142ed73079b98f08c324f7be8a446be3c2fd1e24d306db2ed838241f84ae4e
 EBUILD acme-9999.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.37.0.ebuild b/app-crypt/acme/acme-0.37.0.ebuild
index 3acd37f75f8e..9a9b63c8fa3c 100644
--- a/app-crypt/acme/acme-0.37.0.ebuild
+++ b/app-crypt/acme/acme-0.37.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.38.0.ebuild b/app-crypt/acme/acme-0.38.0.ebuild
new file mode 100644
index 000000000000..3efe8a99669b
--- /dev/null
+++ b/app-crypt/acme/acme-0.38.0.ebuild
@@ -0,0 +1,68 @@
+# 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/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/asekey/Manifest b/app-crypt/asekey/Manifest
index 5ea6668f1234..c18c8f7fdc3c 100644
--- a/app-crypt/asekey/Manifest
+++ b/app-crypt/asekey/Manifest
@@ -1,4 +1,4 @@
 AUX asekey-3.7-bundle.patch 727 BLAKE2B 0758992095369eadb49e4daec62a0786e790acf7e39f980f74627440b53a4eae8ac57be07cb0cabbb898e207adda3e543631e9b398770e72cc4e38fd1e153a16 SHA512 4cc556687f59371d0f1919f8649b705801da4427cdc011a40b9627601e90cd27f3a06684a721cb25f1c51b10ec28f6ae728e33fbc30217716250d42c6c15efe2
 DIST asekey-3.7.tar.bz2 33304 BLAKE2B 95bba8ded9557105dba50a587665ee638162ae6eefe1017a4ed272364eec1da7154b21833ed2f08fa7f4c3d570971795a0a6f65efebe517124da572d0b9b7d91 SHA512 29a01f8250d5fb26a4ba2aca562211cadf403c9e986f9fa6930faf477c374e13095c025b2917e6e837cbe8d83f3a3e023a527598b151ef1c704247c7e7c40647
-EBUILD asekey-3.7.ebuild 673 BLAKE2B 2b2e794249e2ac64022681b72caddb861765202b6c3c8013791ef0609767722faa45893d422c6a8606b3496da759f121d3e4e56891b10cbd919205922b534224 SHA512 545856ed4d260ab1c86f88941a9b6568a0ec4afa96fa66d8fcdbaaa0050e9116278b51107a33e0d638915552960b1937804d9a59c683fd03c004b4f29898ef0a
+EBUILD asekey-3.7.ebuild 684 BLAKE2B 94d5413cdb5b32f5bb41e6ac4bb7660cbccf50fff573428268639add9ea7b82943ab0d09aba999a01bcc9f1d0c2c29b077e6bd8917d2d9a76f799f13348c71d7 SHA512 47068530f671a9f56f09efd2ebfc1ed36c99f29357e622e52c0f23c909dbc118bd4416b5c63da18f24f4a7edcdb3e1adeb86578bb8159393431f00bc8faf0e63
 MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
index 93d6dd55328d..d895f7bfda5f 100644
--- a/app-crypt/asekey/asekey-3.7.ebuild
+++ b/app-crypt/asekey/asekey-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit udev
 
 DESCRIPTION="ASEKey USB SIM Card Reader"
 HOMEPAGE="http://www.athena-scs.com/"
-SRC_URI="${HOMEPAGE}/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="http://www.athena-scs.com/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2"
 LICENSE="BSD LGPL-2.1"
 
 SLOT="0"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 41522893f7c1..7c1a7f602afe 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/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.37.2.tar.gz 1327361 BLAKE2B 2f36276f527ffc29e54cf58f25051952e9435972a94881e420712844401fc86b2a0220d651f56c07fbff69e12114fdb1d3c0650fc5fc6a4539ff1c279a0b4c24 SHA512 2e357dfcb6da669f1ab6e4f9aa3e8e3457ce0f794f40c9ac862a9f24208b4f4d773dbafffd97fd1f7e5b2a29e1ca99be787101469384a9e61b4ddb077b644211
+DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 EBUILD certbot-apache-0.36.0.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
-EBUILD certbot-apache-0.37.0.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
+EBUILD certbot-apache-0.37.2.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
+EBUILD certbot-apache-0.38.0.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
 EBUILD certbot-apache-9999.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.37.2.ebuild b/app-crypt/certbot-apache/certbot-apache-0.37.2.ebuild
new file mode 100644
index 000000000000..af3177274026
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.37.2.ebuild
@@ -0,0 +1,38 @@
+# 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.37.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
index 5ac928afccf9..5ac928afccf9 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.37.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index de570e251bc9..f80dd8f6f700 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/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.37.2.tar.gz 1327361 BLAKE2B 2f36276f527ffc29e54cf58f25051952e9435972a94881e420712844401fc86b2a0220d651f56c07fbff69e12114fdb1d3c0650fc5fc6a4539ff1c279a0b4c24 SHA512 2e357dfcb6da669f1ab6e4f9aa3e8e3457ce0f794f40c9ac862a9f24208b4f4d773dbafffd97fd1f7e5b2a29e1ca99be787101469384a9e61b4ddb077b644211
+DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 EBUILD certbot-nginx-0.36.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
-EBUILD certbot-nginx-0.37.0.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
+EBUILD certbot-nginx-0.37.2.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
+EBUILD certbot-nginx-0.38.0.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.37.2.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.37.2.ebuild
new file mode 100644
index 000000000000..73497ec2cbd3
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.37.2.ebuild
@@ -0,0 +1,34 @@
+# 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%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.35.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.37.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild
index c4f2df8684e9..c4f2df8684e9 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.37.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild
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}]
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 2cbc98c2b6d3..749cc3b6916d 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -16,6 +16,6 @@ DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
 EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266
-EBUILD heimdal-7.6.0.ebuild 4543 BLAKE2B 8f16fd002b689035cbad48626673b43336346054611cf636745cbabe51b20dd67e86c9ba3054681ca23cba8d1838481ab86aeb93199be7d9b98e9d105576b352 SHA512 99756373dfb610def06431c4de594e829c399e92f24274f389043281bd2fdab48dd9624addbad48bcbcf438f59cc23285daf21c73be59b1d923a675283ae5153
-EBUILD heimdal-7.7.0-r1.ebuild 4536 BLAKE2B 758d3177cccbfa83ad69239536b207a218fcbfd0c85f6a943ece3722534b4bdd34d6d0a95de4c04d95f3273198463424117999acbf38f8b7248b62afd8cead59 SHA512 8fde4dc3b338d67c998eafe5122138b49d5d188acdceff1c7455fc02ecd6806794592d9e0b97ca6587b0bfe96e4f7e63996c6d1c9c0e843d17729fe0da84ff0e
+EBUILD heimdal-7.6.0.ebuild 4539 BLAKE2B cb888bddcf93c11fbb3dc7f4f1e79f281d6a8cb569cad25f175a9679501ef5a2160f73fca7d351594dd5c4cad64cf6bcfdac26862ffc32ad46d5f1d464fd5d92 SHA512 014f090fb241244736e7c5a29a2189e925b623325e95ac28f5b6385ed75c786ee066130a49d96a6f1701f683cf97121996536c47db55f82c78d228a2cf9f9393
+EBUILD heimdal-7.7.0-r1.ebuild 4532 BLAKE2B 9c622605356c00474f2897bb6305b6c5db17d348d3c940e7c9732e6c4c7b0b2530ef9c922c37b9c611d10386bdd897d81ef1e99e3638abd9f980ee68fba92081 SHA512 7a1f33ed8567a0ee7621c32071c48b29012183b75091558151c78afa3666d56e3f69d67e6ddbf0aa14b02c9b26d2695dd7322a0ef6846ab2d7b81f96f683bda4
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index f7a31275a72d..e3a1a5ad1bcc 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -155,8 +155,8 @@ multilib_src_install_all() {
 	dodoc ChangeLog* README NEWS TODO
 
 	# client rename
-	mv "${ED%/}"/usr/share/man/man1/{,k}su.1
-	mv "${ED%/}"/usr/bin/{,k}su
+	mv "${ED}"/usr/share/man/man1/{,k}su.1
+	mv "${ED}"/usr/bin/{,k}su
 
 	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
 	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 6fe1ad2703ed..96697f3aa74b 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -155,8 +155,8 @@ multilib_src_install_all() {
 	dodoc ChangeLog* README NEWS TODO
 
 	# client rename
-	mv "${ED%/}"/usr/share/man/man1/{,k}su.1
-	mv "${ED%/}"/usr/bin/{,k}su
+	mv "${ED}"/usr/share/man/man1/{,k}su.1
+	mv "${ED}"/usr/bin/{,k}su
 
 	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
 	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind