gentoo resync : 29.06.2021

4 files changed, 2 insertions, 129 deletions

diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 15482392daa5..00e3a2c4ef63 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,7 +1,5 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 DIST mkdocs-1.2.1.tar.gz 6918891 BLAKE2B a17fc551735de28391809971fdf8973c5adf23e512286041eab73bde02ae9ae597e357f4dcbb3fa9ea90a4b47e12a8390c3626641e89da45770b4df6f9d66029 SHA512 c1f9c3a46fd2c5d6819ea069bd48a82cbf5816bc1586a88e9eb776b2376106d9d5f8a0d9a70a9f9f56e39e9f29eaa3cbfa26a8c588acf568bde86f4028af9796
-EBUILD mkdocs-1.1.2-r1.ebuild 1699 BLAKE2B 59e02ec5ea24d932eef86268220feff250e3f2aa7112c29e74829fc747cc9a27b86ac544ddea54759f019def3d5b2c17958b809d94ac63f87b5ab54aed2ccb3a SHA512 c10a8b6bd1ee42777d69225963521b5941d595f6a8f0fabca19ba830d3a7389a4ce7d9d88f66b63f370595bf07be33c7b69920044faeb61d76b418c177086347
-EBUILD mkdocs-1.1.2-r2.ebuild 1866 BLAKE2B 41ef609e6648cd0d082143b975b0a8c3f9685808c17a1f089907b3e55a813628efe7d1b5533f2b00b9fdeac94d20c50b6d45c03be2543b21e3b262e365aba095 SHA512 f931df4b728f9e2814084a448017ae1fc1fb8942816cc25fc5a631cb797f56e9d3adda6bbd0162f70dc1d47a1fda363b25404da6cabc167441474e803da8fc36
-EBUILD mkdocs-1.1.2.ebuild 1353 BLAKE2B 14ed1990f54f4954dba6afa3b01f967508412573e2826c7feb40c873a2f55000df8186166ea7a31f8bfadd6d040f357747007f889c19f072026bb86887a3a43f SHA512 7d24f6aa455983535ff489f3a34509e236b336a65750b383429dd7304e3243feddc6bdd94164545284f5a29b7e111ec3911591b6e478671637589c24d50a3d11
+EBUILD mkdocs-1.1.2-r2.ebuild 1864 BLAKE2B 4139562e8eaa9e525cab3da9bf98e8d026eb56ad4586a1fe9779fd4cc22a2637064b7449a33480f804b8fabab6cf94302a0407f23384e568b080f6cff2bc60b9 SHA512 7c0b734b407cd72f928527af9bd3bed6babf7f18d5c1dda43c7271c76496a2aa7fe34c62ef1e5cb03cc776a72bd47695f5bd180cc024ab1671fc4a98bc2e2427
 EBUILD mkdocs-1.2.1.ebuild 2119 BLAKE2B 241a1a7cb0b35db402c8d3447cfa505aa5560e7fa11f52812e472a1ae7b28a80e64a75fd315ee0c8eb2d22660600e0fdeb63830e39b8ad88b72f894d07a3af59 SHA512 63efb54b90930e66e44093ad8a454f703282c12beaf2d6fa2643e25065487cca90eb461dadb63bc8a20975020d82fd02bb7129353b3e777b63300b80bcebfe6b
 MISC metadata.xml 404 BLAKE2B 69b46289dc5228603da7575ea456d95e456c969bb5821820d91fa85599960ff9442bd1d7af810f936fbe94e9fcbc3ccace1156572d52f5445322a22c163bd2c1 SHA512 27dac2bb6455dcf92d9d86e3e1d9e29c87d5fafdc6d3e1f8afa059e562cfe9b233a29ed890cc7c3dff1e948d243b007f08b5decc4915deda6a0357d496a7be3f
diff --git a/dev-python/mkdocs/mkdocs-1.1.2-r1.ebuild b/dev-python/mkdocs/mkdocs-1.1.2-r1.ebuild
deleted file mode 100644
index 6d18515e6d89..000000000000
--- a/dev-python/mkdocs/mkdocs-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/livereload-2.6.1[${PYTHON_USEDEP}]
-	~dev-python/lunr-0.5.9[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	# Upstream pins this to workaround with a bug
-	# in lunr, from 0.5.9 onwards lunr (mistakenly?)
-	# depends on nltk<3.5 if [languages], which does not
-	# work with mkdocs. We remove the [languages] part, and
-	# allow the use of 0.5.9 instead of 0.5.8.
-	# Tests pass.
-	sed -i -e 's/lunr\[languages\]==0.5.8/lunr==0.5.9/g' \
-		setup.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
-}
diff --git a/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild b/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
index 7b12540ddb37..29682e6db706 100644
--- a/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc"
 
diff --git a/dev-python/mkdocs/mkdocs-1.1.2.ebuild b/dev-python/mkdocs/mkdocs-1.1.2.ebuild
deleted file mode 100644
index 853c0a488f31..000000000000
--- a/dev-python/mkdocs/mkdocs-1.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/livereload-2.6.1[${PYTHON_USEDEP}]
-	~dev-python/lunr-0.5.8[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	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
-}