gentoo auto-resync : 19:05:2023 - 16:15:42

20 files changed, 98 insertions, 907 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2358829598b4..0cf4128d7b7d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 7339270cc2fe..90cb94622cff 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,12 +1,10 @@
 AUX fwupd-1.8.10-installed_tests.patch 10892 BLAKE2B 27f52fd33ddcf9d64aecf40105413047668e538ace3efe25a87abfc3100c264515b238252b303aed43dde6ca6ddd788ada826f52ec0a0e7bc7b1e2fe47142025 SHA512 f581dfac2e2a94659751958b8c05a54eb2cfc0c23fd89dc1cf3e2a460e3079e15ee60898b5bdb6d399bdc997a82b5bb8a581f5db21cbf6830a94b6f01c443a5a
-AUX fwupd-1.8.11-empty_kernel_cmdline.patch 812 BLAKE2B 5542b3df5de628a069ab26ab53576073a2d4ef30da970061c1129883181d7adfe2fd22f18f1179e7f179a52e55126b12235478c66f3a5e921339e74a7adc34ab SHA512 317f26e6317878c8886e4adeb3a7fca4c4ca823a5f35865f11fac7a810fb5d76dd726526b496069edb7f8a6f8ae86965f07530ec751b616f63dc3e8eef30707e
-AUX fwupd-1.8.11-installed_tests.patch 11562 BLAKE2B ae49094cf8b8312fa529424c5235cd12c68d368ab9a6b5f7520351683c31f71a824d50987869858454c27f6f6868df311042785618eb9bf18e424d5ea00ff987 SHA512 a4ddfd3c36dcb2ad47c4640180c301f0244f056d6812c2c722a84e33232694fd051305fb13600bea100e2ab5f692a039091238cf24d6aa29ca9044825b7dba35
 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.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97
-DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de
 DIST fwupd-1.8.14.tar.xz 3733176 BLAKE2B 6d17ee9ce1fb46a9d0a8a97d54f1873888635805af00a05ad365b32d48d6e58b48b52d706400067ca8cf6f6b846f6b8799c44d66ec64ab2fca5812b199ac2ac5 SHA512 80669f1c8ca60ac646f9a7aa4028edd23d1fc6853d999f60d292fabbfc81733f06b1f76a2987f0af62a739aa2cf5cc75fc40c9283fd37f4d8157f1a08df6fcd2
+DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B 1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa SHA512 c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75
 EBUILD fwupd-1.8.10.ebuild 4877 BLAKE2B 374ad7b6b8f3332a00716dcd46d9904833ef7c52e95d9e269fde77fe810ef17cfb3a76c0bff112b2831b2d80b985b1257386c092363e9e542bcb53afaac8ffc4 SHA512 b1435e3079eae1f76433511b13473fc72665c09b095d21ddba889178ea636ffa53f30f5e8055db3f8c33149af7041e9741aa89d4a2c87aaf60a124253837afdd
-EBUILD fwupd-1.8.11-r1.ebuild 4865 BLAKE2B c654e52b393d0772c96977ce6ba8ca3da83be3738e00e7c7c3475d51bf8c1173e18b2c69da31570e13bbb4d754c55baf92fa43cfb52b217e8471d82da8cca82e SHA512 c0aa1a103ce2f59789bd32e1859daae68e7c42fb589f2f63e980c2f6db9420a3e12096eb9522c9fbc32b2853ec028c951c4882016d81170c6866f6634dd611e6
 EBUILD fwupd-1.8.14.ebuild 4810 BLAKE2B eda66e330abc30b2a7dab73a15b5778326e54cde68da66d1c9dbaa0458059223b34ef5f3a1e18f20c5eb32a73ad6958d9463c361c8ef3f02503b2e05d97ceb43 SHA512 dd8cb5e60205fe0fc8664b39d629f24766070bad9800cb8f4eaba0668a62a9b3cadba3b9a13e9fd54e21d2c78603f1a62453b9b41e5e19e938a9ec50dc63795c
