Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp120945ybg; Mon, 8 Jun 2020 18:11:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2Zur1+yRut9bYlhrzL5AbAB9AP0SnmzA1xC48cY8u8tuJnAnO6/DCRbn38qAAsuSUodAy X-Received: by 2002:a17:906:81c8:: with SMTP id e8mr22202940ejx.361.1591665102973; Mon, 08 Jun 2020 18:11:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591665102; cv=none; d=google.com; s=arc-20160816; b=pIJ5UEkAD5tWiC5yvAlJ+I2A7g5mxXT5BH0GDlNV0B1aQKqx8m8I50XvUGZG0mVPu3 c/WJav/RCNJRxfXjNIqXSLaCnJaAmc+/+0X6hnR06WLiQIc1e3qJNg6mhsNcvNjxL2Wy skwD0FrFnbsmNrBCpnwgoFs51yra40i10lnvjItwAvabGJwe9ydtNBnWfr9KHJLd85yK /c0+mlXeSw7eeaEU8y6YQUBT64NPbXfa68yR1Vi77Ef0QYT21xCcV3ySKCKmyTg/KjSp 84C5Ffxe82uUMUOwOsKdQzQ88XBwgUJRo+I2TRT43wSnKPPDApkj3pIRrbNxEtFi+EAB INXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1eERRVl8HhsqVEahZm3UYoYi6czjnpJlP6hWtrMZGgw=; b=MYhzjP9DU21gZRIjcwhpnAy6LHYyTTSa+6LjmXmH8/48RGDyE7h0oahdEmmlMj8dJz /Qbll7tfixiAWqxFII5jx3W+aKviCwTfb1NPgU63z1hHsurQkTxr4/n6JSSTBXfkT7A3 ep5Gi7yZd01c5rQXiLMors14i26ApNvc0oZd/yGgzMOba8qtSza4hkoPv2ojTRQitPiw nT+PASsan9mQDmLXhNPHGLGdftgevRAvHWjD6S3A/c7TMfFq8cUDpMd2+1QwahqAd5NL emYw6NQUoGQHBLglCE9Exo0pYbXogDJOz4CW2DpKN/bfohqN+mC7w6O35zQcEaqnyT32 Yyfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gWLB2XNo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lh7si9748731ejb.106.2020.06.08.18.11.20; Mon, 08 Jun 2020 18:11:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gWLB2XNo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727022AbgFHXGe (ORCPT + 99 others); Mon, 8 Jun 2020 19:06:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:49352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726933AbgFHXGW (ORCPT ); Mon, 8 Jun 2020 19:06:22 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 542A62076C; Mon, 8 Jun 2020 23:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657582; bh=ekLNBpf31GOaE6htK8WXnUBTXk1rra0US7N5JT8qH1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gWLB2XNor0QD5ecdltAZx7PD4+VcjUso70MyfMsYbGvpUPxuDZOzmPiBxGleCp6fA mxgL1jeaclDhL/PqafVFNAQ4mQCKHKT45NxHEokuantZg8/y6Q9osDsgQjWwzercEg E0qsnVQblnoArnFfEN+Lrf947e4HKKsTu96yf+Uo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mauro Carvalho Chehab , Jonathan Corbet , Sasha Levin , linux-doc@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 011/274] scripts: sphinx-pre-install: address some issues with Gentoo Date: Mon, 8 Jun 2020 19:01:44 -0400 Message-Id: <20200608230607.3361041-11-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mauro Carvalho Chehab [ 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 Link: https://lore.kernel.org/r/7f631edce102b02ccbdbfb18be1376a86b41373d.1586883286.git.mchehab+huawei@kernel.org Signed-off-by: Jonathan Corbet Signed-off-by: Sasha Levin --- 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"); } -- 2.25.1