gentoo auto-resync : 05:12:2023 - 17:02:58

author: V3n3RiX <venerix@koprulu.sector> 2023-12-05 17:02:59 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-12-05 17:02:59 +0000
commit: 6bf575618cf9022e99cbfcc64036fd9db79a749c (patch)
tree: f692d02fb905cd3d5bab465b790da48fb2de546b /dev-python
parent: 5944ce177026c93b7dab690db9d970567ddbf75f (diff)
31 files changed, 767 insertions, 99 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0fbaf1307fee..9715b55c232d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansible-pygments/Manifest b/dev-python/ansible-pygments/Manifest
index ac9b4d50b6bc..8a95ba3f4878 100644
--- a/dev-python/ansible-pygments/Manifest
+++ b/dev-python/ansible-pygments/Manifest
@@ -1,4 +1,4 @@
-AUX ansible-pygments-0.1.1-tests_pygments2_14.patch 4663 BLAKE2B f198da4ffccc4acc7d64397e9e654407cff934a8764054154775c5e5208503096270a35fb712daeb2ff0d834b9638ffaab2f3fee3bbe5d902fde48e1de53a3ea SHA512 0ced02d842fac488a37015503bb1fe163bfe842f20717374ca5b87319e5f80bee6da11b0eef7c311cd750c89248ab5a92a44f402cd0b3fcedd86d26ac9d28679
+AUX ansible-pygments-0.1.1-make_lexer_test_compare_tokens.patch 14695 BLAKE2B c7af16a0b1dbcb5c4c2bb7626c3e3ff815ebd16e0ca920d063eeec4b9202bb6ac72881b703ac18c3cd2bcbd2dca900da3755ffa62f609d88d870982fc0b56be4 SHA512 603742386cdebcaccc87c5a53924c8cda4742f4327e07df8719696cde1af9a9b0a33e29016a1a6f626a73c003cde4156013049c2deeb0d1efb2c27a154492f48
 DIST ansible-pygments-0.1.1.tar.gz 8446 BLAKE2B ff631dd24c723035db7ab11a6c3fc0c90e8cebd72e6b0fa0d8b2c4bc4250ff5fb1e4180366e4ee084aab90bf24a8c3b2ecfad2c421b9f0cfdbf7675c94f0fcf7 SHA512 1ad2f4568d46d7fc617c6e674bcd9aea48e14307d91c476b51a04f778b452f18cb983d87d4872664d567b984193edee2af7964854fb2f3ae37ab4bce09c387d4
-EBUILD ansible-pygments-0.1.1-r1.ebuild 592 BLAKE2B 983c8afe8dee6d4b7beac1c14ffa1d0e82be44561da4a9d04858e1c934052e61d5659b332546de0679091eb7d21dd9fd7bf53f5f800e0a6f5b7ac277019da760 SHA512 ab6f663193f1634e456df79bc1430e5617d9344890e758f1d72994d618ce4d7e78106dfdcb7ea2d92a43e24c975d1bbbf150b0e70384d6f3e23382b2873359b3
+EBUILD ansible-pygments-0.1.1-r1.ebuild 552 BLAKE2B f6c75289068022b9bc5d388c3781d68b70ab486e20d85a0cb0b461e7c8b70c6654566dd881499cd4c0c65cd71fc33d5debf8d3340214ef6af0fc2913f3783a36 SHA512 f4c7aefd5d8e6daf4b4e4b0f1c79c8de912d2e9d6b45108d4a51658ca42c96a695b06e468661295adde3c9d30b67ef4104b9e76b8c51e19b926c51656658b970
 MISC metadata.xml 786 BLAKE2B 5883f03ffc7b0850bc8ecc90c91a15a9498ced9ee196a4f8d2a97a77a41957cb05a40ebf671ddbdf226886b94e9a5e796376094924712544a07559e0858aa5a8 SHA512 c7736962fe565be524294a30630e7cfd2820d1e9ace6f6dbd307ad46a252947ce368057d5ea5d20889a5ccdbb7f3418496affad5f8ed345e0e0808bd4abbe4ed
diff --git a/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
index acf6231a5358..ccaf7b22ee7a 100644
--- a/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
+++ b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517="poetry"
 PYPI_NO_NORMALIZE=1
 
@@ -16,11 +16,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~riscv"
 
