gentoo resync : 22.01.2021

2 files changed, 13 insertions, 13 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 363216b17c45..e91242ad5511 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,9 +2,9 @@ AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b26
 AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
-DIST fwupd-1.5.3.tar.gz 2429886 BLAKE2B 576823f6d235ed9ce2854cd0f44b9a7dd1eace46180ce978f906becaaefabb32e93f86cc672abafc99387427d33e3ab17052e98adfba4b6cbed85c5502a7ec1b SHA512 0c98dd7ca55afeaa4c895a837fc8d6eafcc51d215cc02be659916c7a39ddaa6bc3752adddba8cd2a9c77a4eca707b6c71522645f2847330c1c2ef44910451bf3
 DIST fwupd-1.5.4.tar.gz 2435897 BLAKE2B 23318f5305e3f2478c866e17e150ca3863e5eebf922e81f28a35541af4d9786dada8d2084e51b51e97343bdbf132e9b9981b8bb321ad4e76fba8c42b8b1e2e64 SHA512 961c9298e7672f720f4b6865d374b6066379f0a1c1a99356a9efd9359ee737cf9f9ab2c708f81505c971484d172b8dae96bc5f06be6e6f13c4a55604e6c346e7
+DIST fwupd-1.5.5.tar.gz 2460482 BLAKE2B 79d1b34c07a0befe355e9a6c68770dfbbc575fd540802dd20ae4f65061d9fffd6245944e6f33b702539a5e88563afc7b4c619ca1507e31465dcf40138f92902f SHA512 a37f16b01e6700b0302293a916a379a89b574eed13f63577c19fa8b0ec396bd19f7f7d5c708085f3817af60fca65c02b0ddc4370de82104a5e8e65f583ff3f4a
 EBUILD fwupd-1.4.6.ebuild 4058 BLAKE2B b5741ff3e24a276de100341b9a0bb37bcc71ac958ac19c2437b3c5471212247c75d71aad74c136ad4f103daf8397be495cc01ee858d3ea25886675e3ec637a37 SHA512 c25d3f5b6f8c74937761ba587959bc39a053ad74059750ee63d13ccc098f92c8fe91b1b8cb37d0ee86220f65f05235fd403de8a3cc670035e89a97ddceb90ff1
-EBUILD fwupd-1.5.3.ebuild 4010 BLAKE2B fedc0742777efe79ec0fb6194eff732848ff7317ce31136abaf2eb056f52821da080bed2c154751211126b6e97e95cff6b29c44ad6ea898fcf7910e6536d7a31 SHA512 f84205d02a7702cb49b9e7f5268d3fec37642ee7ff5203a17c5c31a31b536cd952e511c28aef19150c9c323ce24ee1abf93a3bb29ca25935617db5f53c558cb3
 EBUILD fwupd-1.5.4.ebuild 4005 BLAKE2B b21a36c9fa30d7dd48f1b4bb64cdb129f8d4672d17a3d3946840f9007f8e64cc4e543324d16d84b0f97863b6b205930ff3ee8e548ed28dc87b39c5a315b77eae SHA512 089ad0ce8114c28d268d97878b2a56a60e838127ddf99a7c628f279636316591ed755f3f3fd609963caddf7371b070bf9e6e45b8ba20575a697f59041c5ba54c
+EBUILD fwupd-1.5.5.ebuild 4097 BLAKE2B 6e16ecf9aff49031c667b689f27289d927de9019cd2dbe577fa8215523181b24689c2156140cee6b990308191db0da179f3e02a9bdf8a1de2f8d848573712cf3 SHA512 acc70b25cbeb9048adef22a59ba2a1fd18a7803aa9ae111ade5d9cd18933a1e00027ca9fbca72f8e07074f66c448b5998b9703d494d19168158efcd1cff1b99f
 MISC metadata.xml 1038 BLAKE2B e4c7d1ce48108981032cc875ed3512e16eb5ea81197380c42cbf828c67259ec42fa0623b12a4aca12015c2c72033e8edcfeab3a15f9970ad45886cb8b860e1a6 SHA512 0bc97498a83deb2d8ae85df1f7ed8d2191a4b9d0814f388fd32c5cd4efbdc86c5359eb9e8ba2e62561d73dd2af5537c5f6ec61862a2fd24606ac5a96c7fa30d2
diff --git a/sys-apps/fwupd/fwupd-1.5.3.ebuild b/sys-apps/fwupd/fwupd-1.5.5.ebuild
index f9dd4bc46643..2aa0d3875a00 100644
--- a/sys-apps/fwupd/fwupd-1.5.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
@@ -55,21 +55,19 @@ CDEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	virtual/libelf:0=
 	virtual/udev
-	dell? (
-		>=sys-libs/libsmbios-2.4.0
-	)
+	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
-	)
+	policykit? ( >=sys-auth/polkit-0.103 )
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
 		media-libs/fontconfig
 		media-libs/freetype
+		net-libs/gnutls
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
+		sys-fs/udisks
 		sys-libs/efivar
 		x11-libs/cairo
 	)
@@ -92,7 +90,7 @@ PATCHES=(
 
 pkg_setup() {
 	python-single-r1_pkg_setup
-	if use nvme; then
+	if use nvme ; then
 		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
 	fi
 }
@@ -126,10 +124,12 @@ src_configure() {
 		$(meson_use test tests)
 		$(meson_use thunderbolt plugin_thunderbolt)
 		$(meson_use tpm)
-		$(meson_use uefi plugin_uefi)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_pk)
+		-Dconsolekit="false"
+		-Dcurl="true"
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
 	)
 	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
 	export CACHE_DIRECTORY="${T}"