From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 56D251580FD for ; Sat, 21 Dec 2024 16:27:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68801E0961; Sat, 21 Dec 2024 16:27:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29F95E0957 for ; Sat, 21 Dec 2024 16:27:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 467E7340813 for ; Sat, 21 Dec 2024 16:27:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBD97159E for ; Sat, 21 Dec 2024 16:27:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1734798231.a2c1d8920c449b80f88fa2c54455db52ca0102a3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/glib/glib-2.80.5-r1.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a2c1d8920c449b80f88fa2c54455db52ca0102a3 X-VCS-Branch: master Date: Sat, 21 Dec 2024 16:27:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2897730c-615c-4f32-986f-fcd29ce84147 X-Archives-Hash: 36fe1e8d3cf48149c6e0386bda578cea commit: a2c1d8920c449b80f88fa2c54455db52ca0102a3 Author: Alfred Wingate protonmail com> AuthorDate: Sat Dec 21 08:56:52 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 21 16:23:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c1d892 dev-libs/glib: dev-python/packaging is required for >=2.79.0 Requirement removed again in >=2.81.1, setuptools still needed for gobject-introspection via USE="introspection". https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3740 https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4133 Closes: https://bugs.gentoo.org/946727 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/39804 Signed-off-by: Sam James gentoo.org> dev-libs/glib/glib-2.80.5-r1.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev-libs/glib/glib-2.80.5-r1.ebuild b/dev-libs/glib/glib-2.80.5-r1.ebuild index c45723504164..e4c137d3b568 100644 --- a/dev-libs/glib/glib-2.80.5-r1.ebuild +++ b/dev-libs/glib/glib-2.80.5-r1.ebuild @@ -61,6 +61,9 @@ BDEPEND=" doc? ( >=dev-util/gi-docgen-2023.1 ) dev-python/docutils systemtap? ( >=dev-debug/systemtap-1.3 ) + $(python_gen_any_dep ' + dev-python/packaging[${PYTHON_USEDEP}] + ') ${PYTHON_DEPS} test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig @@ -94,7 +97,10 @@ PATCHES=( python_check_deps() { if use introspection ; then + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" + else + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" fi }