From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5FF15158083 for ; Sun, 8 Sep 2024 13:58:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FE27E2A28; Sun, 8 Sep 2024 13:58:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BC2EE2A28 for ; Sun, 8 Sep 2024 13:58:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8561343080 for ; Sun, 8 Sep 2024 13:57:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EAAD1DFC for ; Sun, 8 Sep 2024 13:57:58 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1725803875.d69e6457a7823ce880ca353764289ed95d0991b4.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyyaml/, dev-python/pyyaml/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyyaml/Manifest dev-python/pyyaml/files/pyyaml-6.0.1-cython3.patch dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild X-VCS-Directories: dev-python/pyyaml/files/ dev-python/pyyaml/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d69e6457a7823ce880ca353764289ed95d0991b4 X-VCS-Branch: master Date: Sun, 8 Sep 2024 13:57:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9d858e50-d68e-4186-83c9-1a3d0ef69448 X-Archives-Hash: 08ccc377f171aed92552d010b8591d94 commit: d69e6457a7823ce880ca353764289ed95d0991b4 Author: Michał Górny gentoo org> AuthorDate: Sun Sep 8 13:56:59 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Sep 8 13:57:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69e6457 dev-python/pyyaml: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pyyaml/Manifest | 1 - dev-python/pyyaml/files/pyyaml-6.0.1-cython3.patch | 36 --------------- dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild | 54 ---------------------- 3 files changed, 91 deletions(-) diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest index 0d1e7dff5af7..1a1b9f0615a8 100644 --- a/dev-python/pyyaml/Manifest +++ b/dev-python/pyyaml/Manifest @@ -1,3 +1,2 @@ -DIST pyyaml-6.0.1.gh.tar.gz 120376 BLAKE2B c34f2169f6eb6aa718aeb53dbfaf02590e11e504d16cc85a802e1a1191f296ef9aa2501db683e1a48173ce6adeaeca09f2ab989581dcf1c1ba4004831bb4cf47 SHA512 1c74a92a4ad7d47854dc7bcb2e89b3c8e0b14fa815c7dbfbc22b24480dbba6c81e971c77ee384c494a960914b95f06edf943d7431925a5ed674a0ba830d258e0 DIST pyyaml-6.0.2.gh.tar.gz 123883 BLAKE2B 16ea7f376e45caccb461a18d4347fb06ffaf0dfd65b18e5bd7e74a14ffdce05c9c016c54bd6a501b444bd813f1bfc78999f212ca72cfabf3b125f5ab2f37167e SHA512 c72665131296762521d9ae4fc1c8619946f46ea16ad98b6b8e995828f2cdbd1ed61741fc2d646753f71d95a352b36562a1302f0cb646d5705652cd24b2f10b16 DIST pyyaml-6.0.2rc1.gh.tar.gz 123879 BLAKE2B 9d983338c4e61fa6f5056aa7733dadc854a859baffe3ad5a353d6fc0525b6c5788df7e85ab40514ad8bdeffbccf10417701fdaac4d0985e0a20b300867b89f4f SHA512 4eac37f3b367099e93c53f327f5f838d5f2f06fa636ea08f277a6cf4f570b7dc9870b35057a889d0895c2abd1bfc121d624f282610dcf90e68727973573267ef diff --git a/dev-python/pyyaml/files/pyyaml-6.0.1-cython3.patch b/dev-python/pyyaml/files/pyyaml-6.0.1-cython3.patch deleted file mode 100644 index 346339916f17..000000000000 --- a/dev-python/pyyaml/files/pyyaml-6.0.1-cython3.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/898680 -https://github.com/yaml/pyyaml/pull/731 - -From 17dc5b6cd96dcfe64fd71789c771ca9b96d260e5 Mon Sep 17 00:00:00 2001 -From: "Andrew J. Hesford" -Date: Fri, 21 Jul 2023 09:50:00 -0400 -Subject: [PATCH] Fix builds with Cython 3 - -This is a *de minimis* fix for building with Cython 3. Recent Cython<3 -releases provided `Cython.Distutils.build_ext` as an alias to -`Cython.Distutils.old_build_ext.old_build_ext`; Cython 3 drops this -alias and instead uses a wholly new `Cython.Distutils.build_ext` that -does not provide the `cython_sources` function used in `setup.py`. - -Explicitly importing `old_build_ext` preserves the existing behavior for -recent Cython<3 and uses the correct behavior for Cython 3. Should the -import fail (*e.g.*, because the version of Cython available predates -the availability of `old_build_ext`), the import falls back to just -`Cython.Distutils.build_ext`. - -Signed-off-by: Andrew J. Hesford ---- a/setup.py -+++ b/setup.py -@@ -82,7 +82,11 @@ - with_cython = True - try: - from Cython.Distutils.extension import Extension as _Extension -- from Cython.Distutils import build_ext as _build_ext -+ try: -+ from Cython.Distutils.old_build_ext import old_build_ext as _build_ext -+ except ImportError: -+ from Cython.Distutils import build_ext as _build_ext -+ - with_cython = True - except ImportError: - if with_cython: diff --git a/dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild deleted file mode 100644 index 68bb7965f6a5..000000000000 --- a/dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples" - -DEPEND=" - dev-libs/libyaml:= -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.1-cython3.patch -) - -distutils_enable_tests setup.py - -src_configure() { - export PYYAML_FORCE_CYTHON=1 -} - -python_install_all() { - distutils-r1_python_install_all - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF} - fi -}