gentoo auto-resync : 20:07:2024 - 12:29:37

4 files changed, 2 insertions, 140 deletions

diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index 70c871052dd7..aca645080b5d 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1,9 +1,6 @@
-AUX makefun-1.15.2-test.patch 2871 BLAKE2B b36b8e8e40ab126e6875625a6584ae3eb78237203d426b3d2e7650c30c96e213d46c24980936d56868686fbdde93526e28d5a8b3f41330a2e398c00228097d34 SHA512 0a41884ac53c0efbbcf668aebf8119c096bddea6fe1a2ce66efc5a020d2bb3e4ce5a1cf2e02d7e4d65adfae8c45252e395f7458f5eb331adc618aa0407050bdd
 AUX makefun-1.15.3-test.patch 2142 BLAKE2B 70e7b70c0c78242d05af0929fdeec37f930663d07f6b7226267fee24cc66cb211cce3a6a1c6d590ed563971dc050ef1a82182a4ad7c1457173df6fb51c5bfc5a SHA512 01f58b4cbeb4788c590c7f8a2710ad9613adf91817106408dd975d83f89f95aa3a861a6b3709e3a3c09c37b5a81f8b92f09760fb2192da3dd2e5e331c4dc3d8a
-DIST makefun-1.15.2.tar.gz 74602 BLAKE2B 1992eebfdbff6062ed60e1f66891995a91b7155792ef7b6e701d1d3ee5939ab40d3ab976674e25a5b97030cd7de59db2c69f3c215681cef2f80f2b64523f822b SHA512 b6cb588ebf491176b06e97201846b2a5cee65f60e34b5dbcc4878d8a55e7f9fcf4b58126cb3a4ca47f5d2726422dff9ee685566c5d093dbd8fd75119ecc796b2
 DIST makefun-1.15.3.tar.gz 71799 BLAKE2B 3500be7bc5b0e86a6f75781bb8fb7156624e4c910f54dfd7498268f96cd3df84e1f4d4502f4705f9a278948043e571951137e420358e94e051ba81387b14d4ba SHA512 6d48d8e1bdd60ab440b31241a957ba60aa5ae6c77a7a4785dd0a3c6cf4cedd5389ff76d7a309d230bdf1db9be577ab85446741febb30dae0be87e9c3a2d003a0
 DIST makefun-1.15.4.tar.gz 72160 BLAKE2B 361e598bf17c3e235934d65de48e638897dae9f93285269c39d97d1202506dd7e0c688b628d1811571fc259c39dbe345e8b269809c5079bf651a9ef09b681331 SHA512 eb6ed268137726ed306c7b118307ada365832d6f17a50da2804cc55708d114ad7e630ed4fdbd15a411d92ce601c4cc10d671d1ade7e270349009c10fd82618d7
-EBUILD makefun-1.15.2.ebuild 774 BLAKE2B ac501bbadc947f37a39138bf0f27d8958e20d16346e530f944ec098ee767995daa5fd14b06590c919999bdfe7b1d7a8129dcecef5e43a8461ef6301e2b0fe014 SHA512 0749c2d29d4e5f023c9e6527a7d8fac38d5dcc0674e65470b91fad4bf5d497f854e695e9a950c8e69474740fde495e721eb9778ca6956a2e9343cd9fe5560dad
-EBUILD makefun-1.15.3.ebuild 675 BLAKE2B 2971a71dcc1d8be9415178f0d7b3c1215a48c187cd9733d493162b7ae14c949d52611bb05ca9217cac1086863ea013f85eb63ae0cfc0c2cf08249b2a434e9c55 SHA512 8a80683b18551bd0d9cf94412446504625fcd1a8ff76b3b238dc5c785c388c10d122ac3cfbe9dfd3b01e53e3627e3b93de73bb42437aed9cdeb0d548ad8fb7b6
+EBUILD makefun-1.15.3.ebuild 672 BLAKE2B 7ea57a9f189d1ede9f477e9ddfa660d7b225ce4ff188485065c9888d0b08b8d511b04de11290051642830d635cb3814dc5e6f5db102d1e96d3c50655d8e47fe5 SHA512 4ab852ef1d3ce50041a8734a51abeeeb5967ff60df719381cae70c99ddc216be8d193210c41d3715b99710089a7356efe071b241c3df9166b61eb4adb43a5b5e
 EBUILD makefun-1.15.4.ebuild 523 BLAKE2B 021b1f3d56c5cd43536a4511657a06f1cf2e275f47dacf4bc7222910babba93ac2062a9d53feb3ca8dbcc7214a0162fb05de930b3c743df2133a1d3ea89d9694 SHA512 eeff59e7fe29c8c8a3a79a48f6f008afce8052ca2c50a6572d4d5f61d8dd106909b3eb6057f37fdc4aa0cf315536d980ce2b9cae6c50f2e8825688b9210f06c6
 MISC metadata.xml 396 BLAKE2B 541c5e69fc3236d1aaf79505272c9bdf2a295524bb9bb04e782a4cd15c022e74651a9c4ebaa244672418e5fafaed97a48568538fcd527b135c279576f09350d2 SHA512 a500a2a8b23673ea11ffdd81cae9c96fc1368121cd6ce7955fb61bc59319cf87607b134f6b5d04aa6aa564eab9c2c1248c47d0ccc624cdd8ae58f5f12d96e279
