gentoo Easter resync : 12.04.2020

8 files changed, 43 insertions, 142 deletions

diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index fd304d7809dd..e861685a1402 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,10 +1,5 @@
-DIST recommonmark-0.4.0.tar.gz 7112 BLAKE2B d0e0f95f251e859908523c90b012ef2b162823d72b87192651d08a9cb5217a8bf497caf0320cefd3e724f77d3ad4324db446ddb57de55fd308c7739b78f55c04 SHA512 30d900840093c9ee2c1a322aeaba64c06c6f236e4c86a8d7604edc7d9fb0e78d66387f844619364d9253585db3f38d212242d2798153f343bc01ad281c146c9c
 DIST recommonmark-0.5.0.tar.gz 22356 BLAKE2B e22c6741e704b7017ff81282bd3297272f36396628b3a85e9e2ac5548b363a8b02f6aeb3db256b885a3a9a0ebe681da10f4f29c18f1bdb33490da55bf375b444 SHA512 e11a86961e477e9ae258df90c666fd0129a0ae858a8d5399b7f768b9e9ec5b4952ef5f9383ea91d8ccb1379e2753151387f7250588a98f43929bf3ebe78b7df9
-DIST recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz 22085 BLAKE2B 2225f8854eb92f9c905c5943c3d4db1cb56ccf22826f32101c9e8db6ac1a1658a543d58a71bfdd8650f225229be5c47658a6db9c6f535718eab5361589436d77 SHA512 4b4c3c9354c3de223c7d441b1665879d49a2f9f2328532901c69d10f4f8d90ff84e28aab3d1b4884edecd80071193ec69fbdbce735527ec2edc574b5a3d1fe88
-DIST recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz 22249 BLAKE2B 7466fc1448b54c2fd6969fa06e10c11e7bf1f2d772d96d749de9023d60570387a5472c74d660e8bd0722d294dd2ac1dec8d7d6fc49b281eea14b1f9ce423cf94 SHA512 67fa0b13d49d1f6b08e2fa28cf127c6dadb6454329a35e1e1217ff3bc93aff1a1a040740478cfdcab1b72acd939e0a81d7d8638e7ecdcc76e2791ddc33b8f0ac
-EBUILD recommonmark-0.4.0.ebuild 540 BLAKE2B 2c177c57f2a22f87470711e1b326dabb010de096f66ef4518aaa033b56bb514f2ccd01a2b0e6b41251e8007d6fdd52eec13a42190bf3832427c9dd4c03d18777 SHA512 2ddc82b4e50c439eb5c3fee4478627c47d1be3485e1321c53a59d97ba8956f01676b91e3a39b4418bd71d5a3fb560e997527a6872f2d0470c747c3780d157235
-EBUILD recommonmark-0.5.0.ebuild 855 BLAKE2B 3975e0eb2d4db06fbca22b69f6378133c3f96dfc8ab647f939d06a61aa491bbc1374691b6fef963e6948cd8b9337c64cf2d8351bd530b92d584ff67e2c0152ac SHA512 d22648ebf733f1f606c1b1b049ba15ec5644d8e704ce3936848a85b1f8d24dd902407707180672df387756655663ebb226cf351a6e5d9a008d2f3208b0b102c4
-EBUILD recommonmark-0.5.0_pre20180907.ebuild 978 BLAKE2B 2af506510486d55bc9f7484f29f4655e9dc9f7341b86a07e261102981c2b8c744282aca3b14162a70aa0f87e218f507df1be0f1eca7cc048edda108be7c9183d SHA512 2b057f495d2c8ef8969f2277e7777b5132e07cc57b12aea0e62ff7fb4b503ce1ea10a53d2558623da512586363375ca5318e7561d4c4da907ced88d4fe74b935
-EBUILD recommonmark-0.5.0_pre20181012-r1.ebuild 959 BLAKE2B 3e7de5fa657ed05dc01cfe126d44016e792aefd19cdd5c96940f9249c5982498968c20a2a0a1e0c9712da8050aa825463b89b37b542225b8e6549426088a2a09 SHA512 5be7b444c7e4ba6c2cab92f1d1bbe65893da1f02372fe1cc65cfcd904878aab353f492c897af62b9c0aaad057a26808e755eba792f0f64840062679bec8f93c3
-EBUILD recommonmark-0.5.0_pre20181012.ebuild 960 BLAKE2B 5ac25ec8ced21df3d1d04783feacd42d8ac5e3296745083c7820bc2b1eba5e4f2cd4594c86215d4222a46f7536706dddbab3fc4815c9ac978d689b22ea7a1051 SHA512 64b07cef5b08067a5cba98b3cf25e0cc0ae546bca060eff98bf8368be9337a0f8bf29c4d832c84d6f014d36fe619cc3ca24a31b003cf11c3e53efa4efb7ced40
-MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
+DIST recommonmark-0.6.0.tar.gz 24537 BLAKE2B 47f667ca0799394dc88964709efc59d1e2a68973b1c00fb41abfb514166e939b8dd0b6a0827285cfa1bb60669e08868b7a0993b6a32880fc0dd22cfefa6cf273 SHA512 44005b3fd0052cd8d4fce8a64f9d66a1ac75dc3041a28c115e922254956b2143296cbfbc0a2396b9f95691145645c4242e3be68e695b2c62ae37964014511679
+EBUILD recommonmark-0.5.0.ebuild 841 BLAKE2B 98b6949faa585d2c21bc4f14259069390401a8ce82ff3ce3f3981a36034087398406e6a3c283961bfd73e220426c745ed817db8db79e7e451b450886911914fa SHA512 ad4c8bcf0dcec54515441711334f86a649671438c1aceeea3f0affbb326983d99e751597f124f126451688c352268ec2d58d91f4c5779c74942348ca3f62343c
+EBUILD recommonmark-0.6.0.ebuild 966 BLAKE2B 1f6eba6d3981b65a842bf24e94f8fb6a830fbab84ac220f3647883f179b7b10aee25b2c2dafa9d3d824427abd05fe8a001045ba512d05a4d4d98c8e228f881f4 SHA512 35bcdbc41d6e1bd2485ba5c02e1acd07e918dadb62427ac18ca1a7a0654ed4516f9b9819f1a10c3ad74425cf34b2a9b21e3cf2e532f7d233939b2d00c7f110ee
+MISC metadata.xml 416 BLAKE2B 5bad43d7b568ac13930ffb19460e330e651f7681ef216f4f8a095d181007633ba49912b847520bdfa3a42f41bff688d201977303114f72a3075d20b42c442fe4 SHA512 03d09c52d6e3dc5297c5e4e57ed87ebb376ceb1d244a07bcdf5def6193ec1dca22af943264e28314f05875080c3e9c0630f6f4914e73b179930776bad0b01db5
diff --git a/dev-python/recommonmark/metadata.xml b/dev-python/recommonmark/metadata.xml
index 308621cf5b42..5beb2a2dedc7 100644
--- a/dev-python/recommonmark/metadata.xml
+++ b/dev-python/recommonmark/metadata.xml
@@ -5,12 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    This allows you to write CommonMark inside of Docutils and Sphinx
-    projects.
-  </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">recommonmark</remote-id>
-    <remote-id type="github">rtfd/recommonmark</remote-id>
+    <remote-id type="github">readthedocs/recommonmark</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/recommonmark/recommonmark-0.4.0.ebuild b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
deleted file mode 100644
index 371995c3ae04..000000000000
--- a/dev-python/recommonmark/recommonmark-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-LICENSE="MIT"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/commonmark-0.5.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-IUSE=""
diff --git a/dev-python/recommonmark/recommonmark-0.5.0.ebuild b/dev-python/recommonmark/recommonmark-0.5.0.ebuild
index a6d116d158e8..2863e840d9fa 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
deleted file mode 100644
index dc8566adf369..000000000000
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=33b5c2a4ec50d18d3f659aa119d3bd11452327da
-MY_P=${PN}-${EGIT_COMMIT}
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
-	>=dev-python/commonmark-0.7.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
deleted file mode 100644
index 6c8adfc6c0a0..000000000000
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=fdeeda5f6fe3ed8905deb7a067cc5951a477d091
-MY_P=${PN}-${EGIT_COMMIT}
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/commonmark-0.8[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
deleted file mode 100644
index f0a0ef42540f..000000000000
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=fdeeda5f6fe3ed8905deb7a067cc5951a477d091
-MY_P=${PN}-${EGIT_COMMIT}
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/commonmark-0.8[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/recommonmark/recommonmark-0.6.0.ebuild b/dev-python/recommonmark/recommonmark-0.6.0.ebuild
new file mode 100644
index 000000000000..47b5cbf2d6f6
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.6.0.ebuild
@@ -0,0 +1,35 @@
+# 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,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# known broken with new sphinx
+	# https://github.com/readthedocs/recommonmark/issues/164
+	sed -e 's:test_lists:_&:' \
+		-e '/CustomExtensionTests/s:SphinxIntegrationTests:object:' \
+		-i tests/test_sphinx.py || die
+
+	distutils-r1_src_prepare
+}