gentoo auto-resync : 22:01:2024 - 10:49:19

3 files changed, 46 insertions, 1 deletions

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index f807da4f9147..ad42f981ea45 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,8 +1,9 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
+AUX glib-2.78.4-distutils.patch 933 BLAKE2B a5416e699a8604a5f443339401bdfcc50e6631eeac82a1d4e169f450b7c15b0323d75fa337ab689a029699cf3190310539cf5f603f2262963aea8ee1d1c9b5a0 SHA512 e5cfdfa795671f2a302b0bded516086e03056ee2675df9343819efc97130fb66988bdd67341fa9678b443c750f98d3902efe87c8f7e7532babd314414d93d0d0
 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 glib-2.76.4.ebuild 10851 BLAKE2B 024ba4fac53d839c25828e3b4e562d8e30ac8d126044c69480df50215c127dc1bcb2b794860b9fa877a0c3eb9d5243b8318eb2ccb01c5a6ad19affd79680883a SHA512 2744faaeb7d2c2aaaab35b494a455bc0269f4243824641d9aa9abe8578884bc7517bd3cd429a6716aeb150ce47c9bd2412c959b0cc8d0ac94be85431f1d96ceb
 EBUILD glib-2.78.3.ebuild 10853 BLAKE2B e348de435dd1502bf3d5f241e4615ac8cca39d9ab526138b2be61f944b335d93c305b8e0374d959e8c69154ef3938b0279e280dcf4579f10a82708a61af77c49 SHA512 5905c36a3eec7c54c5db01e9e0e3874afe68695183fe45a041efb1fd731726457c621ea85380385ea8338436d234cdd6a34e616c9cb3428104275dcfc710cc1d
-EBUILD glib-2.78.4.ebuild 10859 BLAKE2B 870ac617cd1bd1441ef1dda0e82e2eb4c089890392147c7c34ef816ec0228c3f260d547c419def44e2159f2b7f1a87308791a6e714e1225c27e3687d1eea5e40 SHA512 2895dac14b2cf80545de5eebd77376ff34123b6acc70885645e35afe1d7fc2c8c459f8f219d105594bae3d8064bd5e254ac943aca4c8122830a044d2dbd67d54
+EBUILD glib-2.78.4-r1.ebuild 11058 BLAKE2B 1ec7026ce1ce914ad14bff04f77f922ae27b4b2f58340dc241b5a2ffd691a6d14de517fd7f0985ac73982e3b4a827f055a44965b1e36041b34ec3ed23523f5ba SHA512 694c333391fdfd4f73e67ba53acc3518dcb38608ad2ce9bf5a77b16e51cc7206f6790df7466d81a7ad074905ed6dd52691eb3db58668112c47a26728ad2b5028
 MISC metadata.xml 1358 BLAKE2B ca4bb1facd33c64aa2d8c2197c97a68e08425bf3bb7cc66b3867e208a8032029cbf3d9bf3b23d38c8268228553d80d0334eacfb61cee82e19f5a7604de26d76d SHA512 d89242c1102b798d82631c4179c362461cf19d12e33cb30afcc3551f2c9b2970ad5f3a594fae504b444de294659693fc76ea560c54794692e492d4eebe23b7b9
diff --git a/dev-libs/glib/files/glib-2.78.4-distutils.patch b/dev-libs/glib/files/glib-2.78.4-distutils.patch
new file mode 100644
index 000000000000..70ceebcf7095
--- /dev/null
+++ b/dev-libs/glib/files/glib-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/gio/gdbus-2.0/codegen/utils.py
++++ b/gio/gdbus-2.0/codegen/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-libs/glib/glib-2.78.4.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild
index 6fdf95422485..ec81f416256d 100644
--- a/dev-libs/glib/glib-2.78.4.ebuild
+++ b/dev-libs/glib/glib-2.78.4-r1.ebuild
@@ -51,6 +51,9 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.5 )
 	systemtap? ( >=dev-debug/systemtap-1.3 )
 	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/packaging[${PYTHON_USEDEP}]
+	')
 	test? ( >=sys-apps/dbus-1.2.14 )
 	virtual/pkgconfig
 "
@@ -69,8 +72,13 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+	"${FILESDIR}"/${PN}-2.78.4-distutils.patch
 )
 
+python_check_deps() {
+	python_has_version "dev-python/packaging[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use kernel_linux ; then
 		CONFIG_CHECK="~INOTIFY_USER"