gentoo Easter resync : 12.04.2020

6 files changed, 6 insertions, 75 deletions

diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index e52ee99a76f9..00fba3823c26 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,10 +1,7 @@
-AUX markdown-2.6.8-dont-build-docs-default.patch 387 BLAKE2B d3ecf07d57d8aae13ecb686ac289d4938ec8e50d643020ccac13b147a5b018a75b32f10ead2dc2bedba309ab6ae3107346ff43155959fdf3e1053e0a9fa13cb8 SHA512 71f7534ce557e061c4f09b9a78aa05fd1e3f16f44c55d5597fa4901c0349f7ec7d0093eab655950812e2cab6d607377d2a15a6583009cb90ae32659c6949cfff
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
-DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
 DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
 DIST Markdown-3.2.1.tar.gz 297048 BLAKE2B b7f72cb856f0986e0e3920bd7d7eb65790312ef9f270ba3cfa679786b921d1c4ce0a86d591d7d748254c11e9c86d9883130efbc0c2d6a26d94b1fe3d9622aeb9 SHA512 5616c77004e4e8f2eb3b1276526ba131891be6edc7371b412a4050bbd59904220e48986d556bb9bb0b9e8acadfcde7828b609d165f68b6aad7bb90a221f80480
 EBUILD markdown-2.6.11.ebuild 1345 BLAKE2B 2cfd63d4168a44df5ddc9845e0c785930f46334b1d9d32b4387b80a8ba8e1f9eb79c757ce4beb065179dc39c73d2bbee59fda07a010d201b34645acfa6b70235 SHA512 6b176ffda719576552b071fc2eccdd6a6b2cfbdfb51fdf0ee19e4807569587b7063415b15fcb98ae506b03f9ca96b192db2379f42a7c1bd58e2f27bbcfff805b
-EBUILD markdown-2.6.8.ebuild 1420 BLAKE2B 376cf24f824a200aa8233c1efc1d1f129a308a1c7fc14a2c30f8949703f4af9f3163e2b1f646c33a52e5840ff45bfb7df5d79f32b292098c0bc169fd21b7db3a SHA512 2fa22e5608a0d41463b4b499f7d5399712f81c00d9e35c7775a634e2578af7baa28490ef2d1d5669f5112995e86b13016aac8159a7fc0dbac26397d9c768b755
-EBUILD markdown-3.1.1-r1.ebuild 903 BLAKE2B 013e7b013dd46d8143c070ebb04cc69f7e4af745b8d447670246a97a24f38bcf6ed7c09548e02977909980409840032a550b637c4277bca741a8ff4d0163c065 SHA512 d2d338d0e6bcd1b37ec2645a0f3258ecf6e53f43fc49ae32d3b063ce5d728ce28836b5e5f4043f24d44df74973da2f1364266368dc652ceb59267a1cb6450276
-EBUILD markdown-3.2.1.ebuild 905 BLAKE2B c1c9fe4895aba4b19ab064185496fe707411620db39e2642ca114d4487854f4e17d7c02678f71bcdb40fc2383ac5af059f0adef36c63827a793dff3fddb1c346 SHA512 cea6a27e23d52477ae619ef0c176be5d0e430a6231f2ef5a61cd3f9726cb838ac859bfe508ded6afbe87f721485d5be49a03c870dce5e00b4a91517be2caf181
-MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c
+EBUILD markdown-3.1.1-r1.ebuild 903 BLAKE2B 60d5ba2d6c2b2686b3c83295ff1f7065dd9992778595adfeb3c2ee38a4d1a74d488756e8e4ceffa96ba37893e2dd233720f0d0bef3b49ed5b357a5262af3923e SHA512 16fd37690ea6fab8ae54ec8db11aa517d541620f20cf89c51a6027bc07fad8990a05a4741fff40b72f45e83fa564aab327b16b60a0a5739dffbec29efe054bab
+EBUILD markdown-3.2.1.ebuild 897 BLAKE2B 70da13b9a271b2dba5887e73bd79fdb73c78f1e25993b43665e714f5ff74fe15a7e12895af864af4ccd8316dbb6fafe58e0ab72d36c0404bfb0cf7cfc7c12368 SHA512 1ab68f71756464b0fd724fffb56140f783017060d1415b2da1ebc44564252a4235bfdfd484096f0e7d01420eaf25f38262b9e9aa8c5e205a233296c2f15eda00
+MISC metadata.xml 490 BLAKE2B ed40aad7c21b46bb6e3395f5a2fd019256a6a47f587eb2a37c42ce1d4407bae188b581ce20be2f2f01f1d4003d2a76aa44ffd516b0d6bbf08010d7d3d9ad02b6 SHA512 4a93ed6bce680acd807a2ee9bed7a3dd999014681ce7d5e5ce95025b6fc5e078716057ef25edfa7f4656a3feb8e92041aa99f52e62e04b034c7a493ee26d7b97
diff --git a/dev-python/markdown/files/markdown-2.6.8-dont-build-docs-default.patch b/dev-python/markdown/files/markdown-2.6.8-dont-build-docs-default.patch
deleted file mode 100644
index 65b7d21c5597..000000000000
--- a/dev-python/markdown/files/markdown-2.6.8-dont-build-docs-default.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't build docs by default, which causes issues when trying
-to remove .txt files, as they will be readded on installing.
-
---- a/setup.py
-+++ b/setup.py
-@@ -204,7 +204,7 @@
- 
-     def initialize_options(self):
-         build.initialize_options(self)
--        self.no_build_docs = False
-+        self.no_build_docs = True
- 
-     def has_docs(self):
-         return not self.no_build_docs
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
deleted file mode 100644
index ec62f2144dbf..000000000000
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P^}"
-PATCHES=(
-	# build system always builds docs
-	"${FILESDIR}"/${PN}-2.6.8-dont-build-docs-default.patch
-)
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_docs
-		HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-		# remove .txt files
-		find "${BUILD_DIR}"/docs -name '*.txt' -delete || die
-	fi
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-	"${EPYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown/markdown-3.1.1-r1.ebuild b/dev-python/markdown/markdown-3.1.1-r1.ebuild
index 531642d3b1bb..415e76d40046 100644
--- a/dev-python/markdown/markdown-3.1.1-r1.ebuild
+++ b/dev-python/markdown/markdown-3.1.1-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="doc"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="test? (
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown/markdown-3.2.1.ebuild b/dev-python/markdown/markdown-3.2.1.ebuild
index 77c56c8c71c0..83427e2277da 100644
--- a/dev-python/markdown/markdown-3.2.1.ebuild
+++ b/dev-python/markdown/markdown-3.2.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml
index 132dd61343bf..968763ca2d14 100644
--- a/dev-python/markdown/metadata.xml
+++ b/dev-python/markdown/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="pygments">Enable fancy pygments support</flag>
   </use>