diff --git a/dev-python/makefun/files/makefun-1.15.2-test.patch b/dev-python/makefun/files/makefun-1.15.2-test.patch
deleted file mode 100644
index ab43045809d9..000000000000
--- a/dev-python/makefun/files/makefun-1.15.2-test.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/tests/test_partial_and_macros.py b/tests/test_partial_and_macros.py
-index 6fd4503..3ce0a33 100644
---- a/tests/test_partial_and_macros.py
-+++ b/tests/test_partial_and_macros.py
-@@ -1,5 +1,6 @@
- import functools
- import pytest
-+import re
- import sys
- 
- import makefun
-@@ -11,6 +12,11 @@ except ImportError:
- 
- PY2 = sys.version_info < (3, )
- 
-+# Python 3.13 dedents docstrings, earlier versions just strip initial
-+# whitespace.  Use a regexp to get a consistently dedented docstring
-+# for comparison across Python versions.
-+DOCSTRING_NORMALIZE_RE = re.compile(r"^ +", re.MULTILINE)
-+
- 
- def test_doc():
-     def foo(x, y):
-@@ -41,15 +47,15 @@ def test_doc():
- 
-     sig_actual_call = ref_sig_str.replace("*, ", "")
- 
--    assert bar.__doc__ \
-+    assert DOCSTRING_NORMALIZE_RE.sub("", bar.__doc__) \
-            == """<This function is equivalent to 'foo%s', see original 'foo' doc below.>
- 
--        a `foo` function
-+a `foo` function
- 
--        :param x:
--        :param y:
--        :return:
--        """ % sig_actual_call
-+:param x:
-+:param y:
-+:return:
-+""" % sig_actual_call
- 
- 
- def test_partial():
-@@ -78,16 +84,16 @@ def test_partial():
- 
-     sig_actual_call = "(x, y='hello', a)"  # if PY2 else "(x, *, y='hello', a)"
- 
--    assert foo.__doc__.replace("=KW_ONLY_ARG!", "") \
-+    assert DOCSTRING_NORMALIZE_RE.sub("", foo.__doc__.replace("=KW_ONLY_ARG!", "")) \
-            == """<This function is equivalent to 'foo%s', see original 'foo' doc below.>
- 
--        a `foo` function
-+a `foo` function
- 
--        :param x:
--        :param y:
--        :param a:
--        :return:
--        """ % sig_actual_call
-+:param x:
-+:param y:
-+:param a:
-+:return:
-+""" % sig_actual_call
- 
- 
- def test_issue_57():
-@@ -127,9 +133,7 @@ def test_create_with_partial():
-     assert m() == -1
-     assert m.i == 1
-     # the doc remains untouched in create_function as opposed to wraps, this is normal
--    assert m.__doc__ == """partial(func, *args, **keywords) - new function with partial application
--    of the given arguments and keywords.
--"""
-+    assert m.__doc__ == functools.partial.__doc__
- 
- 
- def test_args_order_and_kind():
-@@ -161,11 +165,12 @@ def test_args_order_and_kind():
-         # it is possible to keyword-partialize a positional-only argument...
-         fp_ref = functools.partial(f, b=0)
- 
--        # but 'signature' does not support it !
--        with pytest.raises(ValueError):
--            signature(fp_ref)
--
--        # assert str(signature(fp_ref)) == "(c, /, *, d, **e)"
-+        # but 'signature' does not support it before Python 3.12.4 !
-+        if sys.version_info < (3, 12, 4):
-+            with pytest.raises(ValueError):
-+                signature(fp_ref)
-+        else:
-+            assert str(signature(fp_ref)) == "(a, c, /, *, d, **e)"
- 
-         # so we do not support it
-         with pytest.raises(NotImplementedError):
diff --git a/dev-python/makefun/makefun-1.15.2.ebuild b/dev-python/makefun/makefun-1.15.2.ebuild
deleted file mode 100644
index 29cd2d63889b..000000000000
--- a/dev-python/makefun/makefun-1.15.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Small library to dynamically create Python functions"
-HOMEPAGE="
-	https://pypi.org/project/makefun/
-	https://github.com/smarie/python-makefun/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/smarie/python-makefun/pull/103
-		# https://github.com/smarie/python-makefun/pull/104
-		"${FILESDIR}/${P}-test.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	sed -e '/pytest-runner/d' -i setup.cfg || die
-}
diff --git a/dev-python/makefun/makefun-1.15.3.ebuild b/dev-python/makefun/makefun-1.15.3.ebuild
index fcc125bd1795..b27a70e4e38d 100644
--- a/dev-python/makefun/makefun-1.15.3.ebuild
+++ b/dev-python/makefun/makefun-1.15.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]