Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/
Date: Sun, 31 Mar 2019 18:40:21
Message-Id: 1554057608.4dcdcebb67254368e849588d350842f8b6daba4e.polynomial-c@gentoo
1 commit: 4dcdcebb67254368e849588d350842f8b6daba4e
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 31 18:40:08 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 31 18:40:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dcdcebb
7
8 sys-apps/fwupd: Revbump to fix init script with USE="elogind"
9
10 Closes: https://bugs.gentoo.org/682140
11 Package-Manager: Portage-2.3.62, Repoman-2.3.12
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 sys-apps/fwupd/files/fwupd-r1 | 13 +++++++++++++
15 .../fwupd/{fwupd-1.2.6.ebuild => fwupd-1.2.6-r1.ebuild} | 6 +++++-
16 2 files changed, 18 insertions(+), 1 deletion(-)
17
18 diff --git a/sys-apps/fwupd/files/fwupd-r1 b/sys-apps/fwupd/files/fwupd-r1
19 new file mode 100644
20 index 00000000000..4a4865ef15a
21 --- /dev/null
22 +++ b/sys-apps/fwupd/files/fwupd-r1
23 @@ -0,0 +1,13 @@
24 +#!/sbin/openrc-run
25 +# Copyright 1999-2019 Gentoo Authors
26 +# Distributed under the terms of the GNU General Public License v2
27 +
28 +description="Firmware update daemon"
29 +pidfile="/var/run/fwupd.pid"
30 +command="/usr/libexec/fwupd/fwupd"
31 +command_background="true"
32 +
33 +depend() {
34 + need %SEAT_MANAGER% dbus
35 + before xdm
36 +}
37
38 diff --git a/sys-apps/fwupd/fwupd-1.2.6.ebuild b/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild
39 similarity index 96%
40 rename from sys-apps/fwupd/fwupd-1.2.6.ebuild
41 rename to sys-apps/fwupd/fwupd-1.2.6-r1.ebuild
42 index 4f9584b78f9..3006840299e 100644
43 --- a/sys-apps/fwupd/fwupd-1.2.6.ebuild
44 +++ b/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild
45 @@ -122,7 +122,11 @@ src_configure() {
46
47 src_install() {
48 meson_src_install
49 - doinitd "${FILESDIR}"/${PN}
50 +
51 + sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
52 + "${FILESDIR}"/${PN}-r1 \
53 + > "${T}"/${PN} || die
54 + doinitd "${T}"/${PN}
55
56 if ! use systemd ; then
57 # Don't timeout when fwupd is running (#673140)