From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 964E6C2BA19 for ; Tue, 14 Apr 2020 16:58:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6148B2054F for ; Tue, 14 Apr 2020 16:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586883501; bh=KDclv13YFO1FiHWsJS7jiFPTwj6hzKBpxhZNWkEK7FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U58H9DZcZbWy4wTC97NjAzWmrt7JwETm9MSGWIZxDecHGvz9XGHn5q/HsnwHO+LDf +TdGpURAcnrCnkQz1w+6yQFqNZxdUhaeGRboQWswktdatM/ZBKPrcLqNZ3j9sPG0jr tmpot0yU80YWfVMB7CkFpU+2l3jFokYwpmsb1vX0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407506AbgDNQ6T (ORCPT ); Tue, 14 Apr 2020 12:58:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:38490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391546AbgDNQ4R (ORCPT ); Tue, 14 Apr 2020 12:56:17 -0400 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C96BF20774; Tue, 14 Apr 2020 16:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586883377; bh=KDclv13YFO1FiHWsJS7jiFPTwj6hzKBpxhZNWkEK7FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WUjnKt8Vnw8R0aXD8h8BngW091a7DItIyKIlmIqVQB+U2sBSQieAw4/hxZ8pya1Dg Jq9dARKpsg3W8f5QnLAlNC1rFnO+7rfpn3vvToVgyEYjK1d5kRmgNZVfni1vHdcgnd HCNwC6otzgtxjT1s9NDIarLpQ+BnPvp+HuWCqd2o= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jOOr9-0068yj-3i; Tue, 14 Apr 2020 18:56:15 +0200 From: Mauro Carvalho Chehab To: Linux Doc Mailing List Cc: Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Jonathan Corbet , Tim Bird Subject: [PATCH v2 4/6] scripts: sphinx-pre-install: address some issues with Gentoo Date: Tue, 14 Apr 2020 18:56:11 +0200 Message-Id: <7f631edce102b02ccbdbfb18be1376a86b41373d.1586883286.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 ba750f7b9127..86e14b9fd537 100755 --- a/scripts/sphinx-pre-install +++ b/scripts/sphinx-pre-install @@ -560,7 +560,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); } @@ -575,10 +576,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"); } -- 2.25.2