From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 1CC88158B20 for ; Wed, 05 Feb 2025 02:58:06 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id F389934134D for ; Wed, 05 Feb 2025 02:58:05 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id EFC2B11046F; Wed, 05 Feb 2025 02:58:04 +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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E21B811046F for ; Wed, 05 Feb 2025 02:58:04 +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 8A11B34134D for ; Wed, 05 Feb 2025 02:58:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF67E2606 for ; Wed, 05 Feb 2025 02:58:02 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1738723984.5027f7445438287f44cff045ebe4b914fefd0ba9.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/khard/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/khard/khard-0.19.1.ebuild X-VCS-Directories: app-misc/khard/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 5027f7445438287f44cff045ebe4b914fefd0ba9 X-VCS-Branch: master Date: Wed, 05 Feb 2025 02:58:02 +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: 87e36204-7710-461b-be4a-5878376325ad X-Archives-Hash: a2b3246423228649396c3d4719db8fc8 commit: 5027f7445438287f44cff045ebe4b914fefd0ba9 Author: Michael Orlitzky gentoo org> AuthorDate: Wed Feb 5 02:51:21 2025 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Wed Feb 5 02:53:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5027f744 app-misc/khard: sanitize MAKE for sphinx Sphinx tries to pass $MAKE to subprocess.call, so something like MAKE="make -j1" will crash it. I've added a little hack to strip off any arguments that might be in the user's MAKE before running sphinx. Closes: https://bugs.gentoo.org/924143 Signed-off-by: Michael Orlitzky gentoo.org> app-misc/khard/khard-0.19.1.ebuild | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app-misc/khard/khard-0.19.1.ebuild b/app-misc/khard/khard-0.19.1.ebuild index cc08e4b2d294..b08734e7e503 100644 --- a/app-misc/khard/khard-0.19.1.ebuild +++ b/app-misc/khard/khard-0.19.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -56,7 +56,18 @@ distutils_enable_sphinx docs \ dev-python/sphinx-autodoc-typehints python_compile_all() { - use doc && emake -j1 -C doc/ html text man info + if use doc; then + # The safe_MAKE= assignment below strips any arguments you might + # have in your $MAKE variable (i.e. it keeps only the stuff + # before the first space character). Sphinx tries to execute + # $MAKE using subprocess.call, which is expecting an actual + # program and not a program plus flags. This can help in some + # corner cases, like MAKE="make LIBTOOL=..." in make.conf, and + # should still allow e.g. MAKE=/usr/local/bin/mymake + local safe_MAKE="${MAKE%% *}" + [[ -z "${safe_MAKE}" ]] && safe_MAKE=make + emake MAKE="${safe_MAKE}" -j1 -C doc/ html text man info + fi } python_install_all() {