4 files changed, 2 insertions, 145 deletions
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 01d41081bee3..4a9f6d073235 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,6 +1,3 @@
-AUX pycparser-2.21-lextab-cache.patch 2535 BLAKE2B b0455189f1d64a18655cc43b969e260291acc0812c219490f8592bfc96d7f0653dc9b439acc8fef24e49e560ca3fca28e5b8734ec48fe8a6d9e981e239feafb6 SHA512 d24d3db2dae05e9bc4c76bae0dc1070c0905af239b6585d93da0d026e02ba609df28577c47f88ee33cb6c26c59abc5cdb73f806360cc964e5e834c96b55cf423
-DIST pycparser-2.21.tar.gz 170877 BLAKE2B ae6bf42dfc552bf1e3bfb5430cdb0c15b5e011ec53cbd03e0e2507c08a1a78690cefce2de134bd984caccc5dbde90661cb4c18df5c289217967213aac4d52404 SHA512 e61fbdde484d1cf74d4b27bdde40cf2da4b7028ca8ecd37c83d77473dab707d457321aecaf97da3b114c1d58a4eb200290b76f9c958044b57e5fed949895b5f0
 DIST pycparser-2.22.tar.gz 172736 BLAKE2B a080df68cf114c355949b2911a80e89ed02a64b8d1d03e3c5807222249e5dfd2491f691962885dbadcdaf323b55a05c5597319ac082dcf6c67a9ac952be9a7e2 SHA512 c9a81c78d87162f71281a32a076b279f4f7f2e17253fe14c89c6db5f9b3554a6563ff700c385549a8b51ef8832f99f7bb4ac07f22754c7c475dd91feeb0cf87f
-EBUILD pycparser-2.21-r2.ebuild 1958 BLAKE2B 98c8a08c5be434bf59c57cbe49cb3b9a88445c3c88146db37b4dae42751f879d4b23f07cef32e19c5c6946ea17c5ad30d49f0f82ecc9afa5601c569fe1d392a7 SHA512 50871bb5b0d56bf2e6cbbb35a30b5ecebb2b6ff5de7ac60a136280d0b27214be1e80acf87b862cdd85d6583246bd730c9171479b24ba52581131ed651b5384e4
-EBUILD pycparser-2.22.ebuild 1856 BLAKE2B 200c558198f9eb4faaeef7a5d3e6e96bcd4581ee3697a23f6badd4c90f7519fd3ea0f638ee39432e2b57fdce083e60d10395018fd7a03fc2ee7dc1ac718c8e46 SHA512 1abd0f0edfbf4a3445596ed2b37727ce31aa9ec9908ca240842befcd8d39f306459e66c41062f9a4adc2a6fcc3b7fd4b49fcffc435c899d2c46a3c2bde4fe92f
+EBUILD pycparser-2.22.ebuild 1848 BLAKE2B f50e405160255987f2f9b8e1f573dad224186b3d774db8f88f24774e462d52fe45a7a8f3245c21db3de073882636df974812dfe21f2fdfb9f883b00303d512e0 SHA512 abde92e846aafcd9b74c7027fc447a8bccc04c1f782aaef8ee3bf11ec67fece202f4f653e3ce945bc0322db6264012fce2c14a5a572d60caa545b45e7f2fe520
 MISC metadata.xml 406 BLAKE2B 61cb250ac460c4ea05f47bd8d208e44706bc80965ca1982e490d759d3a63652e5e13bf357532afb599ecea491f3c9a4cd315b97250b115bb7e8fa769b2ef03ff SHA512 b2d4ffde31f97a98e4a74bdd70751519d1339bbf3384e9e671760506fc2dac9d92bf6f7a743973002b4ae6da1cd2bb11abbfe63cbb330a1c32702b3eef24a62b
