gentoo resync : 21.06.2020

4 files changed, 93 insertions, 111 deletions

diff --git a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
deleted file mode 100644
index c0e006a7536d..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5c7e17276c8eb0c2a845cecb7d644a4bccf80519 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@dell.com>
-Date: Thu, 13 Feb 2020 12:06:41 -0600
-Subject: [PATCH] fu-util: fix a logic error in report uploading introduced in
- e076d48afb74d1447936d353f12781755f13b047
-
-Fixes: #1770
----
- src/fu-util.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/fu-util.c b/src/fu-util.c
-index 5bcffedeb..e6531c90c 100644
---- a/src/fu-util.c
-+++ b/src/fu-util.c
-@@ -286,16 +286,12 @@ fu_util_maybe_enable_automatic (FuUtilPrivate *priv, GPtrArray *remotes, GError
- 							 NULL, error))
- 				return FALSE;
- 		}
--		return TRUE;
-+		break;
- 	default:
- 		break;
- 	}
- 
--	g_set_error_literal (error,
--			     FWUPD_ERROR,
--			     FWUPD_ERROR_NOTHING_TO_DO,
--			     "invalid option selected");
--	return FALSE;
-+	return TRUE;
- }
- 
- static gboolean
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
deleted file mode 100644
index a01e5fbe570d..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 4e381f2a61c6ea4eb7438c14f76b8301762a800c Mon Sep 17 00:00:00 2001
-From: Dennis Kadioglu <dkadioglu@web.de>
-Date: Thu, 5 Mar 2020 09:37:56 +0100
-Subject: [PATCH] fix fwupd.shutdown.in according to the movement of fwupdtool
- to bindir
-
----
- data/fwupd.shutdown.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/fwupd.shutdown.in b/data/fwupd.shutdown.in
-index 4c027e7ab..53b334555 100755
---- a/data/fwupd.shutdown.in
-+++ b/data/fwupd.shutdown.in
-@@ -4,4 +4,4 @@
- [ -f @localstatedir@/lib/fwupd/pending.db ] || exit 0
- 
- # activate firmware when we have a read-only filesysten
--@libexecdir@/fwupd/fwupdtool activate
-+@bindir@/fwupdtool activate
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
deleted file mode 100644
index 6c9898557ffd..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bacd3a44fe6f06ddd8bb65a3a56eb1738a65ed8c Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 6 Mar 2020 16:00:23 +0100
-Subject: [PATCH] Don't build/install fwupdagent man page if agent build is not
- requested
-
-Otherwise build fails with:
-
-  src/meson.build:196:2: ERROR: Unknown variable "fwupdagent".
-
-Gentoo-bug: https://bugs.gentoo.org/711682
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/meson.build | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 46a9c4ded..e9aac607e 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -193,20 +193,22 @@ if build_daemon and get_option('man')
-     install : true,
-     install_dir : join_paths(mandir, 'man1'),
-   )
--  custom_target('fwupdagent-man',
--    input : fwupdagent,
--    output : 'fwupdagent.1',
--    command : [
--      help2man, '@INPUT@',
--      '--no-info',
--      '--output', '@OUTPUT@',
--      '--name', 'Firmware updating agent',
--      '--manual', 'User Commands',
--      '--version-string', fwupd_version,
--    ],
--    install : true,
--    install_dir : join_paths(mandir, 'man1'),
--  )
-+  if get_option('agent')
-+    custom_target('fwupdagent-man',
-+      input : fwupdagent,
-+      output : 'fwupdagent.1',
-+      command : [
-+        help2man, '@INPUT@',
-+        '--no-info',
-+        '--output', '@OUTPUT@',
-+        '--name', 'Firmware updating agent',
-+        '--manual', 'User Commands',
-+        '--version-string', fwupd_version,
-+      ],
-+      install : true,
-+      install_dir : join_paths(mandir, 'man1'),
-+    )
-+  endif
- endif
- if get_option('man')
-   custom_target('fwupdtool-man',
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 000000000000..818a69ddcd41
--- /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