5 files changed, 0 insertions, 132 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f272d51a649f..4048aca8926d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index 8d9500d72219..3ed47220d0ba 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1,4 +1,3 @@
-AUX build-1.0.3-setuptools-69.patch 3954 BLAKE2B 7c62fb1deb7cce42de31bd66a0aeea9f6393c8d52406d94056fc8b820488573134f7246eec906a6666cd6178f06cca68bfbc6e3ad831c568eba3f909aaac108e SHA512 2d07f6796a3673ce301a93967cc1b681ff80b143ea11f4bae3a0c96740d1911d68aa0d400ea4d4af6d32819bf4c4bcc3213c7d3bbe48755fbd9534c84b491657
 DIST build-1.1.1.gh.tar.gz 44605 BLAKE2B aa1d554d55007e8cb715981938bb8765230ae5ddc6c5bc29efeb52c0e18b6337a13c27f3389772a83cc0ecc9b7d3e889fbc305e91f1290424d7031a1782f683f SHA512 5fa64b07f2c22faca074d1447f5fcb12b7ad40e5fe897f034901d7932d8a9aa2c1dfa806d373503246255d7d9a2429b336384a980376f4ae7c810ae275b735da
 EBUILD build-1.1.1.ebuild 1684 BLAKE2B 0dfc43a98f0edb7693d533cd3b75570191e716e87ce00e1255f2d1a3d40fa06bc028f1895535e8eac7f38b0d3c95da057ae9e93cef1eb763043a471441bea5e7 SHA512 b65bacfcde9bc791b724a9e3d461a1398b206117bea5f3aabbfc5ea96c174ba56979903adde1d10734939685b45c2bf91b832036c21e7220186c38173fded8c1
 MISC metadata.xml 361 BLAKE2B 1c46e1d83bec4a8aaedd932af700865009735ff75e3af63ef7c08f7c00883d5f658f86aec981cd48c8ef0ab0a287250a3a4fdfad42fb434f6c06d9f33f72f7d6 SHA512 89c86db40833c86e25f387c5bfa8952b62e983714be85af1e8ca2a6ef8a402b94cc32dfc18cda8d8850736aaabdb46c153743af9bcb027e86b2c1f085f6f2369
