gentoo resync : 28.11.2020

3 files changed, 2 insertions, 47 deletions

diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 0b21cc63f283..521ca830a383 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,8 +1,6 @@
 AUX markdown-3.3-pygments-2.7.patch 4422 BLAKE2B cdc9c1520ae780299cdcbef675e12009bcd9626b306cfc49800df5998e8ddf90c354316c540c5a72d88f3c9b67c7bf58c81fdf850f841b34483a71de51f39779 SHA512 853431ab2f16ec89178008f8be4fc87e1da584283ac9ec9e0930140d10883e4f5d1a6f6c5c0da86759a404dc10e003076c06518e0ee3ec3bae51d228b9dde95b
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
-DIST Markdown-3.3.1.tar.gz 317115 BLAKE2B 8c46dec8717cfdd03bd32b48071af042ca25508ca39d2a747a85d8c3044889d374b2f37ba6eba577c776c415d74c2f832810842faa19ff2febe596405a0a9157 SHA512 b1e53fe903612f8defbaf31f1f40a5ba4c58670ffb49cce8cf39fbe3a6445072520b7fe23eff594a8583a030b12d6295f124a13e4b58cad311d5d11ec699b4c6
 DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
 EBUILD markdown-2.6.11.ebuild 843 BLAKE2B 0152b3a4257139792a50a10fe8835d4b4b21bf3d452d9ade9d9094ad830fa4dea59f9e519297449aa5e42911ad219efcbce7f8bb08cd7fab717edd951fdf36b5 SHA512 3221f6253071760598e33c5c2483361308dd424e7504e05ebadd84be18fa789407d841a66e4aca3001a5a14c13d50395487e1ed646db397140cc703d0c8fdc61
-EBUILD markdown-3.3.1.ebuild 1086 BLAKE2B f854426f76d902c398021367f4322663cdd4d036f22a77dbc19487aff451925d701c203f3bea1bbc2ed281dba2c7b5919bd3e5ee6a0eed5505cb93b1f6a7ed77 SHA512 07be66953a44d4483c1e707f29964280a5026d85c0834a60e6c1b28d4a13a2ce982c739ad2cea9fa83c1fe9ef8b15c8067480657a1783c2a4e7c53f834ef4d58
-EBUILD markdown-3.3.3.ebuild 1094 BLAKE2B aa520fe7bb5602c2836aeee23cb375a7371f02488be90f32f062b2477d92275f5414037a411cc485dc78d802d94c3a5ad7722040988b73563d6b68d537aeedf4 SHA512 94b12d7579261f9add61edc8b8c7159ad503585daf15bcf73ff0a6426575ace017ecc803edcbde3e4e2396cf11bfaec0a44e8eaaf76c4e033cf85dc7b04acb3a
+EBUILD markdown-3.3.3.ebuild 1086 BLAKE2B f854426f76d902c398021367f4322663cdd4d036f22a77dbc19487aff451925d701c203f3bea1bbc2ed281dba2c7b5919bd3e5ee6a0eed5505cb93b1f6a7ed77 SHA512 07be66953a44d4483c1e707f29964280a5026d85c0834a60e6c1b28d4a13a2ce982c739ad2cea9fa83c1fe9ef8b15c8067480657a1783c2a4e7c53f834ef4d58
 MISC metadata.xml 410 BLAKE2B 933baa8eaf3a60970578ffa8490985e509403b0bc63e99e72da94e2bfc77f821c0df57b8d957a0a3dd1e0c521091aa6f63990a0a8023f04e85faeb8a8f3ae9de SHA512 a4cab000bc793355213d53d84ecb541001afa1b91b0f284d8083c2ac9218e12e7bd01f3eb39768a97cc7e8f214aeccfb9b3227eb8bd12c8649873028da629fe1
diff --git a/dev-python/markdown/markdown-3.3.1.ebuild b/dev-python/markdown/markdown-3.3.1.ebuild
deleted file mode 100644
index 195831f69fce..000000000000
--- a/dev-python/markdown/markdown-3.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} 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"
-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"
-IUSE="doc"
-
-# importlib_metadata is only necessary for <python:3.8 according to setup.py
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.3.3.ebuild b/dev-python/markdown/markdown-3.3.3.ebuild
index be8ae2476b58..195831f69fce 100644
--- a/dev-python/markdown/markdown-3.3.3.ebuild
+++ b/dev-python/markdown/markdown-3.3.3.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"
 
 # importlib_metadata is only necessary for <python:3.8 according to setup.py