gentoo auto-resync : 01:09:2022 - 19:24:10

12 files changed, 452 insertions, 6 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b9c03b7dc495..8803fef8ded1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 86ec490fba29..6be00e98ba4e 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -12,5 +12,5 @@ DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e359696
 EBUILD dbus-1.12.20-r5.ebuild 7556 BLAKE2B c84cbaa05ea704e11ce4e4a30d49aab696be711c19ed1420aaabeac5e8032b122b2d5fe31ccdfff3c0348bc1100f4eb248777c92d06d83214910eb759c62d2f3 SHA512 83dae4eafd70d47f560092491ebcc024230e346c77db199346464b5cff91fc58ba08c7c7491c0c1240538cb9b7b8489179fe70e17bcb2d8b797d54e7d0d0fc32
 EBUILD dbus-1.12.22-r2.ebuild 7681 BLAKE2B 126c3b7802a3ae3d1e3f928e33249f731f43bb1ad40f4992e645b727cc35e0836bd382810ef97b9f594a7db13bfa602ea13ed7c8da8c376fb9ebccc6c0ff2f47 SHA512 db95a5f1ddb86ad4657cef1e108b429976517961c374213d9b4fb158d65568bd71c1d4a67b53b6548c4349a8ed67e0ae1d7bed547678a97ef85b4db7f9b7f97c
 EBUILD dbus-1.14.0-r2.ebuild 7905 BLAKE2B 8a68a64871afd716c57be3c8d13c18e9eeab2405b716daa913e9e723d062c2bde528f73ebf2b8e6e545b038a6108e7d08ac0f5f755590991cd399d619c484d5f SHA512 f7189dca552c555bcfe8ea1e42c0f84435a36418bc2d22f803b0d2da79ff9417cd568cce4e3d068eb339de2fbc070af6eefe7b311faa0c6cd4db45327d10f13d
-EBUILD dbus-1.14.0-r4.ebuild 7888 BLAKE2B 015477b4e201a71de6eabe961b3f18086c821406a8d37cac88ed4b1e6df4462e6b1eb4ebdd058460377faccf709471e6b0e7cdec91ca9878d119b240cd019679 SHA512 0ce4bd87723d284f54ee24aa80474f22344ec35d0ae32fc8bd3635361b6db934b470381d012f748d2f833a01a8203599de34296bd279bf80948a32d3281b76f1
+EBUILD dbus-1.14.0-r4.ebuild 7886 BLAKE2B 5a40cdda99f78c9a7a4d65130582960d37537bcf4c33f2a4de99331a254e297f8dface9c8bdd10d1875c48d9d78d8c88dfd0a7bf63515ce5ca01a92e0fba2824 SHA512 13023462e662c0fb261e26a61d450aa6a166d665cca12b9b33addb5effb77c635b54601952b01df456c402bd3f7fd8a047b9b591994e68fd607ff44c05d7206f
 MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.14.0-r4.ebuild b/sys-apps/dbus/dbus-1.14.0-r4.ebuild
index 995f6e9ac4a3..973247c30368 100644
--- a/sys-apps/dbus/dbus-1.14.0-r4.ebuild
+++ b/sys-apps/dbus/dbus-1.14.0-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 0ed0e7a09e32..a37068ead3a1 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,9 +1,12 @@
 AUX fwupd-1.8.3-docgen_deps_test.patch 671 BLAKE2B 3a39ca3d9c70fc0f18ce4d3b9efaaf2c9cba8ef11b3e9cf9501ba32a1a2e0ef6b6e59dadd0a13bffea77f227d917893609033764c0cad268fbe65826f5f6a11c SHA512 7a81b69349fecf0b9730e3c11e33044a4ee1728f8b61ee0d1e737c74f33fde737111eb7f55fc8e0975e2b72b4df08b4f9c466c4c2ab2c586f2bc1c18e046c648
 AUX fwupd-1.8.3-gresource_quirks_paths.patch 421 BLAKE2B c21f9756c92fdb104bf0ac2d1edd424b9ddc68a4ca192d5569745f2ec332068c3d6d69c16c3c53652c0491a28b23c533752367341e73a7ec7dec9bac8d82709a SHA512 eb272783f1ff849190e7dbb3762b118d661aacf975516948558fedb2aceefb8fab8d1c96e165408b50bccacfce4b1046603479e7234fbf8c81a08c7d9e531128
 AUX fwupd-1.8.3-installed_tests.patch 6003 BLAKE2B 0d70f6c2d8acb905b07d4526c6298912a9665ed2303526037722e7a78eb24ba82d7bf0d3f3e893ff568286e5179419d120afcee7bfad6795987f128cdb2ee58a SHA512 d32cf37fdd689a66ae1738967ee60110771f773a7e713bfcddcd9d0e4b7dbf4f2006509b269782f14f2f5e2b01d15d14ec56d6d97f54c8ac3f56118400543e24
