gentoo resync : 21.05.2019

4 files changed, 94 insertions, 6 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 768000e994a8..3b5242c16ef9 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,6 +1,7 @@
+AUX fwupd-1.2.9-without_systemd_build_fix.patch 2232 BLAKE2B 9cdd0466f4d9e86f823ddd1cfd3d899545cccd4ecf933cb48447a5010cd67ede434834ebfb348f457404da2f10395f2987e56afa3549432bff53380236eccac0 SHA512 29790db66320547fd1046f5f05d0485c54d984be8e0394bba5e8a64dbb73328639896840ece42d4d252d48a2a9c30fe599e0b064491ed16bb7b028ee18f6484b
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
-DIST fwupd-1.2.7.tar.gz 1899554 BLAKE2B aed0377135354c6391f63eb0802d27b5359efdb0f9d3b5c1a55ba8fe7ef0c84c9201e689d8a1bdde998e8147b25767e4dc7586c57bcf33e9f9e9d807e38e7a04 SHA512 12b5c193ab6e55e14256ea84273d139e7353618b6524197ba1f4477db32071e33a73b3e2e2b34733ca6269c4dbad5a03f2d3546b27d22b2a6db23989c69be6e5
 DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154
-EBUILD fwupd-1.2.7.ebuild 3635 BLAKE2B ef585e46a8d923c4b9efa7db3f0be37c8b5edb3f39853698eb2cab6fd65f9bbabdd40eec037945a8f29a8ebc03a1550d8b5076ba3293172b32ef6367e69a841d SHA512 b641c3d787e28a5f0724647d193ed3b4a63d1227abedc0db7c2f7a2663d0dbebe68615b6a6d74ae66fd44c4d8a82495ca2e459efe5088dde6fee3752cacef887
-EBUILD fwupd-1.2.8.ebuild 3634 BLAKE2B 6756dd3ba1f12b56d4fe960b7478df57968ad36ab1276de6b2438f526cd78db332fdafae85adb0538cdb8cdb21bee6c98fe8d3c668d35c5f7fd994677fdd11cd SHA512 8661c3b4cbe4d0b0b995cba2b7f24b22ccd5d3dee068ebbf67bbbcc014011bc6f228a4a0bcc5322a445ffb60ba71e7e5436ad3d9b823f8f4773b84153bcd72ca
+DIST fwupd-1.2.9.tar.gz 1938008 BLAKE2B 6a16c8e3a2c94dfbe9485d3ed57f3908fa2d7bcd95ac122d4b08e9a869706c01483132015f06cfa3076c861fec903740bed83b7ef763ac9b20147673a25a54a1 SHA512 942c6bad822dc65846d1984850798bec677b6a312100c6f5971fc9d5906c182267182ef29e0834bbd2b83fe72b11c3b6e50855d90388d2bf85e8a3b95d0a5a68
+EBUILD fwupd-1.2.8.ebuild 3656 BLAKE2B 4f219b26d50bc3fd9560ec8684a3629f788f92f6b9fa15ef1d948302f40f6194191b4a7d0a9891a5b8d5973d75d575df3d48c27e49733f32a0c8454af0c621d6 SHA512 224bcb6a1b84676695992bdcdcb6d28892b8068ad4f4a09d5b7bad50fba77902c4b10d172e705aa703195f80a0b879cb8322c9f5bb08a9610c502432e6908c5d
+EBUILD fwupd-1.2.9.ebuild 3723 BLAKE2B 0b61a6fc582f93030cac14a6f0bef178c112dba75d859a0df69cb721a39a8c6cac846a59b0403aebddde6b55baf3f41c5e6c57c7dfa6f5d62dd76b55f87223bb SHA512 b9f86fb31cb227a446f5a67e683f004c95f3a44e6cce2e4bd2480f4b6402bcf2c7c9ab704966ac817bced154b8d80370a570de075fa593ad6bda719c0803f268
 MISC metadata.xml 1093 BLAKE2B 0f2e81196b336c6047ae2df81cf2aed692eb452c396d9b65b726e951be859c43a76638ca635fbca96d6d7dfee7e1ebf7d3fc844eb1633569ecfdbea0dcd9228f SHA512 99344e56a5a3641e65bee382a6ada656cd5c63cf114785b4185f4ee1b3a0c9514f83ca3adc77d38f145d9a1f1e64aa21dd72dcc1e4f78cb50d042f901a5c9c8a
