diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-04-20 09:37:10 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-04-21 13:30:56 +0200 |
| commit | 34683d463f8f9d6f67cae43b509098ed9f7b33e5 (patch) | |
| tree | 5d63059943cf493dcae2006bd80a69f8255f22dd /sys-apps | |
| parent | kde-frameworks/ki18n: Fix build with python2_7 (diff) | |
| download | gentoo-34683d463f8f9d6f67cae43b509098ed9f7b33e5.tar.gz gentoo-34683d463f8f9d6f67cae43b509098ed9f7b33e5.tar.bz2 gentoo-34683d463f8f9d6f67cae43b509098ed9f7b33e5.zip | |
sys-apps/fwupd: Add USE consolekit
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/fwupd/fwupd-1.2.7.ebuild | 17 | ||||
| -rw-r--r-- | 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 00ab9a633a64..5951cd35b846 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 64d755cca4f6..d749d5ca31b9 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> |