gentoo auto-resync : 22:01:2024 - 16:48:54

3 files changed, 45 insertions, 2 deletions

diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 0b084865cba9..e437ef68a53a 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,9 +1,10 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
+AUX gdbus-codegen-2.78.4-distutils.patch 889 BLAKE2B eb9749bb47f6485751c9d31fad5c6ac846f049315b12d959a85ecac74c7f238da8b7c5225a3fdc566af368a86661b11037e7f8c4768b59a060f6e21f0fc2f4eb SHA512 cdf02f1791d9144145bc442758e0e729b2ffff99c52309a3798447a428d4bfdc3a5c583e6d0814c5be494d5f67a6053a425fd7384465c5186cfe5052c69db3c4
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7
 DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010a8816a0cef786cec9da2af9f7d7d1da735c971ab8c848b2dcec050330e5b0fdceb156a36d739848e6160cd19 SHA512 9c1af75fb973d23ce0286d5b7836eea45f9628c148ced5ac10e10abceda05024ae4c57f01439824d3287d986527500b7b959828b630b6e4a3314b5224f4d7246
 DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
 EBUILD gdbus-codegen-2.76.4.ebuild 2205 BLAKE2B f14f73a09f58af0d389f8c152a28cb26d4214415d4283ecd011858b8e392e04225d94ca4d21d38e4737760c65f5163899b8c07f0056e0c95075f47e0ee92ee30 SHA512 54b44a179203fdd817ed7a9479bae47d9b14bee870ce18c398fde23a82defca89ab0f7d34dc15b2859cba0075e2b81e8646a5fb23d00dfefb15de408dc1945f5
 EBUILD gdbus-codegen-2.78.3.ebuild 2208 BLAKE2B 22963759fd60dcd643bc457cf66160ec938ea0226fc102e2a39bb9e0df1bfd484c4c35b98def56c079fd7c023a5debfdfeff62d48dbc24ec1f3ae9f5b0385b0a SHA512 492c5b32fdf405091facb25fd0039cb4f956502fe0d1800da596ecfba6bb272010ac6dadf9b202e843be33a619b94c4491e72e5abbcdf6f20dbaea10a8e505ac
-EBUILD gdbus-codegen-2.78.4.ebuild 2214 BLAKE2B 5bfc287bbbeb1b59ce4d156c0c7d3d7803e871a7c9807b5f7e5ad4fd1e893307499479ce059ef7c56ca567f3d5622dc6e4effbb53c76e93fbcbc59b2c2cee099 SHA512 9b095d637786dbbbec322ab6b7539e068ed6f961f142587d9d85d026689248f9d9d945c13abb74bf94335bb0f1b7d0b0a3ae8821dfa13ff5d2055ce5c6292a71
+EBUILD gdbus-codegen-2.78.4-r1.ebuild 2332 BLAKE2B 04ad09b7c32c05a4e4c1d37944b900c5d49601c1b0ff4513576509ca57de551b57f24fb333555fa0af47b3c2926ab6d1f3c02f8d8980ab47e04ad1e2d2c756b0 SHA512 cc1bf57f9500358470f086e789f690b67b595875ed182778c0b68490612b0f128efdabd4de59009e887df54ba2623679734f4c18a32163f7f7361a9b54e9b762
 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch
new file mode 100644
index 000000000000..38fbe0e1a9b5
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/922654
+https://gitlab.gnome.org/GNOME/glib/-/issues/3134
+https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291
+
+[sam: Trimmed the CI changes.]
+
+From 6ef967a0f930ce37a8c9b5aff969693b34714291 Mon Sep 17 00:00:00 2001
+From: Jordan Williams <jordan@jwillikers.com>
+Date: Fri, 1 Dec 2023 09:53:50 -0600
+Subject: [PATCH] Switch from the deprecated distutils module to the packaging
+ module
+
+The distutils module was removed in Python 3.12.
+---
+
+--- a/utils.py
++++ b/utils.py
+@@ -19,7 +19,7 @@
+ #
+ # Author: David Zeuthen <davidz@redhat.com>
+ 
+-import distutils.version
++import packaging.version
+ import os
+ import sys
+ 
+@@ -166,4 +166,4 @@ def version_cmp_key(key):
+         v = str(key[0])
+     else:
+         v = "0"
+-    return (distutils.version.LooseVersion(v), key[1])
++    return (packaging.version.Version(v), key[1])
+-- 
+GitLab
+
+
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.78.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild
index a859319309e2..00234d0e217a 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.78.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild
@@ -17,7 +17,12 @@ LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-RDEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/packaging[${PYTHON_USEDEP}]
+	')
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-libs/libxslt
@@ -29,6 +34,7 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 python_prepare_all() {
 	PATCHES=(
 		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+		"${FILESDIR}/${PN}-2.78.4-distutils.patch"
 	)
 	distutils-r1_python_prepare_all