gentoo auto-resync : 12:01:2025 - 06:41:42

4 files changed, 3 insertions, 124 deletions

diff --git a/dev-python/jinja2/Manifest b/dev-python/jinja2/Manifest
index bb91915e1359..f816c4c3ffb3 100644
--- a/dev-python/jinja2/Manifest
+++ b/dev-python/jinja2/Manifest
@@ -1,6 +1,3 @@
-AUX jinja2-3.1.4-py313.patch 2365 BLAKE2B 554b37e4f874060a6c2758426a08cad61b752913535f607d065e7a648fa5db272abd85615ba7734df3b2775320318da58040db08aa56c195d4b11e8e242adaec SHA512 3470db6a936c4a921ee3d5a8f7443f0dac9e2416be0332cb80c0c5cd6e1a80186a372a9f7034f5609202b93186c7c3e0e2bcddef209187043b2ebd4d9c796fe3
-DIST jinja2-3.1.4.tar.gz 240245 BLAKE2B cb70699cea93ddf53b7c8876b9006cc70599d49f8c64ab615759a53db6829cab7b55ac673777bc4c8dc5dfc68efada29d37f47fe7cf449044721f659fe6a654d SHA512 d07d68a2687af68c705d3b7f5a2c67aca7b9d125316b15085888b9d0d6e769981af76f6f524728b89b5501bd671d518fcb2638f9ae112e57ca2bf2a53482cd89
 DIST jinja2-3.1.5.tar.gz 244674 BLAKE2B 0b3f44e5d3a5f3d898d0b678035ddaaeb30f1f7ca09555da93adbb8d7f7159a3e192809f69f47c21ce5be6f4fb1cc91bc35d4d62f2c38c71582210085091b3d7 SHA512 75ad0094482c69d45fcd3aa8ee32e249931e53fee3f804f6ddfd5b6da0ed16962d8f1fced811e7dcb4d8401fadd828e77528d6d1280547a7d4f5f77cccf9bbd4
-EBUILD jinja2-3.1.4.ebuild 1191 BLAKE2B 238e2dd7ccc3d2483cc31302bed4fa66d1e60e6a8064c27965ff09800a535bd030549aad606e5dfbbf2d3a95dc358b6b9d7835c82d67a7e2e5a77df7b8b59379 SHA512 069dbbe518878a84b8c3a88312986bbdcbc9df858dccb58488799da2be51990ee6acc8797196ef720f55eb16f8c2839993feefe2066382c5cd4ee210960d490f
-EBUILD jinja2-3.1.5.ebuild 1337 BLAKE2B 85191040e1eda50efec5897665207aeb70ac703facd2bc16a89aee8598df4b0788ea6fa363a5160aa9eb3616e5e7748441ac55a33b51a01fce475dcfd49c1e6f SHA512 430a245813a060824a6be6ba12c9aef2db8e1c050850b4d30dcd71ce0f49b90a739d8d270af3cdd602feecc357e4224cf6ab4f33124bc00d6b31f6da8fa133a0
+EBUILD jinja2-3.1.5.ebuild 1329 BLAKE2B dbb563d3e14673a509e67cdb1c533abb4767a87dbb73082684cb6e69a3ad13e5b11bd5c2d46e1698da040fd8b25a4e9632116590e07611bc6354a60a53655bb8 SHA512 f506bdd9404bbaff47ebc1e4160953e00a90eaf81e4f5a68215bd2ee9fbb7a00acb8a9eca5f1692f58e7ebc5dc93d734d26126a22c839c5b18d87aefca32741d
 MISC metadata.xml 467 BLAKE2B 5cba0288a395e281e76810639b6e74153f1fe7532addb41ab9ff1e7e3d23616f2cd6cce9ef266ec3545fe6694fb3e25457f9ad383d5de3e2612dedd5609f2a6f SHA512 04f6f784b771602d2ad23afba5d8c9d10fb44b68873ea20a92904f0350081265852c9e4874866e8684c6a163e99f88053b5ea367357fd74790861f6e7d9cb1e3
diff --git a/dev-python/jinja2/files/jinja2-3.1.4-py313.patch b/dev-python/jinja2/files/jinja2-3.1.4-py313.patch
deleted file mode 100644
index b68091e5397a..000000000000
--- a/dev-python/jinja2/files/jinja2-3.1.4-py313.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 679af7f816ced8941ed5cf9b151a0cac543d0336 Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <tagrain@gmail.com>
-Date: Mon, 13 May 2024 18:02:35 +0100
-Subject: [PATCH] fix test_package_zip_list on 3.13
-
----
- src/jinja2/loaders.py | 32 ++++++++++++++++++++++++++------
- tests/test_loader.py  |  2 +-
- 2 files changed, 27 insertions(+), 7 deletions(-)
-
-diff --git a/src/jinja2/loaders.py b/src/jinja2/loaders.py
-index 9eaf647ba..8c2c86cd0 100644
---- a/src/jinja2/loaders.py
-+++ b/src/jinja2/loaders.py
-@@ -238,6 +238,30 @@ def list_templates(self) -> t.List[str]:
-         return sorted(found)
- 
- 
-+if sys.version_info >= (3, 13):
-+
-+    def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]:
-+        try:
-+            get_files = z._get_files
-+        except AttributeError as e:
-+            raise TypeError(
-+                "This zip import does not have the required"
-+                " metadata to list templates."
-+            ) from e
-+        return get_files()
-+else:
-+
-+    def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]:
-+        try:
-+            files = z._files
-+        except AttributeError as e:
-+            raise TypeError(
-+                "This zip import does not have the required"
-+                " metadata to list templates."
-+            ) from e
-+        return files  # type: ignore[no-any-return]
-+
-+
- class PackageLoader(BaseLoader):
-     """Load templates from a directory in a Python package.
- 
-@@ -382,11 +406,7 @@ def list_templates(self) -> t.List[str]:
-                     for name in filenames
-                 )
-         else:
--            if not hasattr(self._loader, "_files"):
--                raise TypeError(
--                    "This zip import does not have the required"
--                    " metadata to list templates."
--                )
-+            files = _get_zipimporter_files(self._loader)
- 
-             # Package is a zip file.
-             prefix = (
-@@ -395,7 +415,7 @@ def list_templates(self) -> t.List[str]:
-             )
-             offset = len(prefix)
- 
--            for name in self._loader._files.keys():
-+            for name in files:
-                 # Find names under the templates directory that aren't directories.
-                 if name.startswith(prefix) and name[-1] != os.path.sep:
-                     results.append(name[offset:].replace(os.path.sep, "/"))
diff --git a/dev-python/jinja2/jinja2-3.1.4.ebuild b/dev-python/jinja2/jinja2-3.1.4.ebuild
deleted file mode 100644
index abbf2c5a1c94..000000000000
--- a/dev-python/jinja2/jinja2-3.1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYPI_PN=jinja2
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="
-	https://palletsprojects.com/p/jinja/
-	https://github.com/pallets/jinja/
-	https://pypi.org/project/Jinja2/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/pallets/jinja/pull/1979
-		"${FILESDIR}/${P}-py313.patch"
-	)
-
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/babel; then
-		elog "For i18n support, please emerge dev-python/babel."
-	fi
-}
diff --git a/dev-python/jinja2/jinja2-3.1.5.ebuild b/dev-python/jinja2/jinja2-3.1.5.ebuild
index c194a64b9b22..14ae3bcf19a4 100644
--- a/dev-python/jinja2/jinja2-3.1.5.ebuild
+++ b/dev-python/jinja2/jinja2-3.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]