gentoo auto-resync : 24:02:2023 - 21:49:24

6 files changed, 68 insertions, 634 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 44cb562653af..d875b79deb63 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,13 +1,8 @@
 AUX fwupd-1.8.10-installed_tests.patch 10892 BLAKE2B 27f52fd33ddcf9d64aecf40105413047668e538ace3efe25a87abfc3100c264515b238252b303aed43dde6ca6ddd788ada826f52ec0a0e7bc7b1e2fe47142025 SHA512 f581dfac2e2a94659751958b8c05a54eb2cfc0c23fd89dc1cf3e2a460e3079e15ee60898b5bdb6d399bdc997a82b5bb8a581f5db21cbf6830a94b6f01c443a5a
-AUX fwupd-1.8.4-installed_tests.patch 5999 BLAKE2B c59749549f7bf057129802ee534780967c09155ab247f5bc0293112908cd833f2700d92c5839efc1d09250bc2ac966d468c83f7a9e61622d2aa35d60d3b0115b SHA512 6158b56816bf7e5173f23fa29314f33effe5eb49a06201cdfa17743d22b3f0e3260f9aa2661687cc369f252e958ba193088fc96aa4de4d3c93d69658d145ab56
-AUX fwupd-1.8.6-installed_tests.patch 10375 BLAKE2B 2baf10a3a681dcd15ce1c99a3f4b3d59fea07864e57ca09526cd69c4922145779cbc50668a0264f65cf567d521d3e9d79ffc3c1fdd824a2c84b3d30bcb326951 SHA512 2338c2f23385b001edb6ce5ea8c4d54f31ba286eefde2df816eae719ed94046bb26905278ccb3d2c88d9c86f962b659854e67f767782c21c3a033decb48d4e6d
+AUX fwupd-1.8.11-installed_tests.patch 11562 BLAKE2B ae49094cf8b8312fa529424c5235cd12c68d368ab9a6b5f7520351683c31f71a824d50987869858454c27f6f6868df311042785618eb9bf18e424d5ea00ff987 SHA512 a4ddfd3c36dcb2ad47c4640180c301f0244f056d6812c2c722a84e33232694fd051305fb13600bea100e2ab5f692a039091238cf24d6aa29ca9044825b7dba35
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.8.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97
-DIST fwupd-1.8.5.tar.xz 3289548 BLAKE2B d82845ad4a6faaee966d43b8d9d5be0d4522ac6f2455ac8ef9d9c90dd0141a4feb7dd28f5c79526a49fd2ac4b785f92328a913a0fd13073fa2357aa996dd0700 SHA512 96856a56cb10b789bbbb82a33b702473cf1bdc32a9fddca6e48313ba3fefbe2f63a12a7290e3b4bd11939844f6989a0e15e96a4c2911cb900cd9e8d9c6c13f15
-DIST fwupd-1.8.7.tar.xz 3335636 BLAKE2B 1c4e8f369581f826a710274e0789fbcfe735ce58407d1c0f7472721895bf426e0ddf0fd3d014a35efe39726f8891faa7960aaa455482b435138ea116bddbc142 SHA512 374339178a1fbf85bc25b47077d0db351b3664a02ec9478c4a5381228125f3bd65ef0be9eb526574bd09ab665aadd6cd9e39f01ebbfebbd338ec191ba24c5a36
-DIST fwupd-1.8.8.tar.xz 3341320 BLAKE2B 12804e59dbc1a2091e81109d0d4cd58b75240835249be546b423858419841cecdb93b4f50406924ccaa609fafb0c96349561b46345d79a66d97133956e4dfa29 SHA512 05c9527d5b9013937b106e5a79e0337b66e3d79578bb61ccb27763d95b7d2e93cd816c969a4712e1ca6e5d4b6bc166ea264520e6673ab105a7f6eb2122e69c17
+DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de
 EBUILD fwupd-1.8.10.ebuild 4877 BLAKE2B 374ad7b6b8f3332a00716dcd46d9904833ef7c52e95d9e269fde77fe810ef17cfb3a76c0bff112b2831b2d80b985b1257386c092363e9e542bcb53afaac8ffc4 SHA512 b1435e3079eae1f76433511b13473fc72665c09b095d21ddba889178ea636ffa53f30f5e8055db3f8c33149af7041e9741aa89d4a2c87aaf60a124253837afdd
