gentoo auto-resync : 11:07:2023 - 16:30:06

2 files changed, 23 insertions, 22 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 0521e1aa7f4c..ff8d8b74676f 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,9 +1,9 @@
 AUX fwupd-1.8.13-installed_tests.patch 11799 BLAKE2B 7d1b5e18f27a95aabda2421a9ba2ff98ae68f74fc82b103d199fe57905fbe40d21d88c60f2a0708bd575f6ce013abda848c9d0830f2489fb88ff1810926505db SHA512 3edd59a52310a454a86470feb9b17f627def0362947788c65743e0cbbc4670b94a227080caddc1e7808fc9b63f5e045d4a0638b63ae1ff850f70db9e3b748910
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
-DIST fwupd-1.8.14.tar.xz 3733176 BLAKE2B 6d17ee9ce1fb46a9d0a8a97d54f1873888635805af00a05ad365b32d48d6e58b48b52d706400067ca8cf6f6b846f6b8799c44d66ec64ab2fca5812b199ac2ac5 SHA512 80669f1c8ca60ac646f9a7aa4028edd23d1fc6853d999f60d292fabbfc81733f06b1f76a2987f0af62a739aa2cf5cc75fc40c9283fd37f4d8157f1a08df6fcd2
 DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B 1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa SHA512 c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75
 DIST fwupd-1.8.16.tar.xz 3735128 BLAKE2B ae72b850f859e5c7cadbe78b86c2d9d0fc7b27f2de5838ab5c1ab7d7adf41d14ab5bfcb7db72795ca90b7626cf19212f3bb61e15e7ecdbd00a9a454aa80523f8 SHA512 25dd773ca703ab6ad11eb042948bb719c2f3974a2e89ac8f9ae524384bce2c8a3d41e5754a5e0ab5595c14720737d53921dbf2859dd33519dcc480d227aac6c6
-EBUILD fwupd-1.8.14.ebuild 4808 BLAKE2B 451d5c21d9fabb66ef4d383af5bb102daa8d443af15f265ed81e4ab9469a13d20b09df6f46bb6d35029402823238be6fe297d41b788bdaf53187b488786791e8 SHA512 4df4dca82cc6e8f923792b651b0f006957af03809a0566674e3f61489e5cff3ecd4ff5c462450fd3c285aea2bacef5597882963113846f2160e4870e5d0d476d
+DIST fwupd-1.9.3.tar.xz 3807376 BLAKE2B 2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb SHA512 53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0
 EBUILD fwupd-1.8.15.ebuild 4808 BLAKE2B 451d5c21d9fabb66ef4d383af5bb102daa8d443af15f265ed81e4ab9469a13d20b09df6f46bb6d35029402823238be6fe297d41b788bdaf53187b488786791e8 SHA512 4df4dca82cc6e8f923792b651b0f006957af03809a0566674e3f61489e5cff3ecd4ff5c462450fd3c285aea2bacef5597882963113846f2160e4870e5d0d476d
 EBUILD fwupd-1.8.16.ebuild 4811 BLAKE2B 08dd02ab603c8f52daa148984a85ab78fd8e952e2ad71e3e97f7815732e322dc19d2a9a19f75e1abf57e76a49556717968949c813622a139682ebf63d6c2987b SHA512 978a283cde0c3bbf2b64567c1c0cf3adcdc2d7e23acead40db3766dd2cd994b459e90a637cd37b6f886f6237b53f91958d4d4ee1374e3ac42a3e71adca507bcc
+EBUILD fwupd-1.9.3.ebuild 5013 BLAKE2B 87555210d5d42b9823150042acbb2471d4215b154730ce065d9141b629a2f5554b94c1f5491bfeae9eb5059acfa616524c67fcf22d2c6cb2825f7fe6309a1593 SHA512 bcf79ceb08e5d27db33021cfab7fa19069539ae1a1df465fdb0f0a7e776ca03a8124b93ee0611eb5c71913e6ec2811f1eb92a04189b3aa18feb805274fdbafbb
 MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de
diff --git a/sys-apps/fwupd/fwupd-1.8.14.ebuild b/sys-apps/fwupd/fwupd-1.9.3.ebuild
index c4692391da4b..67c8caa00f48 100644
--- a/sys-apps/fwupd/fwupd-1.8.14.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson python-single-r1 vala udev xdg
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="amt +archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
@@ -48,28 +48,28 @@ BDEPEND="$(vala_depend)
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-arch/gcab-1.0
 	app-arch/xz-utils
-	>=dev-libs/glib-2.58:2
-	dev-libs/json-glib
-	dev-libs/libgudev:=
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/json-glib-1.6.0
+	>=dev-libs/libgudev-232:=
 	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
+	>=dev-libs/libxmlb-0.3.6:=[introspection?]
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	')
-	net-misc/curl
+	>=net-misc/curl-7.62.0
 	archive? ( app-arch/libarchive:= )
-	cbor? ( dev-libs/libcbor:= )
+	cbor? ( >=dev-libs/libcbor-0.7.0:= )
 	dell? (
 		>=app-crypt/tpm2-tss-2.0
 		>=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?] )
+	gnutls? ( >=net-libs/gnutls-3.6.0 )
+	gusb? ( >=dev-libs/libgusb-0.3.8[introspection?] )
 	logitech? ( dev-libs/protobuf-c:= )
 	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
+	modemmanager? ( net-misc/modemmanager[mbim,qmi] )
 	policykit? ( >=sys-auth/polkit-0.114 )
 	sqlite? ( dev-db/sqlite )
 	systemd? ( >=sys-apps/systemd-211 )
@@ -91,10 +91,6 @@ DEPEND="
 	x11-libs/pango[introspection]
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.13-installed_tests.patch
-)
-
 src_prepare() {
 	default
 
@@ -173,12 +169,17 @@ src_install() {
 
 	if ! use minimal ; then
 		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+	fi
 
-		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
+	if use test; then
+		# Preventing tests from being installed in the first place is a moving target,
+		# just axe them all afterwards.
+		rm -rf "${ED}"/etc/fwupd/remotes.d/fwupd-tests.conf \
+			"${ED}"/usr/libexec/installed-tests \
+			"${ED}"/usr/share/fwupd/device-tests \
+			"${ED}"/usr/share/fwupd/host-emulate.d/thinkpad-p1-iommu.json.gz \
+			"${ED}"/usr/share/installed-tests \
+		|| die
 	fi
 }