diff --git a/dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch b/dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch
deleted file mode 100644
index d24999e7273a..000000000000
--- a/dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 35a279ecb9af41a6f95ddbc6a0f1beaa2472d165 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 26 Feb 2023 01:04:34 +0100
-Subject: [PATCH] _build_tables: Invalidate cache before importing generated
- modules (#494)
-
-Make sure to invalidate finder caches before trying to import generated
-modules.  This is necessary according to the Python documentation:
-https://docs.python.org/3/library/importlib.html#importlib.invalidate_caches
-
-This fixes a hard-to-reproduce bug that Python would be unable to find
-just-generated `lextab.py` if mtime of the current directory did not
-change from the moment the script was started.  This could
-e.g. be the case if one has second-precision timestamps and removes
-the generated file just before starting the build, e.g.:
-
-    $ rm pycparser/lextab.py; python -m build -nw
-
-It could also be reproduced easier by doing something like:
-
-    $ cd pycparser
-    $ touch .; python -B _build_tables.py
-    Traceback (most recent call last):
-      File "/var/tmp/pycparser/pycparser/_build_tables.py", line 38, in <module>
-        import lextab
-    ModuleNotFoundError: No module named 'lextab'
-
-This is because the first command (`rm` or `touch`) updates the mtime
-of the directory to the current time.  If the script is run fast enough,
-it manages to scan the directory and then write the new `lextab.py`
-within the same second.  As a result, mtime of the directory after
-writing the new file is the same as when the script was started, finder
-does not invalidate the cache and assumes that `lextab.py` does not
-exist since it did not exist when the directory was scanned earlier.
-
-This potentially fixes #493.
-
-It was originally reported on https://bugs.gentoo.org/701878.
-Thanks to Gary E. Miller for patience in reproducing the problem
-and proxy-debugging it for me, as well as testing the final patch before
-submission.
----
- pycparser/_build_tables.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/pycparser/_build_tables.py b/pycparser/_build_tables.py
-index 958381ad..4f371079 100644
---- a/pycparser/_build_tables.py
-+++ b/pycparser/_build_tables.py
-@@ -13,6 +13,7 @@
- # Insert '.' and '..' as first entries to the search path for modules.
- # Restricted environments like embeddable python do not include the
- # current working directory on startup.
-+import importlib
- import sys
- sys.path[0:0] = ['.', '..']
- 
-@@ -32,6 +33,8 @@
- 
- # Load to compile into .pyc
- #
-+importlib.invalidate_caches()
-+
- import lextab
- import yacctab
- import c_ast
diff --git a/dev-python/pycparser/pycparser-2.21-r2.ebuild b/dev-python/pycparser/pycparser-2.21-r2.ebuild
deleted file mode 100644
index 80938a15df34..000000000000
--- a/dev-python/pycparser/pycparser-2.21-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="
-	https://github.com/eliben/pycparser/
-	https://pypi.org/project/pycparser/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/ply:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/eliben/pycparser/pull/494
-		"${FILESDIR}"/${P}-lextab-cache.patch
-	)
-
-	# remove the original files to guarantee their regen
-	rm pycparser/{c_ast,lextab,yacctab}.py || die
-
-	# kill sys.path manipulations to force the tests to use built files
-	sed -i -e '/sys\.path/d' tests/*.py || die
-
-	# Ensure we can find tests in our directory
-	sed -i -e 's/from tests.test_util/from test_util/g' tests/test_*.py || die
-
-	# unbundle ply
-	rm -r pycparser/ply || die
-	sed -i -e 's:\(from \)[.]\(ply\b\):\1\2:' pycparser/*.py || die
-	sed -i -e "s:'pycparser.ply'::" setup.py || die
-
-	ln -s "${S}"/examples tests/examples || die
-
-	rm tests/test_examples.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Skip tests if cpp is not in PATH
-	type -P cpp >/dev/null || return 0
-	# change workdir to avoid '.' import
-	cd tests || die
-
-	# Ensure that 'cpp' is called with the right arguments
-	# Tests don't seem to always pass the include they intend to use.
-	mkdir -p "${T}"/bin || die
-	cat > "${T}"/bin/cpp <<-EOF || die
-	#!${BROOT}/bin/bash
-	exec ${BROOT}/usr/bin/cpp -I${S}/utils/fake_libc_include/ \$@
-	EOF
-	chmod +x "${T}"/bin/cpp || die
-
-	PATH="${T}/bin:${PATH}" eunittest
-}
diff --git a/dev-python/pycparser/pycparser-2.22.ebuild b/dev-python/pycparser/pycparser-2.22.ebuild
index c0a56673a0df..80680c39f2e1 100644
--- a/dev-python/pycparser/pycparser-2.22.ebuild
+++ b/dev-python/pycparser/pycparser-2.22.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/ply:=[${PYTHON_USEDEP}]