diff --git a/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch b/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch
new file mode 100644
index 000000000000..37be190d8aa1
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch
@@ -0,0 +1,77 @@
+From d92cccaf1396d93f97480f32694372b8256f9b11 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 20 May 2019 11:28:31 +0100
+Subject: [PATCH] trivial: Fix non-systemd build
+
+---
+ src/fu-tool.c        | 2 ++
+ src/fu-util-common.c | 5 ++++-
+ src/fu-util.c        | 6 +++++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/fu-tool.c b/src/fu-tool.c
+index 353a52e88..eac7a8cc4 100644
+--- a/src/fu-tool.c
++++ b/src/fu-tool.c
+@@ -113,8 +113,10 @@ fu_util_start_engine (FuUtilPrivate *priv, FuEngineLoadFlags flags, GError **err
+ {
+ 	g_autoptr(GError) error_local = NULL;
+ 
++#ifdef HAVE_SYSTEMD
+ 	if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), &error_local))
+ 		g_debug ("Failed top stop daemon: %s", error_local->message);
++#endif
+ 	if (!fu_engine_load (priv->engine, flags, error))
+ 		return FALSE;
+ 	if (fu_engine_get_tainted (priv->engine)) {
+diff --git a/src/fu-util-common.c b/src/fu-util-common.c
+index 219752b1e..51e16f671 100644
+--- a/src/fu-util-common.c
++++ b/src/fu-util-common.c
+@@ -28,6 +28,7 @@ fu_util_get_systemd_unit (void)
+ 	return SYSTEMD_FWUPD_UNIT;
+ }
+ 
++#ifdef HAVE_SYSTEMD
+ static const gchar *
+ fu_util_get_expected_command (const gchar *target)
+ {
+@@ -35,10 +36,12 @@ fu_util_get_expected_command (const gchar *target)
+ 		return "fwupd.fwupdmgr";
+ 	return "fwupdmgr";
+ }
++#endif
+ 
+ gboolean
+ fu_util_using_correct_daemon (GError **error)
+ {
++#ifdef HAVE_SYSTEMD
+ 	g_autofree gchar *default_target = NULL;
+ 	g_autoptr(GError) error_local = NULL;
+ 	const gchar *target = fu_util_get_systemd_unit ();
+@@ -58,7 +61,7 @@ fu_util_using_correct_daemon (GError **error)
+ 			     fu_util_get_expected_command (target));
+ 		return FALSE;
+ 	}
+-
++#endif
+ 	return TRUE;
+ }
+ 
+diff --git a/src/fu-util.c b/src/fu-util.c
+index c8528e71e..dec96e741 100644
+--- a/src/fu-util.c
++++ b/src/fu-util.c
+@@ -2122,7 +2122,11 @@ fu_util_modify_config (FuUtilPrivate *priv, gchar **values, GError **error)
+ 		if (!fu_util_prompt_for_boolean (FALSE))
+ 			return TRUE;
+ 	}
+-	return fu_systemd_unit_stop (fu_util_get_systemd_unit (), error);
++#ifdef HAVE_SYSTEMD
++	if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), error))
++		return FALSE;
++#endif
++	return TRUE;
+ }
+ 
+ static void
diff --git a/sys-apps/fwupd/fwupd-1.2.8.ebuild b/sys-apps/fwupd/fwupd-1.2.8.ebuild
index 9f2372052b63..9107999ee4a7 100644
--- a/sys-apps/fwupd/fwupd-1.2.8.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -71,7 +71,10 @@ BDEPEND="
 	>=dev-util/meson-0.47.0
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
 "
 
 # required for fwupd daemon to run.
diff --git a/sys-apps/fwupd/fwupd-1.2.7.ebuild b/sys-apps/fwupd/fwupd-1.2.9.ebuild
index 5951cd35b846..ab05058f3b68 100644
--- a/sys-apps/fwupd/fwupd-1.2.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.9.ebuild
@@ -71,13 +71,20 @@ BDEPEND="
 	>=dev-util/meson-0.47.0
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
 "
 
 # required for fwupd daemon to run.
 # NOT a build time dependency. The build system does not check for dbus.
 PDEPEND="sys-apps/dbus"
 
+PATCHES=(
+	"${FILESDIR}/${P}-without_systemd_build_fix.patch"
+)
+
 src_prepare() {
 	default
 	sed -e "s/'--create'/'--absolute-name', '--create'/" \