gentoo Easter resync : 12.04.2020

4 files changed, 5 insertions, 66 deletions

diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 0b9b72ffe644..45ef009beaf2 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,7 +1,5 @@
 DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
-DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
 DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
-EBUILD rst-linker-1.11.ebuild 1504 BLAKE2B 29c4b3ace2ca3481321ec1e25690361a9991fb7c3cd2ba280a195811d6080cc38aeb742ad5939a8bd5faa4e55a7c2e9048574b07e17b6fa8dacc0efeac000628 SHA512 97b17a5d61c20723d7b5ffee25a2017d41980caad166eaf192a31bb7685490a75b71b88aa02c9de0cf27735ac76244bb107e9a1aaa918d536fdc4c87cc22e1f3
-EBUILD rst-linker-1.9-r1.ebuild 1393 BLAKE2B 589e22666f63f41d7990a5e62ed1a9fe7ae1fa3ae3aea24549131cc964dba041c7b0ca1c3a51ccf67e996316046b5cf723ffbc56db6de23c2b9f533ada3389ff SHA512 d77b083e47a9966f7578a07ac69b76d1b850b56ee323cdc824a343b987dfa822e902cf65f1a586009aaea3180a678475caae72b490069d4c97b3a5a1bdb28ab9
-EBUILD rst-linker-2.0.0.ebuild 1349 BLAKE2B 3b99c6d0150b92e2dcf07fa334c9c0366254004734ccac2f4fe362b12a4bff57e4f4975770f4d5a7ec3300d307f8fa7d11023badcbe2769c0aaed09b7e06cef5 SHA512 558fe27f0b6ac95bab6fb10d3824761aa40f3a3f276f594a3482c742b87e28c292ca91a0e7e772f50cfd8be09b394b6be229f0a56432439bc64f377eddbc060f
+EBUILD rst-linker-1.11.ebuild 1501 BLAKE2B 55fd266a6db1c11db22091f30b0e181350d1ec4eec90fb8959955b64ef82e6ba615a8ea3f7835e60482fd9b2a03faf5b433c58a1be177699dcc2131f18c81eb1 SHA512 7cb549ad0eabee7fc784ad50c612c951a7a0b0debd4e0a0ca896b51732fd6122f8b76f8263f3eec1b17f50c5712b6e4e162c3dc41aa19b046c5f22f278ee17a4
+EBUILD rst-linker-2.0.0.ebuild 1345 BLAKE2B 120f6f9416ce03fdef5b2724975a586d38e0ee17df03ea9914bbf1be82354becdd9984ff660f8ef960a0b993d92287d2a8a9ed6e96869c9d499258b1a0c1d6d1 SHA512 a9dcee060b822fc1a46a4b75c5fbd8c9c1d06915b14a0f232943f1564f630b170d39adb36baaf20614cfadbadb50c1bd6ce1179668eaa3b46d734cbf922d241d
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
index ec0ba275e2f8..70c0776a330b 100644
--- a/dev-python/rst-linker/rst-linker-1.11.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
deleted file mode 100644
index fa1c10e2d9ba..000000000000
--- a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
+++ /dev/null
@@ -1,59 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="https://github.com/jaraco/rst.linker"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/path-py[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	py.test -v --ignore=rst || die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# namespace used only by this package in Gentoo at the moment
-	python_moduleinto rst
-	python_domodule rst/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/rst-linker/rst-linker-2.0.0.ebuild b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
index 596c9c6f5461..5986d16e187a 100644
--- a/dev-python/rst-linker/rst-linker-2.0.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"