From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1084863-garchives=archives.gentoo.org@lists.gentoo.org>
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 AF19B138334
for <garchives@archives.gentoo.org>; Sun, 21 Apr 2019 11:31:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A9048E08DD;
Sun, 21 Apr 2019 11:31:40 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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 81343E08DD
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Apr 2019 11:31:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 4BC4A341BEE
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Apr 2019 11:31:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C15D5BE
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Apr 2019 11:31:35 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1555846256.34683d463f8f9d6f67cae43b509098ed9f7b33e5.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/fwupd/fwupd-1.2.7.ebuild sys-apps/fwupd/metadata.xml
X-VCS-Directories: sys-apps/fwupd/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 34683d463f8f9d6f67cae43b509098ed9f7b33e5
X-VCS-Branch: master
Date: Sun, 21 Apr 2019 11:31:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 9549769d-4f48-40dd-a5b6-76f3384b878c
X-Archives-Hash: 33df19f1167761b04f289f6012a8933b
commit: 34683d463f8f9d6f67cae43b509098ed9f7b33e5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 07:37:10 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 11:30:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34683d46
sys-apps/fwupd: Add USE consolekit
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sys-apps/fwupd/fwupd-1.2.7.ebuild | 17 +++++------------
sys-apps/fwupd/metadata.xml | 5 ++---
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/sys-apps/fwupd/fwupd-1.2.7.ebuild b/sys-apps/fwupd/fwupd-1.2.7.ebuild
index 00ab9a633a6..5951cd35b84 100644
--- a/sys-apps/fwupd/fwupd-1.2.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.7.ebuild
@@ -14,10 +14,10 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent colorhug dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
+IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( elogind systemd )
+ ^^ ( consolekit elogind systemd )
dell? ( uefi )
"
@@ -38,10 +38,12 @@ RDEPEND="${PYTHON_DEPS}
>=sys-auth/polkit-0.103
virtual/libelf:0=
colorhug? ( >=x11-misc/colord-1.2.12:0= )
+ consolekit? ( >=sys-auth/consolekit-1.0.0 )
dell? (
sys-libs/efivar
>=sys-libs/libsmbios-2.4.0
)
+ elogind? ( sys-auth/elogind )
gpg? (
app-crypt/gpgme
dev-libs/libgpg-error
@@ -49,10 +51,6 @@ RDEPEND="${PYTHON_DEPS}
nvme? ( sys-libs/efivar )
pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
redfish? ( sys-libs/efivar )
- !systemd? (
- !elogind? ( >=sys-auth/consolekit-1.0.0 )
- elogind? ( sys-auth/elogind )
- )
systemd? ( >=sys-apps/systemd-211 )
thunderbolt? ( sys-apps/thunderbolt-software-user-space )
uefi? (
@@ -94,6 +92,7 @@ src_configure() {
local emesonargs=(
--localstatedir "${EPREFIX}"/var
-Dagent="$(usex agent true false)"
+ -Dconsolekit="$(usex consolekit true false)"
-Dgtkdoc="$(usex doc true false)"
-Delogind="$(usex elogind true false)"
-Dgpg="$(usex gpg true false)"
@@ -111,12 +110,6 @@ src_configure() {
-Dtests="$(usex test true false)"
)
- if use elogind || use systemd ; then
- emesonargs+=( -Dconsolekit=false )
- else
- emesonargs+=( -Dconsolekit=true )
- fi
-
meson_src_configure
}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 64d755cca4f..d749d5ca31b 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -7,10 +7,9 @@
</maintainer>
<use>
<flag name="agent">Enable update notification agent</flag>
- <flag name="colorhug">Enable ColorHug support through
- <pkg>x11-misc/colord</pkg> package.</flag>
+ <flag name="colorhug">Enable ColorHug support through<pkg>x11-misc/colord</pkg> package</flag>
+ <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
<flag name="dell">Enable Dell-specific support.</flag>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
<flag name="gpg">Enable GPG support.</flag>
<flag name="man">Build and install man pages</flag>
<flag name="nvme">Build and install nvme plugin</flag>