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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D0A9F158013 for ; Tue, 5 Dec 2023 04:20:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B4AA2BC039; Tue, 5 Dec 2023 04:20:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD56F2BC039 for ; Tue, 5 Dec 2023 04:20:50 +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 30925335D6D for ; Tue, 5 Dec 2023 04:20:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C3611256 for ; Tue, 5 Dec 2023 04:20:47 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1701750033.e94bf085fb28b26a70973bd72e1d66cdbda67062.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/displaycal-py3/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild X-VCS-Directories: media-gfx/displaycal-py3/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e94bf085fb28b26a70973bd72e1d66cdbda67062 X-VCS-Branch: master Date: Tue, 5 Dec 2023 04:20:47 +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: 8836a550-3875-4c18-ae69-1e4dac58e7b8 X-Archives-Hash: 0d8b258e8e0d7540a64494ee153ff7cb commit: e94bf085fb28b26a70973bd72e1d66cdbda67062 Author: Eli Schwartz gmail com> AuthorDate: Mon Nov 13 21:52:47 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Dec 5 04:20:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94bf085 media-gfx/displaycal-py3: remove incorrect upstream certifi dependency Upstream's setup.cfg has several oddities to it, including claiming an RDEPEND on dev-python/build from when they copied their requirements.txt verbatim into setup.cfg. As for certifi specifically, it is handled in a fiddly try/except that falls back to using a bundled copy that is copied over from certifi into displaycal iff building a py2app/py2exe edition, and if that still doesn't work, silently does nothing. The object of all this is that if a custom cacert.pem is found somewhere, it goes and sets os.environ['SSL_CERT_FILE'] to affect later uses of urllib.request. Reasonably enough, none of this is needed except on Windows and macOS, so displaycal does precisely that: runs this entire thing only on Windows and macOS. On Linux, it never even attempts to import certifi, nor set an environment variable. So we shouldn't depend on it either. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Michał Górny gentoo.org> ...isplaycal-py3-3.9.10-r2.ebuild => displaycal-py3-3.9.10-r3.ebuild} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild similarity index 92% rename from media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild rename to media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild index d6ac7689141f..6cf08031c321 100644 --- a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild +++ b/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild @@ -28,7 +28,6 @@ PATCHES="${FILESDIR}/${P}-python-3.11.patch" DEPEND=" dev-python/build[${PYTHON_USEDEP}] - dev-python/certifi:0[${PYTHON_USEDEP}] dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] @@ -46,6 +45,9 @@ src_prepare() { # Fix QA warning sed -e 's/license_file/license_files/g' -i setup.cfg || die + # remove dependency only imported if `sys.platform in ("darwin", "win32")` + sed -e '/certifi/d' -i setup.cfg || die + # Remove x-world MIME sed -i 's|x-world/x-vrml;||g' \ misc/displaycal-vrml-to-x3d-converter.desktop || die