[gentoo-commits] repo/gentoo:master commit in: dev-python/pyyaml/files/, dev-python/pyyaml/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pyyaml/files/, dev-python/pyyaml/

[Michał Górny]

commit:     7505df3b4d3f36ee501be24d5cf7cca7b0434eda
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 20:42:17 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 10 20:43:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7505df3b

dev-python/pyyaml: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pyyaml/Manifest                         |  1 -
 .../pyyaml/files/pyyaml-5.1-cve-2017-18342.patch   | 40 ------------------
 dev-python/pyyaml/metadata.xml                     |  3 --
 dev-python/pyyaml/pyyaml-5.4.1.ebuild              | 47 ----------------------
 4 files changed, 91 deletions(-)

diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index c11baf76eb9e..a415685ef288 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,2 +1 @@
-DIST pyyaml-5.4.1.gh.tar.gz 173319 BLAKE2B b81cdec32588a419840dd536a2d8addb41eec3e20897f6c464a00a5badb4d6eed9b34b4f95146695187e7d9bcf2d03b81e884290c6dc47927be6192dfdb21eab SHA512 691e54fd9ca01fdc0dcb7de03ddd1970614d92a716c2437032999f9001f90a2ebbcc195a49bfdbe54da0f7a63178c83b02b05b18b5b1024127013f004d1f5997
 DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad

diff --git a/dev-python/pyyaml/files/pyyaml-5.1-cve-2017-18342.patch b/dev-python/pyyaml/files/pyyaml-5.1-cve-2017-18342.patch
deleted file mode 100644
index 28626ba9e974..000000000000
--- a/dev-python/pyyaml/files/pyyaml-5.1-cve-2017-18342.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py
-index e7a419d..5f80761 100644
---- a/lib/yaml/__init__.py
-+++ b/lib/yaml/__init__.py
-@@ -106,6 +106,7 @@ def load(stream, Loader=None):
-     and produce the corresponding Python object.
-     """
-     if Loader is None:
-+        raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348")
-         load_warning('load')
-         Loader = FullLoader
- 
-@@ -121,6 +122,7 @@ def load_all(stream, Loader=None):
-     and produce corresponding Python objects.
-     """
-     if Loader is None:
-+        raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348")
-         load_warning('load_all')
-         Loader = FullLoader
- 
-diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py
-index 5df0bb5..6952ba5 100644
---- a/lib3/yaml/__init__.py
-+++ b/lib3/yaml/__init__.py
-@@ -106,6 +106,7 @@ def load(stream, Loader=None):
-     and produce the corresponding Python object.
-     """
-     if Loader is None:
-+        raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348")
-         load_warning('load')
-         Loader = FullLoader
- 
-@@ -121,6 +122,7 @@ def load_all(stream, Loader=None):
-     and produce corresponding Python objects.
-     """
-     if Loader is None:
-+        raise RuntimeError("Unsafe load() call disabled by Gentoo. See bug #659348")
-         load_warning('load_all')
-         Loader = FullLoader
- 

diff --git a/dev-python/pyyaml/metadata.xml b/dev-python/pyyaml/metadata.xml
index 96c887521e1a..ceaaa2ef50fb 100644
--- a/dev-python/pyyaml/metadata.xml
+++ b/dev-python/pyyaml/metadata.xml
@@ -5,9 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="libyaml">enable support for C implementation using libyaml</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:pyyaml_project:pyyaml</remote-id>
 		<remote-id type="pypi">PyYAML</remote-id>

diff --git a/dev-python/pyyaml/pyyaml-5.4.1.ebuild b/dev-python/pyyaml/pyyaml-5.4.1.ebuild
deleted file mode 100644
index c702311e7455..000000000000
--- a/dev-python/pyyaml/pyyaml-5.4.1.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
-
-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"
-
-BDEPEND="
-	libyaml? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-RDEPEND="libyaml? ( dev-libs/libyaml:= )"
-DEPEND="${RDEPEND}"
-
-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
-}