+EBUILD fwupd-1.8.15.ebuild 4810 BLAKE2B eda66e330abc30b2a7dab73a15b5778326e54cde68da66d1c9dbaa0458059223b34ef5f3a1e18f20c5eb32a73ad6958d9463c361c8ef3f02503b2e05d97ceb43 SHA512 dd8cb5e60205fe0fc8664b39d629f24766070bad9800cb8f4eaba0668a62a9b3cadba3b9a13e9fd54e21d2c78603f1a62453b9b41e5e19e938a9ec50dc63795c
 MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de
diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch b/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
deleted file mode 100644
index 42d5915397b8..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 7e502cf7d3da00a978201455f3a3799ae4aded75 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 6 Mar 2023 16:56:05 +0000
-Subject: [PATCH] Fix a critical warning when parsing an empty kernel cmdline
-
-Fix the bounds check so we never pass a bufsz of zero to fu_strsplit().
-
-Resolves: https://github.com/fwupd/fwupd/issues/5575
---- a/libfwupdplugin/fu-kernel.c
-+++ b/libfwupdplugin/fu-kernel.c
-@@ -253,7 +253,7 @@ fu_kernel_get_cmdline(GError **error)
- 	if (!g_file_get_contents("/proc/cmdline", &buf, &bufsz, error))
- 		return NULL;
- 	hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
--	if (bufsz > 0) {
-+	if (bufsz > 1) {
- 		g_auto(GStrv) tokens = fu_strsplit(buf, bufsz - 1, " ", -1);
- 		for (guint i = 0; tokens[i] != NULL; i++) {
- 			g_auto(GStrv) kv = NULL;
diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
deleted file mode 100644
index 819b6799ebdf..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.11-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
-@@ -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 @@
-       plugin_libs,
-       plugin_builtin_acpi_dmar,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- 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,
-   )
---- 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,
-   )
---- 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,
-   )
---- 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,
-   )
---- 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,
-   )
---- 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,
-   )
---- 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,
-   )
---- 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,
-   )
---- 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,
-   )
---- a/plugins/mtd/meson.build
-+++ b/plugins/mtd/meson.build
-@@ -30,7 +30,6 @@
-       plugin_libs,
-       plugin_builtin_mtd,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- 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,
-   )
---- 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 @@
- 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,
-   )
---- 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())
-@@ -70,7 +60,6 @@
-       fwupdplugin,
-       plugin_builtin_redfish,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- 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())
-@@ -47,7 +45,6 @@
-     c_args: [
-       cargs,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- 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())
-@@ -35,7 +33,6 @@
-       plugin_builtin_synaprom,
-     ],
-     c_args: cargs,
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- 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,
-   )
---- a/plugins/uefi-capsule/meson.build
-+++ b/plugins/uefi-capsule/meson.build
-@@ -146,25 +146,6 @@
-     c_args: cargs
-   )
-   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
-@@ -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 @@
- 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,
-   )
---- a/plugins/vli/meson.build
-+++ b/plugins/vli/meson.build
-@@ -49,7 +49,6 @@
-       plugin_builtin_vli,
-     ],
-     c_args: cargs,
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- 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())
-@@ -40,7 +38,6 @@
-       plugin_builtin_wac,
-     ],
-     c_args: cargs,
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- 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/fwupd-1.8.11-r1.ebuild b/sys-apps/fwupd/fwupd-1.8.15.ebuild
index fa2a0075952f..0689a45a9731 100644
--- a/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.15.ebuild
@@ -92,8 +92,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-installed_tests.patch
-	"${FILESDIR}"/${PN}-1.8.11-empty_kernel_cmdline.patch
+	"${FILESDIR}"/${PN}-1.8.13-installed_tests.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a8d813611b03..b41991e02ab0 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,18 +1,7 @@
-AUX 39_memtest86+-r1 1702 BLAKE2B ba73cef5d026a242ab3e5ac54a98cf289ceedfbe174a9d2109cab785e0b0fc9b9e59aa3c80d276255cc8c18bdc3567f02e644652512e194e3c555436d42be8e3 SHA512 ef2d86bd902f44905921880c630a85d3c9763bea3b79211f64346f1f55a5f31ed0b20a80f9f0c3914de1f33b7bd7d3471762f17065183ced185de52d34f2068f
-AUX 39_memtest86+-r2 3529 BLAKE2B 8af086ab34f99b8307571f1ca4820e8dbcdfe0393d0be1c9b4aa6e44690b03ea23d418aba4cb11f1d099c5b0932942d08857eefa998984bc07dd1985dccbf891 SHA512 0e9c485699a8fcd777b40ae6d366878826608d10b2668bbc6b0b28a91f43a44882bc10c95a2103c573a85a95c1bf6f41e2eb65a3bd2d146d621f987eede2c278
-AUX make-memtest86+-boot-floppy 2499 BLAKE2B 1076e5d3e3a139c46c684f7ed29658cd815525e56fae03eb4dd1e36fda0c751a1aa78c891d040aeee979f8b79a8b0db8453e4e26f2efd9963e7bfa10206b5c86 SHA512 28649d630c4624573a5cf4279f6207cf44707978d8a18f2c614997f641038f2da731bb5c3b26066812a5c02d926c40020e74820b1a4eb2b4732a76686c52c260
-AUX make-memtest86+-boot-floppy.1 1165 BLAKE2B 974a5c70009031517bbeaa06155a7da411ce1823ed2b7dc31a1843618058cbcd1c1a51f9c9012dddd843579b588c619c6448e65ae369ba2dc6441a991bf8d9b7 SHA512 8b5b6397e50cf4d48aeda31de4c1f72493e97db52ff45966716df8f9b0fbbd8d4ed71e289c0113ef53fa52a7ea6df4c107c63ca70f90c951dd085c05b64db147
-AUX memtest86+-5.31b-discard-note_gnu_property.patch 723 BLAKE2B 852a5daf852991cde8dec0bd777524744c5303b1966cacd0e15abad9dfea06ea3d6616ea57777bf694da2edb0e4c8b828288c69d655c0e46e27b6a6463ef787b SHA512 923c71e9d037cc0c26006a55045c9362dabf1ed3a6cf20a5b9f61661d6fe9e6dd17f17bcee47d515497a2720485f5d4d34c0f7815c483997aff123ab9d2f5239
-AUX memtest86+-5.31b-fix-gcc8-freeze-crash.patch 511 BLAKE2B 2a536d7c833f4758c9fd9c650dd98b0887610884aadab67b86c7f73cc682daca5a66052102a4db870550741a11c5da38dd0251a8f4afdd4943c452858d5dae56 SHA512 63b88c7e14c75e01291809fde47df88d323e68cc0e658921ccea600f94deafaf1a118de9b16e9303dd5b49bff205d48be5c23bc34782059d4ea112407103408b
-AUX memtest86+-5.31b-gcc-473.patch 426 BLAKE2B c7ce26466a1d0a083e9da5ce4f1d5430c43c7a1264f9edf533f82905b8dfb290fcf4a67c8cff79277bd26a59003277ef9ea8d321e8c81b0952b2d662369883de SHA512 dde40a97c6ac8aec9b19ace1ab3cedf30146b908d6f9978eb0c6d1b2589242be35e1e4710b2aaa6f2def670d00add92761e4ab763f33724aec334f5b922254c9
-AUX memtest86+-5.31b-hardcoded_cc.patch 316 BLAKE2B 9be278d20cfaeeb01a32628bb433283aa7321f57703c32b4e191e9f6ebfe0659b33f72bbe4d9bde66b64ab62fa6d590b6c57bffc7f0ce59269f4b3a5524ec81f SHA512 6b011df2926b988769da9a257b7558bbb1733d18bcd113d8b04567da23456a6c5c22f0fc72818e43888e96d188cf572673563b123fe2a12750f31633118aaafc
-AUX memtest86+-5.31b-no-clean.patch 570 BLAKE2B 99fcdc691c44b4c116878713e48ec5056f7da80355ce17ba35ca6c3eb4de2f51bb84212bdc48127b870b87bff722be8e21e08b10e1b4f691b9111c374f2a70e4 SHA512 19ef0c4af27a6382729faa6c2b9666006d053cadf3f457e62d4e21fae266e42b54eb5db87d97817a0b3e2d6bd1f41a054bf6e6a85f8acda77816c6bdaf69a59e
-AUX memtest86+-5.31b-objcopy.patch 610 BLAKE2B a7a68cefbca249a2db578fa2d1eac2095ebe35f4fba67b6b44b1a85360fdac86a154585b6776ac95ac2963c773ccfcf4e8d828b2c1736bab2741f483626b61a6 SHA512 ad55e5448e70db93a19801cb6dd7cddfd4bf52d9d11582ba00335e59906cb8ee9165b828e59a1ecd1b0ddb2a52aff7165803d69c2ad3984a18ff07f069d36ea1
-AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d54daca34ad53a6eee0f7ce2592acfc60a60bf0c8f08adacc82ed67ae8e7ae7faa995d9b6efa0d0ea3cf0df33f5cda1a606a7e0d987 SHA512 98965cfe1ec90f5dee115da406609cd85651e09b9914232b717a3b8755b4c10b05f58ed08c8a470b2bd772f1ef4d93faf63516f902a0b48b9c33974eba4733a1
-DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
+AUX 39_memtest86+-r2 3530 BLAKE2B 6c302744000a48fbda7563b48bbac5bb5e580159d74ad595f5fabd21150bd785c1792c0acbafc779a601ab7b820a0e37576c0c0967ba2de739089d2b9cfc3366 SHA512 2e28b671d77ef19958b88c73f9de5560775c3b8cfb647bd7cc480801a64bcaf2a80f750d3fdaf81b1c02364f4aa2fcb8b3ccb8eef4008c9d0619676f0490a084
 DIST memtest86+-6.10.tar.gz 230056 BLAKE2B 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 SHA512 2fb8e6d375f7ced53b1c2d50ffeeafcee1282b2495ea4241958e210c0b4a3500701025041469459c0db1662c448a3b65a51a994d19bc8ac217e23fa935700e42
 DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966 SHA512 b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0
-EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
 EBUILD memtest86+-6.10.ebuild 1733 BLAKE2B 0cc7eef2f79cb4923a9853c8d80e0f253dd34b8fc5850a246de754420a3053ab0b6c00e85c0b95563dc09aacaeb625f31c4bc918747171874d89e20633299ddf SHA512 1240ecf9052cc01b39003adafb2e97d84227c959b62556be0455b8cd4ad38584154f486a1d56c7799295091f1a67ba858134c73dbe28cf3a14c5acb4a87d60a7
+EBUILD memtest86+-6.20-r1.ebuild 1895 BLAKE2B 9023ad708a51ea30ba7d10ba0953608459ef91e4ed266902b3d1cb56a8bba53cb489d264f9f53fcc0daff53fd7dee3e815898c6f390f6a918d3d5585787fad97 SHA512 393ad0d265f301296f36bdc466787473acd8ef4cb4c71a8bbcf24229286e02a1e6035084ea9fc71cba9c76e5004daaf3d2eb798b7fdd83643ea90b0cf6b523cf
 EBUILD memtest86+-6.20.ebuild 1735 BLAKE2B c714b91e5e8b1aa7061cf55dd24ed5e1e0ce6fa888fdac3b717259705de15e2a2e4056fa9336c57194bbed5401a5b242da49f8b64ca60f1ba2c554ccd491ef01 SHA512 07bf4e1c1109258536f83683399fc4046a0bf105a760f408ab18c6c4c988606720e6fc92d256b73cb76b9ed24a5636ac0e9af7c86f4fc2a80481385f29906853
