gentoo resync : 25.11.2020

7 files changed, 197 insertions, 43 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index c78b4ced2278..4bc5042858ee 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -3,10 +3,12 @@ AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8af
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2
 DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd
-DIST fwupd-1.4.5.tar.gz 2318208 BLAKE2B 1e46137f5b72ff104d920771e54e3123bd0665cafd20c75327682a7e4284be93f8e284947db91892c29a153803013bab8ac45e5a0263fcda33b7491c53dd5558 SHA512 47eb40e8d84dc49af783b661db0fce0fb800c4581929becffb03b79c41ed8bfb0987f40fbb8262292b24af85b7f91978a6979ea7458058ee2bfc1a4353d0bd31
 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
-EBUILD fwupd-1.3.10.ebuild 4245 BLAKE2B c010711add27bf1c2526f4d3663d01b7cc0326f0099234f50c06f2e792eb59c59dcf510ee18354c5f4f214cf66f8b41faa2f535573400f07f1f16a266010fe07 SHA512 d99af54dc6d51b030d1515db64a8c3d13311fa6cedd8ac3b367b86671aa86205ac2cdac1219da2a27c555679764b6182fd3e2cb76752dc07a8fb750462bca523
-EBUILD fwupd-1.3.11.ebuild 4247 BLAKE2B 61bf6e25d7217e6025669d98086ad77d774ff310662f3335e711e60f6521ab40d1ba2de37058c0630174cb4d7c81ca79d8857c5b49addeb2c73da899ee6daa91 SHA512 94abbbfc2ab9265b0feda0e2e7d67206abff0a2938a11b08ef5e5c861d88e942c034dd0a5dcfa894cb53cb9dabed0106fcd364e643bfe1ce753757c88703560e
-EBUILD fwupd-1.4.5.ebuild 4157 BLAKE2B bf0ffae31ef8c9d1e79f0f108f6f457722ed0c8c5791ba27964d09e6fd9a9867d18cc0aec12604666099ab3ccb3228186326053000184616f872fa326c3b047c SHA512 1535f9a7d1361322bedb87e1668aa8f95385f221e4eb4170739c5aa8f7ae505ede416b06fa0747d6ff423de585e557a5ed4ec1bc8b0daae37b8b45a5ab31a098
-EBUILD fwupd-1.4.6.ebuild 4157 BLAKE2B bf0ffae31ef8c9d1e79f0f108f6f457722ed0c8c5791ba27964d09e6fd9a9867d18cc0aec12604666099ab3ccb3228186326053000184616f872fa326c3b047c SHA512 1535f9a7d1361322bedb87e1668aa8f95385f221e4eb4170739c5aa8f7ae505ede416b06fa0747d6ff423de585e557a5ed4ec1bc8b0daae37b8b45a5ab31a098
-MISC metadata.xml 1183 BLAKE2B 1d98b79674b3d37f961dfa5f783d12f024865d2f29e53bb5e3de3daa47dbbc7993d0371ac93a7f1fd4411cee9dd0187a31d5904df23ea03ef4cd61e7a75f22dd SHA512 5357a5c7dd3e6578d5eb37296d484b8f5c89b0c619f0da783f642237cb00e72e8c6adc4c463c825959f2dcf58f52fe2f56623a4864b0bd41f26f530b7af51d42
+DIST fwupd-1.5.1.tar.gz 2398842 BLAKE2B dce2da9807bc28c502281a75b98b21bab8fc34778ca1ed5e43b944cec2043ced7d3b997402d904eaceeb62d139182b883dfac0f4b6228750b18f8d0c66539d4f SHA512 57fa13d0c24cf9c8ec5341dca5392e054194861885233284a5a26d7c351ccdaab5a9ac9853681258882d42d21732302324719a709ff7e713885a9977430683ce
+DIST fwupd-1.5.2.tar.gz 2416756 BLAKE2B 8b5849c3b1a0758489cdc369dfa85658a3904bb9483484aded4a4f0d3ed39f0fa819171273dabf18c62a0249f09b1058269cdb57eb3c75590242f1ba6b1a0a85 SHA512 1ea7104c95f884ba52194d3136058f685ac1ad6d705930c4bc584aa4b1902164393d8702a14ec4a6af84e8b06d778a4896e63cbe9d3266f20da31d3795fc7ca7
+EBUILD fwupd-1.3.10.ebuild 4148 BLAKE2B d05855a501dd88e13c9845b1755e940cf231a0f706d5535ee3c836e9cff42555378d8b4614eba0c1ddfd18e94294eda890f7335a6601df6aaaa0518b5fbac455 SHA512 7aca24dc171a5bac2daf1e68b8003f02534bf6c425b9f56c19cabb0a7b21c93d89a7160bf9e094822d5a8aab30f6ad8be9831cd7a1055c6ed11612d36e3d3be8
+EBUILD fwupd-1.3.11.ebuild 4150 BLAKE2B 8fd9c91985f344d898cdd16a95807c5d67d83125ca7fc2035d23ed7e1559803ca5dfa84b5f678c84e7b7c480e93e860ce3f2fa9b84d19dcb0400b80455dec0d9 SHA512 a830693d00099e0ee12aa2d9e6b0be6239958c32684c517c0ca8d118ec9faccd88c6264b86f0d704c5d0e1f9595b34b75973169ab15c4abed62242ec4481b5df
+EBUILD fwupd-1.4.6.ebuild 4058 BLAKE2B b5741ff3e24a276de100341b9a0bb37bcc71ac958ac19c2437b3c5471212247c75d71aad74c136ad4f103daf8397be495cc01ee858d3ea25886675e3ec637a37 SHA512 c25d3f5b6f8c74937761ba587959bc39a053ad74059750ee63d13ccc098f92c8fe91b1b8cb37d0ee86220f65f05235fd403de8a3cc670035e89a97ddceb90ff1
+EBUILD fwupd-1.5.1-r1.ebuild 3970 BLAKE2B 8e4a68c32d0adf5f38f183999d3810a4426c7711b414e8f1d531beac605fc0a3a6165a6275ebb34bfe80fd6455e619bbb35a8456c07ae2037d0967efdade1fc3 SHA512 a8dfb85985376080361b405ac579f623f4dc62ac4e112b035cec445b8c8927c80a198e8d3ba3b50e77498973e2c1cf2608bf8994430ffbbd062d48d9fc5ea7b1
+EBUILD fwupd-1.5.2.ebuild 3970 BLAKE2B 8e4a68c32d0adf5f38f183999d3810a4426c7711b414e8f1d531beac605fc0a3a6165a6275ebb34bfe80fd6455e619bbb35a8456c07ae2037d0967efdade1fc3 SHA512 a8dfb85985376080361b405ac579f623f4dc62ac4e112b035cec445b8c8927c80a198e8d3ba3b50e77498973e2c1cf2608bf8994430ffbbd062d48d9fc5ea7b1
+MISC metadata.xml 1181 BLAKE2B 467c8aa0e5816a75af46609baafd0472db7d28918e91032fb56cbf97eeaef3b196698d965f3e407d843d5f2fc90efbbdfcd4bf4263cab0919c09ec0e6e48b2a9 SHA512 77fbab8ce23a4e2e3568c4b08a7299d8aeea6a3333b12be6073bfc7a17020cd4122f04f8d592b891daf06176bbdcca345c0bae322a8d6db1da096f72ec2a93e6
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.6.ebuild b/sys-apps/fwupd/fwupd-1.4.6.ebuild
index 246c5406ba15..b438727ee7a8 100644
--- a/sys-apps/fwupd/fwupd-1.4.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.6.ebuild
@@ -13,10 +13,10 @@ 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"
+KEYWORDS="amd64 ~arm x86"
+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.5.ebuild b/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild
index 246c5406ba15..9ab001c44f90 100644
--- a/sys-apps/fwupd/fwupd-1.4.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild
@@ -13,10 +13,10 @@ 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"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="agent amt dell gtk-doc elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( consolekit elogind minimal systemd )
+	^^ ( elogind minimal systemd )
 	dell? ( uefi )
 	minimal? ( !introspection )
 "
