gentoo resync : 04.05.2019

3 files changed, 26 insertions, 5 deletions

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 5172e4b5098a..feb342da73ba 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,7 +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.0.tar.gz 1346939 BLAKE2B db0d7bc716206ff9bebcf953b72e29f46e335209d70e518eeb11d944bab26e2fbe15c6bbe448861cbd71c744dfc22aa8cb54b96dfc5d15d497af8a91cfbc6e45 SHA512 24d4a58bcc220451532b1b7d1ddaa90ef773935ff65c2b06e121f044b5575d159555a757660abebd72ff4134a257394dbc99c981729d846d565c75f692317a30
 EBUILD acme-0.32.0.ebuild 1263 BLAKE2B 5486282dd90bee28ca65a9170546ed0d09de38880f7945dcef1009cb7c20b991e5d22e7efe89eae07a13013b24e627624c0da907604359e10c75cda5607478f0 SHA512 6517cd06f5430885b072407d11971850cec39c3bca45545006fb58c970f121aaafb725e6a77371bb08151b05a803fd274b45cb9c2e10e48c02e29e5bf9634d3a
-EBUILD acme-0.33.1-r1.ebuild 1718 BLAKE2B d463fec2156cf80bf480424865fb96f516f78f5fa4959178eaba7bf7c286e722c61c9bce4b8e6405f7d09cb7a628ff7f9a9d287e492f78b2d0339fb2be85ad19 SHA512 785ea278cccfa8e014043c44efe5ff15d58a7380f02686e3a424f9031abb3b7e0368bf077f21c10d3208ff3c6e85d1b412b6512766de29171f15a5019f1383f7
-EBUILD acme-0.33.1.ebuild 1265 BLAKE2B 891e3ade67d911d5b99049887f8e441652fc686006896b39880050f8aa032e17954d21176db0505c784e79c9883633810d749d6bbce48e6f67859517ebef6f7f SHA512 581d0f1f268a2a32ff136ebad3bc17b376ec081eeac58ecb4eec19f1409a23b68c48fc3cb28e00cce3405fc5f5d011106e1b943535f87fdb86a3935413ee6aff
+EBUILD acme-0.33.1-r1.ebuild 1716 BLAKE2B fb4fc28892c7b2ee25479a49521b02a80dd077031d68958af253c014398fb4689cf4b920c4764c4cea5fc4e007d722c58b7403d89a78cd7f5daa84db8d28bf4d SHA512 3b807ba729c2e51fea72d8f4d077328ed430006b0c6f6b46d1153e71ba15f4a04b715ffe25901f218a563b1ae6e8efcd9b5f792d9906c02fcb28490e3eb82629
+EBUILD acme-0.34.0.ebuild 1718 BLAKE2B d463fec2156cf80bf480424865fb96f516f78f5fa4959178eaba7bf7c286e722c61c9bce4b8e6405f7d09cb7a628ff7f9a9d287e492f78b2d0339fb2be85ad19 SHA512 785ea278cccfa8e014043c44efe5ff15d58a7380f02686e3a424f9031abb3b7e0368bf077f21c10d3208ff3c6e85d1b412b6512766de29171f15a5019f1383f7
 EBUILD acme-9999.ebuild 1718 BLAKE2B d463fec2156cf80bf480424865fb96f516f78f5fa4959178eaba7bf7c286e722c61c9bce4b8e6405f7d09cb7a628ff7f9a9d287e492f78b2d0339fb2be85ad19 SHA512 785ea278cccfa8e014043c44efe5ff15d58a7380f02686e3a424f9031abb3b7e0368bf077f21c10d3208ff3c6e85d1b412b6512766de29171f15a5019f1383f7
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.33.1-r1.ebuild b/app-crypt/acme/acme-0.33.1-r1.ebuild
index bfa507fa149c..58b7f12c6356 100644
--- a/app-crypt/acme/acme-0.33.1-r1.ebuild
+++ b/app-crypt/acme/acme-0.33.1-r1.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.33.1.ebuild b/app-crypt/acme/acme-0.34.0.ebuild
index 9df5e0dbdae0..bfa507fa149c 100644
--- a/app-crypt/acme/acme-0.33.1.ebuild
+++ b/app-crypt/acme/acme-0.34.0.ebuild
@@ -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/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/tox[${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
+}