gentoo auto-resync : 27:12:2023 - 19:39:54

3 files changed, 1 insertions, 198 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 59e1dfd1e545..6e414292076c 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,9 +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.10.tar.xz 3901816 BLAKE2B d8a0931188bf494e1b916f5bdebaf290b8e4b81a314e899f7b7e2aeec2dc37240b40c9fbf6259662fd2d92abca477460d630af0d8d95363027aa00ce46021789 SHA512 308bcd3af84d82157492a2ee8dc6fa4d7df6a66cca64e45b3dff9b46d0367f7d3122671388b627f67ab59a69bac1cb36feeccd1668cce0487fe466736dd8b8cc
-DIST fwupd-1.9.3.tar.xz 3807376 BLAKE2B 2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb SHA512 53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0
 DIST fwupd-1.9.6.tar.xz 3863452 BLAKE2B 8b54efef5947dc4766a24b8501100f7e24707944b5c9aae3c3fcd88dfce230667507af8816203b0ececa0510485661f5f599c1cdc2285df72683ede4b7a6d15c SHA512 c65d795268e0e36fd2572ce3d4f2fb811412c16d583fa5463bee017a70b5d0f8b1b92460efa977a7d70bb5e3f6b5b02756e795e5f8ab7e7ac7874dc1ab5a0bfb
 EBUILD fwupd-1.9.10-r1.ebuild 5372 BLAKE2B 20f34a713784f935b227f55245977cca0b2a2e7e3bcc0bfbc9248bfccc39e98d6659282485cd3a97c5c25433a6a8d6215a2814666b27391f493e0ed0effbdb09 SHA512 89ea088f538d05e3d729ac7cbd25d6b4c0e7046a98d5c6d4849ae94bb30ce2589dc612f657c0d33b10ae2c61f608aa361f67274e157f82cca9f7564eb50b9c27
-EBUILD fwupd-1.9.3.ebuild 5011 BLAKE2B 05c0fba2e7da70aef0c2e1adedf1727a458caf1c0b9094ce0a7f83f8a270b196432addbe7ae812cebc04ed3634c958cb8c5aed525173c370ad795543fe0423d1 SHA512 f7f251b020c0624c1fac209bc7e63334a75c006967295b5fcf91d132e5736bd23dc5bd32ce1127b5ef5d2afa21c80e71afa5e4abf53a64cc8a9ddfe05f6c4076
 EBUILD fwupd-1.9.6.ebuild 5304 BLAKE2B c658e75796d05c06b98ac7248706ba2eacd1ae2f8ce785c3bb68c1558a0a7903ef3c229cb29c79a1d4c77f0e35fb7b6c672beae2a064bb54b33ff424e7889bf2 SHA512 fb6d7d0c81f7eee90134f500d2de2f3a3d2634ec6e9b665ee0c34909df98d706e20dac34358881dd650a6adc192464b8574b24a70fac66709c1902c3c5f1e750
-MISC metadata.xml 1577 BLAKE2B fdc253eea7ab1cd6eba54d45f965bb513cf443bcd7a0b990f0dbb95f76120c8b2b6bfe844ca558ed16419a193d22ca8f7fa0b2fe0039fe36abe22dcb232284f5 SHA512 c2d6694ebb30e2c6d7f4a227c6376ce06fbb6e0e19ed0b1db4fba35004fb5a8c17a4bfd42b6f6ab51f22bb479e514ea495d32184901c7a41f6d4ea2ea2cb0dda
+MISC metadata.xml 1521 BLAKE2B 61fd8c6cedf39c9289260683fe6d599f78ba3fc679f4540c3cd0aa936dff3374cf81b3d59536dc5898586f9aeb453960ff64d5182361e712caddbca2986d404c SHA512 1d072df281f653f69abec3c78e10eef5300cfe60a41dc9c2d82460a1807fc7990e12a6a97d56aebadb11a4f4e7325824dcab27ffd4b6a52e73374ee99e075551
diff --git a/sys-apps/fwupd/fwupd-1.9.3.ebuild b/sys-apps/fwupd/fwupd-1.9.3.ebuild
deleted file mode 100644
index f29b15d30779..000000000000
--- a/sys-apps/fwupd/fwupd-1.9.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson python-single-r1 vala udev xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-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="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 )
-	dell? ( uefi )
-	fastboot? ( gusb )
-	logitech? ( gusb )
-	minimal? ( !introspection )
-	modemmanager? ( gusb )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	test? ( archive gusb )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	>=dev-util/meson-0.60.0
-	virtual/pkgconfig
-	gtk-doc? (
-		$(python_gen_cond_dep '
-			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-		')
-		>=dev-util/gi-docgen-2021.1
-	)
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	introspection? ( dev-libs/gobject-introspection )
-	test? (
-		dev-util/umockdev
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/xz-utils
-	>=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.3.6:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-misc/curl-7.62.0
-	archive? ( app-arch/libarchive:= )
-	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-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[mbim,qmi] )
-	policykit? ( >=sys-auth/polkit-0.114 )
-	sqlite? ( dev-db/sqlite )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss:= )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-src_prepare() {
-	default
-
-	vala_setup
-
-	# 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 -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
-		-i docs/meson.build || die
-
-	python_fix_shebang "${S}"/contrib/*.py
-}
-
-src_configure() {
-	local plugins=(
-		-Dplugin_gpio="enabled"
-		$(meson_feature amt plugin_intel_me)
-		$(meson_feature dell plugin_dell)
-		$(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)
-		$(meson_feature uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_feature uefi plugin_uefi_pk)
-	)
-	if use ppc64 || use riscv ; then
-		plugins+=( -Dplugin_msr="disabled" )
-	fi
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="disabled"
-		-Dcurl="enabled"
-		-Defi_binary="false"
-		-Dman="true"
-		-Dsupported_build="enabled"
-		-Dudevdir="${EPREFIX}$(get_udevdir)"
-		$(meson_feature archive libarchive)
-		$(meson_use bash-completion bash_completion)
-		$(meson_feature bluetooth bluez)
-		$(meson_feature cbor)
-		$(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)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_test() {
-	LC_ALL="C" meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-	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
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use minimal || udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use minimal || udev_reload
-}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index bc533598ba5c..37f757e41a8c 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="amdgpu">Build and install AMD dGPU (Navi3x and above) plugin</flag>
 		<flag name="amt">Build and install Intel AMT plugin</flag>
 		<flag name="cbor">Enable CBOR support for coSWID and uSWID via <pkg>dev-libs/libcbor</pkg></flag>
-		<flag name="dell">Enable Dell-specific support</flag>
 		<flag name="fastboot">Build and install fastboot plugin</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>