From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E428D138359 for ; Mon, 9 Nov 2020 17:42:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C65E0E0814; Mon, 9 Nov 2020 17:42:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 880C5E0814 for ; Mon, 9 Nov 2020 17:42:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE739340A7F for ; Mon, 9 Nov 2020 17:42:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 297B043B for ; Mon, 9 Nov 2020 17:42:07 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1604943716.0202348e1e89c3ee6459dc8f6dafca5a2cedaa29.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/flashrom/files/, sys-apps/flashrom/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch sys-apps/flashrom/flashrom-1.2-r3.ebuild X-VCS-Directories: sys-apps/flashrom/ sys-apps/flashrom/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 0202348e1e89c3ee6459dc8f6dafca5a2cedaa29 X-VCS-Branch: master Date: Mon, 9 Nov 2020 17:42:07 +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: 60f8080b-0aa2-4138-ac1e-c10dec2fe896 X-Archives-Hash: 089951db768794f1526e7343be109eda commit: 0202348e1e89c3ee6459dc8f6dafca5a2cedaa29 Author: Marek Szuba gentoo org> AuthorDate: Mon Nov 9 17:31:56 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Nov 9 17:41:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0202348e sys-apps/flashrom-1.2-r3: install the man page Signed-off-by: Marek Szuba gentoo.org> .../files/flashrom-1.2_meson-install-manpage.patch | 43 ++++++++++++++++++++++ sys-apps/flashrom/flashrom-1.2-r3.ebuild | 1 + 2 files changed, 44 insertions(+) diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch new file mode 100644 index 00000000000..8783cfeefa7 --- /dev/null +++ b/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch @@ -0,0 +1,43 @@ +This is essentially the upstream commit 7aea04f7099ad4dde7b1f5900b54ef603eadf25e, +modified so that MAN_DATE is set to simply '-' - the commit generates +the date using the script util/getrevision.sh, which is not included in +release tarballs. + +--- a/flashrom.8.tmpl ++++ b/flashrom.8.tmpl +@@ -40,7 +40,7 @@ + . \} + . \} + .. +-.TH FLASHROM 8 "" "" ++.TH FLASHROM 8 "@MAN_DATE@" "@VERSION@" "@MAN_DATE@" + .SH NAME + flashrom \- detect, read, write, verify and erase flash chips + .SH SYNOPSIS +--- a/meson.build ++++ b/meson.build +@@ -321,6 +321,7 @@ endif + prefix = get_option('prefix') + sbindir = join_paths(prefix, get_option('sbindir')) + libdir = join_paths(prefix, get_option('libdir')) ++mandir = join_paths(prefix, get_option('mandir')) + + install_headers([ + 'libflashrom.h', +@@ -394,6 +395,16 @@ pkgg.generate( + description : 'library to interact with flashrom', + ) + ++conf.set('VERSION', version) ++conf.set('MAN_DATE', '-') ++configure_file( ++ input : 'flashrom.8.tmpl', ++ output : 'flashrom.8', ++ configuration : conf, ++ install: true, ++ install_dir: join_paths(mandir, 'man8'), ++) ++ + flashrom_dep = declare_dependency( + link_with : flashrom, + include_directories : include_directories('.'), diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild index 7d87b514771..732c1ed8d28 100644 --- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild +++ b/sys-apps/flashrom/flashrom-1.2-r3.ebuild @@ -96,6 +96,7 @@ DOCS=( README Documentation/ ) PATCHES=( "${FILESDIR}"/${PN}-1.2_meson-fixes.patch + "${FILESDIR}"/${PN}-1.2_meson-install-manpage.patch ) src_configure() {