gentoo resync : 29.12.2022

3 files changed, 2 insertions, 52 deletions

diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 992637cc459e..3841f77c3369 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,4 +1,3 @@
 DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad
-EBUILD pyyaml-6.0-r1.ebuild 1014 BLAKE2B 728b2e2c697741bde82374965aaee6341f9f0e5b767c13b1e014cbe303f9623f74b27cf43207d2382e2b2b023af0d737403981bca761df27fb33c2b2d5d9fbe4 SHA512 667c7d30921f2e4b21cd1b042fc3a4fb9835670dc6b855009bb51b01c0c320b87557d9e5163ad44624ae997c76129ce115aa4bf4fcb62fb90fe32039659e349b
-EBUILD pyyaml-6.0.ebuild 1323 BLAKE2B 073f228376d18a696d7503b661b6b088a39ef5d3511505ae6f18bdbdb122b72dbddee3c4a265d80a9750ac941b1941c2f7edf6b70cf6308e376a5851ec5acfb8 SHA512 950e2cd60852e0f3ef9bb9bc11dd2f63b815b5a26c8a5feed4b2a11080a91c1ec82c3b6436a04cc59ad0970fbbfaa04e6e880bed21035371b7c29b242c9835b0
+EBUILD pyyaml-6.0-r1.ebuild 1006 BLAKE2B 58ed4048f00e3d83ce1da31f62f5ab5d3565915abc9754ac0f12c79cbf77038a0a0a5e8fe6fa594281d1473b69be6553bcdeb1bad984d1124863e23d03f6bcfa SHA512 e956d2994c41871f0fbe3fab47e8516cbaf3ce85abc235d829a86422da03f1f9235978cc2692a80f94c5f81d3ab2a4313b1dfb3f8e12ebfc26af6cd0b5e11cdf
 MISC metadata.xml 426 BLAKE2B 6216e38c3e79e811aced6c777b49779953abf4f1b0a1185947f6a6fdc851fdf4cc973092024a6cb2d76bf06863feb49742c7a6892a8761b48a5e74902757a610 SHA512 f549b70fcf1588625fcc2bc33ad0c41faa267ad5bb84d564f5502dee1ad2340a663d1a2b92cf9fdeed827a5f7cebdbe76d59166e89de6d03e7933141029c051d
diff --git a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
index b9fb87af60eb..da35f2f7a319 100644
--- a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/pyyaml/pyyaml-6.0.ebuild b/dev-python/pyyaml/pyyaml-6.0.ebuild
deleted file mode 100644
index 75fc788295b0..000000000000
--- a/dev-python/pyyaml/pyyaml-6.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="
-	https://pyyaml.org/wiki/PyYAML
-	https://pypi.org/project/PyYAML/
-	https://github.com/yaml/pyyaml/"
-SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-RDEPEND="dev-libs/libyaml:="
-DEPEND="${RDEPEND}"
-# bundled distutils is broken w/ pypy3 in setuptools < 58
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-58.2.0[${PYTHON_USEDEP}]
-	' pypy3)
-"
-
-distutils_enable_tests setup.py
-
-src_configure() {
-	export PYYAML_FORCE_CYTHON=1
-	DISTUTILS_ARGS=(
-		# --without-libyaml doesn't disable trying to use libyaml
-		# and results in automagic dep; --with-libyaml guarantees that
-		# the build fails if the C extension fails to build
-		--with-libyaml
-	)
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}