gentoo Easter resync : 12.04.2020

6 files changed, 55 insertions, 9 deletions

diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index 9de1fff5678d..7906ea074b9f 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -1,7 +1,9 @@
 DIST CommonMark-0.5.4.tar.gz 120316 BLAKE2B 47904d101d9d0e3759f82c28a4b80edfc0ed12cf0888e4915339118e496322cf0791d8a46d2edddca0d1794e82a9647cc22cbcfcc2d385a740c7c31cb8251659 SHA512 1983714a50a627f30f86af0d02dad9e52cb7b0ffce29691d0e740f587e599ead6de2412d72b895b7df772e1c81e171e56dfecaf593e611af65bd5798632a98ad
 DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e61b17d0335c3234fc0fa0d3738e9117a8ca29e7a6bbaa6cd0d58b112defb6e19a7efce3ca57ca25c8ce67b2d3d2 SHA512 b0e3c4fea6c99b51c541054ecfe887935c2cc517a82df86da1d9cb4914189652326ec5b543cbbcb40ec43e5e09c285c47f5304ca1907764692e659c540591bdd
 DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
-EBUILD commonmark-0.5.4.ebuild 805 BLAKE2B 0bec3226c65ab5427ec6dfe538a6e21421a26632d61f9485567db063608bb29761fab8b697e5e54c025ed0d17aedc8c478c0200fcb4ea00970b0619d2303f3cc SHA512 a3a51a5b6edee044913e9f4b9ccd4071223144b979483fc318c5740d1b1faa12071a0f8129549cf5a12a129ad32aed92602c2dc74300d0af5769b8686dff0d58
-EBUILD commonmark-0.7.5.ebuild 1088 BLAKE2B 6afe1d1ce15f9e40cceba308f7f523aa37d6a3b6b57464c02cf53cdcd640d533a51b0ed42f7c6c8ea3368c42f84bd839b0030f9837aab4fc7ea56e6c4d3c4d51 SHA512 4e6bc4943e32a5bfbc1b945ce1f6e59123afeaac42c52cba0f9ed84cf26ef99608bfedc18710e5362a9e7e0a36d8b9d8d93d5fe19a534de0149c59e4456acdb9
-EBUILD commonmark-0.8.1.ebuild 1042 BLAKE2B 1125cb64cd5fd7a0cb4025830a36ab06fadb24d6fcb3d21635f91610f5f6d8b6ec84006c0ecf70048d8a61068943f4e2974b2f849a69809de133070dd1c21dcf SHA512 30644558fa3887cdca6c90b81a5e92cb297a48e16f0df58ab12f80663a7d225f56f031506acc86ed6b5b7e70184d4a368cc2177b6acc3bd949e7698f99f60795
-MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
+DIST commonmark-0.9.1.tar.gz 95764 BLAKE2B 1f61de784c5cf03aa5255f5fae18c48df30aab8ef135ccf85a0b7a14cfc64275476458fc0853ecfc9beee96daca31d5cccb30d218f7d5b5343844e57aa7a77ec SHA512 bacf5ef387a0c330a2128f42c42c29c1a48ae623683e6e56ad28a1621aabd72e29cd3e2d661e8207b8cc0c347d267f262a55f2145fc58f8c8aeff91e7a283324
+EBUILD commonmark-0.5.4.ebuild 799 BLAKE2B 4090dbc41d0c227a18dc297991726bd1beac3c94a2c8339ff7c245539604e4f01e8baf2fe66950a0e1b7c87ffb15d2d684ba0b382d25a1c48c073ca06861c132 SHA512 bb6ff543eeac300fb928ef9cab955536bbf369ed696c99a7e5ea39fb0ba2347fb9da9b1dea65b84f54edf4e820136e7a2ceff409188f13cde3b01645ab121103
+EBUILD commonmark-0.7.5.ebuild 1084 BLAKE2B 5e7c22fdec8c58d59092e814d3584c14a143957bbaa973ba48d7c970255628ea72217894e02d025b28e9cfc3f0210b956487645d444e061f21d30451165ab491 SHA512 bb68bf8c15a92fb8c6fc3c7106aeadd1227f61fac0217b37afeaf485f221bbd4beec6cf8a618c4f528bb275adab263f08b597b4aa270e9c4bdda633b782acd4a
+EBUILD commonmark-0.8.1.ebuild 1039 BLAKE2B 923d177fc3c065277a88bb1d52f606bb8d816a9a515a884a2fc304cd39420e1886c8ea1499e35a65d926640cb053bf66ff43fe935255ee6e8aa2a5bf3bbae2f1 SHA512 c784c50a20e7f816e5480fcfb6e8d580a7549607ad13e867f0c722f1799892a67df0471722d4a25541be4962cfecbf7bd4b6fe239dafecf23fa7d67bcd883235
+EBUILD commonmark-0.9.1.ebuild 1033 BLAKE2B f8ffed8a3c3739cc327fdb86fc91db74c0dcbd68e7bf4cd15bfc4dc6e5e333b335ea47f055c1d45b2d8c6b51ac37b45d885ada74b8200e0c743d07b74911be80 SHA512 3abd27d9bd97d47f62d4f1637630f79377e2f938fc910918c1e670e81b7685a37dbc08e5530d60f87308378475805c3ce5a43d95b08fa35e7f6215cd295c4530
+MISC metadata.xml 763 BLAKE2B 9a79175d4ae0c20b1871d8f89a571e7eca9ac0788c0f3de2ba2ba9bc0fcac4616877c762beec0c75d11737e84ba9759d134f528b3c2292d2823676e8bfbb7aff SHA512 ff467de52a1e48d4c70b9b5e54e5557f4469c5c7ff75ba6e9264642f835b87862085e8ca666977bee3daff00af765248353597a41ddcc62b83c68e0089ca6719
diff --git a/dev-python/commonmark/commonmark-0.5.4.ebuild b/dev-python/commonmark/commonmark-0.5.4.ebuild
index f000a90e3b6b..ab0f369be3e8 100644
--- a/dev-python/commonmark/commonmark-0.5.4.ebuild
+++ b/dev-python/commonmark/commonmark-0.5.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/commonmark/commonmark-0.7.5.ebuild b/dev-python/commonmark/commonmark-0.7.5.ebuild
index 28ef183ac3d9..a957191cbbdb 100644
--- a/dev-python/commonmark/commonmark-0.7.5.ebuild
+++ b/dev-python/commonmark/commonmark-0.7.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
index cab9fe1b4b01..e2b30049848d 100644
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
new file mode 100644
index 000000000000..403379b45700
--- /dev/null
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@@ -0,0 +1,44 @@
+# 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 parser for the CommonMark Markdown spec"
+HOMEPAGE="https://github.com/readthedocs/commonmark.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONIOENCODING='utf8'
+	distutils-r1_src_test
+}
+
+src_prepare() {
+	default
+	# Fix file collision with app-text/cmark, see bug #627034
+	sed -i -e "s:'cmark\( = commonmark.cmark\:main'\):'cmark.py\1:" \
+		setup.py || die
+}
+
+pkg_postinst() {
+	ewarn "/usr/bin/cmark has been renamed to /usr/bin/cmark.py due file"
+	ewarn "collision with app-text/cmark (see bug #627034)"
+}
diff --git a/dev-python/commonmark/metadata.xml b/dev-python/commonmark/metadata.xml
index fc5b696a8da1..a4daa9b7a863 100644
--- a/dev-python/commonmark/metadata.xml
+++ b/dev-python/commonmark/metadata.xml
@@ -14,6 +14,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">CommonMark</remote-id>
-    <remote-id type="github">rtfd/CommonMark.py</remote-id>
+    <remote-id type="github">readthedocs/commonmark.py</remote-id>
   </upstream>
 </pkgmetadata>