+AUX fwupd-1.8.4-installed_tests.patch 5999 BLAKE2B c59749549f7bf057129802ee534780967c09155ab247f5bc0293112908cd833f2700d92c5839efc1d09250bc2ac966d468c83f7a9e61622d2aa35d60d3b0115b SHA512 6158b56816bf7e5173f23fa29314f33effe5eb49a06201cdfa17743d22b3f0e3260f9aa2661687cc369f252e958ba193088fc96aa4de4d3c93d69658d145ab56
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
 DIST fwupd-1.8.3.tar.gz 4267315 BLAKE2B 35e5855ea0d314fa5b1cc33ed4efa71e54c35b57c742748a5d6c7f4c1f88bfd9c2e5a84f2af72f6e5e63ddfc4f6521312fb7b1446922c76917f9abdd4d90e618 SHA512 271a1c2547f35322a7a7d83adc84d729ba73d810f6ac526d1c6aa2a9774dea1edc986b7d62481ebb70d43653577ced19f13f695dedf4012c82d814da70cb83f4
+DIST fwupd-1.8.4.tar.xz 3269648 BLAKE2B 20857c5de6194a561c587ace0463d94440d25256a04cce51b77f3dcffde9b0f08a03a03e1d0dbb5f15016169f9a31e290609b3fc3f68b40b932c77335f05ec6f SHA512 569d0cb81f9a29259d0a7ae7100ca1063d20557b56903f80c1466667baf40a74d677f48159e5bd53ab6b33de8ce7185bf279b6dbcf6edfee744c1d4965c5db8f
 EBUILD fwupd-1.7.7-r2.ebuild 4684 BLAKE2B 2febf3c31449381b94a4c46589017fd7ba00f262a9fb22c9dfd660018ce2acdff582116984e5e21f8f7181345c013b8eb88f14df1052633a3c29a9cb6546af50 SHA512 677ee8f9c19fc7bcc016b301d0abc9277c3ec20f8fe21cf407f68acab52f2067bb6a3366afc8dfe175ebfdd71c5c701c27d8fc8f75e47a4544f5e7ce5cee2b1a
 EBUILD fwupd-1.8.3.ebuild 5320 BLAKE2B e2e8e4d625d92cd85940197c29e064a6e4dc2902e0d02b4d90935d4a7c98abc28ddf57ac1d0b92228ea97d250f5f16687f1c621fc9f57be49a91437a9d55f967 SHA512 dfe450c35cf339ab06e284aae70f958162035839b56a5b85e9a4b2d6ab724af056994f942f07a5a5a9a48235a5b8593e46e8543b83ece0a63a9ec848b03f5318
