| 1 |
commit: 34683d463f8f9d6f67cae43b509098ed9f7b33e5 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 20 07:37:10 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 21 11:30:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34683d46 |
| 7 |
|
| 8 |
sys-apps/fwupd: Add USE consolekit |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/fwupd/fwupd-1.2.7.ebuild | 17 +++++------------ |
| 14 |
sys-apps/fwupd/metadata.xml | 5 ++--- |
| 15 |
2 files changed, 7 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/fwupd/fwupd-1.2.7.ebuild b/sys-apps/fwupd/fwupd-1.2.7.ebuild |
| 18 |
index 00ab9a633a6..5951cd35b84 100644 |
| 19 |
--- a/sys-apps/fwupd/fwupd-1.2.7.ebuild |
| 20 |
+++ b/sys-apps/fwupd/fwupd-1.2.7.ebuild |
| 21 |
@@ -14,10 +14,10 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 22 |
LICENSE="LGPL-2.1+" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="~amd64 ~arm ~x86" |
| 25 |
-IUSE="agent colorhug dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi" |
| 26 |
+IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi" |
| 27 |
|
| 28 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 29 |
- ?? ( elogind systemd ) |
| 30 |
+ ^^ ( consolekit elogind systemd ) |
| 31 |
dell? ( uefi ) |
| 32 |
" |
| 33 |
|
| 34 |
@@ -38,10 +38,12 @@ RDEPEND="${PYTHON_DEPS} |
| 35 |
>=sys-auth/polkit-0.103 |
| 36 |
virtual/libelf:0= |
| 37 |
colorhug? ( >=x11-misc/colord-1.2.12:0= ) |
| 38 |
+ consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 39 |
dell? ( |
| 40 |
sys-libs/efivar |
| 41 |
>=sys-libs/libsmbios-2.4.0 |
| 42 |
) |
| 43 |
+ elogind? ( sys-auth/elogind ) |
| 44 |
gpg? ( |
| 45 |
app-crypt/gpgme |
| 46 |
dev-libs/libgpg-error |
| 47 |
@@ -49,10 +51,6 @@ RDEPEND="${PYTHON_DEPS} |
| 48 |
nvme? ( sys-libs/efivar ) |
| 49 |
pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) |
| 50 |
redfish? ( sys-libs/efivar ) |
| 51 |
- !systemd? ( |
| 52 |
- !elogind? ( >=sys-auth/consolekit-1.0.0 ) |
| 53 |
- elogind? ( sys-auth/elogind ) |
| 54 |
- ) |
| 55 |
systemd? ( >=sys-apps/systemd-211 ) |
| 56 |
thunderbolt? ( sys-apps/thunderbolt-software-user-space ) |
| 57 |
uefi? ( |
| 58 |
@@ -94,6 +92,7 @@ src_configure() { |
| 59 |
local emesonargs=( |
| 60 |
--localstatedir "${EPREFIX}"/var |
| 61 |
-Dagent="$(usex agent true false)" |
| 62 |
+ -Dconsolekit="$(usex consolekit true false)" |
| 63 |
-Dgtkdoc="$(usex doc true false)" |
| 64 |
-Delogind="$(usex elogind true false)" |
| 65 |
-Dgpg="$(usex gpg true false)" |
| 66 |
@@ -111,12 +110,6 @@ src_configure() { |
| 67 |
-Dtests="$(usex test true false)" |
| 68 |
) |
| 69 |
|
| 70 |
- if use elogind || use systemd ; then |
| 71 |
- emesonargs+=( -Dconsolekit=false ) |
| 72 |
- else |
| 73 |
- emesonargs+=( -Dconsolekit=true ) |
| 74 |
- fi |
| 75 |
- |
| 76 |
meson_src_configure |
| 77 |
} |
| 78 |
|
| 79 |
|
| 80 |
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml |
| 81 |
index 64d755cca4f..d749d5ca31b 100644 |
| 82 |
--- a/sys-apps/fwupd/metadata.xml |
| 83 |
+++ b/sys-apps/fwupd/metadata.xml |
| 84 |
@@ -7,10 +7,9 @@ |
| 85 |
</maintainer> |
| 86 |
<use> |
| 87 |
<flag name="agent">Enable update notification agent</flag> |
| 88 |
- <flag name="colorhug">Enable ColorHug support through |
| 89 |
- <pkg>x11-misc/colord</pkg> package.</flag> |
| 90 |
+ <flag name="colorhug">Enable ColorHug support through<pkg>x11-misc/colord</pkg> package</flag> |
| 91 |
+ <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session tracking</flag> |
| 92 |
<flag name="dell">Enable Dell-specific support.</flag> |
| 93 |
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag> |
| 94 |
<flag name="gpg">Enable GPG support.</flag> |
| 95 |
<flag name="man">Build and install man pages</flag> |
| 96 |
<flag name="nvme">Build and install nvme plugin</flag> |
Archives