public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/flashrom/files/, sys-apps/flashrom/
Date: Mon,  9 Nov 2020 17:42:07 +0000 (UTC)	[thread overview]
Message-ID: <1604943716.0202348e1e89c3ee6459dc8f6dafca5a2cedaa29.marecki@gentoo> (raw)

commit:     0202348e1e89c3ee6459dc8f6dafca5a2cedaa29
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  9 17:31:56 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> 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 <marecki <AT> 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() {


             reply	other threads:[~2020-11-09 17:42 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-09 17:42 Marek Szuba [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-28 19:08 [gentoo-commits] repo/gentoo:master commit in: sys-apps/flashrom/files/, sys-apps/flashrom/ Fabian Groffen
2024-04-24 13:27 Marek Szuba
2023-06-12 23:22 Marek Szuba
2022-03-11 16:40 Marek Szuba
2021-11-16 15:06 Marek Szuba
2021-05-17 12:58 Marek Szuba
2020-11-09 16:22 Marek Szuba
2020-05-02 16:37 Marek Szuba
2020-04-28  9:34 Marek Szuba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1604943716.0202348e1e89c3ee6459dc8f6dafca5a2cedaa29.marecki@gentoo \
    --to=marecki@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox