From bc01ac0c0b98fddd54dd9637a56c9cc5023b9e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Tue, 3 Sep 2024 07:37:00 +0200
Subject: [PATCH] dev-libs/gobject-introspection: Require
 <dev-python/setuptools-74
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Force <dev-python/setuptools-74 to fix incompatibility due to removed
deprecated distutils.msvccompiler.  This is a temporary solution
to avoid patching stable versions.  Incidentally, this also extends
the setuptools dependency to older Python versions, but that should
not be a real issue, and we should probably prefer having it for
consistency anyway.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 ...n-1.76.1.ebuild => gobject-introspection-1.76.1-r1.ebuild} | 3 ++-
 ...n-1.78.1.ebuild => gobject-introspection-1.78.1-r1.ebuild} | 4 ++--
 .../gobject-introspection-1.80.1-r1.ebuild                    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename dev-libs/gobject-introspection/{gobject-introspection-1.76.1.ebuild => gobject-introspection-1.76.1-r1.ebuild} (96%)
 rename dev-libs/gobject-introspection/{gobject-introspection-1.78.1.ebuild => gobject-introspection-1.78.1-r1.ebuild} (97%)

diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild
similarity index 96%
rename from dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild
rename to dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild
index dd5dc146ec03c..47d0dfe216167 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 inherit gnome.org meson python-single-r1 xdg
 
@@ -22,6 +22,7 @@ RDEPEND="
 	>=dev-libs/gobject-introspection-common-${PV}
 	>=dev-libs/glib-2.75.0:2
 	dev-libs/libffi:=
+	<dev-python/setuptools-74
 	doctool? (
 		$(python_gen_cond_dep '
 			dev-python/mako[${PYTHON_USEDEP}]
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild
similarity index 97%
rename from dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild
rename to dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild
index b9506b1ab48cf..899547ef007e5 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild
@@ -23,8 +23,8 @@ RDEPEND="
 	>=dev-libs/glib-2.$(($(ver_cut 2) - 1)).0:2
 	dev-libs/libffi:=
 	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' 3.12)
+		<dev-python/setuptools-74[${PYTHON_USEDEP}]
+	')
 	doctool? (
 		$(python_gen_cond_dep '
 			dev-python/mako[${PYTHON_USEDEP}]
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild
index 511ec1bdb7844..0fb774a4c879b 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	>=dev-libs/glib-2.79.0:2
 	dev-libs/libffi:=
 	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' 3.12)
+		<dev-python/setuptools-74[${PYTHON_USEDEP}]
+	')
 	doctool? (
 		$(python_gen_cond_dep '
 			dev-python/mako[${PYTHON_USEDEP}]