-EBUILD fwupd-1.8.5.ebuild 4975 BLAKE2B 269da725271292aeca1accab387c65dfda239c193aecb0c47c62e78c5e8620ee3309619646da694cbde3718479b5b15044c6a41a59f686a62cd1412bcc0afd3e SHA512 6c766d1044d2250b5fd4d045aa6e284788d6ee943803df8fae04c1fb06d2ead38c904df3bfb278b4a12260271da54c14ce09f229153a8f343176205ca12fd829
-EBUILD fwupd-1.8.7.ebuild 4868 BLAKE2B 934db3177be02165f5d3f7c25d51aa6581268fa21e6b0b78ef08c303657d151db7f3785a6f646733494c9fe3eaac47047a4728c9c09e90968d2e3d9d10cf88a5 SHA512 855fa0e6c2d87ecfca9185be4f057f398d75ac7f73796b385b29b7517d2552fe64fa652971f60f068963b151964e0622349e0537b72a52260fc304bea445a047
-EBUILD fwupd-1.8.8-r1.ebuild 4870 BLAKE2B de8da6728e210cd5f6eeef10c4ffbe942eb17f936892c454999577a10d66b24bf74b7e4525cae54216ed2c2004bff519b9b7df2d594acfef5647c573a88cf301 SHA512 2c19be779e65b5c4df50095086765bcf99febc16c1217a68461b8430fb509fc74f24555bed24820a193704e769013fb6f815713b0465d5180718448230d83752
+EBUILD fwupd-1.8.11.ebuild 4879 BLAKE2B bcb4bc55a2db90ef65d1dfcf217ca677cd8f87790395828a7be8fc24c24557bf97b757bfe8ba21391a270cff7cf3993c6457f9bfee338eb95d86899254e0f00c SHA512 129634825e136cf9d4a243d3386f5f3d9e6d2b9a81ed1a55e92fbf1419b30f3f6a7bb3f123c915e5f059e81f1f048c799872ce270765b18323b03d78647d163d
 MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de
diff --git a/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
index d82a326e0d08..819b6799ebdf 100644
--- a/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch
+++ b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
@@ -21,6 +21,33 @@
  if build_standalone
    install_data(['daemon.conf'],
      install_dir: join_paths(sysconfdir, 'fwupd')
+--- a/libfwupdplugin/meson.build
++++ b/libfwupdplugin/meson.build
+@@ -370,6 +370,7 @@
+   )
+   test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env)
+ 
++  if false
+   install_data([
+       'tests/chassis_type',
+       'tests/sys_vendor',
+@@ -388,6 +389,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 @@
@@ -92,7 +119,7 @@
    )
 --- a/plugins/ccgx/meson.build
 +++ b/plugins/ccgx/meson.build
-@@ -28,8 +28,6 @@
+@@ -29,8 +29,6 @@
  plugin_builtins += plugin_builtin_ccgx
  
  if get_option('tests')
@@ -101,7 +128,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -44,7 +42,6 @@
+@@ -45,7 +43,6 @@
        plugin_libs,
        plugin_builtin_ccgx,
      ],
@@ -121,7 +148,7 @@
    )
 --- a/plugins/elantp/meson.build
 +++ b/plugins/elantp/meson.build
-@@ -20,8 +20,6 @@
+@@ -22,8 +22,6 @@
  plugin_builtins += plugin_builtin_elantp
  
  if get_option('tests')
@@ -130,7 +157,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -36,7 +34,6 @@
+@@ -38,7 +36,6 @@
        plugin_libs,
        plugin_builtin_elantp,
      ],
@@ -140,7 +167,7 @@
    )
 --- a/plugins/linux-swap/meson.build
 +++ b/plugins/linux-swap/meson.build
-@@ -25,7 +25,6 @@
+@@ -28,7 +28,6 @@
        plugin_libs,
        plugin_builtin_linux_swap,
      ],
