gentoo auto-resync : 02:07:2023 - 22:04:01

3 files changed, 34 insertions, 2 deletions

diff --git a/dev-python/scikit-build-core/Manifest b/dev-python/scikit-build-core/Manifest
index fa6d5d488854..59c98fd57ca4 100644
--- a/dev-python/scikit-build-core/Manifest
+++ b/dev-python/scikit-build-core/Manifest
@@ -1,5 +1,5 @@
-DIST scikit_build_core-0.4.6.tar.gz 160670 BLAKE2B 8efa818ed17d898818c7fd1f56ed36369b25fcba62fdc4172e147db9a70a9a468e8472b8cca599c7afd32fe5ef3fdfce30d173359ddc4ff7ea7db6c257f63f9a SHA512 24f5ebfd855677c6f7af8f5098c257326cffc5de5cd0d04b4dc51f40c78784c7dc49ccbc97d43460f5091478b0b9bb09c4d3c93178699ec1938521688fc48bd8
+AUX scikit-build-core-0.4.7-setuptools-hooks.patch 1289 BLAKE2B 628510dd9638190ca4dae89c3b2dced2a2986a43bc556aa078162f22da5e4976064ee3058b220d3ab2f4f9fe8f7d26f51287b08e1af97504eb15c97f83313e75 SHA512 ea5c0837e363d0a62bd492056f4efee5abbfbc234ea32049c411dd794f3cbf6bb4c6d7dc77cb4337c6a164342d99b4e0de0bd96209512dd01ac1626a76e1980d
 DIST scikit_build_core-0.4.7.tar.gz 161024 BLAKE2B a06136ca6144305290dcebacd33690556ce30c28793572adfd7b42b043d4bb7f2e6e8000fcb543608d33a130f7094683a31870aa40067fb24fbb453fed884ccf SHA512 39f99facc920e3a46a3592d15ce9f3ceb90cf92dca8a010546a9cc15d50ea7737951286b6474f2f3f68f206f4fa7d157931fcfa831e122f51266df56ec5f043e
-EBUILD scikit-build-core-0.4.6.ebuild 1196 BLAKE2B cc7aa554ac04d64b84c59c81f11aa07c503a740e57955adb142b79efca1797ccecab104af2a9664f368cea60512e9c26815637b7fe16a4367453c15b457fd3e4 SHA512 3f2a3d7ff1df60b2214a88e54820f7da0a7fcfef4f75514d9c14e206c2fa3fce6100ba17e06aae1aa5449f2b9884ce98bd69ef9db13f2896cc75014081c479d3
+EBUILD scikit-build-core-0.4.7-r1.ebuild 1252 BLAKE2B 5a37c30fce41b4db4c357d54ec3891edbd248593cdee06ad2af5f870a3ea6f37293b5b3c5aaf8b636c37550bbccaa568e6641c350c7d18b45c65b037ac4ce9ab SHA512 56bab5fde5d23e58fbf4b8f0ce45734c4d1674586e40dfef1f5c52a4640c1147f229776c4376f9958bcf2f3fd27c588c6e5ad64697eecc2c3ce61d6e38d6cfba
 EBUILD scikit-build-core-0.4.7.ebuild 1196 BLAKE2B cc7aa554ac04d64b84c59c81f11aa07c503a740e57955adb142b79efca1797ccecab104af2a9664f368cea60512e9c26815637b7fe16a4367453c15b457fd3e4 SHA512 3f2a3d7ff1df60b2214a88e54820f7da0a7fcfef4f75514d9c14e206c2fa3fce6100ba17e06aae1aa5449f2b9884ce98bd69ef9db13f2896cc75014081c479d3
 MISC metadata.xml 393 BLAKE2B 25bdc0bc295ed4bd7cd76a5a6952cb7fa5d5a404d3260562f2ed322d80f2466add0373a2a6b10a41c4dc2211e82e0a680735301d8844e70a54760301b4ab190f SHA512 176537f2027aedb3bc8bd16bbbcde8bfed246d621763e22a979f2942c016e1bafa5ef2d11d8d078e5d59970ea115864a8501185343bc3d4b9fd8493adbd16aab
diff --git a/dev-python/scikit-build-core/files/scikit-build-core-0.4.7-setuptools-hooks.patch b/dev-python/scikit-build-core/files/scikit-build-core-0.4.7-setuptools-hooks.patch
new file mode 100644
index 000000000000..f3b352644b0d
--- /dev/null
+++ b/dev-python/scikit-build-core/files/scikit-build-core-0.4.7-setuptools-hooks.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/909035
+https://bugs.gentoo.org/909335
+https://github.com/scikit-build/scikit-build-core/issues/413
+https://github.com/scikit-build/scikit-build-core/commit/fd9e6cf638a14dee2fb39b36e41b607ce8221d27
+
+From fd9e6cf638a14dee2fb39b36e41b607ce8221d27 Mon Sep 17 00:00:00 2001
+From: Henry Schreiner <HenrySchreinerIII@gmail.com>
+Date: Sat, 24 Jun 2023 15:07:26 -0400
+Subject: [PATCH] fix: avoid interfering with other setuptools plugins (#414)
+
+Fix #413.
+
+---------
+
+Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
+--- a/src/scikit_build_core/setuptools/build_cmake.py
++++ b/src/scikit_build_core/setuptools/build_cmake.py
+@@ -182,7 +182,8 @@ def _has_cmake(dist: Distribution) -> bool:
+ def _prepare_extension_detection(dist: Distribution) -> None:
+     # Setuptools needs to know that it has extensions modules
+ 
+-    dist.has_ext_modules = lambda: type(dist).has_ext_modules(dist) or _has_cmake(dist)  # type: ignore[method-assign]
++    orig_has_ext_modules = dist.has_ext_modules
++    dist.has_ext_modules = lambda: orig_has_ext_modules() or _has_cmake(dist)  # type: ignore[method-assign]
+ 
+     # Hack for stdlib distutils
+     if not setuptools.distutils.__package__.startswith("setuptools"):  # type: ignore[attr-defined]
+
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.4.6.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.4.7-r1.ebuild
index 9cf9fc3a704b..b3c010a4c60d 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.4.6.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.4.7-r1.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-setuptools-hooks.patch
+)
+
 distutils_enable_tests pytest
 
 python_test() {