From nobody Sun Feb 8 17:19:18 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C33B92E6122; Wed, 9 Jul 2025 13:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752069141; cv=none; b=eQUVFQafYnn+bLDxKiAeDbUXYrNL0zjFtdWetHcJyj7NgZVn9xoCR+5ziNvZJ1slvBfGqYZfrWJUIkU/kRv7Nru4TPo+w9jHueKvZMXbODatMNvVmmtqQyKNn8LqYBtQfW7rD/cxnsCthdEVcWCj1j55hhm2zfKlGczAPgOtkR0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752069141; c=relaxed/simple; bh=ycz4EO/MkfHKJ8271RLTLGkxXzNhsic8MuWu+lzxdXM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L43eBryPTiv8GiBC+6C1jt/frmC+KTMSf1prLGd/xUAzVlIYKq3MkbSciOOFUSgr1Xq4iTl2vnrMn9XlbNoYKUA+qdGtqcHC4jGAehuBIidu+3xdUG8/TrgLPbM99F319DG5C2x/TgeidCljxenu6wwh78lWrMwbMRy2dxe7YtI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QmY8RSh/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QmY8RSh/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8FE7DC4AF0B; Wed, 9 Jul 2025 13:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752069141; bh=ycz4EO/MkfHKJ8271RLTLGkxXzNhsic8MuWu+lzxdXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QmY8RSh/2ccIcKCxarhNZ7eU+fsna2ok9uthk9M/gGT+5z+eg22I3yBo+pmf5qzZO rDdn+NdGZPDL2mkUsgTTi8E8ypqHpfwI7Gah8l8hucWz+JjMjSSALaMZDbtWPV1p6K yOs3vzCt8NYpj4tmMbQl/Ys4NMrwUn1sqDWq1mjf7G7v+4Uph3TOQ7ZIj+efd0MYaK tdR4tp22rmATFMBK6hQDWeT0RxBQTjkiLV+Yxuzj2gbSRo/aPIUmFppF1d1bBpC/uE ep3ki9jcx4NCvjdQSJ6KxCqFmSXA5tkLFKYRaXP4ki18/IIJy9S3Pcpulw6WH8t3wg sk0spJ9my/jww== Received: from mchehab by mail.kernel.org with local (Exim 4.98.2) (envelope-from ) id 1uZVDd-00000000ECa-1UQU; Wed, 09 Jul 2025 15:52:17 +0200 From: Mauro Carvalho Chehab To: Linux Doc Mailing List , Jonathan Corbet Cc: Mauro Carvalho Chehab , "Akira Yokosawa" , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org Subject: [PATCH v2 10/39] scripts: sphinx-pre-install: fix support for gentoo Date: Wed, 9 Jul 2025 15:51:42 +0200 Message-ID: <852f9b2fdf58c32f4dae6e85281e9940a873075b.1752067814.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab Content-Type: text/plain; charset="utf-8" Some gentoo packages have changes. Fix it. While here, improve emerge portage use logic. Signed-off-by: Mauro Carvalho Chehab --- scripts/sphinx-pre-install.py | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/scripts/sphinx-pre-install.py b/scripts/sphinx-pre-install.py index 65438c198674..b793796329c8 100755 --- a/scripts/sphinx-pre-install.py +++ b/scripts/sphinx-pre-install.py @@ -669,12 +669,13 @@ class SphinxDependencyChecker: =20 def give_gentoo_hints(self): progs =3D { - "convert": "media-gfx/imagemagick", - "dot": "media-gfx/graphviz", - "rsvg-convert": "gnome-base/librsvg", - "virtualenv": "dev-python/virtualenv", - "xelatex": "dev-texlive/texlive-xetex media-fonts/dejavu", - "yaml": "dev-python/pyyaml", + "convert": "media-gfx/imagemagick", + "dot": "media-gfx/graphviz", + "rsvg-convert": "gnome-base/librsvg", + "virtualenv": "dev-python/virtualenv", + "xelatex": "dev-texlive/texlive-xetex media-fonts/dejavu= ", + "yaml": "dev-python/pyyaml", + "python-sphinx": "dev-python/sphinx", } =20 if self.pdf: @@ -699,21 +700,17 @@ class SphinxDependencyChecker: print("You should run:") print("\n") =20 - imagemagick =3D "media-gfx/imagemagick svg png" - cairo =3D "media-gfx/graphviz cairo pdf" - portage_imagemagick =3D "/etc/portage/package.use/imagemagick" - portage_cairo =3D "/etc/portage/package.use/graphviz" =20 - result =3D self.run(["grep", "imagemagick", portage_imagemagick], - stdout=3Dsubprocess.PIPE, text=3DTrue) - if not result.stdout.strip(): - print(f"\tsudo su -c 'echo \"{imagemagick}\" > {portage_imagem= agick}'") + portages =3D [ + "media-gfx/imagemagick", + "media-gfx/graphviz", + ] =20 - result =3D self.run(["grep", "graphviz", portage_cairo], - stdout=3Dsubprocess.PIPE, text=3DTrue) - - if not result.stdout.strip(): - print(f"\tsudo su -c 'echo \"{cairo}\" > {portage_cairo}'") + for p in portages: + result =3D self.run(["grep", p, "/etc/portage/package.use/*"], + stdout=3Dsubprocess.PIPE, text=3DTrue) + if not result.stdout.strip(): + print(f"\tsudo emerge -av1 {p}") =20 print(f"\tsudo emerge --ask {self.install}") =20 --=20 2.49.0