@@ -150,7 +177,7 @@
    )
 --- a/plugins/mtd/meson.build
 +++ b/plugins/mtd/meson.build
-@@ -27,7 +27,6 @@
+@@ -30,7 +30,6 @@
        plugin_libs,
        plugin_builtin_mtd,
      ],
@@ -160,7 +187,7 @@
    )
 --- a/plugins/nitrokey/meson.build
 +++ b/plugins/nitrokey/meson.build
-@@ -30,7 +30,6 @@
+@@ -33,7 +33,6 @@
        plugin_libs,
        plugin_builtin_nitrokey,
      ],
@@ -168,6 +195,16 @@
      install_rpath: libdir_pkg,
      install_dir: installed_test_bindir,
    )
+--- 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,
+   )
 --- a/plugins/pixart-rf/meson.build
 +++ b/plugins/pixart-rf/meson.build
 @@ -19,8 +19,6 @@
@@ -189,14 +226,16 @@
    )
 --- a/plugins/redfish/meson.build
 +++ b/plugins/redfish/meson.build
-@@ -40,14 +40,6 @@
+@@ -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_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'],
@@ -204,7 +243,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -68,7 +60,6 @@
+@@ -70,7 +60,6 @@
        fwupdplugin,
        plugin_builtin_redfish,
      ],
@@ -271,7 +310,7 @@
    )
 --- a/plugins/uefi-capsule/meson.build
 +++ b/plugins/uefi-capsule/meson.build
-@@ -144,25 +144,6 @@
+@@ -146,25 +146,6 @@
      c_args: cargs
    )
    test('uefi-self-test', e, env: env)
@@ -297,6 +336,16 @@
  endif
  
  endif
+--- a/plugins/uefi-dbx/meson.build
++++ b/plugins/uefi-dbx/meson.build
+@@ -32,7 +32,6 @@
+       plugin_builtin_uefi_dbx,
+     ],
+     c_args: cargs,
+-    install: true,
+     install_rpath: libdir_pkg,
+     install_dir: installed_test_bindir,
+   )
 --- a/plugins/uf2/meson.build
 +++ b/plugins/uf2/meson.build
 @@ -18,8 +18,6 @@
@@ -318,7 +367,7 @@
    )
 --- a/plugins/vli/meson.build
 +++ b/plugins/vli/meson.build
-@@ -46,7 +46,6 @@
+@@ -49,7 +49,6 @@
        plugin_builtin_vli,
      ],
      c_args: cargs,
@@ -328,7 +377,7 @@
    )
 --- a/plugins/wacom-usb/meson.build
 +++ b/plugins/wacom-usb/meson.build
-@@ -22,8 +22,6 @@
+@@ -23,8 +23,6 @@
  plugin_builtins += plugin_builtin_wac
  
  if get_option('tests')
@@ -337,7 +386,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -39,7 +37,6 @@
+@@ -40,7 +38,6 @@
        plugin_builtin_wac,
      ],
      c_args: cargs,
