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 (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF6C815800A for ; Wed, 16 Aug 2023 05:56:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34F5A2BC013; Wed, 16 Aug 2023 05:56:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D11D2BC013 for ; Wed, 16 Aug 2023 05:56:03 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FC0E335D16 for ; Wed, 16 Aug 2023 05:56:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B1A9FB8 for ; Wed, 16 Aug 2023 05:56:01 +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: <1692165344.01500ab07fd2a2d423ce457691bf9c570ef465b9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/matplotlib/matplotlib-3.7.1.ebuild dev-python/matplotlib/matplotlib-3.7.2.ebuild X-VCS-Directories: dev-python/matplotlib/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 01500ab07fd2a2d423ce457691bf9c570ef465b9 X-VCS-Branch: master Date: Wed, 16 Aug 2023 05:56:01 +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: 11279f98-4bc5-48a9-8fab-cb41712f5d71 X-Archives-Hash: 8469870aabe58e673abf63b7bcb770c6 commit: 01500ab07fd2a2d423ce457691bf9c570ef465b9 Author: Sam James gentoo org> AuthorDate: Wed Aug 16 05:53:37 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 16 05:55:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01500ab0 dev-python/matplotlib: conditionalise gtk+, pygobject test deps The test suite skips correctly if gtk+ is disabled and works fine if pygobject isn't installed as well. The only snag is that libblockdev installs a Python module (gi.*) where gi (pygobject) itself may not be installed, so that's fixed in 87fe7688480db245fa772b2f750259ea6213c266. Previously, that was confusing mpl's 'import gi' check. See also: https://github.com/gentoo/gentoo/pull/32331 Bug: https://bugs.gentoo.org/807637 Signed-off-by: Sam James gentoo.org> dev-python/matplotlib/matplotlib-3.7.1.ebuild | 6 ++++-- dev-python/matplotlib/matplotlib-3.7.2.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-python/matplotlib/matplotlib-3.7.1.ebuild b/dev-python/matplotlib/matplotlib-3.7.1.ebuild index d0f4addd4224..1b925186597a 100644 --- a/dev-python/matplotlib/matplotlib-3.7.1.ebuild +++ b/dev-python/matplotlib/matplotlib-3.7.1.ebuild @@ -111,9 +111,11 @@ BDEPEND=" dev-python/mock[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] + gtk3? ( + >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] + x11-libs/gtk+:3[introspection] + ) ) " diff --git a/dev-python/matplotlib/matplotlib-3.7.2.ebuild b/dev-python/matplotlib/matplotlib-3.7.2.ebuild index acdd8ed32ffc..0590c8818ea7 100644 --- a/dev-python/matplotlib/matplotlib-3.7.2.ebuild +++ b/dev-python/matplotlib/matplotlib-3.7.2.ebuild @@ -114,9 +114,11 @@ BDEPEND=" dev-python/mock[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] + gtk3? ( + >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] + x11-libs/gtk+:3[introspection] + ) ) "