gentoo auto-resync : 27:10:2023 - 14:48:06

4 files changed, 0 insertions, 449 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 40b6a1f4e9ac..75e8ca2a7ab5 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,6 +1,3 @@
-AUX fwupd-1.8.13-installed_tests.patch 11799 BLAKE2B 7d1b5e18f27a95aabda2421a9ba2ff98ae68f74fc82b103d199fe57905fbe40d21d88c60f2a0708bd575f6ce013abda848c9d0830f2489fb88ff1810926505db SHA512 3edd59a52310a454a86470feb9b17f627def0362947788c65743e0cbbc4670b94a227080caddc1e7808fc9b63f5e045d4a0638b63ae1ff850f70db9e3b748910
-AUX fwupd-1.9.4-fragile_tests.patch 1571 BLAKE2B b051c32ac4decb4f7eab52b532fe866382ebf203fa47a6a24cd6069a8c231da6a9cc42306a877511a3521f28f52fef4b65cead85bc89118019629f0cebd0d736 SHA512 b80f490ee00e4528adcabfb556a39fbcd581911ad3fa29d416a98b149d955f0cbe8b68089d9f47f569fee76e5f6eb75e05aaebe4d3f5670f2a0f3ef6d172c93a
-AUX fwupd-1.9.5-parallel_build.patch 432 BLAKE2B 584949820b5c6e6840b48fe7ed6128ddf0ea43d9871148d8c68db0f154a7dcec62f77745fe4dd9f4e5472eac57aa6f77e5f2d7738ed215093c1bb819f4beb56b SHA512 13888a32a9af7e5aec26fbe51305b571783a952732a34c2ddcc1c38417664936fb4e6bb85df6fe99f73118b4a5e819e451ee0851e632015d7e852e2afe320607
 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.3.tar.xz 3807376 BLAKE2B 2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb SHA512 53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0
