3 files changed, 110 insertions, 2 deletions
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index 3e0b78462bba..dbed73ba776b 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1,3 +1,4 @@
+AUX build-1.0.3-setuptools-69.patch 3954 BLAKE2B 7c62fb1deb7cce42de31bd66a0aeea9f6393c8d52406d94056fc8b820488573134f7246eec906a6666cd6178f06cca68bfbc6e3ad831c568eba3f909aaac108e SHA512 2d07f6796a3673ce301a93967cc1b681ff80b143ea11f4bae3a0c96740d1911d68aa0d400ea4d4af6d32819bf4c4bcc3213c7d3bbe48755fbd9534c84b491657
 DIST build-1.0.3.gh.tar.gz 43412 BLAKE2B cb707b21582a1f7a5f649dcaf0fa7d30d253641a51c6af1284b17df46ad877af5280b5d1a07ce7eb90ef468d0f850e3e85dba1f24f7942c6ba432789760ae670 SHA512 c2c67ccf407bb1780c90e02bbc2692b8b10cfe441f445c05d38a675f3498d1d6f94306dcbe270c181e14471f1dd3712e2cba33a4792f6140e2e9f0aa3c8e7b81
-EBUILD build-1.0.3.ebuild 1664 BLAKE2B ffd31b821df0fc2c0d55e53d019054f053b6b8ea740cc67c6a06d808fb1fc78fa51b76a63b9f1da6ff35d11c02fb54fa99705c942c3b0f8b3f6946472b8a3976 SHA512 1c86382f2fb2c61631f3ac5c204831cf9de040ffdc4226d7f4364bb2d81bcf245f49bbdb9406fbd7367a42dbc0b4156f5a4dcac5535ebe8fe4b5eac42633cd2b
+EBUILD build-1.0.3.ebuild 1759 BLAKE2B 54ff42e04a8eb6f5faf2d234e1ecd68b9b66ba01910a19374a9bab73b0611acd1728ade87f324e036ba5acb614913f50460566260ed2858ff748076ed9755c8d SHA512 7deff279ef23a18875aa195babf3a614f1396b367ef5f4bb39ecfd6486bf9f148d77112231c2aa949d60f1fb21fb317ba59e6d1863c1cd3b7f2602dd7a8ca3c6
 MISC metadata.xml 361 BLAKE2B 1c46e1d83bec4a8aaedd932af700865009735ff75e3af63ef7c08f7c00883d5f658f86aec981cd48c8ef0ab0a287250a3a4fdfad42fb434f6c06d9f33f72f7d6 SHA512 89c86db40833c86e25f387c5bfa8952b62e983714be85af1e8ca2a6ef8a402b94cc32dfc18cda8d8850736aaabdb46c153743af9bcb027e86b2c1f085f6f2369
diff --git a/dev-python/build/build-1.0.3.ebuild b/dev-python/build/build-1.0.3.ebuild
index e1c120c79606..b5380c983e46 100644
--- a/dev-python/build/build-1.0.3.ebuild
+++ b/dev-python/build/build-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,6 +41,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/pypa/build/pull/722
+	"${FILESDIR}/${P}-setuptools-69.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# broken by the presence of flit_core
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
new file mode 100644
index 000000000000..3aa79d080245
--- /dev/null
+++ b/dev-python/build/files/build-1.0.3-setuptools-69.patch
@@ -0,0 +1,102 @@
+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
+