gentoo resync : 13.11.2021

10 files changed, 4 insertions, 640 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 916b64b2c93c..64ffc1b72d15 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,19 +1,9 @@
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
-AUX fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch 1105 BLAKE2B 898f70b2baa27de6678b415ffe9671e2599ff69d9f1ad52cfcefd271d5c5c936bf32276970ef36a88464f11ea1956d90bedd64989adeb9f87be6a2e4d82bcd14 SHA512 106112dedd1c205604b6588ad08092cdb5bcdc1bab3f2e415526faf7af3075ed442d61b3f31a3d0421b683d6f772fb196f93131d3f2f8227b65a6dc781ec6461
-AUX fwupd-1.6.2-dell-dock-requires-gusb.patch 716 BLAKE2B 470db7243fa0e7398778ef8c5d716013e04ef6429e1b4a35b644c3f4bca7148f3bb9f2fc08814b82edc50e1605dc00feb2691f3f1c09b371afdeb1b838181a6c SHA512 08546194d1dfe27a09b10feb6d63a1f29cae881a0ac23bd1497b91eea44fff21559bb67ab5feac3b5613d4f99626708dade0127cb6c7f5ea4c842612c0323ec3
-AUX fwupd-1.7.0-elanfp-requires-gusb.patch 641 BLAKE2B 54dd8413a9608a9e1711622af3422ad874839c7083009c964f8cb2d198103e551d9bb262fc87da3dec0913829defbff358a2777aed1b11c0a42463d930a6f35b SHA512 fbe76f0db8364dd62b86fffaac16d8cf79eb65cbe71862030641c56d9b779c579f4528d176fbc382f055bee144fed5b2c9823486d3354d7de41240035307eacf
-AUX fwupd-1.7.0-fix-test-configure.patch 508 BLAKE2B 7b06c980fe18ee42969951cef6202c77f8c8bef713a344a6ade039c818e44123c4396ea1c191017d28491a3d3905c552d53d4e7d82d91f4cc4373bfae42861b7 SHA512 23232788c0e80933852d8df816889c8b0b181de62e8b0210f1f3e71f0a6d0ac9a1e484982c29e25bd47f57d49591564e92704afbf2638deb59170c8b65295fee
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
-DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
-DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67
 DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