diff --git a/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch
deleted file mode 100644
index f97343be5224..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.13-installed_tests.patch
+++ /dev/null
@@ -1,406 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -10,20 +10,10 @@
-   subdir('fish-completion')
- endif
- 
--if get_option('tests')
--subdir('device-tests')
--endif
--
- if build_daemon
- subdir('motd')
- endif
- 
--if get_option('tests')
--  if build_daemon
--    subdir('installed-tests')
--  endif
--endif
--
- if build_standalone
-   install_data(['daemon.conf'],
-     install_dir: join_paths(sysconfdir, 'fwupd')
---- a/libfwupdplugin/meson.build
-+++ b/libfwupdplugin/meson.build
-@@ -371,6 +371,7 @@
-   )
-   test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env)
- 
-+  if false
-   install_data([
-       'tests/chassis_type',
-       'tests/sys_vendor',
-@@ -389,6 +390,7 @@
-     ],
-     install_dir: join_paths(installed_test_datadir, 'tests/dmi/tables64'),
-   )
-+  endif
- endif
- 
- fwupdplugin_incdir = include_directories('.')
---- a/libfwupdplugin/tests/meson.build
-+++ b/libfwupdplugin/tests/meson.build
-@@ -10,6 +10,5 @@
-   command: [
-     python3, '-m', 'zipfile', '-c', '@OUTPUT@', '@INPUT@',
-   ],
--  install: true,
-   install_dir: installed_test_datadir,
- )
---- a/plugins/acpi-dmar/meson.build
-+++ b/plugins/acpi-dmar/meson.build
-@@ -28,7 +28,6 @@
-       plugin_libs,
-       plugin_builtin_acpi_dmar,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/acpi-facp/meson.build
-+++ b/plugins/acpi-facp/meson.build
-@@ -28,7 +28,6 @@
-       plugin_libs,
-       plugin_builtin_acpi_facp,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/acpi-ivrs/meson.build
-+++ b/plugins/acpi-ivrs/meson.build
-@@ -28,7 +28,6 @@
-       plugin_libs,
-       plugin_builtin_acpi_ivrs,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/acpi-phat/meson.build
-+++ b/plugins/acpi-phat/meson.build
-@@ -31,7 +31,6 @@
-       plugin_libs,
-       plugin_builtin_acpi_phat,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/ata/meson.build
-+++ b/plugins/ata/meson.build
-@@ -33,7 +33,6 @@
-       plugin_libs,
-       plugin_builtin_ata,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/bcm57xx/meson.build
-+++ b/plugins/bcm57xx/meson.build
-@@ -25,8 +25,6 @@
- plugin_builtins += plugin_builtin_bcm57xx
- 
- if get_option('tests')
--  install_data(['tests/bcm57xx.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -41,7 +39,6 @@
-       plugin_libs,
-       plugin_builtin_bcm57xx,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/ccgx/meson.build
-+++ b/plugins/ccgx/meson.build
-@@ -29,8 +29,6 @@
- plugin_builtins += plugin_builtin_ccgx
- 
- if get_option('tests')
--  install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -45,7 +43,6 @@
-       plugin_libs,
-       plugin_builtin_ccgx,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/dfu/meson.build
-+++ b/plugins/dfu/meson.build
-@@ -70,7 +70,6 @@
-       plugin_libs,
-       plugin_builtin_dfu,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/elantp/meson.build
-+++ b/plugins/elantp/meson.build
-@@ -22,8 +22,6 @@
- plugin_builtins += plugin_builtin_elantp
- 
- if get_option('tests')
--  install_data(['tests/elantp.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -38,7 +36,6 @@
-       plugin_libs,
-       plugin_builtin_elantp,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/linux-swap/meson.build
-+++ b/plugins/linux-swap/meson.build
-@@ -28,7 +28,6 @@
-       plugin_libs,
-       plugin_builtin_linux_swap,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/mtd/meson.build
-+++ b/plugins/mtd/meson.build
-@@ -29,7 +29,6 @@
-       plugin_libs,
-       plugin_builtin_mtd,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/nitrokey/meson.build
-+++ b/plugins/nitrokey/meson.build
-@@ -33,7 +33,6 @@
-       plugin_libs,
-       plugin_builtin_nitrokey,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/nvme/meson.build
-+++ b/plugins/nvme/meson.build
-@@ -38,7 +38,6 @@
-       plugin_libs,
-       plugin_builtin_nvme,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/pixart-rf/meson.build
-+++ b/plugins/pixart-rf/meson.build
-@@ -19,8 +19,6 @@
- plugin_builtins += plugin_builtin_pxi
- 
- if get_option('tests')
--  install_data(['tests/pixart.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -35,7 +33,6 @@
-       plugin_libs,
-       plugin_builtin_pxi,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/redfish/meson.build
-+++ b/plugins/redfish/meson.build
-@@ -40,16 +40,6 @@
- )
- 
- if get_option('tests')
--  install_data(['tests/redfish-smbios.bin'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
--  install_data(['tests/redfish.conf'],
--    install_dir: join_paths(installed_test_datadir, 'tests'),
--    install_mode: 'rw-r-----',
--  )
--  install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
--    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
--  install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
--    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -69,7 +59,6 @@
-       fwupdplugin,
-       plugin_builtin_redfish,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/synaptics-mst/meson.build
-+++ b/plugins/synaptics-mst/meson.build
-@@ -22,8 +22,6 @@
- plugin_builtins += plugin_builtin_synaptics_mst
- 
- if get_option('tests')
--  install_data(['tests/synaptics-mst.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -44,7 +42,6 @@
-       fwupdplugin,
-       plugin_builtin_synaptics_mst,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/synaptics-prometheus/meson.build
-+++ b/plugins/synaptics-prometheus/meson.build
-@@ -18,8 +18,6 @@
- plugin_builtins += plugin_builtin_synaprom
- 
- if get_option('tests')
--  install_data(['tests/synaptics-prometheus.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -34,7 +32,6 @@
-       plugin_libs,
-       plugin_builtin_synaprom,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/synaptics-rmi/meson.build
-+++ b/plugins/synaptics-rmi/meson.build
-@@ -25,8 +25,6 @@
- plugin_builtins += plugin_builtin_synaptics_rmi
- 
- if get_option('tests')
--  install_data(['tests/synaptics-rmi-0x.builder.xml','tests/synaptics-rmi-10.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -41,7 +39,6 @@
-       plugin_libs,
-       plugin_builtin_synaptics_rmi,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/uefi-capsule/meson.build
-+++ b/plugins/uefi-capsule/meson.build
-@@ -149,25 +149,6 @@
-     ],
-   )
-   test('uefi-self-test', e, env: env)
--
--# to use these do `sudo systemctl edit fwupd.service` and set
--# Environment="FWUPD_SYSFSFWDIR=/usr/share/installed-tests/fwupd"
--install_data([
--    'tests/efi/esrt/entries/entry0/capsule_flags',
--    'tests/efi/esrt/entries/entry0/fw_class',
--    'tests/efi/esrt/entries/entry0/fw_type',
--    'tests/efi/esrt/entries/entry0/fw_version',
--    'tests/efi/esrt/entries/entry0/last_attempt_status',
--    'tests/efi/esrt/entries/entry0/last_attempt_version',
--    'tests/efi/esrt/entries/entry0/lowest_supported_fw_version',
--  ],
--  install_dir: join_paths(installed_test_datadir, 'efi/esrt/entries/entry0'),
--)
--install_data([
--    'tests/efi/efivars/CapsuleMax-39b68c46-f7fb-441b-b6ec-16b0f69821f3',
--  ],
--  install_dir: join_paths(installed_test_datadir, 'efi/efivars'),
--)
- endif
- 
- endif
---- a/plugins/uefi-dbx/meson.build
-+++ b/plugins/uefi-dbx/meson.build
-@@ -31,7 +31,6 @@
-       plugin_libs,
-       plugin_builtin_uefi_dbx,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/uf2/meson.build
-+++ b/plugins/uf2/meson.build
-@@ -18,8 +18,6 @@
- plugin_builtins += plugin_builtin_uf2
- 
- if get_option('tests')
--  install_data(['tests/uf2.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -34,7 +32,6 @@
-       plugin_libs,
-       plugin_builtin_uf2,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/vli/meson.build
-+++ b/plugins/vli/meson.build
-@@ -48,7 +48,6 @@
-       plugin_libs,
-       plugin_builtin_vli,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/plugins/wacom-usb/meson.build
-+++ b/plugins/wacom-usb/meson.build
-@@ -23,8 +23,6 @@
- plugin_builtins += plugin_builtin_wac
- 
- if get_option('tests')
--  install_data(['tests/wacom-usb.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -39,7 +37,6 @@
-       plugin_libs,
-       plugin_builtin_wac,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-     c_args: [
---- a/src/tests/host-emulate/meson.build
-+++ b/src/tests/host-emulate/meson.build
-@@ -8,7 +8,6 @@
-       output: '@0@.gz'.format(input_file),
-       capture: true,
-       command: [gzip, '-k', '--stdout', '@INPUT@'],
--      install: true,
-       install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
-     )
-   endforeach
diff --git a/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch b/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch
deleted file mode 100644
index 95105177499b..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.9.4-fragile_tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-umockdev-based tests appear not to play nicely with the sandbox,
-often they work but on some systems they persistently fail.
-
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -60,6 +60,7 @@
- option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
- option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'})
- option('tests', type : 'boolean', value : true, description : 'enable tests')
-+option('test-full', type : 'boolean', value : false, description : 'enable tests known to be fragile when called from Gentoo ebuilds')
- option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'})
- option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
- option('efi_os_dir', type: 'string', description : 'the hardcoded name of OS directory in ESP, e.g. fedora')
---- a/plugins/thunderbolt/meson.build
-+++ b/plugins/thunderbolt/meson.build
-@@ -19,7 +19,7 @@
- plugin_builtins += plugin_builtin_thunderbolt
- 
- # we use functions from 2.52 in the tests
--if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
-+if get_option('tests') and get_option('test-full') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
diff --git a/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch b/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch
deleted file mode 100644
index fb9d3562841e..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.9.5-parallel_build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From 085a89ce3f7734fd9bc0527df7f0bb05e27fbaef Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Tue, 12 Sep 2023 07:42:23 +0100
-Subject: [PATCH] trivial: Fix parallel build, harder still
-
-Fixes https://github.com/fwupd/fwupd/issues/6175
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -17,6 +17,7 @@ engine_dep = [
-   polkit,
-   sqlite,
-   cbor,
-+  fwupdplugin_rs_dep,
- ]
- 
- if get_option('passim').allowed()