gentoo resync : 20.10.2021

3 files changed, 51 insertions, 49 deletions

diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 7447127da175..f683ef85d866 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,6 +1,6 @@
 AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
-DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
 DIST pyyaml-5.4.1.gh.tar.gz 173319 BLAKE2B b81cdec32588a419840dd536a2d8addb41eec3e20897f6c464a00a5badb4d6eed9b34b4f95146695187e7d9bcf2d03b81e884290c6dc47927be6192dfdb21eab SHA512 691e54fd9ca01fdc0dcb7de03ddd1970614d92a716c2437032999f9001f90a2ebbcc195a49bfdbe54da0f7a63178c83b02b05b18b5b1024127013f004d1f5997
-EBUILD pyyaml-5.3.1-r1.ebuild 1142 BLAKE2B 0fb7ffcdf9e7e7357c55bb939d866e11122931c6acc0dd22180271a0a967aa677d592de64bc154a0bfa36aed156523091f7c57345c7d1f4ab8ecac86ff9b8e96 SHA512 8bef7ced134dd3f84f069b602f33156eb6e6d61bbc5a9f99f7bacff46249951c85164605e27b34f104e5cd229d18a03ec8abe118461105340c25010fbf3a5585
+DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad
 EBUILD pyyaml-5.4.1.ebuild 1125 BLAKE2B cd03ce8beb70c2e1be3bfe00bbce4387fb98d331217e988aea8678054e5c9f1c98b73563bfb53e3a93f2122da2cfdf899bc39fd0a603b56cd4ab9b535e856367 SHA512 75ed7274f0b8ea11ba1fb50ccfadba104f5fe2fad0aa45c8f8c1a30ead7868e140903b90c25f39a35af665edcad1fd9038810a4ec1cd75b40c03d31122cbf5b8
+EBUILD pyyaml-6.0.ebuild 1324 BLAKE2B 5f501853e9e37b5af49e463b4e0fbac99f1a82253364e831751a7c315f3f8488e183409e54632a62a9cb120826c8172e8f01b28d125c5e182968516e53cc6719 SHA512 2f65827f4d25cba956ad883c2ec35c38a4f91458841f7f372f0e99ef0f80f216bb7aefe7de2724ac2eb9e6965e328e674af411dd3893da93800d0f910b86d157
 MISC metadata.xml 521 BLAKE2B c10b7a0c805b705894457b699d5f352d45a41c025abc307d19068de5ba27a9360bda7ea60343bb12c798626c27b30156e3f749af8ae33ee768ea3698631ef64e SHA512 702a2308f05cb6d8fa0ef2bcf281392edfda73d18a03f8180a5c3647e5211df7422857c1e0ab14bbc4547a1d78f2eefbae73f7ddeb811345aa33d4692a402025
diff --git a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
deleted file mode 100644
index a3e461f6d8c3..000000000000
--- a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="examples +libyaml"
-
-RDEPEND="libyaml? ( dev-libs/libyaml:= )"
-DEPEND="${RDEPEND}
-	libyaml? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-		' 'python*')
-	)"
-
-PATCHES=(
-	# bug #659348
-	"${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_configure_all() {
-	mydistutilsargs=( $(use_with libyaml) )
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml/pyyaml-6.0.ebuild b/dev-python/pyyaml/pyyaml-6.0.ebuild
new file mode 100644
index 000000000000..0448b8d0f038
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 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 ~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
+}