gentoo resync : 23.09.2020

4 files changed, 6 insertions, 31 deletions

diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 7372546fae5b..7d84dc2472ef 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,7 +1,7 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
 DIST Markdown-3.2.2.tar.gz 299658 BLAKE2B c5a0337b6633ac3d795885d138ee3c078e36fdcacee659d8908ecdb839e0496c06ac8c721efd16183f03026ebf681e8382cdadd28d910abf5c021fdef9237e2a SHA512 72ce79b0daed4df2d09a458dad24da3e303143307640fb15d15cb10edc6c641d422dcf5043380c1572c4b9ed8f5fc11ec52e28928d8215d687309e4ce9ae3d7c
-EBUILD markdown-2.6.11.ebuild 1345 BLAKE2B 2cfd63d4168a44df5ddc9845e0c785930f46334b1d9d32b4387b80a8ba8e1f9eb79c757ce4beb065179dc39c73d2bbee59fda07a010d201b34645acfa6b70235 SHA512 6b176ffda719576552b071fc2eccdd6a6b2cfbdfb51fdf0ee19e4807569587b7063415b15fcb98ae506b03f9ca96b192db2379f42a7c1bd58e2f27bbcfff805b
-EBUILD markdown-3.1.1-r1.ebuild 903 BLAKE2B 60d5ba2d6c2b2686b3c83295ff1f7065dd9992778595adfeb3c2ee38a4d1a74d488756e8e4ceffa96ba37893e2dd233720f0d0bef3b49ed5b357a5262af3923e SHA512 16fd37690ea6fab8ae54ec8db11aa517d541620f20cf89c51a6027bc07fad8990a05a4741fff40b72f45e83fa564aab327b16b60a0a5739dffbec29efe054bab
+EBUILD markdown-2.6.11.ebuild 853 BLAKE2B 6005ec084404b66a9a9ed697405cc44db07c784255aa207d7c133b90d73cc84903988826b4af8d7338824ddd5fb72906ec81f3dddc8cd7cb13e18544ce0177a9 SHA512 249822e2c5715a8dd1e04becad68faf6926077cf42e67197dcd550879f1453f61772bfd84c2b0ce05687f5a6c87d7a0f6ed9906c2ca4cbaf1b52673f22f158df
+EBUILD markdown-3.1.1-r1.ebuild 752 BLAKE2B 747fed1e747f1a2a9b5ea692cb824ce0450d3429337e65dc25a9596de75eccea7b0b863df61aae69bed8b43b8bb9c08d48ddd996e0ab899c7748c83517c6d0df SHA512 afc7de06c8798d33d1057fd0d2bf6e9427940b18201d25d5d577d7f9db9442c4696582e2eac75953526be7d1a8ac800d01bc8b11bab5f112300d300303fb8aa6
 EBUILD markdown-3.2.2.ebuild 1087 BLAKE2B 7058888df12ed02a3cf894c4dd0814b593a407c55ad24229f77d2554bfe252edfea06c6187063b933686d775a3272967778daca0219e5bb72ef2ef1ae01f102c SHA512 79cb2516a15f66614366d0c9246aa2968aa7457e51c2ad85f1907462c2c8cd1c2902729a37a2b64da7bb8d04ac2eef9f41ba17f9dc3cfd11c1ae16d76465c4b1
-MISC metadata.xml 490 BLAKE2B ed40aad7c21b46bb6e3395f5a2fd019256a6a47f587eb2a37c42ce1d4407bae188b581ce20be2f2f01f1d4003d2a76aa44ffd516b0d6bbf08010d7d3d9ad02b6 SHA512 4a93ed6bce680acd807a2ee9bed7a3dd999014681ce7d5e5ce95025b6fc5e078716057ef25edfa7f4656a3feb8e92041aa99f52e62e04b034c7a493ee26d7b97
+MISC metadata.xml 410 BLAKE2B 933baa8eaf3a60970578ffa8490985e509403b0bc63e99e72da94e2bfc77f821c0df57b8d957a0a3dd1e0c521091aa6f63990a0a8023f04e85faeb8a8f3ae9de SHA512 a4cab000bc793355213d53d84ecb541001afa1b91b0f284d8083c2ac9218e12e7bd01f3eb39768a97cc7e8f214aeccfb9b3227eb8bd12c8649873028da629fe1
diff --git a/dev-python/markdown/markdown-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
index dd9e8ce92979..af9423e865d1 100644
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ b/dev-python/markdown/markdown-2.6.11.ebuild
@@ -18,18 +18,8 @@ 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}] )"
+IUSE="doc"
+RESTRICT="test"
 
 S="${WORKDIR}/${P^}"
 
@@ -42,9 +32,3 @@ python_compile_all() {
 		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 415e76d40046..36073784c3ad 100644
--- a/dev-python/markdown/markdown-3.1.1-r1.ebuild
+++ b/dev-python/markdown/markdown-3.1.1-r1.ebuild
@@ -21,16 +21,10 @@ 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"
-
-DEPEND="test? (
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytidylib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}] )"
+RESTRICT="test"
 
 S="${WORKDIR}/${P^}"
 
-distutils_enable_tests pytest
-
 python_install_all() {
 	use doc && dodoc -r docs/
 
diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml
index 968763ca2d14..367b46477ac9 100644
--- a/dev-python/markdown/metadata.xml
+++ b/dev-python/markdown/metadata.xml
@@ -6,9 +6,6 @@
     <name>Python</name>
   </maintainer>
   <stabilize-allarches/>
-  <use>
-    <flag name="pygments">Enable fancy pygments support</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">Markdown</remote-id>
     <remote-id type="github">waylan/Python-Markdown</remote-id>