-# 2.14.0+ needed in order for tests to pass
-RDEPEND=">=dev-python/pygments-2.14.0[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.1-tests_pygments2_14.patch
+	"${FILESDIR}"/${PN}-0.1.1-make_lexer_test_compare_tokens.patch
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-make_lexer_test_compare_tokens.patch b/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-make_lexer_test_compare_tokens.patch
new file mode 100644
index 000000000000..41ce8a5c2314
--- /dev/null
+++ b/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-make_lexer_test_compare_tokens.patch
@@ -0,0 +1,324 @@
+Backported upstream patch 179c74e9f1a5dc870dec6d4db6cab60d2dca1ed2
+
+--- a/tests/lexer_test.py
++++ b/tests/lexer_test.py
+@@ -1,26 +1,24 @@
+ # Author: Felix Fontein <felix@fontein.de>
+ # License: BSD-2-Clause
+ # Copyright: Felix Fontein <felix@fontein.de>, 2021
+-"""Tests for Pygments lexers."""
++"""Tests for Pygments lexers.
+ 
+-from pygments import highlight
+-# pylint: disable=no-name-in-module
+-# Ref: https://github.com/PyCQA/pylint/issues/491
+-from pygments.formatters import HtmlFormatter
+-
+-from ansible_pygments.lexers import AnsibleOutputLexer
++They rely on token comparison for stability reasons. Relying on
++additional style formatting is known to break with updates to
++the pygments library itself.
++"""
+ 
++from pygments import __version__ as _pygments_version
++from pygments.lexers import get_lexer_by_name as _get_lexer_by_name
++from pygments.token import Token
+ 
+-def run_test(data, lexer):
+-    """Format the data snippet as HTML using a given lexer."""
+-    formatter = HtmlFormatter()
+-    result = highlight(data, lexer, formatter)
+-    return formatter.get_style_defs('.highlight'), result
++PYGMENTS_VERSION_INFO = tuple(map(int, _pygments_version.split('.')))
++IS_OLD_PYGMENTS_PRE_2_14 = PYGMENTS_VERSION_INFO <= (2, 14, 0)
+ 
+ 
+ def test_ansible_output_lexer():
+-    """Test that AnsibleOutputLexer produces expected HTML output."""
+-    data = R"""
++    """Test that ``AnsibleOutputLexer`` produces expected tokens."""
++    ansible_play_output_example = R"""
+ ok: [windows] => {
+     "account": {
+         "account_name": "vagrant-domain",
+@@ -71,58 +69,226 @@
+ 
+ changed: [localhost]
+ """
+-    _, result = run_test(data, AnsibleOutputLexer())
+-    print(result)
+ 
+-    # pylint: disable=line-too-long
+-    assert result == R"""<div class="highlight"><pre><span></span><span class="k">ok</span><span class="p">:</span> <span class="p">[</span><span class="nv">windows</span><span class="p">]</span> <span class="p">=&gt;</span> <span class="p">{</span>
+-    <span class="nt">&quot;account&quot;</span><span class="p">:</span> <span class="p">{</span>
+-        <span class="nt">&quot;account_name&quot;</span><span class="p">:</span> <span class="s">&quot;vagrant-domain&quot;</span><span class="p">,</span>
+-        <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s">&quot;User&quot;</span>
+-    <span class="p">},</span>
+-    <span class="nt">&quot;authentication_package&quot;</span><span class="p">:</span> <span class="s">&quot;Kerberos&quot;</span><span class="p">,</span>
+-    <span class="nt">&quot;user_flags&quot;</span><span class="p">:</span> <span class="p">[]</span>
+-<span class="p">}</span>
+-
+-<span class="k">TASK</span> <span class="p">[</span><span class="l">paused</span><span class="p">]</span> <span class="nv">************************************************************************************************************************************</span>
+-<span class="w">Sunday 11 November 2018  20:16:48 +0100 (0:00:00.041)       0:07:59.637 *******</span>
+-<span class="gd">--- before</span><span class="w"></span>
+-<span class="gi">+++ after</span><span class="w"></span>
+-<span class="gu">@@ -1,5 +1,5 @@</span><span class="w"></span>
+-<span class="w"> </span>{<span class="w"></span>
+-<span class="gd">-  &quot;exists&quot;: false,</span><span class="w"></span>
+-<span class="gd">-  &quot;paused&quot;: false,</span><span class="w"></span>
+-<span class="gd">-  &quot;running&quot;: false</span><span class="w"></span>
+-<span class="gi">+  &quot;exists&quot;: true,</span><span class="w"></span>
+-<span class="gi">+  &quot;paused&quot;: true,</span><span class="w"></span>
+-<span class="gi">+  &quot;running&quot;: true</span><span class="w"></span>
+-<span class="w"> </span>}<span class="w"></span>
+-<span class="w">\ No newline at end of file</span>
+-
+-<span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span>
+-
+-<span class="k">TASK</span> <span class="p">[</span><span class="l">volumes (more volumes)</span><span class="p">]</span> <span class="nv">********************************************************************************************************************</span>
+-<span class="w">Sunday 11 November 2018  20:19:25 +0100 (0:00:00.607)       0:10:36.974 *******</span>
+-<span class="gd">--- before</span><span class="w"></span>
+-<span class="gi">+++ after</span><span class="w"></span>
+-<span class="gu">@@ -1,11 +1,11 @@</span><span class="w"></span>
+-<span class="w"> </span>{<span class="w"></span>
+-<span class="w"> </span>  &quot;expected_binds&quot;: [<span class="w"></span>
+-<span class="gd">-    &quot;/tmp:/tmp:rw&quot;,</span><span class="w"></span>
+-<span class="gd">-    &quot;/:/whatever:rw,z&quot;</span><span class="w"></span>
+-<span class="gi">+    &quot;/tmp:/somewhereelse:ro,Z&quot;,</span><span class="w"></span>
+-<span class="gi">+    &quot;/tmp:/tmp:rw&quot;</span><span class="w"></span>
+-<span class="w"> </span>  ],<span class="w"></span>
+-<span class="w"> </span>  &quot;expected_volumes&quot;: {<span class="w"></span>
+-<span class="gd">-    &quot;/tmp&quot;: {},</span><span class="w"></span>
+-<span class="gd">-    &quot;/whatever&quot;: {}</span><span class="w"></span>
+-<span class="gi">+    &quot;/somewhereelse&quot;: {},</span><span class="w"></span>
+-<span class="gi">+    &quot;/tmp&quot;: {}</span><span class="w"></span>
+-<span class="w"> </span>  },<span class="w"></span>
+-<span class="w"> </span>  &quot;running&quot;: true<span class="w"></span>
+-<span class="w"> </span>}<span class="w"></span>
+-<span class="w">\ No newline at end of file</span>
+-
+-<span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span>
+-</pre></div>
+-"""
++    expected_resulting_text_tokens = [
++        (0, Token.Text.Whitespace, '\n'),
++        (1, Token.Keyword, 'ok'),
++        (3, Token.Punctuation, ':'),
++        (4, Token.Text, ' '),
++        (5, Token.Punctuation, '['),
++        (6, Token.Name.Variable, 'windows'),
++        (13, Token.Punctuation, ']'),
++        (14, Token.Text, ' '),
++        (15, Token.Punctuation, '=>'),
++        (17, Token.Text, ' '),
++        (18, Token.Punctuation, '{'),
++        (19, Token.Text, '\n    '),
++        (24, Token.Name.Tag, '"account"'),
++        (33, Token.Punctuation, ':'),
++        (34, Token.Text, ' '),
++        (35, Token.Punctuation, '{'),
++        (36, Token.Text, '\n        '),
++        (45, Token.Name.Tag, '"account_name"'),
++        (59, Token.Punctuation, ':'),
++        (60, Token.Text, ' '),
++        (61, Token.Literal.String, '"vagrant-domain"'),
++        (77, Token.Punctuation, ','),
++        (78, Token.Text, '\n        '),
++        (87, Token.Name.Tag, '"type"'),
++        (93, Token.Punctuation, ':'),
++        (94, Token.Text, ' '),
++        (95, Token.Literal.String, '"User"'),
++        (101, Token.Text, '\n    '),
++        (106, Token.Punctuation, '}'),
++        (107, Token.Punctuation, ','),
++        (108, Token.Text, '\n    '),
++        (113, Token.Name.Tag, '"authentication_package"'),
++        (137, Token.Punctuation, ':'),
++        (138, Token.Text, ' '),
++        (139, Token.Literal.String, '"Kerberos"'),
++        (149, Token.Punctuation, ','),
++        (150, Token.Text, '\n    '),
++        (155, Token.Name.Tag, '"user_flags"'),
++        (167, Token.Punctuation, ':'),
++        (168, Token.Text, ' '),
++        (169, Token.Punctuation, '['),
++        (170, Token.Punctuation, ']'),
++        (171, Token.Text, '\n'),
++        (172, Token.Punctuation, '}'),
++        (173, Token.Text, '\n'),
++        (174, Token.Text.Whitespace, '\n'),
++        (175, Token.Keyword, 'TASK'),
++        (179, Token.Text, ' '),
++        (180, Token.Punctuation, '['),
++        (181, Token.Literal, 'paused'),
++        (187, Token.Punctuation, ']'),
++        (188, Token.Text, ' '),
++        (
++            189,
++            Token.Name.Variable,
++            '*' * 132,
++        ),
++        (321, Token.Text, '\n'),
++        *(
++            (
++                (
++                    322,
++                    Token.Text.Whitespace,
++                    'Sunday 11 November 2018  20:16:48 +0100 (0:00:00.041)       '
++                    '0:07:59.637 *******\n',
++                ),
++            ) if IS_OLD_PYGMENTS_PRE_2_14 else (
++                (
++                    322,
++                    Token.Text,
++                    'Sunday 11 November 2018  20:16:48 +0100 (0:00:00.041)       '
++                    '0:07:59.637 *******',
++                ),
++                (401, Token.Text.Whitespace, '\n'),
++            )
++        ),
++        (402, Token.Generic.Deleted, '--- before'),
++        (412, Token.Text.Whitespace, '\n'),
++        (413, Token.Generic.Inserted, '+++ after'),
++        (422, Token.Text.Whitespace, '\n'),
++        (423, Token.Generic.Subheading, '@@ -1,5 +1,5 @@'),
++        (438, Token.Text.Whitespace, '\n'),
++        (439, Token.Text.Whitespace, ' '),
++        (440, Token.Text, '{'),
++        (441, Token.Text.Whitespace, '\n'),
++        (442, Token.Generic.Deleted, '-  "exists": false,'),
++        (461, Token.Text.Whitespace, '\n'),
++        (462, Token.Generic.Deleted, '-  "paused": false,'),
++        (481, Token.Text.Whitespace, '\n'),
++        (482, Token.Generic.Deleted, '-  "running": false'),
++        (501, Token.Text.Whitespace, '\n'),
++        (502, Token.Generic.Inserted, '+  "exists": true,'),
++        (520, Token.Text.Whitespace, '\n'),
++        (521, Token.Generic.Inserted, '+  "paused": true,'),
++        (539, Token.Text.Whitespace, '\n'),
++        (540, Token.Generic.Inserted, '+  "running": true'),
++        (558, Token.Text.Whitespace, '\n'),
++        (559, Token.Text.Whitespace, ' '),
++        (560, Token.Text, '}'),
++        (561, Token.Text.Whitespace, '\n'),
++        *(
++            (
++                (
++                    562,
++                    Token.Text.Whitespace,
++                    '\\ No newline at end of file\n',
++                ),
++            ) if IS_OLD_PYGMENTS_PRE_2_14 else (
++                (562, Token.Text, '\\ No newline at end of file'),
++                (589, Token.Text.Whitespace, '\n'),
++            )
++        ),
++        (590, Token.Text.Whitespace, '\n'),
++        (591, Token.Keyword, 'changed'),
++        (598, Token.Punctuation, ':'),
++        (599, Token.Text, ' '),
++        (600, Token.Punctuation, '['),
++        (601, Token.Name.Variable, 'localhost'),
++        (610, Token.Punctuation, ']'),
++        (611, Token.Text, '\n'),
++        (612, Token.Text.Whitespace, '\n'),
++        (613, Token.Keyword, 'TASK'),
++        (617, Token.Text, ' '),
++        (618, Token.Punctuation, '['),
++        (619, Token.Literal, 'volumes (more volumes)'),
++        (641, Token.Punctuation, ']'),
++        (642, Token.Text, ' '),
++        (
++            643,
++            Token.Name.Variable,
++            '*' * 116,
++        ),
++        (759, Token.Text, '\n'),
++        *(
++            (
++                (
++                    760,
++                    Token.Text.Whitespace,
++                    'Sunday 11 November 2018  20:19:25 +0100 (0:00:00.607)       '
++                    '0:10:36.974 *******\n',
++                ),
++            ) if IS_OLD_PYGMENTS_PRE_2_14 else (
++                (
++                    760,
++                    Token.Text,
++                    'Sunday 11 November 2018  20:19:25 +0100 (0:00:00.607)       '
++                    '0:10:36.974 *******',
++                ),
++                (839, Token.Text.Whitespace, '\n'),
++            )
++        ),
++        (840, Token.Generic.Deleted, '--- before'),
++        (850, Token.Text.Whitespace, '\n'),
++        (851, Token.Generic.Inserted, '+++ after'),
++        (860, Token.Text.Whitespace, '\n'),
++        (861, Token.Generic.Subheading, '@@ -1,11 +1,11 @@'),
++        (878, Token.Text.Whitespace, '\n'),
++        (879, Token.Text.Whitespace, ' '),
++        (880, Token.Text, '{'),
++        (881, Token.Text.Whitespace, '\n'),
++        (882, Token.Text.Whitespace, ' '),
++        (883, Token.Text, '  "expected_binds": ['),
++        (904, Token.Text.Whitespace, '\n'),
++        (905, Token.Generic.Deleted, '-    "/tmp:/tmp:rw",'),
++        (925, Token.Text.Whitespace, '\n'),
++        (926, Token.Generic.Deleted, '-    "/:/whatever:rw,z"'),
++        (949, Token.Text.Whitespace, '\n'),
++        (950, Token.Generic.Inserted, '+    "/tmp:/somewhereelse:ro,Z",'),
++        (982, Token.Text.Whitespace, '\n'),
++        (983, Token.Generic.Inserted, '+    "/tmp:/tmp:rw"'),
++        (1002, Token.Text.Whitespace, '\n'),
++        (1003, Token.Text.Whitespace, ' '),
++        (1004, Token.Text, '  ],'),
++        (1008, Token.Text.Whitespace, '\n'),
++        (1009, Token.Text.Whitespace, ' '),
++        (1010, Token.Text, '  "expected_volumes": {'),
++        (1033, Token.Text.Whitespace, '\n'),
++        (1034, Token.Generic.Deleted, '-    "/tmp": {},'),
++        (1050, Token.Text.Whitespace, '\n'),
++        (1051, Token.Generic.Deleted, '-    "/whatever": {}'),
++        (1071, Token.Text.Whitespace, '\n'),
++        (1072, Token.Generic.Inserted, '+    "/somewhereelse": {},'),
++        (1098, Token.Text.Whitespace, '\n'),
++        (1099, Token.Generic.Inserted, '+    "/tmp": {}'),
++        (1114, Token.Text.Whitespace, '\n'),
++        (1115, Token.Text.Whitespace, ' '),
++        (1116, Token.Text, '  },'),
++        (1120, Token.Text.Whitespace, '\n'),
++        (1121, Token.Text.Whitespace, ' '),
++        (1122, Token.Text, '  "running": true'),
++        (1139, Token.Text.Whitespace, '\n'),
++        (1140, Token.Text.Whitespace, ' '),
++        (1141, Token.Text, '}'),
++        (1142, Token.Text.Whitespace, '\n'),
++        *(
++            (
++                (
++                    1143,
++                    Token.Text.Whitespace,
++                    '\\ No newline at end of file\n',
++                ),
++            ) if IS_OLD_PYGMENTS_PRE_2_14 else (
++                (1143, Token.Text, '\\ No newline at end of file'),
++                (1170, Token.Text.Whitespace, '\n'),
++            )
++        ),
++        (1171, Token.Text.Whitespace, '\n'),
++        (1172, Token.Keyword, 'changed'),
++        (1179, Token.Punctuation, ':'),
++        (1180, Token.Text, ' '),
++        (1181, Token.Punctuation, '['),
++        (1182, Token.Name.Variable, 'localhost'),
++        (1191, Token.Punctuation, ']'),
++        (1192, Token.Text, '\n'),
++    ]
++
++    unprocessed_text_tokens = list(
++        _get_lexer_by_name('ansible-output').
++        get_tokens_unprocessed(ansible_play_output_example),
++    )
++    assert unprocessed_text_tokens == expected_resulting_text_tokens
diff --git a/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch b/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch
deleted file mode 100644
index d58a13256ac5..000000000000
--- a/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Backported upstream commit 0ddab3516217ac2067b6e980f5b2a6b2ac1be3fa
-
---- a/tests/lexer_test.py
-+++ b/tests/lexer_test.py
-@@ -86,41 +86,41 @@ def test_ansible_output_lexer():
- 
- <span class="k">TASK</span> <span class="p">[</span><span class="l">paused</span><span class="p">]</span> <span class="nv">************************************************************************************************************************************</span>
- <span class="w">Sunday 11 November 2018  20:16:48 +0100 (0:00:00.041)       0:07:59.637 *******</span>
--<span class="gd">--- before</span><span class="w"></span>
--<span class="gi">+++ after</span><span class="w"></span>
--<span class="gu">@@ -1,5 +1,5 @@</span><span class="w"></span>
--<span class="w"> </span>{<span class="w"></span>
--<span class="gd">-  &quot;exists&quot;: false,</span><span class="w"></span>
--<span class="gd">-  &quot;paused&quot;: false,</span><span class="w"></span>
--<span class="gd">-  &quot;running&quot;: false</span><span class="w"></span>
--<span class="gi">+  &quot;exists&quot;: true,</span><span class="w"></span>
--<span class="gi">+  &quot;paused&quot;: true,</span><span class="w"></span>
--<span class="gi">+  &quot;running&quot;: true</span><span class="w"></span>
--<span class="w"> </span>}<span class="w"></span>
-+<span class="gd">--- before</span>
-+<span class="gi">+++ after</span>
-+<span class="gu">@@ -1,5 +1,5 @@</span>
-+<span class="w"> </span>{
-+<span class="gd">-  &quot;exists&quot;: false,</span>
-+<span class="gd">-  &quot;paused&quot;: false,</span>
-+<span class="gd">-  &quot;running&quot;: false</span>
-+<span class="gi">+  &quot;exists&quot;: true,</span>
-+<span class="gi">+  &quot;paused&quot;: true,</span>
-+<span class="gi">+  &quot;running&quot;: true</span>
-+<span class="w"> </span>}
- <span class="w">\ No newline at end of file</span>
- 
- <span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span>
- 
- <span class="k">TASK</span> <span class="p">[</span><span class="l">volumes (more volumes)</span><span class="p">]</span> <span class="nv">********************************************************************************************************************</span>
- <span class="w">Sunday 11 November 2018  20:19:25 +0100 (0:00:00.607)       0:10:36.974 *******</span>
--<span class="gd">--- before</span><span class="w"></span>
--<span class="gi">+++ after</span><span class="w"></span>
--<span class="gu">@@ -1,11 +1,11 @@</span><span class="w"></span>
--<span class="w"> </span>{<span class="w"></span>
--<span class="w"> </span>  &quot;expected_binds&quot;: [<span class="w"></span>
--<span class="gd">-    &quot;/tmp:/tmp:rw&quot;,</span><span class="w"></span>
--<span class="gd">-    &quot;/:/whatever:rw,z&quot;</span><span class="w"></span>
--<span class="gi">+    &quot;/tmp:/somewhereelse:ro,Z&quot;,</span><span class="w"></span>
--<span class="gi">+    &quot;/tmp:/tmp:rw&quot;</span><span class="w"></span>
--<span class="w"> </span>  ],<span class="w"></span>
--<span class="w"> </span>  &quot;expected_volumes&quot;: {<span class="w"></span>
--<span class="gd">-    &quot;/tmp&quot;: {},</span><span class="w"></span>
--<span class="gd">-    &quot;/whatever&quot;: {}</span><span class="w"></span>
--<span class="gi">+    &quot;/somewhereelse&quot;: {},</span><span class="w"></span>
--<span class="gi">+    &quot;/tmp&quot;: {}</span><span class="w"></span>
--<span class="w"> </span>  },<span class="w"></span>
--<span class="w"> </span>  &quot;running&quot;: true<span class="w"></span>
--<span class="w"> </span>}<span class="w"></span>
-+<span class="gd">--- before</span>
-+<span class="gi">+++ after</span>
-+<span class="gu">@@ -1,11 +1,11 @@</span>
-+<span class="w"> </span>{
-+<span class="w"> </span>  &quot;expected_binds&quot;: [
-+<span class="gd">-    &quot;/tmp:/tmp:rw&quot;,</span>
-+<span class="gd">-    &quot;/:/whatever:rw,z&quot;</span>
-+<span class="gi">+    &quot;/tmp:/somewhereelse:ro,Z&quot;,</span>
-+<span class="gi">+    &quot;/tmp:/tmp:rw&quot;</span>
-+<span class="w"> </span>  ],
-+<span class="w"> </span>  &quot;expected_volumes&quot;: {
-+<span class="gd">-    &quot;/tmp&quot;: {},</span>
-+<span class="gd">-    &quot;/whatever&quot;: {}</span>
-+<span class="gi">+    &quot;/somewhereelse&quot;: {},</span>
-+<span class="gi">+    &quot;/tmp&quot;: {}</span>
-+<span class="w"> </span>  },
-+<span class="w"> </span>  &quot;running&quot;: true
-+<span class="w"> </span>}
- <span class="w">\ No newline at end of file</span>
- 
- <span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span>
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index d6a380447207..193c7a14777a 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,3 +1,3 @@
-DIST bareos-22.1.0.tar.gz 14719993 BLAKE2B 38e354d3227d401c69ffb003c83ae90c2067720490af089d529da636bc300e2fb5042451ab439b8b102f6850aeadbe8dedc4311dba13f800eab0bc77d89f809d SHA512 dea64c6eb34a93f1a93eb6b0ac628a75101ac8873e06800a256f226e8f3a556fe39ce4e500246f9c51de30a2b0907732f789c6394f29b7bb9d983a64c709ad2c
-EBUILD bareos-22.1.0.ebuild 503 BLAKE2B 9807827c6793d3ef9c472dede531f4bcdf51bbd72f02b7cd8a41c009a591f599da74e59a7bb2094dd4ab595dd5dea8e48922b24e1f89568f4da51d0ecffb0228 SHA512 d19897753734d92388dc840de256888722e4e1908f42a1cc4c8058bf2859628b740e609d282276f5d5a19930e3a1019a5ce81f6a99f6418c279a804c0ba2c34a
+DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880 SHA512 76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327
+EBUILD bareos-22.1.2.ebuild 503 BLAKE2B 9807827c6793d3ef9c472dede531f4bcdf51bbd72f02b7cd8a41c009a591f599da74e59a7bb2094dd4ab595dd5dea8e48922b24e1f89568f4da51d0ecffb0228 SHA512 d19897753734d92388dc840de256888722e4e1908f42a1cc4c8058bf2859628b740e609d282276f5d5a19930e3a1019a5ce81f6a99f6418c279a804c0ba2c34a
 MISC metadata.xml 329 BLAKE2B 9e0fc3eff1f6e5e0b9529f5264b5e9aac303a2806f6276691728689df3e0f23d866a57e4df9794aa59be1008d736e073c9c854a88edd0c460bc5102a2f098848 SHA512 2325dddc4c62c5f0caba21e0419aea28cb556dd56664eabb2219cf7ea0b1b3177d5e142c6760a95c0a3aba6120f60d37241f6faf01759a00a6f76b12d4332e10
diff --git a/dev-python/bareos/bareos-22.1.0.ebuild b/dev-python/bareos/bareos-22.1.2.ebuild
index 16447ca3586b..16447ca3586b 100644
--- a/dev-python/bareos/bareos-22.1.0.ebuild
+++ b/dev-python/bareos/bareos-22.1.2.ebuild
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index ec6ac1f88265..ae7f544b67b8 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,5 +1,7 @@
 DIST django-filter-23.3.gh.tar.gz 137495 BLAKE2B 70049e744ec87a1dab9680144093684d3d23dd338a9b2d697de302b45e65bcd6f93c03c55ad5386ba1a7187e7ff5d1c43904f19cb17652ef6644b47a0f23101c SHA512 1da3f9bb1988d0b89d25f4101c26f4102d38e4717cdbd8d0cd4ae03a97658bfcc050afd3468ef6d0e33dc6533c7679f1906ddaccba8e7096a4bd570282a93c0a
 DIST django-filter-23.4.gh.tar.gz 137524 BLAKE2B 2ba4697e72f2a211860cd5571e76e4cb2c74a588112ea1570ea53cbb57358b178f9f64f651df471fbc06034ab6713e21e61ad83576adb29e3d758bbba965fa1f SHA512 ee564b3b67e355e6598adcc7b9046e4a3855a0dfd99cf551793c3a5c9797b0d87805b2b78b29f1e20de7e68337e6e1472205908f3b5cf26e36f554345b99cce9
+DIST django-filter-23.5.gh.tar.gz 137866 BLAKE2B 8956441dc4425925ff8a121833fc59552709274a64d880aa5cadbae8063a67891969a712f79c9a5aa03fcd404ed288294e818e9f2e968c4d88761a847e35a3e9 SHA512 5534a4e8538b4ed0b5dbc168a7ba4eb51b0431d22874d1d4613b421ec830f45caed8faa71ecb144ba26704ff842742e8517d1599277b84480c4bf4282c19308c
 EBUILD django-filter-23.3.ebuild 891 BLAKE2B 93b427180ada5db9597dbed36a66240e6162e9919b7f457807d8d32860617bdd035bfd6c029306f180abd0d81f4a608b2bee0a7c1b19bef497f9a9faa03a0af4 SHA512 1c7fdcaa19cbca3806d741a6af79f2bb73586cdbe6bb8d6fb073c96097c03f63c6de584d569b545ba9cd71e3d65cb3f76d8b3f1ff896591469acd39099d44e7f
 EBUILD django-filter-23.4.ebuild 898 BLAKE2B 094cac72496d4aaec9cc70c01526ee772bd7c8f1fad6fde1263da6529b648789350a9d1100cbba90894b02c1185ca93d4b19e8d2d2e09c68d037afde9f0dfb4e SHA512 c6041ed51ceb745d41d52e25b44b16a63bc8769af412f6c3de00b3ae97f66d730f8fa3695ea7e498f3de898fc7a2fa6c250a753b4753bf64d399b748f119e475
+EBUILD django-filter-23.5.ebuild 898 BLAKE2B 094cac72496d4aaec9cc70c01526ee772bd7c8f1fad6fde1263da6529b648789350a9d1100cbba90894b02c1185ca93d4b19e8d2d2e09c68d037afde9f0dfb4e SHA512 c6041ed51ceb745d41d52e25b44b16a63bc8769af412f6c3de00b3ae97f66d730f8fa3695ea7e498f3de898fc7a2fa6c250a753b4753bf64d399b748f119e475
 MISC metadata.xml 408 BLAKE2B 65a69b978d067aa59567504b378b931dddab24cfa11723a8fb1b317cf1ed906120835fe9bdb19d5457e57ab735e114bc3fb021a7defa4d895c2a80825430a818 SHA512 1e04d4fb02d1818913f7b5ee2e81be3df339c1b0a942ad0c0ae867e168350b8dc0aeac8fd6c31b701b4f6e743a90dccc70ea9b0a47e8add1a675435b4997506e
diff --git a/dev-python/django-filter/django-filter-23.5.ebuild b/dev-python/django-filter/django-filter-23.5.ebuild
new file mode 100644
index 000000000000..fac2db6651c4
--- /dev/null
+++ b/dev-python/django-filter/django-filter-23.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
+HOMEPAGE="
+	https://github.com/carltongibson/django-filter/
+	https://pypi.org/project/django-filter/
+"
+SRC_URI="
+	https://github.com/carltongibson/django-filter/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/djangorestframework[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		!!dev-python/coreapi
+	)
+"
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	"${EPYTHON}" -m django test -v 2 || die
+}
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 46b1a665d3df..6379adc497ee 100644
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,3 +1,5 @@
 DIST django-tables2-2.6.0.gh.tar.gz 431368 BLAKE2B 56896a416599e6f4293202ca945bf808c99ce08c4b5f53848919c3a32590e18d867e694fe7c989fdb855a5cdaf94350199c65735078c0d312d1f4f0a556ed9ae SHA512 29cabb777ed102dfde4d24836c5952bf892c7c8e3c5e5f608e00fd1aa4eecc33c6a2b1be1fd07617b354d7de34215d501592c53033d6f48c29e89ab68fdcb22d
+DIST django-tables2-2.7.0.gh.tar.gz 431811 BLAKE2B 2a6a9d74fa50bab049b9b85fc4a2d39b5a54b0fbbcd51f86f2b196e51bd1a1ef36ccc032db13f7cde4f836419a2d92248571b4fb985a8aefb3be2bb740856a2b SHA512 9666dad152d995ef7772881ace4bb83fc41aca1675e0cc116791e4fbfb970de600bd8cc2310b5694558b11e479dea2fc84584a669f6a8127a4bb0a354d24e39a
 EBUILD django-tables2-2.6.0.ebuild 995 BLAKE2B 1c1218885608e09be056fecd06400b0f34946854070458922904865e154bb761d0a1c5a7b2f152c5ea04f1078a2f7273b0f43e25633ca99738e0ced86439a3ae SHA512 80ecc9bfc9b2bd22635db22368280285efc7bd3d731126c2407d8d876bb78834d97a2c03a0acce958aa248edeed52f869b4312068d35927b1a806d9a30d6d849
+EBUILD django-tables2-2.7.0.ebuild 995 BLAKE2B 1c1218885608e09be056fecd06400b0f34946854070458922904865e154bb761d0a1c5a7b2f152c5ea04f1078a2f7273b0f43e25633ca99738e0ced86439a3ae SHA512 80ecc9bfc9b2bd22635db22368280285efc7bd3d731126c2407d8d876bb78834d97a2c03a0acce958aa248edeed52f869b4312068d35927b1a806d9a30d6d849
 MISC metadata.xml 416 BLAKE2B f63a86611d3d5805c63f14c75851d6283f12777fce462a796c205ca4141fd5d5a321a7173f2b8bda70d67a3db5935864ca632e6858757626ed632fe3ec6874fb SHA512 1cf202a6a5fcbe86157ba8bf71f5c0c8df2c4393dcc955b2ad37e4f2164a33e241287bed237116df298e6a062a861ec99f3326d13f8f5845891556eb36d9bbf3
diff --git a/dev-python/django-tables2/django-tables2-2.7.0.ebuild b/dev-python/django-tables2/django-tables2-2.7.0.ebuild
new file mode 100644
index 000000000000..455addd05950
--- /dev/null
+++ b/dev-python/django-tables2/django-tables2-2.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Table/data-grid framework for Django"
+HOMEPAGE="
+	https://pypi.org/project/django-tables2/
+	https://github.com/jieter/django-tables2/
+"
+SRC_URI="
+	https://github.com/jieter/django-tables2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/django-filter[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# these tests require tablib
+	rm tests/test_export.py tests/test_templatetags.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" manage.py test -v 2 tests || die
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index cef0b1e97c9e..f26311412a2c 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -11,8 +11,11 @@ DIST Django-4.2.6.checksum.txt 2572 BLAKE2B 1bdd9b4a11e80bcbb7c857c25bd9666b1a14
 DIST Django-4.2.6.tar.gz 10407018 BLAKE2B d2d365d234aecd730bcffd64cdfaee283933779be339d1baa75cf490fe7477248feb079c8716f3c8dc570c54bf6af94ce9864908f1efdbf69e5b6e9369126cf7 SHA512 bfd36ae6f7c4393bad45e97d6d43b370fb37d7e21cd115a6f6b730bb38ad11c6ccdcef94d5ddcd09e8eb9107a51ff486ec79b39cf3f4250d0ae1af000820cd82
 DIST Django-4.2.8.checksum.txt 2553 BLAKE2B 552fd9dc6740baabc434a4d069c0a22c49e36661da58face4853c8ca5f34254314a3ca85048d5a4786a9a15ed27c8f73016c9a3d7bcf63dc617373e243a3ee77 SHA512 e3808f5d28fb95aa6ebbcc393161cc69cb948ab4ebe0dcc7a4f6ca8964e4a3dacf4aa185688d21b5d176456621f609e95909cbbc4abe6528f72afe3b644b5ea3
 DIST Django-4.2.8.tar.gz 10425581 BLAKE2B e3592dadb54a616cea6129ba45f27e1c93dda2fcffec8c827e2f74a46c6c953a6c2893f236eff64dc77106ee60246eb843e028d44ebf27b8e30da1a6f766315f SHA512 9a60d2202886656a239e764c79b3638d4bc9e549bba8a822b36c745ab32468e3ddd813e7cda4a9e69c867ede0fca02da63391a2efe1462798e5c2e4f35625b63
+DIST Django-5.0.checksum.txt 2553 BLAKE2B 93202aa273f62a828b05ae9b34e7e96dd74ef5b852a94953fbd24e9a609609bf23fa73eaa005d4c9da48dba508bf2efe6a21e91096fee90b1f6811c0af6d4843 SHA512 eb44a3a4128188fd4dd90c6e7b0202652c64db8572daa72e617cf0464b2278cc7839562b880158264bbebc24efe871c3b376c3c134a5c7033292f2b765d6f3b0
+DIST Django-5.0.tar.gz 10585390 BLAKE2B 50cc715e21b046292dd86c08801b6f182c8e71a36c73de657ca631b611738e196ab6d4fa035589c26fff952170fb92e0a752a8af15771c33107e343b01d7b4d7 SHA512 d0591eb109cecffd330138ef63c7f768a77b6763ce73a5bc656d892181613981094221e2f77d5888ba4679b581df21ec8e6ac5faa67d31d00d289f4d892caf2f
 EBUILD django-3.2.22.ebuild 3017 BLAKE2B e16c0f15ab99d5d3636aac0d2e507fd52d4709b043607b929e2ff0560a4783784a1e9253ac0f73f06ce94d8cb9c35e9e986195af83c9e2ea1b893243d0578ced SHA512 03122f56b4be788d1031a4b01d6fa18bda1515fc88454ea76629325cd65c8d1abaafb02d37be1e7bec149bb28a33f69e866f7ff86a2179d7ab6923d8eca893b9
 EBUILD django-4.1.12.ebuild 2640 BLAKE2B 6a2b9d1f80a7a16c6b892c6cb1c242668aa3d300037662be339e2112a7ef57beb698e7887ec75d6ae480cad09efceb598b2d37d1caf6f63b06d093f861a63e8d SHA512 e4628c3bd55bddbb36d0f5364a3fada8a42547fe87eee76c076014b61e714214fee9534cb29ddb00ade89a606622f684749195165ac09e15640bbe4bc96d08c2
 EBUILD django-4.2.6.ebuild 2681 BLAKE2B 74a8e4a4837d861df4d6faec7f50a24d15a24c29d39b3a8113532ef0c32b40c42bb718e898dfa5f54d8ebb41b4005ff9d5d4328fce67791ebaabca04e4bf2942 SHA512 0a51bed47ab789244e136136dcaa4508ad96eb2a4cc0816ed59b93d6d6d0ba85f8e8bcb24e818c3ef5ddea4203a2b972c1963410c48a23898e4b99af245f5d0f
 EBUILD django-4.2.8.ebuild 2712 BLAKE2B 022208c7b43334476198cff762b0ead9e3b25d168a7823f811bc329a4d7ff3442390039950bb859f266018533170051835dd23c07855b31cdb461e4d281ea8fc SHA512 fcebe851b00406a3936de9cff4c58417b98526e8bc119ebf27df35e67dc32181163487df30155f4e5d7e66352773a8476b3bb644de3b89db6d75d836abf18b76
+EBUILD django-5.0.ebuild 2703 BLAKE2B b3aa0ea21eb054c2827291a08e40561a56c06074969731c03d1ed362f01d34083932408a5dc129e1e8178d2608dec74ba69932d7bbc2c32111cb236dcc98b71d SHA512 701c493e6770f5f1de51bb2c4fb9aa3ea1b2a844372e558e1d4507608950a653393ca398879e7bfefe3da534d3cd0b6afe9aac38fd6525867a1f37f7985f6488
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-5.0.ebuild b/dev-python/django/django-5.0.ebuild
new file mode 100644
index 000000000000..7f0fe1f8b245
--- /dev/null
+++ b/dev-python/django/django-5.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2.11.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/selenium-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/tblib-1.5.0[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20230606 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/django-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
+		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+}
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 22126a7b208b..f6d550668481 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,3 +1,5 @@
+DIST h5py-3.10.0-cython3.patch.xz 3868 BLAKE2B 3c0d952bdca5307ebf0bf878c26b94d0593bb89ac538a51017fb94e1e488bffc1583dcf4e713005b87d1b5e20d7b73043b24d65404faf60fb69515e598ca2133 SHA512 a0a0e3d1a9bccad1c89aa7efe3ba1e080eb70cae1f42f8de1021c212817970eaaa7070131e8e39859eea3c18d6c1243a17e7f53f2179f34ff6c406b315bab8fa
 DIST h5py-3.10.0.tar.gz 403716 BLAKE2B a8e4351a15aee5fe9d23f9c5f9b6ff44e688a391ba17e27338675bde60415c73e3cd97a4a0c05490df849f649d626450d3dbecc9ae6ea3d24d784a0a4aaa1850 SHA512 840d7f2b9b9d5e22e8edae21c84884abec64acdd6c36437a4921ce9dc1b343c55f66f72b699146d71fe55688f6f948787b62335a24906288e9565b2b19b24b01
+EBUILD h5py-3.10.0-r1.ebuild 1431 BLAKE2B 6b8ffbb3bbd097e6e5492904c7c3f80226d813a35a049a3a3891d5b95cb55dd5f246d37617f6f03f32116ab31720c057442fbb7b8d7d7bd929caaf1f81c2ad76 SHA512 63739840043eb9ca8c5e4b8df071360465cf44bf144405c31bbb32abab8971e96899fe1d2c0b4b89a694e582c0de5521cf992640481e60038d937bb4ec47963d
 EBUILD h5py-3.10.0.ebuild 1489 BLAKE2B 3590f05ab032240df42a54ee39c6ee5edf1632a6f3c659bfe4db27a3edcf8d5ef9d64e52860318498b34cd6c7be8a382e6ddc047305e61dd317b63bcfe6d7b95 SHA512 0cbd679e6d3aaad32f7cda5d958f0be2da85cfaa69862cc3bcda3b13e111fdbc1b78807be6e5dbdf22e794bf5bed31df355d865cafb618935e3a58573b417488
 MISC metadata.xml 1069 BLAKE2B 0f3ef8e7af7f4bb493824427a238588c019c04c28fe8a4b9c0b9af1c986158eb3dae3b7d7937713cc4c87374ef80686603ccdbae2baff5b1150d814ab108d973 SHA512 47a6074e383cc922234ebb9f67aaa5863421eaeb2003444587bb8499b3bf845da93ac8d8d267717bea01300691df10f67c9389248fbe228afe07c17fba3a64f3
diff --git a/dev-python/h5py/h5py-3.10.0-r1.ebuild b/dev-python/h5py/h5py-3.10.0-r1.ebuild
new file mode 100644
index 000000000000..88aeec5dd302
--- /dev/null
+++ b/dev-python/h5py/h5py-3.10.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 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..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="
+	https://www.h5py.org/
+	https://github.com/h5py/h5py/
+	https://pypi.org/project/h5py/
+"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.10.0-cython3.patch.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="
+	>=sci-libs/hdf5-1.10.4:=[hl(+)]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/numpy-1.17.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	>=dev-python/cython-0.29.31[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	test? (
+		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-3.10.0-cython3.patch
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_prepare_all() {
+	# avoid pytest-mpi dep, we do not use mpi anyway
+	sed -i -e 's:pytest-mpi::' pytest.ini || die
+	distutils-r1_python_prepare_all
+
+	export H5PY_SETUP_REQUIRES=0
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest -m "not mpi"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pipx/Manifest b/dev-python/pipx/Manifest
index 40569365e5a5..059e899ee6ab 100644
--- a/dev-python/pipx/Manifest
+++ b/dev-python/pipx/Manifest
@@ -1,7 +1,9 @@
 DIST pipx-1.2.1.gh.tar.gz 405585 BLAKE2B ca24ffd9fe3657549d149aa6e24f85ef2d7ae0832f94605a0a52ecd255232c3bd1b553e61be805bd80c9d54586a4e6e9e156db17c5bb901e24069828f0716594 SHA512 93a0d67de9540584987be126d4e28a2628beefba99e15936369c948dc29fb7f11745413ef3f0ace5586b4456ed8554103bcd5079079bc0a34babc02823f7f9d3
 DIST pipx-1.3.1.gh.tar.gz 418883 BLAKE2B f9c0ee11eb1e92efb4fc1600d56383ff838b3d97200a4baef32d1221e05c65aeb9d9cc48477dbdf85cb596f44423fb746abd97be2861724ca0de433aa6794d68 SHA512 9ee91efa142f72fbe962d05a21ad3bfcef4d401a20078863bb65a932b3598efff95cd707ec27cca1d4c82f3396270c7162d4cb1407ad1d40b2e477aa0b3c02fc
 DIST pipx-1.3.2.gh.tar.gz 411632 BLAKE2B d7a84a7b23f937e1b00340a7acd76e8d90c54de8955233e6aed8f95aa4b8ee613b1120fbda5a02ffdb63fe11e7efed6e0fdbca7bcb9de42476e78b9af4144b34 SHA512 a0a21c22a867b7bae3d6aceb68e1c5ee404ad794211c7f9014223d510250953b80a5fb525a11a422ae54ee9b0ede81220fa1e145f91b934bf000185a50b613f7
+DIST pipx-1.3.3.gh.tar.gz 355893 BLAKE2B f2ae8847d4c6f2205fe75a47df04afb49d57cc8f717cc615d5201f54bd2dee2940bc095a778496cd7baf048df8db8e74ca7ff5a7ee3b2024bf37f27bbeb425eb SHA512 42246a0d8275beee16b85a1007d46d328a892beb89e79fb406ba53942a57b7312d34150376835395b9eca3ecb68db71f0c3c470fd92519dd9175311003707a3d
 EBUILD pipx-1.2.1.ebuild 761 BLAKE2B 77a442dcdd60a2c67703781be480f06322dce9e493361ece2386d2eb65195df26136f55bfca4e636f2bf0cad189ee4ac00fa1bda821cdc7278224f18eec1683d SHA512 0ba7216868328f440187b2e416b1e0da55434696bd38952384ff88e69d1b006dc6ef5472df9ae353212cac5b64e67f968c5cc8b388b0519bda9c8bdd87b02478
 EBUILD pipx-1.3.1.ebuild 887 BLAKE2B 71463764881cded1969281047594f5f9a67f1aa871c483cca356105694b860ede4be999860c0ab389e2e8bedccd39b5634e92f228bc59ac8c761e5be276b5511 SHA512 7a4aaeb88e9ae035e900e10bc08e9fa637652188434f22e4654f21ef56e3e11d3ad73e9fbaac265b92aef6c017584af57d749f7d4c5ca1fd4bedd256c18d2175
 EBUILD pipx-1.3.2.ebuild 984 BLAKE2B 2f5b2e41fee253ea94bc6fe5edea25d55f2d6d7bb6fa6b47b66171419ebf2fbeb192dfd1d3a529826bdcf197221f6a25cad58ec3e003a1c51f5cf5b1eb11f04a SHA512 51728541c740ccf4a948b2a095a9d5b63af31fac593882bb54dfedcd00493ab01adac649800b3ca915ed31fac4eb9e4435227a78445e7a106fa2ce142a656def
+EBUILD pipx-1.3.3.ebuild 1015 BLAKE2B f485027bfea36ae7437318770b311a066fc733c02e1def5e131cfcc49d54663e7cb08acaef41c44b51d3c48e01595d257b991a1457fb001cd2465ec894557438 SHA512 0ba78cc0064af06a5eb9251307badd83191d0c34db2417ba0e32167ef64e2c564abf489b4e7f0b3de4bf6ac93343862e689092a8d491cefc969c96a018d94716
 MISC metadata.xml 361 BLAKE2B 64a1d56c1c20595adff59c8df102b6301c8d8eb9ff7c4c2a9e326d0c144d1cbf10a1dd2c61b64eb3ffc757955e689cecbe5c69528d59e9b79007150a9327a74b SHA512 edb195766bc66572ead0b5913a26be82df533cfea7d22d4aadc90c2644c22e458e34f227092a556bc644de35f6e64184b3683ea9015ae6d9126dffe47340d8b0
diff --git a/dev-python/pipx/pipx-1.3.3.ebuild b/dev-python/pipx/pipx-1.3.3.ebuild
new file mode 100644
index 000000000000..ff6c65c37339
--- /dev/null
+++ b/dev-python/pipx/pipx-1.3.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Install and Run Python Applications in Isolated Environments"
+HOMEPAGE="
+	https://pipx.pypa.io/stable/
+	https://pypi.org/project/pipx/
+	https://github.com/pypa/pipx/
+"
+# no tests in sdist
+SRC_URI="
+	https://github.com/pypa/pipx/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+	>=dev-python/userpath-1.9.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	epytest --net-pypiserver
+}
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 5750f4f1e239..e98a46417511 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-glanceclient-4.4.0.tar.gz 205612 BLAKE2B 8a1e31eb8dbefe4b08e945377bb190264332cd01066b96ec061e8839a45294ed6cf5ab08fd89d97b57bc072987ce04d19f94a887d5e8eaa10760d996058122bf SHA512 31d2994fef3298f790a3ec268b26d432602a6b73265277e961ff2b47df2a84028253da8b2090193e1e65c55ab6e4b40413a16d01a653b90cae926545ea4097ae
-EBUILD python-glanceclient-4.4.0-r1.ebuild 1405 BLAKE2B e09e8c69435353d6cbc23340670e42e00204761783e5b8b93136d81db5d69279f78939d27c1a47ba38f3a4ce1902fd7ff67f9874da3568c2ce9866700653c83f SHA512 5ff0ef8e43ae9dd78d3bcd7dfcc66e1342897c9f13b6d02e8563c14f88dd3c9c751bf8d03d34558f22c1c2ffd547da00a1812fdf9ccf101bf885a0634349e807
+EBUILD python-glanceclient-4.4.0-r1.ebuild 1447 BLAKE2B 40c40c23b254d7a10f601302f303e116ebb1e11fe3a2dae611f618b3e7fc3f87a44e7696b3a2f759dbcef55247db40619bb0c6898936a18d2ded3e33da6d4b66 SHA512 42efacf1d4b5cee415f527472033c4f89d6e274523ea82b08f8db4e088f50e97b91bc0c80277807cb619ee89673582eb98ceb3b84c8260e7366252502fd3ab5c
 MISC metadata.xml 663 BLAKE2B 642540f3f4d577797725731f2374b5801ec2d4ad799ee4ccfaa4e29d955bd93a8ade0e6c9ec7712ee27d9f1f93186854472d301016a732020575b8f7bc1c5138 SHA512 fa9b88dce5a10824dd0d6987698587666343c95d8b6c607e466f14883c34fb0ebc846b683ae7d8bb65efe88007e6db0d2b1b41ba389c3b656a24f1839d03d9e2
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.4.0-r1.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.4.0-r1.ebuild
index 232d8a4bb350..3c609ea792f3 100644
--- a/dev-python/python-glanceclient/python-glanceclient-4.4.0-r1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-4.4.0-r1.ebuild
@@ -40,6 +40,7 @@ BDEPEND="
 		dev-python/tempest[${PYTHON_USEDEP}]
 		dev-python/testscenarios[${PYTHON_USEDEP}]
 		dev-python/testtools[${PYTHON_USEDEP}]
+		<dev-python/urllib3-2[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 87ef6fc6096f..bd85d89071d9 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-ironicclient-5.4.0.tar.gz 228187 BLAKE2B 1ce5f17fbbc752d0b8589abbc1207b8cde8c8d11a9ea6394b726313e3c5bdaf415536e606fb052cb130a0bd264dbd125048ceab5368a1c64915d3e52473017c0 SHA512 dccbbdeddd3f0cd087b6589e120de375e7c8bb33a67ac8a51b1f62e7a66307b19c508cc1a568346136129bb52cfdd0af00d70af8b0d50b2bd634d89a75db0378
-EBUILD python-ironicclient-5.4.0.ebuild 1542 BLAKE2B dd21564930d17615880cdec3b8cffb50e7abe0338285898e3c8434dae64fe5cd56dc53a76c03f755ad1353919b02c5092d23aafae235e70724ed66639fa0d16f SHA512 b43dc9fdeff4159c57fb4a3ac68de83536109bdc76864f1130adb1166b521e92223cefb2c99bbb64bb7b96d8a6d80fbf1d0cabd6cbe2e1956f0cda16f0eef025
+EBUILD python-ironicclient-5.4.0.ebuild 1541 BLAKE2B 5079ba6d697a15ed11d4fd31f6b456d02860a3ebee8686b8a572e15fba43c2efc73b880afc1a074c8ca2543780f28b3a38e393aba4ad0bcaa50e18664861779e SHA512 b964c1b7b275f5fab9096c8b4e446d4d97cfc4af950569af1b2575f41e27390471550fe53316e514d58700226cdc74f7f4ceef536cdbf6a606e5c7b2f301e19d
 MISC metadata.xml 531 BLAKE2B 0dc9961528a2fda61466eace2d8069b75dbb362b32d5adc3f50dd8b6c9daf5bb2690bc145e30d96807cb063c450e98824d783d566c2db96f036cc227f025dbc4 SHA512 99b57932cfbc2fc5e6607b167991964c17376504f07e7d3741900940d512a40a9c5dda73c0f87cc9b3718159d7aced0360831ef9c11ba063d11febda0786f943
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.4.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.4.0.ebuild
index b21b2c7b54e1..12b7daa74908 100644
--- a/dev-python/python-ironicclient/python-ironicclient-5.4.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-5.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index a8afe3cd96bb..c977ce6ba2d7 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-neutronclient-11.0.0.tar.gz 206846 BLAKE2B e7ba4db5763a9310aa393e01d8561e9cfe85dfe584942de70a1b2254ccd8d5a79f6ffe5dc195fc3ef6f338c49686f8460b81111f6d4118315af38d7eea6f8c1c SHA512 3732892db34287343bc7015aa0be426e61f7a111e8a69c529f9baac0b6abbba09232d2d73e255dc82a816a1e9ff70237097c6269a287910a034787af58a730a1
 DIST python-neutronclient-11.1.0.tar.gz 210626 BLAKE2B c9b3328a57fb05a6bd4058b3a96a1a346caea08110724cc5d7d3855d08140bb2baeb3f133464aa02d74a6ed18e3b7f174560766134d15aa681fea68b169c7b2c SHA512 04f81f0dffc085a16ffca76d16c4de7b9c0a686053e45aacbedfb94902651c20dd34c6ccc29b15bb8e8836df5124e466d5f1bea94a82dc06d194fa6c2df62734
-EBUILD python-neutronclient-11.0.0.ebuild 2435 BLAKE2B 11f1cf4ae334f0a2446650ab3e494466b5c74f1e43813ff65e33fea427910e757712611d90d6353fe3342c52fe394c7c487993965a6b7c851f150d51086074be SHA512 605cdfa0bc912a31b9ae7ab759a139f63b63055bfc4aa633dc17292bf5a00586b88922831124b0b0f16c23cdabee553a8b218976a54009f33074aba12feb3f01
+EBUILD python-neutronclient-11.0.0.ebuild 2434 BLAKE2B d284ad407c86782e25bd458f43085ff05dae3a540591b0ff7f3503d27a5ab14949a0566387676b64248b5cdea21464b3263713532f1506ceb2a6d622e0131e76 SHA512 810b3c20d9a5436b27f623e2a557417162d9b6b468b87cf3d3f6495f2b4972c41ac27fac91467847b9031eefad9990103cbfd83355477fd269996e26ae495623
 EBUILD python-neutronclient-11.1.0.ebuild 2388 BLAKE2B ac2db8f7681ea0f0c721f2deaba92471623c35cdd2090a00d3e36000939893c3c92d9b53e7249273e0183a24d7f172b9c575820e709fd61fc4c7b190591b7459 SHA512 0683696aecfb438939f70baede019a4ddb6fee6e0895a742394dbe7a2408b2e1e2cdb31708d695a98077ea02c8fa9c551a2e7c34cd2497dd96ebbea3cac8d19c
 MISC metadata.xml 717 BLAKE2B 75f33edaa71a10416b2b714a8cf11293977a15c6f2480b1606836d2dff0a5833e0ae10080acc5da0d665b466b6487f01e9bb911b4099f68c45bd0509eec811ed SHA512 39e07805e8c08291ddee7b569f092bfd2c2b7bad520bb076d724427e939b3e33b0a83007fce2f43a075fb53606bb611bdf2dd56cb5ddf0dcc7a26ad71f086cea
diff --git a/dev-python/python-neutronclient/python-neutronclient-11.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-11.0.0.ebuild
index 682f17ae021f..b5b4d462477c 100644
--- a/dev-python/python-neutronclient/python-neutronclient-11.0.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-11.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 585d999c7aa7..22a3a4c5b705 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-novaclient-18.4.0.tar.gz 339338 BLAKE2B 6a0c47d8d7aec338986d5928d29a736020a08ccbd3df3bbaeda77dd18de8fb78d51da9586065bf25bd620f224462cbcaf421dcb28c649e1a4ee92911a9f12a9a SHA512 767d53c3fa3b312b2210dcdbe8895baefa167c00041fe6b228a30099c892b17ed4339477894a81d314b746da5c2a772a07e7a887eb807a31ef7bbdbea621c40f
-EBUILD python-novaclient-18.4.0.ebuild 1913 BLAKE2B 0baf56da1443d4faa663528aaa99855ac76094ed2a3ba031d0b40655efbe1e36de48dcbccf13becbbbdad295e9ccb42ac5356ff4fcb90d03eecbf3ed3b60b713 SHA512 a7bc7cefe6ecbf78683142ac67f4e38c069ff2883477be0e8981510e9d75b30b6156fb4ef8427db1b9be7b58de4b8c9fb78923c4fd084e4ff27737614b4474fa
+EBUILD python-novaclient-18.4.0.ebuild 1912 BLAKE2B 2b20f48f6ecc1166814b970c7dfed23bc33982c256e9d8f6fd1e57393b611edeca988f8ba067d96283f3f2c1c27925eeb282d141535516827dff8ccbff53e49f SHA512 8dd054f515c09150b0a32955c4975752c1c0b50d75c598d2ff058815ba5314f8ac387f902482a313f09695ce9e10f56a633485d27e14d7968c7156dc66e36c04
 MISC metadata.xml 893 BLAKE2B 42037d5052de72a81e2aac430fd14d107a0fa723c4288cd7f599bef817975ecc6b1dfc82b754ace2a50e4f9e0f5870cc6a43a3f0722d7647a38322e6cfde7eb8 SHA512 f89bf49eddaa5803ab953abc2dac189252095e529071cbd6412c15885e0a890a8e73a71295d3c3f9ebfb16bfe321316693c104d330037d112d03e04eadbf5a4d
diff --git a/dev-python/python-novaclient/python-novaclient-18.4.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.4.0.ebuild
index c0bdeab07522..59eb53a3ed9d 100644
--- a/dev-python/python-novaclient/python-novaclient-18.4.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-18.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index c15f80c10f56..79606edd5dff 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,4 +1,4 @@
 AUX python-openstackclient-6.3.0-test.patch 9399 BLAKE2B f4f599e28f6408137d2bbf47cd8eee46042235e4ef83fb38502ae4198ea19c2aad8014f8bbff1dd396e200ef0c9900e781fa4e27f9e9dc19efe0cab0407db0a3 SHA512 2a8f243eb19cdb83fd8585d9520efd0e4cbafac1cded158c3674d176a0d9499f652f1ba5bb80ce679fb293cc282f897e2ba524aca96ecfc2727cb99b2ce193e1
 DIST python-openstackclient-6.3.0.tar.gz 899811 BLAKE2B 9dd1b174d23f4bfe0f4e54e1e72fc92f28989b7007981132ab3d60050e1c7c19be820388c9453e004f0847ad67c1bf6eadfccd26fd391e5c1b6c62185e2132c9 SHA512 da03e92208ec82920bb3fae3be0c3ecb834f3046cf709cff626a2336ca875976bcc72a41593bfee28b988ab5e89e49dbfc466362ab6200f90c91f949ce1feb06
-EBUILD python-openstackclient-6.3.0.ebuild 1929 BLAKE2B 68d225193fb3777c040c6f0dda877b220ab56372929e03ecb1916434b1c9c628fc050618c6e00e52d5e8be383c85d9f97053fbfdcad9f8d24f465b55909c1baf SHA512 e008ecc63afdf08bf161a2e9d6a2adfae0f762df40c8ef23882e8d7711bfb358379136013f73cb64e38c9af1501970894c6bf6c05960fac7b46ef97fb7c43baa
+EBUILD python-openstackclient-6.3.0.ebuild 1928 BLAKE2B 0e266403ff3526e7830ddeca36a0ea4a20acccf12b76c61725ab010af786b48c96f18681d8a4d97b9c86cef0ec0f09da21b8f74bb6122ed3c7830996cbaa97e6 SHA512 b711657cf2fcf5fd2d8b170b50f6c539d5cd4a8893853da92df0fcf2e9d0a57d68846952fdb103f0765b67aaf2104842cadefb8de900c379340e677ec45ff0c2
 MISC metadata.xml 562 BLAKE2B e4f7a3fccc9c2c798962efb6dda973ad71c19e5db8efd57869b6a8cd565784d5f4a6c581bf11a28eed826bb8c3451b5938e43974b91291609d177050fc654603 SHA512 3fdb3a9300dcaa310ec02266127a998ac4587fa9fde5e381342a5c18d0435442dfdafd0b326730e1cee26f72b43fccb6a15df7d5d1fd8f5a9bb3783983b0dcca
diff --git a/dev-python/python-openstackclient/python-openstackclient-6.3.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-6.3.0.ebuild
index a331211dd91a..54d89bca4085 100644
--- a/dev-python/python-openstackclient/python-openstackclient-6.3.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-6.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pywlroots/Manifest b/dev-python/pywlroots/Manifest
index 82ef6a0f6cd6..622c61df5c6a 100644
--- a/dev-python/pywlroots/Manifest
+++ b/dev-python/pywlroots/Manifest
@@ -2,5 +2,5 @@ AUX pywlroots-0.15.24-no-import-version-check.patch 592 BLAKE2B 24ef9a82a3a7c62e
 DIST pywlroots-0.15.24.gh.tar.gz 85570 BLAKE2B 0c7ba0be6159152488785298028bb1feec20e2380357060a850dab417b3fb1fccb4a9e6cc6564d2b7f124bf4fc454789549267e9036b0b4559e5fcd4c6f06196 SHA512 b29b76cf18a65b2ef19d15ecf018a9ba44119d60ee61435967d17f06d5f7544d2117f2e9a81574734c71591a237b00c8584a5cc6d6adb928f39f11170f21ee94
 DIST pywlroots-0.16.6.tar.gz 91625 BLAKE2B d8784add8266958745fb9d9ca25d47b3bd52957cef22a70b30b051aa53996a8b870d436a44c75f8a16fd7346b7ff2c00a70eb86b376294f3928ecd8807b6646e SHA512 31588ebccbd269e45374cd42067738c23bd76ea8a0304d17aff9da33c7686a5fb9c83a676575f0ad034afd2827cb8bea7eb9334e96badcc83ffede56fbf75a1b
 EBUILD pywlroots-0.15.24-r2.ebuild 1003 BLAKE2B 19a6ce2c6c9fff501e2a4274ac1254d6cf22b693b1451c7e3e61d09f4d8ff1b93b98ef6242c683e4f48527b0d022f971bcb3b016541ad7a352c28c3cd8bf9060 SHA512 83343df9d58b79b6abd76d9706ddfd236eae1a05bb975dcfdf0561371f43687f3c34c9c194ebb8a363e005ea9c54ce84d12f70893f80d1593741425ecca81c21
-EBUILD pywlroots-0.16.6-r1.ebuild 838 BLAKE2B a2004cac7955f7c2c072868523c9ca39cb74ef418642cb8c32f4f4149ff224f970ed8993fd5bd131120a752266f58e1ce07231b09c06857aaa0dbd03ae846a92 SHA512 7a1368f44e858526236265da93eacf3f3e05e96438c61ac62760cb4529a533e956ae45e89402ff6b6ef4db5f990909db76c1067a6d013b6e20d75fddfd6c8ba1
+EBUILD pywlroots-0.16.6-r2.ebuild 1201 BLAKE2B 01ffa126ca8a48b653b9218bbd680fcb56d052c61ef960bf82895ce3f2a135aea9f21a439cb50ff1d5f0c48d3794c3d1b25bd066cb553d14285f257653c80509 SHA512 2543ef20f1882f6246b866f4894e7f3604cfd3de9a9573aaf06523181563a4c3156096f21b7b99c32810e7c32b7b63625ea35db45ef7be9a18a7a1ed14292b81
 MISC metadata.xml 351 BLAKE2B 8c8ef3ef1d58928c0a15fcd756e4d1c94b2793626c9b4e9cbeb31443119cb47fa4975063547065cbc6e06f327ec7d36beb5e74973fd3d372ad4f7feeac3410ea SHA512 b4840e4149647c29e358b64d3de99a0f2b148a4d7d123d7ef7df67cf918a3f599d3e199ed7ef4d0d39bf8ccc8e4630058db4ae3a2260119ce1c5d255bf2dd9c8
diff --git a/dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild b/dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild
index e5ef19dd6278..bc058a1c6aff 100644
--- a/dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild
+++ b/dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild
@@ -18,25 +18,37 @@ HOMEPAGE="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~riscv ~x86"
+IUSE="X"
 
 # See README for wlroots dep
 DEPEND="
 	dev-python/cffi:=[${PYTHON_USEDEP}]
 	>=dev-python/pywayland-0.4.14[${PYTHON_USEDEP}]
 	>=dev-python/xkbcommon-0.2[${PYTHON_USEDEP}]
-	=gui-libs/wlroots-$(ver_cut 1-2)*:=
-	x11-base/xwayland
+	=gui-libs/wlroots-$(ver_cut 1-2)*:=[X?]
 "
 RDEPEND="
 	${DEPEND}
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.24-no-import-version-check.patch
-)
-
 distutils_enable_tests pytest
 
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-0.15.24-no-import-version-check.patch
+	)
+
+	# override automagic detection and caching that's completely broken
+	# by design; https://github.com/flacjacket/pywlroots/issues/132
+	cat > wlroots/_build.py <<-EOF || die
+		has_xwayland = $(usex X True False)
+	EOF
+	sed -e "s:return.*has_xwayland$:return $(usex X True False):" \
+		-i wlroots/ffi_build.py || die
+
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	rm -rf wlroots || die
 	epytest
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 2b0931b12080..b91a82df255a 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,4 +1,6 @@
 AUX pyzmq-23.2.0-libdir.patch 510 BLAKE2B cb7884416d3e15f735412d69a7ae0decbbf8eca14ae909b23e68231a65b3ad36d021b5c6f5315a3cb982cd571913ce021cc5df60509d90b28d4353dd7bd316e8 SHA512 f268d03de45971d50a89210366b4aef0e79e652a45d650fc3e4a6711558ee186ee558a2808b7c9f5c5a64ce8b9282adf024ab21a782ba614900a4813e8b6d6ca
 DIST pyzmq-25.1.1.gh.tar.gz 389825 BLAKE2B d8e231a0eeaa6a7ad372da912cb42e96e4d862e163859b97d1c369a7940e019c074fc717685f53da06de69cfee79430e343fcd1987d768f3cc99ec75cad0955b SHA512 4aa0d5d5c1036e6ac35898c48d9612f677ee6e9345fafd02091ba81a5081f1ac8bf552eb5c03636ad643cc87e17f037013ec981d9b852c0252d30de8ce046d5a
+DIST pyzmq-25.1.2.gh.tar.gz 391272 BLAKE2B 80814704e7ea08d407859c1d71338f6ea283efcd1f3994155334aa5b60c4b6cd89167de8c78d19f8efdbeb5f4071f7b5954ea911eb6e7fbb48a0087b86579cab SHA512 b146a6dbce7cbbe2eb1da7ebd64e463067354f1566cdb4ff634b59bbb6d65e16263b6acb2d101a4ea53f870be5c753c9a12f9cc37bc5a81236681ea4fda6c56b
 EBUILD pyzmq-25.1.1.ebuild 2307 BLAKE2B 518a210ee7f2b29debae65a154c954e299e433a490808aac7169b5955341db1b371949f3a18c256ac9aff30669eafd42c027140a3219e9b15b7b01dccd56b1b2 SHA512 e97f310487ff3b94e1476b9af92437f639e20751b93ad54dc6955c4bf58d2f9d1c02fa36603bdd470d4da1f78712d31c998c909d1c36da73d4a97236b2a1c379
+EBUILD pyzmq-25.1.2.ebuild 2315 BLAKE2B 7444306ad2b6e5b2abae5823456d6888514427372f8a2991e0cbb6f565a72d908be52edaf1d84d7e8f5106900f9fe58979926a7fea7599961fd800075402b31b SHA512 aad1fdd14ea11f82b63439780bf16e25e71f9e4ab203b8849df3a1a4c273b7244cfa83ee74573d884be88cddf4acf74007330f54e9c3a95d27e11d46dd6e807f
 MISC metadata.xml 549 BLAKE2B 46a9a1476f68f05c71bb4f849a9e0822c58142ac036da635454f57781dcea81687accfbf9563273d4f8672a8479b098c9f03cec64e5e7f456e50ad8c7ffba9d3 SHA512 3765c31f1b0048a60d5ccf90aa1fa5416c92addb7b01c62e529419e53a4e29746d0e4434d4d4fbd5918413e7521144c8758cdef9eacf5298108c2287783908c1
diff --git a/dev-python/pyzmq/pyzmq-25.1.2.ebuild b/dev-python/pyzmq/pyzmq-25.1.2.ebuild
new file mode 100644
index 000000000000..e647f9a638db
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-25.1.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/
+"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="drafts"
+
+# There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts=]
+"
+# It uses cffi backend for pypy, cython backend for cpython
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.2.0-libdir.patch
+)
+
+distutils_enable_tests pytest
+# TODO: Package enum_tools
+# distutils_enable_sphinx docs/source \
+# 	dev-python/numpydoc \
+# 	dev-python/sphinx-rtd-theme \
+# 	dev-python/myst-parser
+
+python_prepare_all() {
+	export ZMQ_DRAFT_API=$(usex drafts '1' '0')
+	export ZMQ_PREFIX="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		zmq/tests/test_auth.py
+		zmq/tests/test_cython.py
+		zmq/tests/test_zmqstream.py
+
+		# swap thrashing on low-mem hosts, per Debian:
+		# https://salsa.debian.org/python-team/packages/pyzmq/-/blob/master/debian/patches/skip_large_send
+		zmq/tests/test_socket.py::TestSocket::test_large_send
+	)
+	local EPYTEST_IGNORE=(
+		# Avoid dependency on mypy
+		zmq/tests/test_mypy.py
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# not implemented in cffi variant?
+				zmq/tests/test_draft.py::TestDraftSockets
+			)
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest -p asyncio -p rerunfailures
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-12-05 17:02:59 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-12-05 17:02:59 +0000
commit	6bf575618cf9022e99cbfcc64036fd9db79a749c (patch)
tree	f692d02fb905cd3d5bab465b790da48fb2de546b /dev-python
parent	5944ce177026c93b7dab690db9d970567ddbf75f (diff)