@@ -43,7 +43,7 @@ CDEPEND="${PYTHON_DEPS}
 	dev-libs/json-glib
 	dev-libs/libgpg-error
 	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
+	>=dev-libs/libgusb-0.3.5[introspection?]
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
 	>=dev-libs/libxmlb-0.1.13:=
 	$(python_gen_cond_dep '
@@ -54,26 +54,21 @@ 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
 	)
-	elogind? ( sys-auth/elogind )
-	!minimal? (
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	policykit? (
 		>=sys-auth/polkit-0.103
 	)
-	nvme? ( sys-libs/efivar )
-	redfish? ( sys-libs/efivar )
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
-		app-crypt/tpm2-tss
 		media-libs/fontconfig
 		media-libs/freetype
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
 		x11-libs/cairo
 	)
 "
@@ -91,7 +86,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
 )
 
 pkg_setup() {
@@ -106,6 +100,8 @@ src_prepare() {
 	# c.f. https://github.com/fwupd/fwupd/issues/1414
 	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
 		-i plugins/thunderbolt/meson.build || die
+	sed '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
 	vala_src_prepare
 }
 
@@ -115,26 +111,25 @@ 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 flashrom plugin_flashrom)
 		$(meson_use gtk-doc gtkdoc)
 		$(meson_use man)
 		$(meson_use nvme plugin_nvme)
 		$(meson_use introspection)