diff --git a/dev-python/build/files/build-1.0.3-setuptools-69.patch b/dev-python/build/files/build-1.0.3-setuptools-69.patch
deleted file mode 100644
index 3aa79d080245..000000000000
--- a/dev-python/build/files/build-1.0.3-setuptools-69.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 9f6e34228a0da7e5ce724f400a34bc9f4e69a1ac Mon Sep 17 00:00:00 2001
-From: Henry Schreiner <HenrySchreinerIII@gmail.com>
-Date: Wed, 17 Jan 2024 02:44:57 -0500
-Subject: [PATCH] tests: support setuptools v69.0.3+ (#722)
-
-* tests: support setuptools v69.0.3+
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
-
-* tests: missed one more normalization fix
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
-
-* fix: add MANIFEST.in for old setuptools in tests
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
-
-* tests: used the wrong name
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
-
----------
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
----
- tests/packages/test-setuptools/MANIFEST.in | 1 +
- tests/test_projectbuilder.py               | 6 ++++--
- tests/test_self_packaging.py               | 1 +
- tests/test_util.py                         | 6 ++++--
- 4 files changed, 10 insertions(+), 4 deletions(-)
- create mode 100644 tests/packages/test-setuptools/MANIFEST.in
-
-diff --git a/tests/packages/test-setuptools/MANIFEST.in b/tests/packages/test-setuptools/MANIFEST.in
-new file mode 100644
-index 0000000..e69e3cf
---- /dev/null
-+++ b/tests/packages/test-setuptools/MANIFEST.in
-@@ -0,0 +1 @@
-+include pyproject.toml setup.cfg
-diff --git a/tests/test_projectbuilder.py b/tests/test_projectbuilder.py
-index d46927b..69914ab 100644
---- a/tests/test_projectbuilder.py
-+++ b/tests/test_projectbuilder.py
-@@ -502,7 +502,8 @@ def test_metadata_path_no_prepare(tmp_dir, package_test_no_prepare):
-         pathlib.Path(builder.metadata_path(tmp_dir)),
-     ).metadata
- 
--    assert metadata['name'] == 'test-no-prepare'
-+    # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
-+    assert metadata['name'].replace('-', '_') == 'test_no_prepare'
-     assert metadata['Version'] == '1.0.0'
- 
- 
-@@ -513,7 +514,8 @@ def test_metadata_path_with_prepare(tmp_dir, package_test_setuptools):
-         pathlib.Path(builder.metadata_path(tmp_dir)),
-     ).metadata
- 
--    assert metadata['name'] == 'test-setuptools'
-+    # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
-+    assert metadata['name'].replace('-', '_') == 'test_setuptools'
-     assert metadata['Version'] == '1.0.0'
- 
- 
-diff --git a/tests/test_self_packaging.py b/tests/test_self_packaging.py
-index fb1d124..3a436ef 100644
---- a/tests/test_self_packaging.py
-+++ b/tests/test_self_packaging.py
-@@ -27,6 +27,7 @@ sdist_files = {
-     'tests/constraints.txt',
-     'tests/packages/test-cant-build-via-sdist/some-file-that-is-needed-for-build.txt',
-     'tests/packages/test-no-project/empty.txt',
-+    'tests/packages/test-setuptools/MANIFEST.in',
-     'tox.ini',
- }
- 
-diff --git a/tests/test_util.py b/tests/test_util.py
-index 8045b51..0ab81b8 100644
---- a/tests/test_util.py
-+++ b/tests/test_util.py
-@@ -12,7 +12,8 @@ import build.util
- def test_wheel_metadata(package_test_setuptools, isolated):
-     metadata = build.util.project_wheel_metadata(package_test_setuptools, isolated)
- 
--    assert metadata['name'] == 'test-setuptools'
-+    # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
-+    assert metadata['name'].replace('-', '_') == 'test_setuptools'
-     assert metadata['version'] == '1.0.0'
-     assert isinstance(metadata.json, dict)
- 
-@@ -41,7 +42,8 @@ def test_wheel_metadata_isolation(package_test_flit):
- def test_with_get_requires(package_test_metadata):
-     metadata = build.util.project_wheel_metadata(package_test_metadata)
- 
--    assert metadata['name'] == 'test-metadata'
-+    # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
-+    assert metadata['name'].replace('-', '_') == 'test_metadata'
-     assert str(metadata['version']) == '1.0.0'
-     assert metadata['summary'] == 'hello!'
-     assert isinstance(metadata.json, dict)
--- 
-2.43.0
-
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 97cec0928664..9bb4e7f3843c 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
-AUX pipenv-2023.11.15-fix-import-path-PackageDAG.patch 795 BLAKE2B 4e1d473b97c59c455b53b59340f456ddc3e9dd07a604798a7b16da7f59cffcb6f1131b4a4726feb2613e30efce829b467bd1628ada6583e5a2ea2ebfe9ece84f SHA512 d352ce2aa493115d9c0dfcebf2e0fd4b49c2da9bc4f6af5f2b5d7ca4e8b8604704c486c92893cc62b0317761e3dc924924ec6dd882f55322413dac79a98a126e
 AUX pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch 1043 BLAKE2B 09a50ba813d21a82333905e098dbd99b11a6c6f07c2ae512eed4189bfee371b0ceb2e27ffff41fb414b336c8ec49014c43903f3a2f12fb9b6323dafdf13f8634 SHA512 c900dc2589b5f4b3f36b15ddf2287d74dcafb1395c96330058a400ac3698a525715b69cd32b5780cc7ec9d71d067f159c623deaf63c9e4c11876cd651c069f87
 AUX pipenv-2023.9.8-inject-system-packages.patch 1672 BLAKE2B d803b80a5c46bac67ab7c361f369fad58b1c2a933bc2f78b2d4fa5fa172a23e7e5c026edf48cf398b3232280428eaf40369cafdf4c6c019c3dc9e397e884564d SHA512 5600a8bd7bc5cdf2152d84fc7791359a04df15f38d11f8c9517b709a2793ce05c6fc5acc1d1d8b763078465012e421826699287d2e3ae97838e155a9a1694650
 DIST pipenv-2023.12.1.gh.tar.gz 10728288 BLAKE2B dc9425303e24652b797c9f9f9f6cc6f13f30e32775fe0458ee472af5d859ee245c58f3adb6040390bd53d3e1efd6493f930c7336e69956516b36e26e70ca14b7 SHA512 caadbeb32c0445abfae65d86df8d9a5875e71c1a0a281193194ae61c0b095c8f9361a5dd67f92acd5b64d8dc1d877324e959357470894d7d60ceb1a619c831db
diff --git a/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch b/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch
deleted file mode 100644
index 25035da66115..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b1e69d07afc4f94c6148f4ec65834e341a67b10d Mon Sep 17 00:00:00 2001
-From: Oz Tiram <oz.tiram@gmail.com>
-Date: Thu, 4 Jan 2024 14:59:33 +0100
-Subject: [PATCH 1/2] Fix import path of PackageDAG
-
-pipdeptree moved it in the recent versions.
-
-Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
----
- pipenv/environment.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/environment.py b/pipenv/environment.py
-index 26975ce0d..7e0206ade 100644
---- a/pipenv/environment.py
-+++ b/pipenv/environment.py
-@@ -678,7 +678,7 @@ class Environment:
-     def get_package_requirements(self, pkg=None):
-         from itertools import chain
- 
--        from pipdeptree import PackageDAG
-+        from pipdeptree._models import PackageDAG
- 
-         flatten = chain.from_iterable
- 
--- 
-2.41.0
-