diff --git a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
deleted file mode 100644
index 1cb3b41cb728..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
+++ /dev/null
@@ -1,215 +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/plugins/acpi-dmar/meson.build
-+++ b/plugins/acpi-dmar/meson.build
-@@ -47,7 +47,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-dmar-self-test', e, env: env)  # added to installed-tests
---- a/plugins/acpi-facp/meson.build
-+++ b/plugins/acpi-facp/meson.build
-@@ -47,7 +47,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-facp-self-test', e, env: env)  # added to installed-tests
---- a/plugins/acpi-ivrs/meson.build
-+++ b/plugins/acpi-ivrs/meson.build
-@@ -47,7 +47,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-ivrs-self-test', e, env: env)  # added to installed-tests
---- a/plugins/acpi-phat/meson.build
-+++ b/plugins/acpi-phat/meson.build
-@@ -53,7 +53,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-phat-self-test', e, env: env)  # added to installed-tests
---- a/plugins/ata/meson.build
-+++ b/plugins/ata/meson.build
-@@ -53,7 +53,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('ata-self-test', e, env: env)  # added to installed-tests
---- a/plugins/bcm57xx/meson.build
-+++ b/plugins/bcm57xx/meson.build
-@@ -35,8 +35,6 @@
- )
- 
- 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())
-@@ -63,7 +61,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('bcm57xx-self-test', e, env: env)
---- a/plugins/ccgx/meson.build
-+++ b/plugins/ccgx/meson.build
-@@ -37,8 +37,6 @@
- endif
- 
- 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())
-@@ -64,7 +62,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('ccgx-self-test', e, env: env)
---- a/plugins/elantp/meson.build
-+++ b/plugins/elantp/meson.build
-@@ -33,8 +33,6 @@
- endif
- 
- 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())
-@@ -57,7 +55,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('elantp-self-test', e, env: env)
---- a/plugins/linux-swap/meson.build
-+++ b/plugins/linux-swap/meson.build
-@@ -44,7 +44,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('linux-swap-self-test', e)  # added to installed-tests
---- a/plugins/mtd/meson.build
-+++ b/plugins/mtd/meson.build
-@@ -46,7 +46,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('mtd-self-test', e)  # added to installed-tests
---- a/plugins/nitrokey/meson.build
-+++ b/plugins/nitrokey/meson.build
-@@ -47,7 +47,6 @@
-     link_with: [
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('nitrokey-self-test', e)  # added to installed-tests
---- a/plugins/pixart-rf/meson.build
-+++ b/plugins/pixart-rf/meson.build
-@@ -31,8 +31,6 @@
- )
- 
- 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())
-@@ -55,7 +53,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('pxi-self-test', e, env: env)
---- a/plugins/redfish/meson.build
-+++ b/plugins/redfish/meson.build
-@@ -47,14 +47,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_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())
-@@ -89,7 +81,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('redfish-self-test', e, env: env)  # added to installed-tests
---- a/src/tests/host-emulate/meson.build
-+++ b/src/tests/host-emulate/meson.build
-@@ -8,7 +8,7 @@
-       output: '@0@.gz'.format(input_file),
-       capture: true,
-       command: [gzip, '-k', '--stdout', '@INPUT@'],
--      install: true,
-+      install: false,
-       install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
-     )
-   endforeach
diff --git a/sys-apps/fwupd/fwupd-1.8.8-r1.ebuild b/sys-apps/fwupd/fwupd-1.8.11.ebuild
index dfcb3a16a2f7..ae2c0c6958c2 100644
--- a/sys-apps/fwupd/fwupd-1.8.8-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.11.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	modemmanager? ( gusb )
 	spi? ( lzma )
 	synaptics? ( gnutls )
-	test? ( gusb )
+	test? ( archive gusb )
 	uefi? ( gnutls )
 "
 RESTRICT="!test? ( test )"
@@ -96,7 +96,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.6-installed_tests.patch
+	"${FILESDIR}"/${PN}-1.8.11-installed_tests.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/fwupd/fwupd-1.8.5.ebuild b/sys-apps/fwupd/fwupd-1.8.5.ebuild
deleted file mode 100644
index e2c5b1bc22bf..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.5.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 +man 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? ( 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 )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	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.58:2
-	dev-libs/json-glib
-	dev-libs/libgudev:=
-	>=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
-	archive? ( app-arch/libarchive:= )
-	cbor? ( dev-libs/libcbor:= )
-	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?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[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]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.4-installed_tests.patch
-)
-
-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 '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	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_amt)
-		$(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"
-		-Dgresource_quirks="disabled"
-		-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_use man)
-		$(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_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
-		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
-	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/fwupd-1.8.7.ebuild b/sys-apps/fwupd/fwupd-1.8.7.ebuild
deleted file mode 100644
index 202260d525cc..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.7.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 +man 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? ( 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 )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	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.58:2
-	dev-libs/json-glib
-	dev-libs/libgudev:=
-	>=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-misc/curl
-	archive? ( app-arch/libarchive:= )
-	cbor? ( dev-libs/libcbor:= )
-	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?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[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]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.6-installed_tests.patch
-)
-
-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"
-		-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_use man)
-		$(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}
-
-		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
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use minimal || udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use minimal || udev_reload
-}