gentoo resync : 08.06.2019

3 files changed, 28 insertions, 8 deletions

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 367a18a18d61..f871c2d2d6bf 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
-EBUILD acme-0.32.0.ebuild 1263 BLAKE2B 5486282dd90bee28ca65a9170546ed0d09de38880f7945dcef1009cb7c20b991e5d22e7efe89eae07a13013b24e627624c0da907604359e10c75cda5607478f0 SHA512 6517cd06f5430885b072407d11971850cec39c3bca45545006fb58c970f121aaafb725e6a77371bb08151b05a803fd274b45cb9c2e10e48c02e29e5bf9634d3a
+DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee
 EBUILD acme-0.33.1-r1.ebuild 1681 BLAKE2B 020b1e9b09cc794ebd39ecffeaa904e260b375dd1bd853e62c926d6065501da6cec10977fcf45b7addc660e85b838012e1a5bacfa4f7015ab62496672a0138b3 SHA512 5330cefe084d1b20801bc34b7c8ef30f9f4891f9f3407b28ed84a307b7afe574a2df7bea29fbf208c09520b5075b1c8195e48cd6ba3051387dca8b0bf86d84da
-EBUILD acme-0.34.2.ebuild 1719 BLAKE2B 5c80b37136ee7a8ada33074a902bcb58e3142e19076dbeec1ba2559d0e0943993bc6877e96f5a34dfde243e02c7512eb552d0b2b28c2b83ff2c2bda48421e803 SHA512 1936ca1386df956735403ca55061250c218ca072d4d9d7753c6eb9ecabb5cd959ae7cdbdebe8577c16259c796e97187cc1b1b5c6e04b6d5c3c50afe9c60930a9
+EBUILD acme-0.34.2.ebuild 1717 BLAKE2B d79a119ee31160c29560401a6a9699f3a2a59995b237e0a559b8c9116cca8f8ef1536b43edb4508fc401df8ce17b5dd91a2a46193660b7478e65831e22b34004 SHA512 66fae749e643082bed24c9dbae62b38dc4f40dc5571da4cf848ea3cca0adda42c89228e9e537df793cfabc5e981b4059c6ae9ddec5d38df986f270862efdf7b2
+EBUILD acme-0.35.0.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
 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.34.2.ebuild b/app-crypt/acme/acme-0.34.2.ebuild
index b972b974afbe..f70241eefc65 100644
--- a/app-crypt/acme/acme-0.34.2.ebuild
+++ b/app-crypt/acme/acme-0.34.2.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.32.0.ebuild b/app-crypt/acme/acme-0.35.0.ebuild
index b0ddd1ccb5cd..3acd37f75f8e 100644
--- a/app-crypt/acme/acme-0.32.0.ebuild
+++ b/app-crypt/acme/acme-0.35.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -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
 
@@ -21,10 +21,11 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
+IUSE="doc test"
 
 RDEPEND="
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=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}]
@@ -35,14 +36,33 @@ RDEPEND="
 	>=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
+}