[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/, sys-apps/fwupd/files/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     3e90512c83b68e0011dd94c573e22866c8927abb
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 06:34:52 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 06:34:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e90512c

sys-apps/fwupd: Fixed build with USE="man minimal"

Thanks-to: Kamil Smardzewski <roderyk197 <AT> gmail.com>
Closes: https://bugs.gentoo.org/728484
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../fwupd/files/fwupd-1.4.4-help2man_var.patch     | 93 ++++++++++++++++++++++
 sys-apps/fwupd/fwupd-1.3.10.ebuild                 |  1 +
 sys-apps/fwupd/fwupd-1.3.11.ebuild                 |  1 +
 sys-apps/fwupd/fwupd-1.4.2.ebuild                  |  1 +
 sys-apps/fwupd/fwupd-1.4.4.ebuild                  |  1 +
 5 files changed, 97 insertions(+)

diff --git a/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch b/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch
new file mode 100644
index 00000000000..818a69ddcd4
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch
@@ -0,0 +1,93 @@
+From 5164e713f620972b43c54e34a653a932c968e653 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@dell.com>
+Date: Thu, 18 Jun 2020 12:11:31 -0500
+Subject: [PATCH] trivial: fix issue with agent on but man off
+
+Fixes: #2192
+---
+ src/meson.build | 64 +++++++++++++++++++++++++------------------------
+ 1 file changed, 33 insertions(+), 31 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 7a0b2976a..9a8334973 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -166,22 +166,24 @@ fwupdtool = executable(
+   install_dir : bindir
+ )
+ 
+-if build_daemon and get_option('man')
++if get_option('man')
+   help2man = find_program('help2man')
+-  custom_target('fwupdmgr-man',
+-    input : fwupdmgr,
+-    output : 'fwupdmgr.1',
+-    command : [
+-      help2man, '@INPUT@',
+-      '--no-info',
+-      '--output', '@OUTPUT@',
+-      '--name', 'Firmware update manager client utility',
+-      '--manual', 'User Commands',
+-      '--version-string', fwupd_version,
+-    ],
+-    install : true,
+-    install_dir : join_paths(mandir, 'man1'),
+-  )
++  if build_daemon
++    custom_target('fwupdmgr-man',
++      input : fwupdmgr,
++      output : 'fwupdmgr.1',
++      command : [
++        help2man, '@INPUT@',
++        '--no-info',
++        '--output', '@OUTPUT@',
++        '--name', 'Firmware update manager client utility',
++        '--manual', 'User Commands',
++        '--version-string', fwupd_version,
++      ],
++      install : true,
++      install_dir : join_paths(mandir, 'man1'),
++    )
++  endif
+   if get_option('agent')
+     custom_target('fwupdagent-man',
+       input : fwupdagent,
+@@ -198,22 +200,22 @@ if build_daemon and get_option('man')
+       install_dir : join_paths(mandir, 'man1'),
+     )
+   endif
+-endif
+-if get_option('man')
+-  custom_target('fwupdtool-man',
+-    input : fwupdtool,
+-    output : 'fwupdtool.1',
+-    command : [
+-      help2man, '@INPUT@',
+-      '--no-info',
+-      '--output', '@OUTPUT@',
+-      '--name', 'Standalone firmware update utility',
+-      '--manual', 'User Commands',
+-      '--version-string', fwupd_version,
+-    ],
+-    install : true,
+-    install_dir : join_paths(mandir, 'man1'),
+-  )
++  if build_standalone
++    custom_target('fwupdtool-man',
++      input : fwupdtool,
++      output : 'fwupdtool.1',
++      command : [
++        help2man, '@INPUT@',
++        '--no-info',
++        '--output', '@OUTPUT@',
++        '--name', 'Standalone firmware update utility',
++        '--manual', 'User Commands',
++        '--version-string', fwupd_version,
++      ],
++      install : true,
++      install_dir : join_paths(mandir, 'man1'),
++    )
++  endif
+ endif
+ 
+ if build_daemon

diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
index fb249ead344..a16b4f0ace0 100644
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild
@@ -90,6 +90,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
 )
 
 pkg_setup() {

diff --git a/sys-apps/fwupd/fwupd-1.3.11.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild
index fb249ead344..a16b4f0ace0 100644
--- a/sys-apps/fwupd/fwupd-1.3.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.11.ebuild
@@ -90,6 +90,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
 )
 
 pkg_setup() {

diff --git a/sys-apps/fwupd/fwupd-1.4.2.ebuild b/sys-apps/fwupd/fwupd-1.4.2.ebuild
index fc4bbdbfe90..78788fa23ce 100644
--- a/sys-apps/fwupd/fwupd-1.4.2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.2.ebuild
@@ -86,6 +86,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
 )
 
 pkg_setup() {

diff --git a/sys-apps/fwupd/fwupd-1.4.4.ebuild b/sys-apps/fwupd/fwupd-1.4.4.ebuild
index 557d271177c..5ad09f23bf8 100644
--- a/sys-apps/fwupd/fwupd-1.4.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.4.ebuild
@@ -86,6 +86,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
 )
 
 pkg_setup() {