sys-apps/fwupd: remove consolekit support

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>

5 files changed, 16 insertions, 21 deletions

diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
index f0c9fd71429f..a75d878756bd 100644
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild
@@ -14,9 +14,9 @@ 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 amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
+IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( consolekit elogind minimal systemd )
+	^^ ( elogind minimal systemd )
 	dell? ( uefi )
 	minimal? ( !introspection )
 "
@@ -53,7 +53,6 @@ CDEPEND="${PYTHON_DEPS}
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
 	dell? (
 		sys-libs/efivar
 		>=sys-libs/libsmbios-2.4.0
@@ -119,7 +118,6 @@ src_configure() {
 		-Dbuild="$(usex minimal standalone all)"
 		$(meson_use agent)
 		$(meson_use amt plugin_amt)
-		$(meson_use consolekit)
 		$(meson_use dell plugin_dell)
 		$(meson_use elogind)
 		$(meson_use gpg)
@@ -140,6 +138,7 @@ src_configure() {
 		-Dplugin_flashrom="false"
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
+		-Dconsolekit="false"
 	)
 	export CACHE_DIRECTORY="${T}"
 	meson_src_configure
@@ -149,7 +148,7 @@ src_install() {
 	meson_src_install
 
 	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+		sed "s@%SEAT_MANAGER%@elogind@" \
 			"${FILESDIR}"/${PN}-r1 \
 			> "${T}"/${PN} || die
 		doinitd "${T}"/${PN}
diff --git a/sys-apps/fwupd/fwupd-1.3.11.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild
index dd8d595a5892..378dc3009785 100644
--- a/sys-apps/fwupd/fwupd-1.3.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.11.ebuild
@@ -14,9 +14,9 @@ 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 amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
+IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( consolekit elogind minimal systemd )
+	^^ ( elogind minimal systemd )
 	dell? ( uefi )
 	minimal? ( !introspection )
 "
@@ -53,7 +53,6 @@ CDEPEND="${PYTHON_DEPS}
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
 	dell? (
 		sys-libs/efivar
 		>=sys-libs/libsmbios-2.4.0
@@ -119,7 +118,6 @@ src_configure() {
 		-Dbuild="$(usex minimal standalone all)"
 		$(meson_use agent)
 		$(meson_use amt plugin_amt)
-		$(meson_use consolekit)
 		$(meson_use dell plugin_dell)
 		$(meson_use elogind)
 		$(meson_use gpg)
@@ -140,6 +138,7 @@ src_configure() {
 		-Dplugin_flashrom="false"
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
+		-Dconsolekit="false"
 	)
 	export CACHE_DIRECTORY="${T}"
 	meson_src_configure
@@ -149,7 +148,7 @@ src_install() {
 	meson_src_install
 
 	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+		sed "s@%SEAT_MANAGER%@elogind@" \
 			"${FILESDIR}"/${PN}-r1 \
 			> "${T}"/${PN} || die
 		doinitd "${T}"/${PN}
diff --git a/sys-apps/fwupd/fwupd-1.4.5.ebuild b/sys-apps/fwupd/fwupd-1.4.5.ebuild
index 246c5406ba15..10d29cf18bc2 100644
--- a/sys-apps/fwupd/fwupd-1.4.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.5.ebuild
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt consolekit dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
+IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( consolekit elogind minimal systemd )
+	^^ ( elogind minimal systemd )
 	dell? ( uefi )
 	minimal? ( !introspection )
 "
@@ -54,7 +54,6 @@ CDEPEND="${PYTHON_DEPS}
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
 	dell? (
 		sys-libs/efivar
 		>=sys-libs/libsmbios-2.4.0
@@ -115,7 +114,6 @@ src_configure() {
 		-Dbuild="$(usex minimal standalone all)"
 		$(meson_use agent)
 		$(meson_use amt plugin_amt)
-		$(meson_use consolekit)
 		$(meson_use dell plugin_dell)
 		$(meson_use elogind)
 		$(meson_use gtk-doc gtkdoc)
@@ -134,6 +132,7 @@ src_configure() {
 		-Dplugin_flashrom="false"
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
+		-Dconsolekit="false"
 	)
 	export CACHE_DIRECTORY="${T}"
 	meson_src_configure
@@ -143,7 +142,7 @@ src_install() {
 	meson_src_install
 
 	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+		sed "s@%SEAT_MANAGER%@elogind@" \
 			"${FILESDIR}"/${PN}-r1 \
 			> "${T}"/${PN} || die
 		doinitd "${T}"/${PN}
diff --git a/sys-apps/fwupd/fwupd-1.4.6.ebuild b/sys-apps/fwupd/fwupd-1.4.6.ebuild
index 246c5406ba15..10d29cf18bc2 100644
--- a/sys-apps/fwupd/fwupd-1.4.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.6.ebuild
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt consolekit dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
+IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( consolekit elogind minimal systemd )
+	^^ ( elogind minimal systemd )
 	dell? ( uefi )
 	minimal? ( !introspection )
 "
@@ -54,7 +54,6 @@ CDEPEND="${PYTHON_DEPS}
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
 	dell? (
 		sys-libs/efivar
 		>=sys-libs/libsmbios-2.4.0
@@ -115,7 +114,6 @@ src_configure() {
 		-Dbuild="$(usex minimal standalone all)"
 		$(meson_use agent)
 		$(meson_use amt plugin_amt)
-		$(meson_use consolekit)
 		$(meson_use dell plugin_dell)
 		$(meson_use elogind)
 		$(meson_use gtk-doc gtkdoc)
@@ -134,6 +132,7 @@ src_configure() {
 		-Dplugin_flashrom="false"
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
+		-Dconsolekit="false"
 	)
 	export CACHE_DIRECTORY="${T}"
 	meson_src_configure
@@ -143,7 +142,7 @@ src_install() {
 	meson_src_install
 
 	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+		sed "s@%SEAT_MANAGER%@elogind@" \
 			"${FILESDIR}"/${PN}-r1 \
 			> "${T}"/${PN} || die
 		doinitd "${T}"/${PN}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 9ff465d6aed9..70be5575b0f1 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -8,7 +8,6 @@
   <use>
     <flag name="agent">Enable update notification agent</flag>
     <flag name="amt">Build and install Intel AMT plugin</flag>
-    <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
     <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>