gentoo resync : 17.06.2021

7 files changed, 82 insertions, 278 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index e5e47d0de32b..ccf2594b1684 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,11 +1,8 @@
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
-AUX fwupd-1.6.0-gusb_deps.patch 2610 BLAKE2B 462e15359979cf1d4ea288161723a71f30ec6a027e4c191a78fa19446c86c6572d70d262b5475e5871f6481b2635be9fb2a2c4fe29a6132f026ac417572fcdef SHA512 9f659172b7125e7b8481e928ed7a20843f2772513e842350c57021fb8be114db0d2d7c5005ec6220eb2c8a434f3eb14cd3b8e06603366a33fc7f3a23be6191e7
-AUX fwupd-1.6.1-revert-Change-python-version-check-order.patch 1011 BLAKE2B 733c667528b52594ed7ab6ac19296ac71d961a2fdfdd45f1bc4af0540fc4b1cd520ab30ca6d7b0a48261a9966a49211f90875a6b0925d21bbdcc3c117fab3db3 SHA512 c4d1e61682f963f2c0465b49b1e944e800683003ad263e1dd7e61cf4e023f55f6bb010a51f87468aa0b4c1ea523f31a5f265e5fa0e70a10b4527243bc250f4bf
+AUX fwupd-1.6.1-fix-python-detection.patch 1897 BLAKE2B 4c33cca345113fcae867b55e8575ac2da89c13cb76c9245201f2118695d319dd5795656a5c70151466973f19a8ffaf6d385255eb49e834e40aa6cf937fb0e6a8 SHA512 2174d2a9f99d444ec846adffc5c62a14553274d11072ef9ddcb78a3044a03c8c33d9f9e1c54604facde270a6d135b65cdb6d5fe9f20cf075181e19012545adf9
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
-DIST fwupd-1.6.0.tar.gz 3747361 BLAKE2B 6368089db78a512048268ef3cb0333c75bb95b0f62d023e3db7c854c3362b88db1b1676cc24b9a4a5fe854e7dea6c727ec3d645476ee323a0dae16caf7028478 SHA512 0f2342fba95d635348c4b153887f2ea27e4bf49972558716143051ba79c39948487eb6cc15f938738d83aa3ea3eef5ae2854c9756a60f59f52ac859d35e2a669
 DIST fwupd-1.6.1.tar.gz 3786336 BLAKE2B 429e41cad3acdcd9b245532a38126a8e3d366081aba16b9f3e04a2029980b8d6e3f4ac3f8c6d6cd1332c344526a7901c976d6fa0bc1c4011e54d5dc96a427d2d SHA512 6d795e9898de6097d0f1185fbc3a6864566f90fc504e5d9cf192e5dca50c659d39f43f1922c7506151bd1538a23db507e95893436de733b1335bd69dc56f3b1c
 EBUILD fwupd-1.5.9-r1.ebuild 4398 BLAKE2B 8c5e659230931788d337fa7b9b9d6f86e781819d2fd96f4f061690202a1b0483b7707c641264120da3b868e1a5d6dd469818c0be6ce7d1d81235bb137f55c682 SHA512 a6697293e77036d791d370c106e0bb9de354a2776db5eca6734e976d60f5d8b3fa89c767fb1a32453db4b260d725c38e5e5e6cf147ea39d851f5d2317a3eb77f
-EBUILD fwupd-1.6.0-r1.ebuild 4377 BLAKE2B 7761382860ace3b417be28363ee7684ca70093ce61caf9ad4f29fc39c5e0d49ef8673b37cd59559ebdd9577966d70f0897b38471f82b2ab258b7efc5e7a28190 SHA512 63a48ed1b558961540e4c634353f92edcd7f05e0e35f1b11c70dcbe5fcda6dfa5feaa0eae0adb7b2f74fd27ca6afaf185814f8c1a77236fa84a70efe65a089ae
-EBUILD fwupd-1.6.1.ebuild 4417 BLAKE2B 6c47be55cccbbd398ba0c84031c49247aca6bbe737d5d215e162eb196c1cafce858327171f13f0cd372c47674bec8e75a15eac50200dda8e2928d79991505d3f SHA512 4383a8b4f9d8dd2516afc5a7492680338dbe3b6359e9fcc331bf70396aba86896aec5f9ff978774beebf562eb6047dab0e8f66f2fa5cf7566c763a39624c5218
-MISC metadata.xml 1140 BLAKE2B 9e901230c53b487f05f290b46c53a5ee3ebd81b3aefcab2368bfc99f28e80d85554613de8cc4481047a49cf6719f1b1a442d87456ad21aecbadd573ab0959385 SHA512 93bd5bbe8a57219d825e0cc0a8ebd85534396922efcefa224d733bbd1190f201009a8223dfdf5fb2a2403439805c2205b0eef39e8a9e25d0df3733b1654b8f61
+EBUILD fwupd-1.6.1-r1.ebuild 4392 BLAKE2B 3760d77a04baad7cd87b9ff4a2ffd1a60443c2fa799c197d5e5b9f3ef2c99e624dfac030cb0c4b892f9961777c48cc377b57ecaaa021f9d5e63a4a03a62b0218 SHA512 c1213a533d5ec136fc0311ad7ab1e50dabd578d2a2b2acadc6021421ea096ed2404affcdcee1b220eadb3bff1e4e596baec602c00b02c679a1fce5bef1ed5f9d
+MISC metadata.xml 1273 BLAKE2B e58cbe75ac3cf69ef5f70b831617f0a6c268d8270263cfa005046120eeeac464aa70024ae7b5ffb5a4526c948070d55cfcb6b927ea03c660db91c7cadc86417f SHA512 b024927cfdf78d1ec6ac33a1e04a2c6f7b9397a3cbd0334bcc13e964f2f8f5b01fe50a4b0bea896cf8b6e491b33473d0ba9a7f87edb47fd3b0d3e63a919b0909
diff --git a/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch b/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch
deleted file mode 100644
index 92b8af9a70ee..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 41f5294f1bfdfcbe96ed0d19ec79dc2f3cc24d36 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 20 May 2021 11:03:20 +0200
-Subject: [PATCH] analogix plugin requires gusb
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise the following build error happens:
-
-  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:54:10: error: ‘G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE’ undeclared (first use in this function)
-     54 |          G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE,
-        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:54:10: note: each undeclared identifier is reported only once for each function it appears in
-  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:55:10: error: ‘G_USB_DEVICE_REQUEST_TYPE_VENDOR’ undeclared (first use in this function)
-     55 |          G_USB_DEVICE_REQUEST_TYPE_VENDOR,
-        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:56:10: error: ‘G_USB_DEVICE_RECIPIENT_DEVICE’ undeclared (first use in this function)
-     56 |          G_USB_DEVICE_RECIPIENT_DEVICE,
-        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c: In function ‘fu_analogix_device_receive’:
-  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:96:10: error: ‘G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST’ undeclared (first use in this function)
-     96 |          G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST,
-        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:97:10: error: ‘G_USB_DEVICE_REQUEST_TYPE_VENDOR’ undeclared (first use in this function)
-     97 |          G_USB_DEVICE_REQUEST_TYPE_VENDOR,
-        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:98:10: error: ‘G_USB_DEVICE_RECIPIENT_DEVICE’ undeclared (first use in this function)
-     98 |          G_USB_DEVICE_RECIPIENT_DEVICE,
-        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  and more...
----
- plugins/analogix/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/analogix/meson.build b/plugins/analogix/meson.build
-index 1bfbbc33..c112d72d 100644
---- a/plugins/analogix/meson.build
-+++ b/plugins/analogix/meson.build
-@@ -1,3 +1,4 @@
-+if get_option('gusb')
- cargs = ['-DG_LOG_DOMAIN="FuPluginAnalogix"']
- 
- install_data(['analogix.quirk'],
-@@ -28,3 +29,4 @@ shared_module('fu_plugin_analogix',
-     plugin_deps,
-   ],
- )
-+endif
--- 
-2.32.0.rc0
-
diff --git a/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch b/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch
new file mode 100644
index 000000000000..b5da660e643a
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch
@@ -0,0 +1,51 @@
+From 1a53fc57e8b5cd2de571ad5f1119c90ac8082f7a Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <superm1@gmail.com>
+Date: Tue, 15 Jun 2021 08:10:06 -0500
+Subject: [PATCH 1/2] Revert "meson.build: Change python version check order"
+
+This reverts commit 1b396215d9396680b1b6b5c14c6f57f2226ff0a9.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1f89e6070..0ae12a1a7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -252,7 +252,7 @@ libm = cc.find_library('m', required: false)
+ libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
+ gcab = find_program('gcab', required : get_option('tests'))
+ bashcomp = dependency('bash-completion', required: false)
+-python3 = find_program('python3.8', 'python3', 'python3.9')
++python3 = find_program('python3')
+ 
+ if get_option('gnutls')
+   gnutls = dependency('gnutls', version : '>= 3.6.0')
+
+From f4ef486da80a3b5916f8a58f10a70f30cf05f756 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <superm1@gmail.com>
+Date: Tue, 15 Jun 2021 08:13:17 -0500
+Subject: [PATCH 2/2] trivial: fix a regression in Gentoo detecting python
+ versions
+
+---
+ meson.build | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 0ae12a1a7..6e09ac69b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -252,7 +252,11 @@ libm = cc.find_library('m', required: false)
+ libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
+ gcab = find_program('gcab', required : get_option('tests'))
+ bashcomp = dependency('bash-completion', required: false)
+-python3 = find_program('python3')
++if host_machine.system() != 'freebsd'
++  python3 = find_program('python3')
++else
++  python3 = find_program('python3.8', 'python3', 'python3.9')
++endif
+ 
+ if get_option('gnutls')
+   gnutls = dependency('gnutls', version : '>= 3.6.0')
diff --git a/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch b/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch
deleted file mode 100644
index d1c1b1408303..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 72a470fd607a40e8f23c1f2407faf69e91350783
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Tue Jun 15 14:11:24 2021 +0200
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Tue Jun 15 14:11:24 2021 +0200
-
-    Revert "meson.build: Change python version check order"
-    
-    This reverts commit 1b396215d9396680b1b6b5c14c6f57f2226ff0a9.
-    
-    This is causing a regression for Gentoo, https://bugs.gentoo.org/796143.
-
-diff --git a/meson.build b/meson.build
-index 5d507515..1e0e350a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -252,7 +252,7 @@ libm = cc.find_library('m', required: false)
- libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
- gcab = find_program('gcab', required : get_option('tests'))
- bashcomp = dependency('bash-completion', required: false)
--python3 = find_program('python3.8', 'python3', 'python3.9')
-+python3 = find_program('python3')
- 
- if get_option('gnutls')
-   gnutls = dependency('gnutls', version : '>= 3.6.0')
diff --git a/sys-apps/fwupd/fwupd-1.6.0-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.0-r1.ebuild
deleted file mode 100644
index ed555c82411d..000000000000
--- a/sys-apps/fwupd/fwupd-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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 gnutls gtk-doc gusb elogind flashrom lzma minimal introspection +man 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_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?]
-	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 )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		sys-boot/gnu-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}/${PN}-1.6.0-gusb_deps.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 plugins=(
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_altos)
-		$(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)
-
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
-		-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 gtk-doc gtkdoc)
-		$(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.1.ebuild b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
index 5468692f74bd..e258342be627 100644
--- a/sys-apps/fwupd/fwupd-1.6.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
@@ -67,7 +67,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
-		sys-boot/gnu-efi
+		sys-apps/fwupd-efi
 		sys-boot/efibootmgr
 		sys-fs/udisks
 		sys-libs/efivar
@@ -87,7 +87,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-	"${FILESDIR}"/${PN}-1.6.1-revert-Change-python-version-check-order.patch
+	"${FILESDIR}"/${P}-fix-python-detection.patch
 )
 
 pkg_setup() {
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 14228b123c2f..f746f9116957 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -1,25 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <use>
-    <flag name="agent">Enable update notification agent</flag>
-    <flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
-    <flag name="amt">Build and install Intel AMT plugin</flag>
-    <flag name="dell">Enable Dell-specific support.</flag>
-    <flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
-    <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
-    <flag name="nvme">Build and install NVMe plugin</flag>
-    <flag name="spi">Install Intel-SPI plugin</flag>
-    <flag name="synaptics">Install synaptics plugin</flag>
-    <flag name="thunderbolt">Install Thunderbolt plugin</flag>
-    <flag name="tpm">Install Trusted Platform Module plugin</flag>
-    <flag name="uefi">Enable UEFI support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">hughsie/fwupd</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<use>
+		<flag name="agent">Enable update notification agent</flag>
+		<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
+		<flag name="amt">Build and install Intel AMT plugin</flag>
+		<flag name="dell">Enable Dell-specific support.</flag>
+		<flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
+		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
+		<flag name="nvme">Build and install NVMe plugin</flag>
+		<flag name="spi">Install Intel-SPI plugin</flag>
+		<flag name="synaptics">Install synaptics plugin</flag>
+		<flag name="thunderbolt">Install Thunderbolt plugin</flag>
+		<flag name="tpm">Install Trusted Platform Module plugin</flag>
+		<flag name="uefi">Enable UEFI support</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/fwupd/fwupd/issues</bugs-to>
+		<remote-id type="github">fwupd/fwupd</remote-id>
+	</upstream>
 </pkgmetadata>