gentoo auto-resync : 10:11:2024 - 21:02:06

2 files changed, 11 insertions, 35 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 588ad45ea57b..397625d39ca6 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,7 +1,7 @@
 AUX fwupd-1.9.6-fragile_tests.patch 1051 BLAKE2B 01ae6cae17b911d055eb820a041329e4347eb26533e372a540f08d6a7ab521118550e97c0ae3762d2532a9131a3ecdcfd719f6c1af6fb4c674688ee170c92581 SHA512 f1f22997477589f5a1fe18c7cca56309a365ff472aee0eaeaa1831a24b878d7301519f46e0b36e70fe5c0729b792fbeaa4430eee43c0169bcdbef8d1171bc107
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
-DIST fwupd-1.9.23.tar.xz 4300104 BLAKE2B d084244f99b5edccf4bf6a783846623876e9b4344c05bfe3cd412235bcde63d1f36db5528572e371fd0bde27f72c2bd61ba7b6472504ade4c9a068a00e34ca4e SHA512 379adcc79d40795f4895749bc944689ffee6fadc7c3dd1974df98c15120ca47d020ad4efabc68d0371cb36ebd3b549698c05a81bee0a673745a867bb32c4eeb5
 DIST fwupd-1.9.24.tar.xz 4305048 BLAKE2B 5ac7bbc5cdcee13a39fe25cd5b83dfbb9615e6349cd39e8b25cc654c0318870de603c1f6ce550da6662d3f9cd7d275cf6254058f6b71dcb9f7916329147ab771 SHA512 2f9935bbfc3ffc49bf0939a75dd52861eea9108d8f7026dbcdf4c07ad234f70f0b1cb6740eefe555dc2a49aba1ea4d65a78427aad7a0ba9de1fe318734255bfe
-EBUILD fwupd-1.9.23.ebuild 5381 BLAKE2B 38ada083d022ac68cdaa9c40b04ed6c649f78eebab0253d65ad5e03a1793d06447a3c01ed83a71bb996ecffbceb9c5102ef84a05c1d55d147e135f2aa5ab042f SHA512 72f48d900e3bfadd4b81fd68abf172647c17bf206dba8e8afbd92fc78807793039d9af1c28935522ad2ef85f3b7f18ff5861d6365f37cd57274be6372eff3e6e
+DIST fwupd-2.0.1.tar.xz 4971220 BLAKE2B 44d95bae51cb299ab4130805f1a57ebfb0fd5ba8872b6679f5fdde46150cb245f25fdd888f47e57eb35842b6e34f105feefca2f90bb84950ad93748f9f294820 SHA512 bf4e1bdd9ebfc593490a0d5d6fd6e31718e89aff5bb0feda9babf235676e26bff0e6e751a5df96e884a9f86db11b40ad00b63c7a5385c3fa9ab89f7f154b945f
 EBUILD fwupd-1.9.24.ebuild 5381 BLAKE2B 3bfa54ed795adc8c200dd888891a88c72b4f32576a11d42e859629f43c0b099c9e04a9f183ae4870834c788ecda39b9c5a12391e19421a2a1c12e0e40cf8ab69 SHA512 5250d74f29a7fbabb25d3b42837e4f379069b88d6d597d64321fab7f1db52032cb12bce7826a8a311889ea6d27ebc0503768a8314fe8e170538907f774ecfdf0
+EBUILD fwupd-2.0.1.ebuild 4678 BLAKE2B b85980cd91fd7319b42b6a65773083e3f5a23bc98a9a0f95a43e8c25c49023a1095415e5a3e5f2781ddcca8487bbb0a8de7c2d93d7a68fedb48d3ccb70a6ed27 SHA512 0c51d5044b2755044b8ea132a2fdd969c06e5c735e9df9b749a94b06feac8b1e72ee513bfcdfc7a4916ee7b42440a1716fbe3403b10c7b599db4413dbafd5ce9
 MISC metadata.xml 1674 BLAKE2B b451d794c2be5515f1f5889a88e5c512ab5e8c62f53105b68374cd07007f0032fdb5f99bf2c0c403f4f6ac558fc3fc4513a06cb1acb06dbd321e1e4814c220bf SHA512 e176cca39887ad3eaccf7699c8d8fb8bb76587bec0e797f1952ce8d83bd259e43334870232f9660fe29cf177a2abaa1ca8e8e5527e88ade43e6a7a022510c025