-		$(meson_use redfish plugin_redfish)
+		$(meson_use policykit polkit)
 		$(meson_use synaptics plugin_synaptics)
 		$(meson_use systemd)
 		$(meson_use test tests)
 		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
+		$(meson_use tpm)
 		$(meson_use uefi plugin_uefi)
-		# Although our sys-apps/flashrom package now provides
-		# libflashrom.a, meson still can't find it
-		-Dplugin_flashrom="false"
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
+		-Dconsolekit="false"
 	)
+	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
 	export CACHE_DIRECTORY="${T}"
 	meson_src_configure
 }
@@ -143,7 +138,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.5.2.ebuild b/sys-apps/fwupd/fwupd-1.5.2.ebuild
new file mode 100644
index 000000000000..9ab001c44f90
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.5.2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="agent amt dell gtk-doc elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	minimal? ( !introspection )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+CDEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/libarchive:=
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libgusb-0.3.5[introspection?]
+	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	virtual/libelf:0=
+	virtual/udev
+	dell? (
+		>=sys-libs/libsmbios-2.4.0
+	)
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	policykit? (
+		>=sys-auth/polkit-0.103
+	)
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		media-libs/fontconfig
+		media-libs/freetype
+		sys-boot/gnu-efi
+		sys-boot/efibootmgr
+		x11-libs/cairo
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${CDEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${CDEPEND}
+	x11-libs/pango[introspection]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+	sed '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		$(meson_use agent)
+		$(meson_use amt plugin_amt)
+		$(meson_use dell plugin_dell)
+		$(meson_use elogind)
+		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use man)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use introspection)
+		$(meson_use policykit polkit)
+		$(meson_use synaptics plugin_synaptics)
+		$(meson_use systemd)
+		$(meson_use test tests)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm)
+		$(meson_use uefi plugin_uefi)
+		# Dependencies are not available (yet?)
+		-Dplugin_modem_manager="false"
+		-Dconsolekit="false"
+	)
+	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		sed "s@%SEAT_MANAGER%@elogind@" \
+			"${FILESDIR}"/${PN}-r1 \
+			> "${T}"/${PN} || die
+		doinitd "${T}"/${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 9ff465d6aed9..757decb28e49 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -8,8 +8,8 @@
   <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="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></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>