From: Mauro Carvalho Chehab mchehab+huawei@kernel.org
[ Upstream commit e45a631742fadd7c9feb5a0049382102e5d43fe7 ]
There are some small misdetections with Gentoo. While they don't cause too much trouble, it keeps recomending to install things that are already there.
Signed-off-by: Mauro Carvalho Chehab mchehab+huawei@kernel.org Link: https://lore.kernel.org/r/7f631edce102b02ccbdbfb18be1376a86b41373d.158688328... Signed-off-by: Jonathan Corbet corbet@lwn.net Signed-off-by: Sasha Levin sashal@kernel.org --- scripts/sphinx-pre-install | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install index fa3fb05cd54b..09b38ee38ce8 100755 --- a/scripts/sphinx-pre-install +++ b/scripts/sphinx-pre-install @@ -557,7 +557,8 @@ sub give_gentoo_hints() "media-fonts/dejavu", 2) if ($pdf);
if ($pdf) { - check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf"], + check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf", + "/usr/share/fonts/noto-cjk/NotoSerifCJK-Regular.ttc"], "media-fonts/noto-cjk", 2); }
@@ -572,10 +573,10 @@ sub give_gentoo_hints() my $portage_imagemagick = "/etc/portage/package.use/imagemagick"; my $portage_cairo = "/etc/portage/package.use/graphviz";
- if (qx(cat $portage_imagemagick) ne "$imagemagick\n") { + if (qx(grep imagemagick $portage_imagemagick 2>/dev/null) eq "") { printf("\tsudo su -c 'echo "$imagemagick" > $portage_imagemagick'\n") } - if (qx(cat $portage_cairo) ne "$cairo\n") { + if (qx(grep graphviz $portage_cairo 2>/dev/null) eq "") { printf("\tsudo su -c 'echo "$cairo" > $portage_cairo'\n"); }