+EBUILD fwupd-1.8.4.ebuild 5182 BLAKE2B 13e3e4d424caf84002369039b18c63a623fbe0c1ba350ed533e964cef94f983e5a1d9c10357ced7b41aa92670109a9599e6376b0239057e0e09016d69960ff68 SHA512 9d1b2ede1f397ec4dee3fa2ede4df8a1fbcb8c9cb9faa53735e481ffe21dbb07b70b0d7f64a4cc4370994c34f18418bc229ef5e038ff9ad94b521b6b947a2adb
 MISC metadata.xml 1527 BLAKE2B 0cbeb805ede86d77bbd736349c84de642534059b2c90d938bd68c3caf0ff90257f3579d20eb38313f10a99f72780accd242601d778fd73386a727cad362a9f48 SHA512 9a541ecead0fc13a5cd78bcbcda425b9b2f4029dd921f01dc0ab1d2055ffcb0690d1fefdfbb98c68ef168c150178f75d085eeedf0699d35fd440d0b4d730a8d2
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
new file mode 100644
index 000000000000..1cb3b41cb728
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
@@ -0,0 +1,215 @@
+--- 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.4.ebuild b/sys-apps/fwupd/fwupd-1.8.4.ebuild
new file mode 100644
index 000000000000..995724a81068
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.8.4.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit linux-info 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 )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+	gtk-doc? (
+		>=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.3-docgen_deps_test.patch
+	"${FILESDIR}"/${PN}-1.8.4-installed_tests.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	vala_setup
+	if use nvme ; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# 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() {
+	# TODO (maybe): acpi_phat, bcm57xx, cfu, cpu, emmc, ep963x, mtd, nitrokey,
+	#   parade_lspcon, pixart_rf, realtek_mst, scsi, redfish, upower
+	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() {
+	use minimal || udev_reload
+}
+
+pkg_postrm() {
+	use minimal || udev_reload
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 49408fb77f77..e6d1566f9fdd 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,7 @@
 DIST osinfo-db-20220516.tar.xz 129272 BLAKE2B 47f6eb2e1ae0cad277be71fb0955415c4afdb27e3b80e36c98ce5b7c8d22efcab91047e93c586045baa233ac61dc08113a5aedb626db4f24bf0472455826e481 SHA512 44c56824c774e68bd79633c415c71155e814c1f928fceba845ab649f8cb0dd325ad06b91a2d720cb25fd62e67d7ea17774cc395995b4f201527c4a6aa447a744
 DIST osinfo-db-20220727.tar.xz 133656 BLAKE2B 27136c861bf16377b61d56daceee857c29a76f4f2f7c68ef768b54b553bfee5c6f7ae7024e19746fd8e6caa8a0a80a0fa83f32d52bf9d82652d2655190678eec SHA512 1b0bbf64e6808e06bd3d40ef4da932a7f96957a79fc4a1d8d11074da25acd81b016aaf5816dcf39c6f28cf0a17734aab8238d25d2628ee05e80a37a09ad363f3
+DIST osinfo-db-20220830.tar.xz 136300 BLAKE2B 8710ed459db0573c436e2f25bd22d9dc7761b23a9046a406ffb2b106e7623010f8c9134ce24fe7fa096c6da698d9ec6749df9755c75e43af4d1be1140d2ab1b9 SHA512 8d728ce1afab9855430fa40595f8c156e72c155cd91e0064a9922a49e948116d5f49a75c89b642c5804b7f43f73e4d81ba179f8dc8cbeef8f10ccef7f9a696fb
 EBUILD osinfo-db-20220516.ebuild 692 BLAKE2B 6a023a7d52c7ac117481e628e0a0d8aabf43e2a18ef0daeca80503b3e3256ddb13ff063d45c4f11d4e58e3d871d47871559b68ce4e9be6fcdbe7920289cbb575 SHA512 f98f2d6cbd7c52c5c149030f4983d2a27ce24639b2886062f1205ca4636823df0bb1de63de08fec2bfa0eb9a95a4530b30d3aae540abe05d930ae549dccfe049
 EBUILD osinfo-db-20220727.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
+EBUILD osinfo-db-20220830.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-apps/osinfo-db/osinfo-db-20220830.ebuild b/sys-apps/osinfo-db/osinfo-db-20220830.ebuild
new file mode 100644
index 000000000000..28ae854564ac
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20220830.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="sys-apps/osinfo-db-tools"
+
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 6661aef7a43f..676b01794942 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -2,6 +2,6 @@ AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f
 DIST pcsc-tools-1.5.6.tar.bz2 289691 BLAKE2B 35dd50a3a8babff89f9e5d769ef70a573e58b2780d680c82dfa07177a3daaf527b5ccca665c901f9667ca4a81719916bd5aebb2e9b1b4d0301001498fe587832 SHA512 94076ed5af698afcec05da9645d7108c02c110fd0ee5efecbd8e0c7eb5ed9a55ee857d23b79ab2ccb93847f8a36f996fa9d521d999395f63274d4bf1d9cf3d26
 DIST pcsc-tools-1.5.7.tar.bz2 292637 BLAKE2B f0bfa9f680a2f2b348d2baef4b4b4567008163f47d7d7e6cec694cdc424626c5c6f18c475f0e8d4c5cd49111315b3c8a934fecf30afe90bbebc0a15f8d6f4a1d SHA512 58d70f41c5815297def7d8b64807e960db85719996771ecb43a4320d3f3fc82e2deb133d9ca97b3a4e8e76267294b3339d8883ba4770bdd0071566e1ce457501
 EBUILD pcsc-tools-1.5.6.ebuild 1334 BLAKE2B 8f671f22c23efe48c28f9af575d596dd2573e97894f80f85f5727da4d62eded2779158b9f4d8d2190cda6ddce10ca26d89dbec3972870311d479127a7829096d SHA512 4692b478bfa5add8df4784e3a291bd6d782fb4c012f012d50cc964d3d726e09435a1f2257a4c9ad664fe7285a1fa33c185e1503633e43d7b35d8fe5ae25df22f
-EBUILD pcsc-tools-1.5.7-r1.ebuild 1384 BLAKE2B cfa533a949228bd37faba534b8643809fd6a3db641a3cefbfd64502769cf2c2147b04bac9245fed0e242639ebc9dc327151fde077b61fcbafa50fe8c4a102865 SHA512 6ede8d9306ef45184908398de1d87cb49da2acd5727951151b6ddce5ff9b86b6e6f60e4b023f3032d4f689bb01054a6474467840224c1862b53c9131f115f052
+EBUILD pcsc-tools-1.5.7-r1.ebuild 1380 BLAKE2B 8b965aea287ba16e74f2dc1fa3a2fef992ea8f688c7eab2fac5cd0e875cad7e0627d6e3ba83dbebb9ca6b6c9fd62cbf5c30b13a5952a9ad82978d6f05ada54b7 SHA512 0632d67332bdf81fdc647bbe4dd2f5ca6fb16de9ec7d9539ca3126a211504769f2f15ca31092e447a3cade72d2d745a90d088ef0601071a6357a03a2f21ff1d8
 EBUILD pcsc-tools-1.5.7.ebuild 1384 BLAKE2B f564d094b220ae5f527e749439bf158d80ed630934ed2c67476a4e3082751be8c8db5db1686f00be9fa28f02d5e4d1219f231831b8a77178b7128516f84f3304 SHA512 8404504fabb1d89fcc85f122090ab672054efe137924faebfe496bf8eac5a30d3b1084a56b06e4b4d4d2503e9534b46a3187c092279b7263bcddf86622c8b448
 MISC metadata.xml 357 BLAKE2B 42de2e205846206e147c56d469fd99d34e0e0ae207337223f93089c4d6ff86dfdeeeb65a4d0fb81398afc8d847be8f4e7559dc34ee50b899e8f20bcbea79b606 SHA512 241d96ef35852c80c581c527a9e469043c218cd81a4fa835c36d097e0b128961482d081e879cb99d74694121e35a99fb75ec7b9eba4f30970897c4e2fc3839db
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild
index c4fece6556bd..6319092c2a68 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="gtk network-cron"
 
 DEPEND=">=sys-apps/pcsc-lite-1.4.14"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 51b0a9fa63eb..434446cef5f8 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -8,5 +8,5 @@ DIST shadow-4.11.1.tar.xz 1656584 BLAKE2B d459a1e0ffb342b6b455caf65e6af60b32eee7
 DIST shadow-4.12.3.tar.xz 1747620 BLAKE2B 63b10d75a11d419156a996b8acf1bebbfab28999c2ab796e6625c028882073d4021806d8b56224190886c076a1205955e7797cb6f797ef73af3a8a33ac34bf2f SHA512 0529889258f54e7634762dc154aa680d55f8c5f1654afadd1b7431cfbb890a3b1ba27c7ff4b7c45986e4ee2289946db2e420b23ed13e4e5b15800a1fb3a013bc
 DIST shadow-4.12.3.tar.xz.asc 488 BLAKE2B b23525c3303f78df9d046c0225ed3ee1715cb000650630daae8b41fb71413daa45b5fe39a98fc640aaafa0f219fbaf9e065afa6b44f051373fb1967358ccc43d SHA512 d3f294d86c0e2174c88809810a801737c01cd01f9cadbe7b1ae382b2745d86e2e30c0718fa6489c2abb65500ed94c8ac1961d05243b5a1800c966384c69281c9
 EBUILD shadow-4.11.1.ebuild 6247 BLAKE2B 1aa58e8496f45bfa85c1d9a9893eeb31629ea6709b81451e68a42369f7bfb293c538bc1b2d458afbd30a7c9511d88c8f977c7ec4283b38553de454f5b1712ef1 SHA512 021974ec33b5cc1d512a6c1626b7e71787b30ecf331aa9aba214b1f37a2ea8ef02f53dcc186ee2ccdd304845af3f5ae8526da5073611f90e26cb45840ed2aed6
-EBUILD shadow-4.12.3.ebuild 6483 BLAKE2B e57c3029dfef8433e54d789b5f8a2b21954f80fc6d34c86e133dd25d8f327af3f6e475c3f3ea4584632c4dd8aa10df46b5c88002f1ef629a8b072030032c3d35 SHA512 4bc26a1ea21289a8d4de733d2c30c8d98e2dc28fa72301aa9c97005c089c4d4d8c00a1fc0c597e719695c032d96b809fbd11c67011143f1f1589b2bc766f287f
+EBUILD shadow-4.12.3.ebuild 6482 BLAKE2B bc7bc19a961369429b2850e04957c3c4b66aa6b57482897f051b4f93e9ca68c0dc1979e75b3323e498ed6da8bed01f0e56605a4fed0edb58f90e3ad8de9c42e7 SHA512 842e434b064fc30675805c360c1ff73830c9d01016d5f9a8f74ba70d0892f48de8e792e963d25b82db2d75380a51fcfd0789fc655f85e720f9c86d5bfc081192
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/shadow-4.12.3.ebuild b/sys-apps/shadow/shadow-4.12.3.ebuild
index 4798878d28d5..5a781ec8b641 100644
--- a/sys-apps/shadow/shadow-4.12.3.ebuild
+++ b/sys-apps/shadow/shadow-4.12.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/downloa
 LICENSE="BSD GPL-2"
 # Subslot is for libsubid's SONAME.
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )