gentoo resync : 12.05.2022

3 files changed, 3 insertions, 53 deletions

diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 052765e4c154..748f6ecf7828 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,4 +1,3 @@
 DIST ruamel.yaml-0.17.21.tar.xz 184612 BLAKE2B cc7e2a336d3c77a9f2d7e5d7233ceb4d15fddca3a97ec0e54427469fd24c7c63fc70b258adbad92a816d99a1f9839d41eccb9f3224e7a23884914755fa424bc9 SHA512 87f4723bfc76b1b21168852aabe4b49921f175294ac05b4e3f292f2bcf23fe6595df3e066843d193f881b274be2a7b358bd04625afef913bb0e5811efe98b761
-EBUILD ruamel-yaml-0.17.21-r1.ebuild 1393 BLAKE2B 013f2a2ce71ebe9383ba9a765aa230b0825f2978fa6f53f8b2cfe826b12c6c522c1079639fee074e0db8f9633aad895f785ca6a44e95aa1ba8a11ee822a340a3 SHA512 15bc06351c27703c72d19712e077b1e872747e9a02e62659be28a0970dc39c15e5da3e07f62999e80aa4e7cc3047c39ae0aebd4d83dd7ce2e761a9975d5a9795
-EBUILD ruamel-yaml-0.17.21.ebuild 1264 BLAKE2B e83e161b6ff1b67a74f7bd4993c129b22613c4981a1c124b37e89afc226db80f5a4eaa96e0aa0e9ddf0bdd670899bdfde75be821ad571f92479e5e685e15a9d7 SHA512 11e3dd3e090ef8470825de7d23e856c725c066eaafbb367a319ee1f76ccb224b252893837cbaf223c90eb2776c5305f2eea79d153bd774a2782209befaa2a7a2
+EBUILD ruamel-yaml-0.17.21-r2.ebuild 1416 BLAKE2B a995b96e8218e1ce01f9f0348572a0b3f2c23fac30dd8f2ecfa46fca797b5aef77ed09232b050a2f6b14298c188e7ba3689ef63bfc2a19ea9ca052460b3029fe SHA512 396d0261de8b31850585de5c6827bdb8a4d1bdeb26de1fa7c315a27667b5aaabb10af3c6ccf8d6f7d86ec00579d970b28dd74528ecefebcb5c74de9d9f73803d
 MISC metadata.xml 759 BLAKE2B ce5ec2429c5fe84587d1b5e7744055e1e8e91eae8dec780a4654cab405df46350d1c8175827351948364255b8fcd62ea234239260c01b8ce23b8db182e6514e6 SHA512 faa587083ffa9af40108e2ca9cfb7a4e2c3e19a731b39241a7ec62d6fca051ace92bcff3fa9896a343fdc196a04fe1d132bcbb7bfa3fd96401ac996b76bba4ee
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r2.ebuild
index a5c9a8fbd528..e8911cc77e1d 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r1.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r2.ebuild
@@ -20,10 +20,11 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+	!dev-python/namespace-ruamel
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.21.ebuild
deleted file mode 100644
index bbb698d9950c..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/projects/ruamel-yaml/
-"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	[[ ${EPYTHON} == pypy3 ]] && local EPYTEST_DESELECT=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		_test/lib/
-	)
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}