From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E562F138334 for ; Sun, 31 Mar 2019 18:40:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 195CFE08F1; Sun, 31 Mar 2019 18:40:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2838E08F1 for ; Sun, 31 Mar 2019 18:40:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38712335C67 for ; Sun, 31 Mar 2019 18:40:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D91AB452 for ; Sun, 31 Mar 2019 18:40:15 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1554057608.4dcdcebb67254368e849588d350842f8b6daba4e.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/fwupd/files/fwupd-r1 sys-apps/fwupd/fwupd-1.2.6-r1.ebuild sys-apps/fwupd/fwupd-1.2.6.ebuild X-VCS-Directories: sys-apps/fwupd/files/ sys-apps/fwupd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 4dcdcebb67254368e849588d350842f8b6daba4e X-VCS-Branch: master Date: Sun, 31 Mar 2019 18:40:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f1df4f7f-2294-4045-940f-6a9cf41f20ba X-Archives-Hash: e2087b945935842860ad20447769998a commit: 4dcdcebb67254368e849588d350842f8b6daba4e Author: Lars Wendler gentoo org> AuthorDate: Sun Mar 31 18:40:08 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Mar 31 18:40:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dcdcebb 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 gentoo.org> sys-apps/fwupd/files/fwupd-r1 | 13 +++++++++++++ .../fwupd/{fwupd-1.2.6.ebuild => fwupd-1.2.6-r1.ebuild} | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sys-apps/fwupd/files/fwupd-r1 b/sys-apps/fwupd/files/fwupd-r1 new file mode 100644 index 00000000000..4a4865ef15a --- /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 4f9584b78f9..3006840299e 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)