diff --git a/sys-apps/fwupd/fwupd-1.9.23.ebuild b/sys-apps/fwupd/fwupd-2.0.1.ebuild
index d00aca03ce06..324f906650ff 100644
--- a/sys-apps/fwupd/fwupd-1.9.23.ebuild
+++ b/sys-apps/fwupd/fwupd-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit meson python-single-r1 vala udev xdg
 
@@ -13,18 +13,14 @@ 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"
-IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
-	fastboot? ( gusb )
-	logitech? ( gusb )
 	minimal? ( !introspection )
-	modemmanager? ( gusb )
 	spi? ( lzma )
 	synaptics? ( gnutls )
-	test? ( archive gusb )
-	test-full? ( test )
+	test? ( archive )
 	uefi? ( gnutls )
 "
 RESTRICT="!test? ( test )"
@@ -33,7 +29,7 @@ BDEPEND="$(vala_depend)
 	$(python_gen_cond_dep '
 		dev-python/jinja[${PYTHON_USEDEP}]
 	')
-	>=dev-build/meson-0.60.0
+	>=dev-build/meson-1.3.2
 	virtual/pkgconfig
 	gtk-doc? (
 		$(python_gen_cond_dep '
@@ -45,17 +41,15 @@ BDEPEND="$(vala_depend)
 	introspection? ( dev-libs/gobject-introspection )
 	test? (
 		net-libs/gnutls[tools]
-		test-full? ( dev-util/umockdev )
 	)
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-arch/gcab-1.0
 	app-arch/xz-utils
-	>=dev-libs/glib-2.68:2
+	>=dev-libs/glib-2.72:2
 	>=dev-libs/json-glib-1.6.0
-	>=dev-libs/libgudev-232:=
 	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.3.6:=[introspection?]
+	>=dev-libs/libxmlb-0.3.19:=[introspection?]
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	')
@@ -65,7 +59,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	elogind? ( >=sys-auth/elogind-211 )
 	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
 	gnutls? ( >=net-libs/gnutls-3.6.0 )
-	gusb? ( >=dev-libs/libgusb-0.3.8[introspection?] )
+	virtual/libusb:1
 	logitech? ( dev-libs/protobuf-c:= )
 	lzma? ( app-arch/xz-utils )
 	modemmanager? ( net-misc/modemmanager[mbim,qmi] )
@@ -94,20 +88,6 @@ DEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.6-fragile_tests.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test-full && has sandbox ${FEATURES}; then
-			ewarn "Certain ${PN} tests are fragile with sandboxing enabled,"
-			ewarn "see https://github.com/fwupd/fwupd/issues/1414."
-			ewarn "When in doubt, emerge ${PN} with USE=-test-full."
-		fi
-	fi
-}
-
 src_prepare() {
 	default
 
@@ -122,15 +102,14 @@ src_prepare() {
 src_configure() {
 	local plugins=(
 		-Dplugin_gpio="enabled"
+		-Dplugin_uf2="enabled"
 		$(meson_feature amdgpu plugin_amdgpu)
 		$(meson_feature amt plugin_intel_me)
 		$(meson_feature fastboot plugin_fastboot)
 		$(meson_feature flashrom plugin_flashrom)
-		$(meson_feature gusb plugin_uf2)
 		$(meson_feature logitech plugin_logitech_bulkcontroller)
 		$(meson_feature modemmanager plugin_modem_manager)
 		$(meson_feature nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
 		$(meson_feature synaptics plugin_synaptics_mst)
 		$(meson_feature synaptics plugin_synaptics_rmi)
 		$(meson_feature tpm plugin_tpm)
@@ -151,7 +130,6 @@ src_configure() {
 		-Dman="true"
 		-Dsupported_build="enabled"
 		-Dsystemd_unit_user=""
-		-Dudevdir="${EPREFIX}$(get_udevdir)"
 		$(meson_feature archive libarchive)
 		$(meson_use bash-completion bash_completion)
 		$(meson_feature bluetooth bluez)
@@ -159,14 +137,12 @@ src_configure() {
 		$(meson_feature elogind)
 		$(meson_feature gnutls)
 		$(meson_feature gtk-doc docs)
-		$(meson_feature gusb)
 		$(meson_feature lzma)
 		$(meson_feature introspection)
 		$(meson_feature policykit polkit)
 		$(meson_feature sqlite)
 		$(meson_feature systemd)
 		$(meson_use test tests)
-		$(meson_use test-full)
 
 		${plugins[@]}
 	)