gentoo resync : 29.12.2022

4 files changed, 5 insertions, 111 deletions

diff --git a/dev-python/yamlpath/Manifest b/dev-python/yamlpath/Manifest
index 1b34ff7b3c96..5bb36b5f19db 100644
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@@ -1,7 +1,3 @@
-DIST yamlpath-3.6.1.tar.gz 214053 BLAKE2B 5c72ffc4e4307f1a3fea7a697782c432402acc1ee929de34a702188d51287fd7187b688354533163b7101dc17ed394f0e2681a1a194807f00762bf6c71387292 SHA512 8ef8e1931118ed881d52b6d7f589b1c671694c211cb1c988e7e6945b7ff5408163bd402f52c1815b453bf8ccc61e8b8ed5c19a00be076d8e76e0a037461a12e2
-DIST yamlpath-3.6.3.gh.tar.gz 214734 BLAKE2B fd36d276831771c81272a2bb60a9fe7995c63f1026143925e34167ee397b56725ec9ba5d5afac2a85121512b8f8da3f988fd022dc2378ee80b91567f15d95c1a SHA512 b6c41b550339809e3a0bcbd7dca190956f06799303c1c12bb68eed567c56ccafd2acc2a8a6ab33fb03abde61b3de25673ee2d459f6d66e6782f9325212653ade
 DIST yamlpath-3.6.4.gh.tar.gz 216016 BLAKE2B fc6537b7c80ecfb9f69c646970e43935374bb105df007c123cf837eb1de6827ac2cc443294b69500c966ea6bc5d7f56498aec13340238c7660118f17cc6685e5 SHA512 eb1ac0d5861818f4f4b57b07f9fa7f758846982abbb3ac4ec58a1adaca8ec36deba1e21ce3e13916e74a946512f4d66e341a9d45392ef7133d0293e5fd6f66c9
-EBUILD yamlpath-3.6.1.ebuild 1364 BLAKE2B 9365a26e0db3098c76da2b803f1f30cc34126622d40c8946646cbba71568153d5639ed759303f08d3771f1c03f8de9390236da9c8bbee24427a94eb85f00d5ed SHA512 f64320f092cd60d8f15978c297b95fe28bdf4895c680865566d4500d537dc34b38abd554e6e662e7e70ba60edd9397ecf2a0fd555a4606b64892652580c1aa34
-EBUILD yamlpath-3.6.3.ebuild 1151 BLAKE2B 9cf93439ae4046e2b1b279804a7c434761048fe54de1142c1544e876cebf998ef1bd45f0b81a7f9cf8126cc68a1a8f97cba0a606ecc27542bd793a60b12583f1 SHA512 868e70308e51d795853c6aff2453626900e21f699f1a167fbe09490d02dc80ee67ef2caf193d2a1ae88dbfcf246796bfefda562d40e04c194ba3667d0bf9863a
 EBUILD yamlpath-3.6.4.ebuild 1151 BLAKE2B 9cf93439ae4046e2b1b279804a7c434761048fe54de1142c1544e876cebf998ef1bd45f0b81a7f9cf8126cc68a1a8f97cba0a606ecc27542bd793a60b12583f1 SHA512 868e70308e51d795853c6aff2453626900e21f699f1a167fbe09490d02dc80ee67ef2caf193d2a1ae88dbfcf246796bfefda562d40e04c194ba3667d0bf9863a
-MISC metadata.xml 563 BLAKE2B 5b63f4324ccc2685c7e11f4a75b105f9e97b860a983ffba37f1ae862082ce4654d0114ecde9fe7dc66e1c8121e607ade520e3f34192d2e85ebd538ff0631f355 SHA512 f50a3f78e2fa6d4f06fb1f52267202781d189942135112b45f17ed620025b87637925d3205f151573fee635b5f7b4d2ef1de5106223cd13d2f8e2963a31d29ac
+MISC metadata.xml 664 BLAKE2B cdf919f6a46dbc7ed8f2546509a623e0e784da711afaade20ec79b2861e8c83f54f755ce68ec2944bd0edb92f2e05b18a9c0ff93430c185574c41de2d789e03d SHA512 8020ca58f464e2aed71c01c29375b95dda238be6cdb94468a0abe50c7ce0270a42d723318f34cb4eb8728184cbe6769c7e666f43cffde37e6e9f42cab4d7292e
diff --git a/dev-python/yamlpath/metadata.xml b/dev-python/yamlpath/metadata.xml
index 2e66798ac25a..b4a77c52d5a4 100644
--- a/dev-python/yamlpath/metadata.xml
+++ b/dev-python/yamlpath/metadata.xml
@@ -11,4 +11,8 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/yamlpath/yamlpath-3.6.1.ebuild b/dev-python/yamlpath/yamlpath-3.6.1.ebuild
deleted file mode 100644
index fcffedb6f449..000000000000
--- a/dev-python/yamlpath/yamlpath-3.6.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
-HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
-SRC_URI="https://github.com/wwkimball/yamlpath/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="test"
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	local sed_args
-
-	sed_args=(
-		-e 's|\("ruamel\.yaml\)[^"]*|\1|'
-		-e '/pytest-cov/d'
-		-e '/pytest-console-scripts/d'
-	)
-	sed "${sed_args[@]}" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${S}" py.test -v tests || die "Tests failed under ${EPYTHON}"
-}
-
-yamlpath_post_src_install() {
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	insinto "${sitedir}/yamlpath"
-	doins -r "${S}/yamlpath/patches"
-	python_optimize "${D}${sitedir}" || die
-}
-
-src_install() {
-	find "${WORKDIR}" -name tests -print0 | xargs -0 rm -rf || die
-	distutils-r1_src_install
-
-	python_foreach_impl yamlpath_post_src_install
-}
diff --git a/dev-python/yamlpath/yamlpath-3.6.3.ebuild b/dev-python/yamlpath/yamlpath-3.6.3.ebuild
deleted file mode 100644
index caea22ecdf53..000000000000
--- a/dev-python/yamlpath/yamlpath-3.6.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
-HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
-SRC_URI="
-	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-ruby/hiera-eyaml
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	sed -e '/ruamel\.yaml/d' \
-		-e '/pytest-cov/d' \
-		-e "/find_packages/s/()/(exclude=\['tests'\])/" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install and optimize yamlpath/patches/aliasstyle.py
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	insinto "${sitedir}/yamlpath"
-	doins -r "${S}/yamlpath/patches"
-	python_optimize "${D}${sitedir}"
-}