From 4dcdcebb67254368e849588d350842f8b6daba4e Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sun, 31 Mar 2019 20:40:08 +0200 Subject: [PATCH] sys-apps/fwupd: Revbump to fix init script with USE="elogind" Closes: https://bugs.gentoo.org/682140 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler --- sys-apps/fwupd/files/fwupd-r1 | 13 +++++++++++++ .../{fwupd-1.2.6.ebuild => fwupd-1.2.6-r1.ebuild} | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 sys-apps/fwupd/files/fwupd-r1 rename sys-apps/fwupd/{fwupd-1.2.6.ebuild => fwupd-1.2.6-r1.ebuild} (96%) diff --git a/sys-apps/fwupd/files/fwupd-r1 b/sys-apps/fwupd/files/fwupd-r1 new file mode 100644 index 000000000000..4a4865ef15af --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-r1 @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Firmware update daemon" +pidfile="/var/run/fwupd.pid" +command="/usr/libexec/fwupd/fwupd" +command_background="true" + +depend() { + need %SEAT_MANAGER% dbus + before xdm +} diff --git a/sys-apps/fwupd/fwupd-1.2.6.ebuild b/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild similarity index 96% rename from sys-apps/fwupd/fwupd-1.2.6.ebuild rename to sys-apps/fwupd/fwupd-1.2.6-r1.ebuild index 4f9584b78f93..3006840299ec 100644 --- a/sys-apps/fwupd/fwupd-1.2.6.ebuild +++ b/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild @@ -122,7 +122,11 @@ src_configure() { src_install() { meson_src_install - doinitd "${FILESDIR}"/${PN} + + sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ + "${FILESDIR}"/${PN}-r1 \ + > "${T}"/${PN} || die + doinitd "${T}"/${PN} if ! use systemd ; then # Don't timeout when fwupd is running (#673140) -- 2.26.2