gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 59 deletions

diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 5a5f065dc3d4..4f9ee292166e 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -4,8 +4,6 @@ AUX m2r-0.2.1-upstream-fix.patch 641 BLAKE2B 4d75137a8bc0e5ba9363d72b611b83933c7
 AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab45d4b86adbe4306d39a705509f7c4597d9f0ef37cd61af035d59871e04596f6cbdc10c5 SHA512 bb085477c363a0384a5aea0f5cac3e64ece957048f5a610b3063a5d96a31e8b78167dd847bd42d0f267b506595b55cffdf7647a5c819c9755b054e34d2ee3a99
 AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
 AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
-DIST m2r-0.1.14.tar.gz 15926 BLAKE2B 48d8961b6ebf66d494511f6bf755ae2d2de0740aa27eec82f6690a3ccb686795c204a51ddc6d89d44440fc74bcd6f914917ef5d56f2b2275dd98dd8e6d5a9c0c SHA512 fba6c580c1e8f1fda704628a3e16dc75d23faf532767e56065cc3786e59331196c1d2dfeb49804b7b931356d5ac2d498320a752d0e20cd6e3b8e28be92d38120
 DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.1.14.ebuild 1306 BLAKE2B 68348e610a98228a2569e38160ef7478dbb669c961cf57c81da1bade26fa17d5f8ca42844bf54df55b6651fadee82b5eb03e5a371e29d823a03e9026d2875561 SHA512 e9eef841274d2a72ba3aae3c6d11ccf8ae5c53d2af6f1b3e6e706649317f01cfcf36d28c85e8c4ebb33c36d62306e1751483771e7c8d946efa5ea7741ded70cf
-EBUILD m2r-0.2.1.ebuild 1421 BLAKE2B ef3120cb488085399345d9b1a2aa0b8f2f22fc02319ceb8f3e73a6461732d4db6012fa808da2e22ce50d93eabfb7976f2c756353f4d670db9e86af0de74172ae SHA512 83390afb830fa4117e9c0a2390ab8c8cce34c96f4f76e57e1629b7dbca7638246e62c153fee6dfddd4738436fc30ec2bc785324c89a81005334de36d75543a82
-MISC metadata.xml 504 BLAKE2B 9e21e9256baae870dce5b60ba0f2c9feb5857c79f6ff81dbf10aafcb81d7886c18114155f2f825a6bdb7ab5b51f5e9f733ae4e8c799bbbb8c424c662cec85959 SHA512 551e5a6e90f257d5171995d6cb7ed7122e3820a787cb4acf177a9b0acc22810e71d432b8cd53667793c2e01e39edcb43540841e541737097231fe36b51eca7fd
+EBUILD m2r-0.2.1.ebuild 1425 BLAKE2B e4eed326136da48e96d400aeaddfd39cead99bda713594343dd38f61cc2050b6ae9666fb776d30001aa89669228b021ad40836e35bc4fb434941fa8dcca35849 SHA512 a146fa16d4af8412c423cd084d391476249ad05c58dbc63ad49469eb4aefc90be291b8f5596a087a664275467b164ca32c702271c534272eba0d14b2730e6398
+MISC metadata.xml 387 BLAKE2B 9afa0632ca2c8320eef24f538949e83fa74c290c2d0845b097d7d5c9fc8a34534b53766e41acbc6efb4a9c2956a798f54f3ead47fc2d36e489b847612d7ca73e SHA512 1466a5630e24d76f8ef99192d8d8c993b1e6085aee4c38e0750214d119cdfc9bfea3f193a9f47f6bd8c72d5797ec15acdbcbd26e962f53a26722c128281aee6a
diff --git a/dev-python/m2r/m2r-0.1.14.ebuild b/dev-python/m2r/m2r-0.1.14.ebuild
deleted file mode 100644
index 4d5e26f0d33d..000000000000
--- a/dev-python/m2r/m2r-0.1.14.ebuild
+++ /dev/null
@@ -1,51 +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,7})
-
-inherit distutils-r1
-
-DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/mistune[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-	${RDEPEND}
-"
-
-#S=${WORKDIR}/${P}
-
-python_prepare_all() {
-	# fix a Q/A violation, trying to install the tests as an independant package
-	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
-	# add missing test files
-	cp "${FILESDIR}/"test.md tests/ || die
-	cp "${FILESDIR}/"test.rst tests/ || die
-	cp "${FILESDIR}/"m2r.1 ./ || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman m2r.1
-}
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index cf55c799edfd..d1c56ad4dfa9 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/m2r/metadata.xml b/dev-python/m2r/metadata.xml
index 10ff509a87e0..fa17bcbedde2 100644
--- a/dev-python/m2r/metadata.xml
+++ b/dev-python/m2r/metadata.xml
@@ -10,7 +10,4 @@
 		<remote-id type="pypi">m2r</remote-id>
 		<remote-id type="github">miyakogi/m2r</remote-id>
 	</upstream>
-	<longdescription>
-		M2R converts a markdown file including reST markups to a valid reST format.
-	</longdescription>
 </pkgmetadata>