-MISC metadata.xml 1033 BLAKE2B 1de0b3113db89962f9566a73eb6aae90d5faf62502910020292a72baaf2a068f03866db231e9b927ea484b20606b726c417f8a8882ba0eae0e82352f8b76a1ed SHA512 6f45ad3578993ffb1e6ec76075b2d3047a9a69f8893e30dbe6a7fe6345d25b3a448495a3374c369c948e1d01d7fbde1e667507d8aeb5273513a0898d1715942e
+MISC metadata.xml 817 BLAKE2B 86125269ad6d6292102fb52af0ed6b4ac2a8f9a021d2a91d1efb8a37c7e9aaa386ff303140bff66ab02eb2c70b7d2266202667855fcf219ef279e2f10ed29b81 SHA512 e6bbf1204f7a150097aa1794da810076e8f84458a1648516a10a877dc529fe06bd58ab57ae7873b6c6b89d1932a43d193da42b41135e222d6758665fab2b28db
diff --git a/sys-apps/memtest86+/files/39_memtest86+-r1 b/sys-apps/memtest86+/files/39_memtest86+-r1
deleted file mode 100644
index 20422b74d65a..000000000000
--- a/sys-apps/memtest86+/files/39_memtest86+-r1
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-. /usr/share/grub/grub-mkconfig_lib
-
-memtest=/boot/memtest86plus/memtest.bin
-
-memtestelf=/boot/memtest86plus/memtest
-
-if [ -f "${memtest}" ] && [ -f "${memtestelf}" ]; then
-	multiple_memtest=true
-fi
-
-submenu_indentation=""
-if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
-	submenu_indentation="${grub_tab}"
-	cat <<EOF
-submenu 'Memtest86+' {
-EOF
-fi
-
-if [ -f "${memtest}" ]; then
-	gettext_printf "Found memtest image: %s\n" "${memtest}" >&2
-
-	device="$("${grub_probe}" --target=device "${memtest}")"
-	path="$(make_system_path_relative_to_its_root "${memtest}")"
-	cat <<EOF
-${submenu_indentation}menuentry 'Memtest86+' {
-EOF
-
-	if [ -n "{submenu_indentation}" ]; then
-		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
-	else
-		prepare_grub_to_access_device "${device}" | grub_add_tab
-	fi
-
-	cat <<EOF
-	${submenu_indentation}linux16 "${path}"
-${submenu_indentation}}
-EOF
-fi
-
-if [ -f "${memtestelf}" ]; then
-	gettext_printf "Found memtest image: %s\n" "${memtestelf}" >&2
-
-	device="$("${grub_probe}" --target=device "${memtestelf}")"
-	path="$(make_system_path_relative_to_its_root "${memtestelf}")"
-	cat <<EOF
-${submenu_indentation}menuentry 'Memtest86+ (ELF)' {
-EOF
-
-	if [ -n "${submenu_indentation}" ]; then
-		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
-	else
-		prepare_grub_to_access_device "${device}" | grub_add_tab
-	fi
-
-	# We use knetbsd as a lazy way of booting an ELF.
-	# It's not actually related to NetBSD at all.
-	cat <<EOF
-	${submenu_indentation}knetbsd "${path}"
-${submenu_indentation}}
-EOF
-fi
-
-if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
-	cat <<EOF
-}
-EOF
-fi
diff --git a/sys-apps/memtest86+/files/39_memtest86+-r2 b/sys-apps/memtest86+/files/39_memtest86+-r2
index a213e0325609..d53f83cc311a 100644
--- a/sys-apps/memtest86+/files/39_memtest86+-r2
+++ b/sys-apps/memtest86+/files/39_memtest86+-r2
@@ -30,7 +30,7 @@ ${submenu_indentation}if [ "x\$grub_platform" = xpc ]; then
 ${submenu_indentation}menuentry 'Memtest86+ 32bit' {
 EOF
 
-	if [ -n "{submenu_indentation}" ]; then
+	if [ -n "${submenu_indentation}" ]; then
 		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
 	else
 		prepare_grub_to_access_device "${device}" | grub_add_tab
diff --git a/sys-apps/memtest86+/files/make-memtest86+-boot-floppy b/sys-apps/memtest86+/files/make-memtest86+-boot-floppy
deleted file mode 100644
index 9c225c740bf4..000000000000
--- a/sys-apps/memtest86+/files/make-memtest86+-boot-floppy
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-#
-# Script for making a memtest86 boot floppy using GRUB as bootloader
-#
-
-# (c) 2003 Peter Loje Hansen <pl@2m.dk>
-#  - original version
-# (c) 2004 Yann Dirson <dirson@debian.org>
-#  - added parameters
-#  - ability to work on a floppy image instead of a real floppy
-#  - adapted patches from Martin Koeppe <martin@koeppe-net.de>, to use
-#    mtools and install full grub
-
-# TODO:
-# - add a flag to generate a default boot entry for (hd0)
-
-set -e
-
-MEMTEST=/boot/memtest86plus/memtest.bin
-FLOPPYIMAGE=/dev/fd0
-GRUBBIN=/sbin/grub
-GRUBLIB=/lib/grub
-MFORMAT=/usr/bin/mformat
-
-arch=$(uname -m)
-
-case "$arch" in
-	i386|i486|i686)		GRUBARCH=i386-pc;;
-	x86_64)				GRUBARCH=x86_64-pc;;
-	*)					error "Unsupported architecture: $arch";;
-esac
-
-error()
-{
-    echo >&2 "$0: $*"
-    exit 1
-}
-
-needsarg()
-{
-    [ $1 -ge 2 ] || error "syntax error"
-}
-
-[ -d $GRUBLIB ] || error "Can't find $GRUBLIB - did you install a recent grub package (0.95+cvs20040624 or later) ?"
-[ -x $MFORMAT ] || error "Can't find mformat - did you install the mtools package ?"
-
-while [ $# -gt 0 ]
-do
-    case "$1" in
-    --help) echo "$0 [--memtest $MEMTEST] [--floppyimage $FLOPPYIMAGE]"; exit 0 ;;
-    --memtest) needsarg $#; MEMTEST="$2"; shift ;;
-    --floppyimage) needsarg $#; FLOPPYIMAGE="$2"; shift ;;
-    *) error "syntax error" ;;
-    esac
-    shift
-done
-
-MOUNTPOINT=$(mktemp -d)
-
-if [ -b "$FLOPPYIMAGE" ]
-then
-    FINALDEV="$FLOPPYIMAGE"
-    FLOPPYIMAGE="$(mktemp)"
-else
-    FINALDEV=""
-fi
-
-echo "* Creating msdos file system"
-echo
-if [ ! -s "$FLOPPYIMAGE" ]; then
-    # unless a non-empty image exists, create a blank one first
-    dd bs=1024 count=1440 if=/dev/zero of="$FLOPPYIMAGE"
-fi
-# FIXME: "-f 1440" should probably be dropped
-mformat -i $FLOPPYIMAGE -f 1440 :: 
-
-mmd -i $FLOPPYIMAGE ::/boot 
-mmd -i $FLOPPYIMAGE ::/boot/grub 
-
-echo
-echo "* Installing GRUB files"
-mcopy -v -i "$FLOPPYIMAGE" - ::/boot/grub/menu.lst <<EOF
-color green/black light-green/black
-default 0
-timeout 10
-title  memtest
-kernel (fd0)/boot/memtest.bin
-EOF
-mcopy -v -i "$FLOPPYIMAGE" $GRUBLIB/$GRUBARCH/* ::/boot/grub 
-
-echo
-echo "* Installing $MEMTEST"
-mcopy -v -i "$FLOPPYIMAGE" "$MEMTEST" ::/boot/memtest.bin 
-
-echo
-echo -n "* Installing GRUB"
-$GRUBBIN --batch --device-map=/dev/null <<EOF
-device (fd0) $FLOPPYIMAGE
-root (fd0)
-setup (fd0)
-quit
-EOF
-
-if [ -n "$FINALDEV" ]; then
-    echo
-    echo "Insert a writable floppy for $FINALDEV and press enter"
-    read FOO
-
-    dd bs=1024 if="$FLOPPYIMAGE" of="$FINALDEV"
-    rm "$FLOPPYIMAGE"
-fi
diff --git a/sys-apps/memtest86+/files/make-memtest86+-boot-floppy.1 b/sys-apps/memtest86+/files/make-memtest86+-boot-floppy.1
deleted file mode 100644
index e1283e5efc8f..000000000000
--- a/sys-apps/memtest86+/files/make-memtest86+-boot-floppy.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\" Man page for make-memtest86+-boot-floppy 
-
-.TH make-memtest86+-boot-floppy 1
-
-.SH NAME
-make-memtest86+-boot-floppy \- create a memtest86+ boot-floppy using GRUB.
-
-.SH SYNOPSIS
-
-.B make-memtest86+-boot-floppy [ \-\-memtest 
-.I <path to memtest86+-image>
-.B ] [ \-\-floppyimage 
-.I <path to floppyimage/device>
-.B ]
-
-.SH DESCRIPTION
-.B make-memtest86+-boot-floppy
-can create a memtest86+ boot floppy using GRUB as the bootloader.
-
-.SH OPTIONS
-
-.IP "\-\-memtest <path to the memtest-image>"
-Path to the memtest86+-image, default is /boot/memtest86+.bin.
-
-.IP "\-\-floppyimage <path to the floppyimage or device>"
-File or device where the boot-image should be written to, default is /dev/fd0.
-
-.IP "\-\-help" 
-Display a short message about the options of the tool.
-
-.SH AUTHOR
-This man-page has been written by Thomas Schmidt <thomas@thsnet.de>
-.PP
-Permission is granted to copy, distribute and/or modify this document under
-the terms of the GNU General Public License, Version 2 any
-later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common\-licenses/GPL.
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-discard-note_gnu_property.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-discard-note_gnu_property.patch
deleted file mode 100644
index e24ad4318f37..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-discard-note_gnu_property.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makefile	2021-12-04 15:15:45.845429722 +0100
-+++ b/Makefile	2021-12-04 15:22:51.924755794 +0100
-@@ -11,9 +11,9 @@
- OBJCOPY=objcopy
- 
- CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
-- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-+ -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -Wa,-mx86-used-note=no
- CPPFLAGS= -m32
--ASFLAGS= -32
-+ASFLAGS= -32 -mx86-used-note=no
- 
- SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
- 
---- a/memtest.bin.lds	2020-04-12 17:14:51.000000000 +0200
-+++ b/memtest.bin.lds	2021-12-04 14:54:33.178625382 +0100
-@@ -11,5 +11,6 @@
- 		*(.data) 
- 		_end = . ;
- 	}
-+	/DISCARD/ : { *(.note.gnu.property) }
- 	_syssize = (_end - _start + 15) >> 4;
- }
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-fix-gcc8-freeze-crash.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-fix-gcc8-freeze-crash.patch
deleted file mode 100644
index 44d11b76b344..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-fix-gcc8-freeze-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur memtest86+-5.31b/Makefile memtest86+-5.31b.new/Makefile
---- memtest86+-5.31b/Makefile	2021-09-16 09:27:24.401570971 -0500
-+++ memtest86+-5.31b.new/Makefile	2021-09-16 09:30:24.332704245 -0500
-@@ -64,6 +64,9 @@
- memsize.o: memsize.c
- 	$(CC) -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector   -c -o memsize.o memsize.c
- 
-+test.o: test.c
-+test.o: CFLAGS += -fno-strict-overflow
-+
- random.o: random.c
- random.o: CFLAGS += -O3 -fno-PIC
\ No newline at end of file
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch
deleted file mode 100644
index 76c0761512b4..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://forum.canardpc.com/threads/110950-fix-controller-loop-error
-
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ FDISK=/dev/fd0
- AS=as -32
- CC=gcc
- 
--CFLAGS= -Wall -Werror -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
-  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
- 
- SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch
deleted file mode 100644
index 4ee174478b7b..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -9,11 +9,10 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
- CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
-  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-+CPPFLAGS= -m32
-+ASFLAGS= -32
- 
- SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
- 
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch
deleted file mode 100644
index dbb560e506b9..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://forum.canardpc.com/threads/110954-PATCH-fix-parallel-build-issues
-
-
-don't run the clean target when building all as we run into parallel races:
- - memtest kicks off building of a bunch of .o files
- - clean runs in parallel which runs `rm` and deletes some of the new .o
- - memtest goes to link and fails because objects are missing
-
---- a/Makefile
-+++ b/Makefile
-@@ -22,7 +22,7 @@
- 
- SELF_TEST_OBJS = test.o self_test.o cpuid.o random.o
- 
--all: clean memtest.bin memtest
-+all: memtest.bin memtest
- 
- run_self_test : self_test
- 	./self_test && touch run_self_test
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch
deleted file mode 100644
index 9398c4163a4d..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Allow 'objcopy' override with user's OBJCOPY.
-
---- a/Makefile
-+++ b/Makefile
-@@ -8,6 +8,7 @@
- # Path for the floppy disk device
- #
- FDISK=/dev/fd0
-+OBJCOPY=objcopy
- 
- CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
-  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-@@ -36,7 +37,7 @@
- 	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
- 
- memtest_shared.bin: memtest_shared
--	objcopy -O binary $< memtest_shared.bin
-+	$(OBJCOPY) -O binary $< memtest_shared.bin
- 
- memtest: memtest_shared.bin memtest.lds
- 	$(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-test-random-cflags.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-test-random-cflags.patch
deleted file mode 100644
index f3faf1392b3a..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-test-random-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-make sure we re-use the existing CFLAGS settings so that we get all the right
-flags (like -fno-stack-protector).  just append the few changes we want (the
-optimization levels).
-
-https://bugs.gentoo.org/590974
-
---- a/Makefile
-+++ b/Makefile
-@@ -65,7 +65,7 @@
- 	$(CC) -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector   -c -o memsize.o memsize.c
- 
- random.o: random.c
--	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
-+random.o: CFLAGS += -O3 -fno-PIC
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \
diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
deleted file mode 100644
index 77e7831ed564..000000000000
--- a/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="+boot floppy iso serial"
-
-BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-BDEPEND="iso? ( app-cdr/cdrtools )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-473.patch"
-	"${FILESDIR}/${P}-hardcoded_cc.patch"
-	"${FILESDIR}/${P}-no-clean.patch" #557890
-	"${FILESDIR}/${P}-objcopy.patch"
-	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
-	"${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
-	"${FILESDIR}/${P}-discard-note_gnu_property.patch"
-)
-
-pkg_pretend() {
-	use boot && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-
-	if use serial ; then
-		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h || die "sed failed"
-	fi
-	#613196
-	use amd64 && sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
-	default
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake OBJCOPY="$(tc-getOBJCOPY)"
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	if use boot ; then
-		insinto "${BOOTDIR}"
-		doins memtest memtest.bin
-	fi
-
-	insinto /usr/share/${PN}
-	use iso && newins mt*.iso memtest.iso
-	doins memtest memtest.bin
-
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_preinst() {
-	use boot && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	if use boot; then
-		mount-boot_pkg_postinst
-
-		elog "memtest86+ has been installed in ${BOOTDIR}/"
-		elog "You may wish to update your bootloader configs:"
-		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
-		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
-		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
-		elog "    > image  = ${BOOTDIR}/memtest.bin"
-		elog "    > label  = ${PN}"
-		elog ""
-		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
-	fi
-
-	if use boot && [ -e /sys/firmware/efi ]; then
-		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
-	fi
-}
-
-pkg_prerm() {
-	use boot && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use boot && mount-boot_pkg_postrm
-}
diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
new file mode 100644
index 000000000000..3af084f4510a
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}
+
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pk_prerm
+}
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 814c43bc7044..43e3311c9323 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -8,14 +8,11 @@
 <use>
 	<flag name="bios32">Compile a BIOS-bootable 32bit memtest image</flag>
 	<flag name="bios64">Compile a BIOS-bootable 64bit memtest image</flag>
-	<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>
+	<flag name="boot">Install to /boot in addition to /usr/share/memtest86+/</flag>
 	<flag name="efi32">Compile a EFI32-bootable 32bit memtest image</flag>
 	<flag name="efi64">Compile a UEFI-bootable 64bit memtest image</flag>
-	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
-	<flag name="iso">Compile an ISO image</flag>
 	<flag name="iso32">Compile a 32bit ISO image</flag>
 	<flag name="iso64">Compile a 64bit ISO image</flag>
-	<flag name="serial">Compile with serial console support</flag>
 </use>
 <upstream>
 	<remote-id type="github">memtest86plus/memtest86plus</remote-id>