-DIST fwupd-1.7.0.tar.gz 4102985 BLAKE2B 9a29621e029c526d513304863294ee69f14ff1cf069b388fe5dc6037b2f030ea24136f18d9096abcc449376295996e3184c1c969f8dda329f2786622ba1300a7 SHA512 148f161f0e8d008fa20091c747baf4a205bc2e76ddc5dbb3676e3f2a15ca5d6d1454b572ea0336f185b5ef3a8ca8bfd3ad1098649e095a58c9822d4dbffe2987
 DIST fwupd-1.7.1.tar.gz 4025627 BLAKE2B 035796e8ebaafe139b8b6e7014f51c6e16a228d0ef697984f86e31c28f38aa62bc7d3bd64466b3f3c83c2605b229d7b3063287373c83ec4d962adca3c85cc6de SHA512 c695b66ebbe23908f5d6ef6d6084c092af8754e0677f094ee4d09b02d904f3f3cca0e460c5345a835c16b7303bba72209e216ba28285e44bce4872fffa136a5e
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
-EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea
-EBUILD fwupd-1.6.3.ebuild 4504 BLAKE2B 78cb6e9716c4109fcf2e26cad2c8d5d84d952a1514827f2b48106b8b15d9a65085468396fee88584bc498441ed230dba5b150f682326e982c2fe45620aa3c1ed SHA512 01927eff188e8bf7fa80d394f9666bcc47266bf7e685264da4484ab4c7966adab92669007473c1602b31253cb35ec9bef44737bf4ba78d0ac8b1cb4d9799c255
-EBUILD fwupd-1.6.4-r1.ebuild 4504 BLAKE2B a5efb85ec19fd9484769314b6fcdcdffd1a7d331150496385e1f071421eaa20580c3b7590e52d83e36f752e8953fb6415873cff29fca9a70ea2e66722d4cf105 SHA512 f79dea7b0732564e976507863d39ea2af2d02a4218efc683476f9be1a18248ec8a25f1ff7729a44d5ff0171dc725cac3ebc3057b25c8704365c127a9ac6b9cde
-EBUILD fwupd-1.7.0.ebuild 4730 BLAKE2B 2ef6da5175a815e8867b180f0054657be387015ea200979d253bb35e9933adf9a8eee4fc9c64649965cd5fadccd98a3d8180803766abf3c1c586b7e1754c9c97 SHA512 d8c63a463cc5beca4580ab522cd4a027997deb238202e44ce4c1f79634385b834232bf5c4b0b6c20fbaa4e661bd63f78a1f699991eace1f4b3372bfb82dd4a48
-EBUILD fwupd-1.7.1.ebuild 4634 BLAKE2B 25e17477f6fdda731d559f0678558456834f2dd6ea624cce564ea951670dc482bf8fb16b6c8ce03272a4bc127d76f8e3d9fce05a5698a417a3f2f17c7dc70125 SHA512 e7b9940e52bc89a707d2d07107d8de16dd375c9a9ed88d038ac89a478ad36bec6a38378ca699b31c7881ee7c57489dae9d7a440038cf83816d55d2b970f3b1c6
+EBUILD fwupd-1.6.4-r1.ebuild 4477 BLAKE2B 899806f95e598ce0823a8e5af810b4edc5387884393e03fb51f3fe81cf37eb2f4cb96ec8461b20a4d0b016c142a9cb05113fd1fa6249a6883b0d92b780c37e02 SHA512 71e80891822d1e1a84cfa742ddde3fd7d6213ec9374fdfc7153db66d18129be99fb4eac9f137aa7b246dc9643dc6ffd50a9b728e9fc6b989a955b31b8417c019
+EBUILD fwupd-1.7.1.ebuild 4607 BLAKE2B 2a4f91e570ce3d7f0c204e46e7abd02fc78a8828392610ab94e4e721a4ade946477fda9db231f59cf929b7e0e7539d2ff6821084306aa6defc3c890fbaa6532d SHA512 969c631fa511c55473d1521d886c74de978f139a77de701f37404300ee33cf987ba44bc07a4b634a9ad3c7d8426efca21d6f10af560495a5ff96e899dbd0402f
 MISC metadata.xml 1493 BLAKE2B f75354ee9b89d3be913749ffc0d1e8d0d57946f1d785d6cbdab3c6670c790e99666c1943a662d0f5f054e22d3b97e1f8e739640efc5e04659d0a6723ee35b279 SHA512 6ea568ca9c8cba4e0db1f6c06d5e57f539602e5bfa1ce9be2fb9fc7107e1e42dde715c7bd0737ad60246569b0e9fad275a4c451c427451b9692410becb3b05d3
diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
deleted file mode 100644
index 99434fe226f8..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 196cc6d9b445ee4246c7ff18d98d616aef286550 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 4 Aug 2021 15:38:59 +0200
-Subject: [PATCH] plugin modem-manager: XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY is
- only available in >=libxmlb-0.2.2
-
-Closes: https://github.com/fwupd/fwupd/issues/3600
----
- plugins/modem-manager/fu-firehose-updater.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/modem-manager/fu-firehose-updater.c b/plugins/modem-manager/fu-firehose-updater.c
-index 00fcdf607..076aa79cc 100644
---- a/plugins/modem-manager/fu-firehose-updater.c
-+++ b/plugins/modem-manager/fu-firehose-updater.c
-@@ -630,7 +630,11 @@ fu_firehose_updater_run_action (FuFirehoseUpdater *self, XbNode *node, guint max
- 
- 	action = xb_node_get_element (node);
- 
-+#if LIBXMLB_CHECK_VERSION(0,2,2)
- 	cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY, error);
-+#else
-+	cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_NONE, error);
-+#endif
- 	if (cmd_str == NULL)
- 		return FALSE;
- 	cmd_bytearray = g_byte_array_new_take ((guint8 *)cmd_str, strlen (cmd_str));
diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch
deleted file mode 100644
index 162cc194a2ad..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4f5961a389698844117e70601ccf4c9e3ae1cb86 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 4 Aug 2021 15:11:26 +0200
-Subject: [PATCH] dell-dock plugin requires gusb
-
-Closes: https://github.com/fwupd/fwupd/issues/3598
----
- plugins/dell-dock/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/dell-dock/meson.build b/plugins/dell-dock/meson.build
-index 829771de1..ae8f67f33 100644
---- a/plugins/dell-dock/meson.build
-+++ b/plugins/dell-dock/meson.build
-@@ -1,3 +1,4 @@
-+if get_option('gusb')
- cargs = ['-DG_LOG_DOMAIN="FuPluginDellDock"']
- 
- install_data(['dell-dock.quirk'],
-@@ -34,3 +35,4 @@ shared_module('fu_plugin_dell_dock',
-     gudev,
-   ],
- )
-+endif
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
deleted file mode 100644
index fec6aab4a3ce..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit fa403db414301c247aef1bc895795a04b06d9298
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Fri Oct 15 15:45:55 2021 +0200
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Fri Oct 15 15:45:55 2021 +0200
-
-    elanfp plugin requires gusb
-
-diff --git a/plugins/elanfp/meson.build b/plugins/elanfp/meson.build
-index e8bb8255..2b5d7fde 100644
---- a/plugins/elanfp/meson.build
-+++ b/plugins/elanfp/meson.build
-@@ -1,3 +1,4 @@
-+if get_option('gusb')
- cargs = ['-DG_LOG_DOMAIN="FuPluginElanfp"']
- 
- install_data(['elanfp.quirk'],
-@@ -27,3 +28,4 @@ shared_module('fu_plugin_elanfp',
-     plugin_deps,
-   ],
- )
-+endif
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch b/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
deleted file mode 100644
index 4974a82bdf52..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://bugs.gentoo.org/791760
-# https://github.com/fwupd/fwupd/pull/3921
-
-diff --git a/plugins/synaptics-rmi/meson.build b/plugins/synaptics-rmi/meson.build
-index acbb6b92..10ac3047 100644
---- a/plugins/synaptics-rmi/meson.build
-+++ b/plugins/synaptics-rmi/meson.build
-@@ -38,7 +38,6 @@ shared_module('fu_plugin_synaptics_rmi',
-     fwupdplugin,
-   ],
- )
--endif
- 
- if get_option('tests')
-   e = executable(
-@@ -67,3 +66,4 @@ if get_option('tests')
-   )
-   test('synaptics-rmi-self-test', e)
- endif
-+endif
diff --git a/sys-apps/fwupd/fwupd-1.6.2.ebuild b/sys-apps/fwupd/fwupd-1.6.2.ebuild
deleted file mode 100644
index aa776823c5e4..000000000000
--- a/sys-apps/fwupd/fwupd-1.6.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~arm64 ~ppc64 ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	uefi? ( gnutls )
-"
-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]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-	"${FILESDIR}"/${P}-dell-dock-requires-gusb.patch
-	"${FILESDIR}"/${P}-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.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 -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
-		-i data/builder/meson.build || die
-
-	vala_src_prepare
-}
-
-src_configure() {
-	local plugins=(
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_altos)
-		$(meson_use modemmanager plugin_modem_manager)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_use uefi plugin_uefi_pk)
-	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
-		-Ddocs="$(usex gtk-doc gtkdoc none)"
-		-Defi_binary="false"
-		-Dsupported_build="true"
-		$(meson_use agent)
-		$(meson_use archive libarchive)
-		$(meson_use bluetooth bluez)
-		$(meson_use elogind)
-		$(meson_use gnutls)
-		$(meson_use gusb)
-		$(meson_use lzma)
-		$(meson_use man)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${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
-}
diff --git a/sys-apps/fwupd/fwupd-1.6.3.ebuild b/sys-apps/fwupd/fwupd-1.6.3.ebuild
deleted file mode 100644
index 39ff4e2e07d0..000000000000
--- a/sys-apps/fwupd/fwupd-1.6.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	uefi? ( gnutls )
-"
-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]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-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 -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
-		-i data/builder/meson.build || die
-
-	vala_src_prepare
-}
-
-src_configure() {
-	local plugins=(
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_altos)
-		$(meson_use modemmanager plugin_modem_manager)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_use uefi plugin_uefi_pk)
-	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-	use riscv && plugins+=( -Dplugin_msr="false" )
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
-		-Ddocs="$(usex gtk-doc gtkdoc none)"
-		-Defi_binary="false"
-		-Dsupported_build="true"
-		$(meson_use agent)
-		$(meson_use archive libarchive)
-		$(meson_use bluetooth bluez)
-		$(meson_use elogind)
-		$(meson_use gnutls)
-		$(meson_use gusb)
-		$(meson_use lzma)
-		$(meson_use man)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${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
-}
diff --git a/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
index a64bc49822db..72e4cba1d3a2 100644
--- a/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+IUSE="amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
@@ -140,7 +140,6 @@ src_configure() {
 		-Ddocs="$(usex gtk-doc gtkdoc none)"
 		-Defi_binary="false"
 		-Dsupported_build="true"
-		$(meson_use agent)
 		$(meson_use archive libarchive)
 		$(meson_use bluetooth bluez)
 		$(meson_use elogind)
diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild
deleted file mode 100644
index aa0388af0054..000000000000
--- a/sys-apps/fwupd/fwupd-1.7.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit linux-info meson python-single-r1 vala xdg
-
-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 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	logitech? ( gusb )
-	minimal? ( !introspection )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	uefi? ( gnutls )
-"
-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]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-	"${FILESDIR}"/${P}-elanfp-requires-gusb.patch
-	"${FILESDIR}"/${P}-fix-test-configure.patch # bug 791760
-)
-
-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 -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
-		-i data/builder/meson.build || die
-
-	vala_src_prepare
-}
-
-src_configure() {
-	local plugins=(
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_altos)
-		$(meson_use logitech plugin_logitech_bulkcontroller)
-		$(meson_use modemmanager plugin_modem_manager)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_use uefi plugin_uefi_pk)
-	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-	use riscv && plugins+=( -Dplugin_msr="false" )
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
-		-Ddocs="$(usex gtk-doc gtkdoc none)"
-		-Defi_binary="false"
-		-Dsupported_build="true"
-		$(meson_use agent)
-		$(meson_use archive libarchive)
-		$(meson_use bluetooth bluez)
-		$(meson_use elogind)
-		$(meson_use gnutls)
-		$(meson_use gusb)
-		$(meson_use lzma)
-		$(meson_use man)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${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
-}
diff --git a/sys-apps/fwupd/fwupd-1.7.1.ebuild b/sys-apps/fwupd/fwupd-1.7.1.ebuild
index 3d035a100b4e..a5c8fc642ce5 100644
--- a/sys-apps/fwupd/fwupd-1.7.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+IUSE="amt archive bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
@@ -141,7 +141,6 @@ src_configure() {
 		-Ddocs="$(usex gtk-doc gtkdoc none)"
 		-Defi_binary="false"
 		-Dsupported_build="true"
-		$(meson_use agent)
 		$(meson_use archive libarchive)
 		$(meson_use bluetooth bluez)
 		$(meson_use elogind)