gentoo Easter resync : 12.04.2020

4 files changed, 70 insertions, 4 deletions

diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index a83878bc39a2..db93f6cf0a37 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-0.15.3.tar.gz 1805972 BLAKE2B e6619fa0bd14fefe96de5abeb9243369b1419e7018705ac6a6d58fcb40c01aff380c3b4ca514af0a25da90092f39776abe42d19a67f7e86780c5c4111884b230 SHA512 e5b72eb56dcc2fe2be154155af15845a7d0fc06d6176f1c6b2bb54e8673d207146bdd92b37a709d72c1d59fcc76a793e6fed5d7fb6d9008f28d43baa17e446f8
 DIST mkdocs-1.0.1.tar.gz 1589767 BLAKE2B 54f7a33c166fa44b9471069db45436e1381d451470fea4ed11de1cabc0cead3508bffbaf2303d33904ef0bee8f81cfbdacb0fd095ee53d6fa7c09f33274c03af SHA512 9f6b1ff5922fb58783d70f3912bb0170f927ba0160f5e48f71db2d267030208bd50997f14f4626fbfce891ddce7f97747ba05100ea96cdc24609341d382f039a
+DIST mkdocs-1.1.tar.gz 6984465 BLAKE2B 878d0351ac477651094b5f33a26d5faa444fed430b72df723d4fe020ee8d6953ee198a9e923aa79a04286445ff673e1d6967ca1740d8f02b37426b33038f76fb SHA512 3e846eac816d9a4f380e2cce856a1785b67c9d855392af8be2eb0de5c9aad7ead19e675fb36ff53e9e3046798c8691908c1d6bfec67f8c74dcaee6852b9c50cd
 EBUILD mkdocs-0.15.3.ebuild 1070 BLAKE2B f070f5293016c1e04fce21f395dc7eedb9079c2685cde71274f6fa2e17af6f90f231808ab2b20b37b35136cae26c2e13be3e55d19db80bb13b6c4e7f6633e283 SHA512 1fc10a6ced330ae8817f8e0a433d18b75e815e1e53487ef4634df7dd986d49ed11b2180de5d778d2b7295bd08cc74150aa8b2cd6d88f6c0b7d76ef79dcce3515
-EBUILD mkdocs-1.0.1.ebuild 1330 BLAKE2B 3edfd28012c8c5e7ba052f78ceaf6e3017b0531bacfc9bdc53f2ce6862170d0402f787d49262eb1eb5a318232bb8010e48d85bb8f9ce613639409912432e2c50 SHA512 2bb387eeb33cf09541f5b98f7df6805635b51e528a5440d7f4cd436b25de77723a865c1d46b6a766bb470acb0d2d1ff8fd911b5f4e7ce74ba57221412ae93a28
-MISC metadata.xml 248 BLAKE2B ca12914d7dc6c1711fe96cccf5fe6a62c7854264634cd4bf62450125107655cbd64ab6e214fbef1065948a6adec5e83b3c0ba272f307a3c5b393dbb671f2d8cf SHA512 4b39eb7ca7e3e9fb49cdcefb0f721af61ec5e2e701becda0e3746b964be7105117fbde1601415985a7bcf23b3f42a0a44a55556a48c80c4c8d09ab1c7d848b9d
+EBUILD mkdocs-1.0.1.ebuild 1335 BLAKE2B 293870d3a952abdc3abd86e0619a3dd71fb77523ce9b06996d37b86eb0911bb84ca1ac6bdf6af748c13c48b9819aaf6b38e120d92e77bc5884f163675f4f5ce6 SHA512 9e6f99d09794dc44d096f9e3f9ff7dcc50af5a79c089117645389c65df0247849837dae62772732114ddc359a00041fbfeef86422cb6e08cca44872fcd5ff251
+EBUILD mkdocs-1.1.ebuild 1325 BLAKE2B 08258ce14d37db5c17b696de43b479b691679a0b4e9b48fbda1f229cf98080558482eedd025ad622aa408c7ff57377ed758738e2979e744e74672795c3239350 SHA512 93b26681aeb5a372a629ba2645e18e840ab6b30adf63c2434e31cd79ad1c34ccab9d5a152a721cadfadf799a182530306e1f6a95f8a3002ecefbbfb4d3e30dfe
+MISC metadata.xml 458 BLAKE2B ce343abd6776491064d2ababef8e680cf279e8413ec5007cc9b19a1a4f996706d5e51fcf9dfb74e0f977d6c8067320bf6cd90c28818768c7b3570c27b7f97680 SHA512 f94bcfe8a93ad939c54e501426bdc879a24638d88a434144c5fc2beb5d737845fd79989a204ca92f9fa3209610fe5bc81b74df242ded15ab06d805d9209f6e2a
diff --git a/dev-python/mkdocs/metadata.xml b/dev-python/mkdocs/metadata.xml
index 251c93451e3d..5d57d454ac2f 100644
--- a/dev-python/mkdocs/metadata.xml
+++ b/dev-python/mkdocs/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tomchristie/mkdocs</remote-id>
 	</upstream>
diff --git a/dev-python/mkdocs/mkdocs-1.0.1.ebuild b/dev-python/mkdocs/mkdocs-1.0.1.ebuild
index a6585445076c..cc0da185048f 100644
--- a/dev-python/mkdocs/mkdocs-1.0.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mkdocs/mkdocs-1.1.ebuild b/dev-python/mkdocs/mkdocs-1.1.ebuild
new file mode 100644
index 000000000000..fde74459fdda
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown."
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		dev-python/mdx_gh_links
+	)
+"
+
+RDEPEND="
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/livereload-2.5.1[${PYTHON_USEDEP}]
+	~dev-python/lunr-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+python_prepare_all(){
+	# cannot get all themes
+	sed -i -e 's:test_get_themes:_&:' mkdocs/tests/utils/utils_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}