gentoo resync : 16.04.2022

2 files changed, 13 insertions, 12 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index de771355ce18..0873db24d20e 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,8 @@
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
-DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521
 DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31
 DIST fwupd-1.7.6.tar.gz 4054269 BLAKE2B dea4a37aea406e933f312fb809ee2ea972e3b017e5267d51bed835b6d440c15ca1d589f76a6c1906e616acc7cdd6c0f6dcec034e1460427057d8a1168583c4ce SHA512 f04ee78a6ec9e73ce0f3eb9c2dcbfc471ac88264451a378f1b0010fa528596052b4d3a63f5303074dd4fad55bf153fe5642d77adebd4ed805d74f57fbbff5b2b
-EBUILD fwupd-1.7.2-r2.ebuild 4613 BLAKE2B 25a272eeeaefa4189652e3c36e2650e7e63411e1425d9638b881eb4212c9d2ff127a1490d75474cd16da39e4c28a6678c3dd15a82544e276de7fc6c490e82f91 SHA512 fb4d755c895bc592bf9332c1832a7be592eab965d370c82be19a05420b8ecb099e60c75f895680570144f1d6293e21aade92fbb681fe78e2471aee68e903c9af
+DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
 EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9ea522da715e4ffa5359e2dc23315a79b823f016723b3f68507bf272fca29a8471e5c2388b1a1f1c6146231b SHA512 1899b4041033e23d658cc7991aed0c94252186a737616baa8d09595e97cf4cf16369478286ab2947441b81779227f48bf10b490ce3faae821e489f29a25053c2
 EBUILD fwupd-1.7.6.ebuild 4691 BLAKE2B c83b7b98d97fecc4696447cd9988620e041a4868c33484fd838f594fd5ba093cee24b8d4808bc26fa07d221293b6d6a8005df90995deb85ba7e2a496a8ba95e4 SHA512 3341d357d1622e65ef810c0c130e2ca42ae9c908d4b9ef73ebb3715498eb8cc3afb343d140423d4f2b6bc954bbaff9dfd1cd98ce5bef038a4c03aefb79941bb5
+EBUILD fwupd-1.7.7-r1.ebuild 4684 BLAKE2B 5dc38d1d040b856211d56fe82cfd3da57e02313d82ba1d41aee6c3fbe17af91c770e461f4e0b45fec53e86830c4103fcc309f459e29c6b71180d91f1279420f1 SHA512 215c70588d4f4b59b98394af472c0a7e3273ba849fa4917811258ea781dcc4a905912ecc63d9d8f6891cf640317635da654c42366b31b8e46049b573d8aad26c
 MISC metadata.xml 1432 BLAKE2B 02b0b170e7d8ecd293457ed8e1f9fffe2aecb4bb4e1be91869b638445d98c9e5824baf0ef497fe19aced0c1b80d747e7c41643a159edbaf7bca6f845bb5baa18 SHA512 aa650a07d777ba5a3816f6f3fd6ff6fadea149b29a7c1633acec56149de99c072493965724d33d8a76ac0221bb665ee6bf2ddc35f61967798cedbe02f79bcfbb
diff --git a/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r1.ebuild
index 03e200fc2781..9982065f894a 100644
--- a/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.7-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -13,8 +13,8 @@ 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="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
@@ -43,19 +43,17 @@ BDEPEND="$(vala_depend)
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
+	app-arch/xz-utils
+	>=dev-libs/glib-2.58:2
 	dev-libs/json-glib
-	dev-libs/libgpg-error
 	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
 	>=dev-libs/libxmlb-0.1.13:=[introspection?]
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	net-misc/curl
-	virtual/udev
 	archive? ( app-arch/libarchive:= )
 	dell? ( >=sys-libs/libsmbios-2.4.0 )
 	elogind? ( >=sys-auth/elogind-211 )
@@ -66,6 +64,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	lzma? ( app-arch/xz-utils )
 	modemmanager? ( net-misc/modemmanager[qmi] )
 	policykit? ( >=sys-auth/polkit-0.103 )
+	sqlite? ( dev-db/sqlite )
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
@@ -89,6 +88,7 @@ DEPEND="
 
 pkg_setup() {
 	python-single-r1_pkg_setup
+	vala_setup
 	if use nvme ; then
 		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
 	fi
@@ -105,19 +105,20 @@ src_prepare() {
 
 	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
 		-i data/builder/meson.build || die
-
-	vala_src_prepare
 }
 
 src_configure() {
 	local plugins=(
+		-Dplugin_gpio="true"
 		$(meson_use amt plugin_amt)
 		$(meson_use dell plugin_dell)
 		$(meson_use fastboot plugin_fastboot)
 		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gusb plugin_uf2)
 		$(meson_use logitech plugin_logitech_bulkcontroller)
 		$(meson_use modemmanager plugin_modem_manager)
 		$(meson_use nvme plugin_nvme)
+		$(meson_use sqlite)
 		$(meson_use spi plugin_intel_spi)
 		$(meson_use synaptics plugin_synaptics_mst)
 		$(meson_use synaptics plugin_synaptics_rmi)