gentoo auto-resync : 04:05:2024 - 00:00:19

32 files changed, 274 insertions, 412 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9603ba5accf3..17eb6e1ad37e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 4ad1b7a2593d..c7cf9fda3936 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,6 +1,8 @@
 AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09
+AUX accountsservice-23.13.9-c99-fixes.patch 2036 BLAKE2B 04c3e7014ac34751754756a0df9bdb8782a1020575fa1bd842ce377be0663d7267442540c85535e167a74479f7a35cf764dd3c6f0de5a143d8983dc303684aa7 SHA512 3ec9c0a780b0293b907a5e51721601c997ea1be3773ab932edacda2aeb0d67659dcbbcc807099c01c3e402b2e708534c0527e3eab4d2b96cba7850087737075f
 AUX accountsservice-23.13.9-generate-version.patch 1156 BLAKE2B e5b464ac3a15f089dbaa2b687a91126af002370b8be30e5b5f77a2528620c100569bb96bc75be86b69753a161d09c4d6ba803352047343cf454f79798d302fa1 SHA512 b288368df675bb82a083c9ea94df53e3789ca824d174b10dccd50a3996983f7284b059ea646e42a00b03723ea13c54a67ef032112ac4f61d0b6740698fbed790
 AUX accountsservice-23.13.9-musl-fixes.patch 1939 BLAKE2B f8384ced0320f11778cb3403dfae2952bee34970565f740b5a93d7a720336f42f891d5628c719a04276890c0f5ec0679211eb5cf1332c328e2a2be349de7800e SHA512 60c818dfbfd3869a65e6d309bb2db71af65e3241b23aedf93ae6334e2dbc764cc03d244d2a73f11082f9521cdb2306ad3d8f6e7d8cab1b509a55fedfa1198ed8
+AUX accountsservice-23.13.9-test-fix.patch 1683 BLAKE2B bf0f628652d584cb8987744869063b71a78203bec6bb6727598eb9f4b1c9016122768ce2f6a0c5178f21c029d2fa1ba539bc98f21ca400025390ce0335026ee0 SHA512 895c25a8d038c385fe927f43570185b28b5c3b6a6ae2762433f4d683ac19b9f725dafbe9a43dcf51cd24e037f071040c81161930620280382886b99106c2a5c1
 DIST accountsservice-23.13.9.tar.xz 636064 BLAKE2B 74dbbe816937e626ba0f6524b4293466ac2905f474396f5d23633e966d46e013de110671abcbfe2911fffa1e98872e2525b61594a967f917975ebf18d39b8547 SHA512 c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89
-EBUILD accountsservice-23.13.9.ebuild 2386 BLAKE2B 0c2f0400fc40810ae6d2e97dfe069e722930b7ee5fa545229c17b52786322f85ed6077c8599dfb44efb1e8c8642502b725ee07197c3ffb32be3be746aa3ca016 SHA512 aa2c83691a376329762fb97e18d89953b800dbbc127b0d7d128ded6eba7179062b1d3ff7e6956aadd72900b53900f9f6111610b070fee97eecbd871af9da520e
+EBUILD accountsservice-23.13.9.ebuild 2483 BLAKE2B ff44580977046464032aa34945d498110f327da07d4890fbb9c1dba21ce367a9f5e2e2280066b1fdf1efa204311b373b78b9592417e857a28348ffbc03f28204 SHA512 68599eae2d2841aa65ce2abeff622b230f9f8631ff8604b581268c49e4b665fc83e245595f822951b0568f4a47889ef75930906d7910943a93caf6d2a5bbaddc
 MISC metadata.xml 559 BLAKE2B c43012a95ec8ddd3ce687f69b4dc1889c82f31828f8e1f53bded7723b82c2a8faff594674fbd819370078dc13f48f51df45a3a280563c6a00080e5332128498c SHA512 6c1e1e291bcd11a06fe4e7b73031accdf0fe839cb7372f96d1cc52e5c1a1a1b032adcf0da7dde016331fefcb1ae1402386ba3ab2713b4256e9e60dd2b73f76f5
diff --git a/sys-apps/accountsservice/accountsservice-23.13.9.ebuild b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
index 61e932e21ed9..af4e0ea9c6ee 100644
--- a/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
+++ b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 inherit meson python-any-r1 systemd
 
 DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
@@ -58,6 +58,8 @@ PATCHES=(
 	# From Alpine Linux
 	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/97
 	"${FILESDIR}"/${PN}-23.13.9-musl-fixes.patch
+	"${FILESDIR}"/${PN}-23.13.9-c99-fixes.patch #930715
+	"${FILESDIR}"/${PN}-23.13.9-test-fix.patch
 )
 
 python_check_deps() {
diff --git a/sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch b/sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch
new file mode 100644
index 000000000000..28f82fc5a87f
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/930715
+https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/da65bee12d9118fe1a49c8718d428fe61d232339
+
+From da65bee12d9118fe1a49c8718d428fe61d232339 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 11 Apr 2023 10:09:07 -0400
+Subject: [PATCH] mocklibc: Fix compiler warning
+
+print_indent is defined in one file and used in another without a
+forward declaration. That leads to a compiler warning/error.
+
+This commit fixes that.
+---
+ subprojects/mocklibc.wrap                           |  2 ++
+ subprojects/packagefiles/mocklibc-print-indent.diff | 13 +++++++++++++
+ 2 files changed, 15 insertions(+)
+ create mode 100644 subprojects/packagefiles/mocklibc-print-indent.diff
+
+diff --git a/subprojects/mocklibc.wrap b/subprojects/mocklibc.wrap
+index af82298..539ee83 100644
+--- a/subprojects/mocklibc.wrap
++++ b/subprojects/mocklibc.wrap
+@@ -8,3 +8,5 @@ source_hash = b2236a6af1028414783e9734a46ea051916ec226479d6a55a3bb823bff68f120
+ patch_url = https://wrapdb.mesonbuild.com/v1/projects/mocklibc/1.0/2/get_zip
+ patch_filename = mocklibc-1.0-2-wrap.zip
+ patch_hash = 0280f96a2eeb3c023e5acf4e00cef03d362868218d4a85347ea45137c0ef6c56
++
++diff_files = mocklibc-print-indent.diff
+diff --git a/subprojects/packagefiles/mocklibc-print-indent.diff b/subprojects/packagefiles/mocklibc-print-indent.diff
+new file mode 100644
+index 0000000..4aaed40
+--- /dev/null
++++ b/subprojects/packagefiles/mocklibc-print-indent.diff
+@@ -0,0 +1,13 @@
++diff -up mocklibc-1.0/src/netgroup-debug.c.print-indent mocklibc-1.0/src/netgroup-debug.c
++--- mocklibc-1.0/src/netgroup-debug.c.print-indent	2023-04-11 10:20:53.717381559 -0400
+++++ mocklibc-1.0/src/netgroup-debug.c	2023-04-11 10:21:02.296270333 -0400
++@@ -21,6 +21,9 @@
++ #include <stdio.h>
++ #include <stdlib.h>
++ 
+++void print_indent (FILE        *stream,
+++                   unsigned int indent);
+++
++ void netgroup_debug_print_entry(struct entry *entry, FILE *stream, unsigned int indent) {
++   print_indent(stream, indent);
++ 
+-- 
+GitLab
+
diff --git a/sys-apps/accountsservice/files/accountsservice-23.13.9-test-fix.patch b/sys-apps/accountsservice/files/accountsservice-23.13.9-test-fix.patch
new file mode 100644
index 000000000000..a0f8346ce802
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-23.13.9-test-fix.patch
@@ -0,0 +1,41 @@
+https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/ad0365b77b583da06bcd1e8da4c1bed74129895a
+
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+
diff --git a/sys-apps/bfs/Manifest b/sys-apps/bfs/Manifest
index e196e30cd900..a3cbf1d0d247 100644
--- a/sys-apps/bfs/Manifest
+++ b/sys-apps/bfs/Manifest
@@ -1,5 +1,5 @@
-DIST bfs-3.1.2.tar.gz 237571 BLAKE2B 48051f50bcc11a06c542f21e33a858903c80d6950651c022d2a909e5da3f8813659f08937b202b11753ea132388899f3ebc66d28751682f0bfbfa9cf13e3938f SHA512 324a32067b2ae4ed50f166c783c28f16048ac33c8457eda5acc4ea86f25b3c0268c96c3d7c3230e1dde75fee72d41e7d4d53371d5fb6a95b2a9c812d079d1ad5
 DIST bfs-3.1.3.tar.gz 237696 BLAKE2B ca76ef02cd8ea65ab7d866a9c677063367c16c89b5f521da842ca0465e0485a90077009d9b5f324c7df09c1ab53036eb0f2965f372fd56762556dfbed43deb2c SHA512 4511c809666241f1b14ef3a01b80f0dc369510b67f45c1ce3e2d4445bcec9a4b86fb01333067b8dd713e992e57be7b99328b47a21b27864e6575981287de8e36
-EBUILD bfs-3.1.2.ebuild 1018 BLAKE2B 0fd542926fa7d6469a439f399a0e5cbda3e5e51549257f2e9370bc43efe2646e4475cf5071dedd421bb8d2c4ab41107e4c59a212c2e03127d7fa9bdc49aefca4 SHA512 a93c320d5e64b28082050644d8a205367cb1ba59b9d56ff8dba15b60e5ca20e630cf02bc80b893fb30aa96290ac0197d888ed2f2c4f86749b1ff932dd69392dd
+DIST bfs-3.2.tar.gz 252756 BLAKE2B 444d23c8df92c6c0bcbd38889cec29012c40d742a23e1755390259a325fab9d082a23ef444bf76462b21fcdeb41fa749593f5ec7d640f7270252ed4268ccc3fe SHA512 2881a37b65d8015853a658a4f759a5213ea433a726ee9952b82bd2d6c682f92e7d014eaa7ec8f1d127b3c25b5d3b04e3b24ae61ec2549212a7a4f9335f91bf8b
 EBUILD bfs-3.1.3-r1.ebuild 1083 BLAKE2B f9f6e08ef6dcb587adfcc84f02c5ddefaed54d6a52758c385034f4972f1d1eaa1d8fc7217a0f3b3b18ea4990219ea8943aa023a9a181c053d84617849b8ef15d SHA512 46a8104d9461043785c9ac145e05dcf92a1c59a6a1bae53ffef1873aec527627f55d2d1b240115a134ed544e3301de9d04e7372d600a8234e1b1bff6e440b08f
+EBUILD bfs-3.2.ebuild 1285 BLAKE2B 245293b20193df0394feac532852ae023cdc777888e6711f8591a9147490467d16ea526f0768a6f35b7aff708021821a7428199a9bb37efeda9752b532562ab2 SHA512 55c4d27724353a87e91c8ec7da543497e173b4f2d7c4f95338feeb4be77739b32aeafdb42f56e7eddab7f15cd4540b97184061405604489f4fcd6b41c0d64e83
 MISC metadata.xml 419 BLAKE2B eadf85369714b56ec89d384a8603c78c282e197db94c324fa9e627d70fa8c0c7c557c21c9c25ff292c93312d9752f36b4dd06a9a9c758c5375621694fb55e50d SHA512 192ae0599d4f36d43d8d2d94fa1e16fc5798b75abf0befecfa4a768a2b57e17387cb98a0663678b0c672c65c50d74cc3d1668cf222e0a9a4084be9078eb09445
diff --git a/sys-apps/bfs/bfs-3.1.2.ebuild b/sys-apps/bfs/bfs-3.2.ebuild
index ba8cd9bde472..c99fcb8e9ad7 100644
--- a/sys-apps/bfs/bfs-3.1.2.ebuild
+++ b/sys-apps/bfs/bfs-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit edo flag-o-matic toolchain-funcs
 
 DESCRIPTION="Breadth-first version of the UNIX find command"
 HOMEPAGE="https://tavianator.com/projects/bfs.html"
@@ -12,35 +12,46 @@ SRC_URI="https://github.com/tavianator/bfs/archive/refs/tags/${PV}.tar.gz -> ${P
 LICENSE="0BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
-IUSE="acl caps debug io-uring unicode xattr"
+IUSE="acl caps debug io-uring selinux unicode"
 
 DEPEND="
 	acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	io-uring? ( sys-libs/liburing:= )
+	selinux? ( sys-libs/libselinux )
 	unicode? ( dev-libs/oniguruma:= )
-	xattr? ( sys-apps/attr )
 "
 RDEPEND="${DEPEND}"
 
-bfsmake() {
-	emake \
-		USE_ACL=$(usev acl '1') \
-		USE_ATTR=$(usev xattr '1') \
-		USE_LIBCAP=$(usev caps '1') \
-		USE_LIBURING=$(usev io-uring '1') \
-		USE_ONIGURUMA=$(usev unicode '1') \
-		"$@"
-}
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Not available on Linux
+	acl_is_trivial_np acl_trivial fdclosedir getdents getprogname
+	posix_spawn_file_actions_addfchdir
+)
 
-src_compile() {
-	tc-export CC
+src_configure() {
+	tc-export CC PKG_CONFIG
 	use debug || append-cppflags -DNDEBUG
 
-	bfsmake
+	edo ./configure \
+		$(use_enable acl libacl) \
+		$(use_enable caps libcap) \
+		$(use_enable selinux libselinux) \
+		$(use_enable io-uring liburing) \
+		$(use_enable unicode oniguruma) \
+		V=1
+}
+
+src_compile() {
+	emake V=1
 }
 
 src_test() {
 	# -n check gets confused so need manual src_test definition?
-	bfsmake check
+	emake V=1 check
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+	einstalldocs
 }
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 3922b7cee561..713cab914362 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -8,7 +8,7 @@ DIST flatpak-1.14.5.tar.xz 1637692 BLAKE2B 180dc094ef3feef1ccefceb562836f55f6e87
 DIST flatpak-1.14.6.tar.xz 1644056 BLAKE2B 68bc8bdaf1d1c8a6046a06f800d41c1603e691e60a90f070c694501d50ee6fba3ad1978e222d22a9f99e2b85de9154e670149227b0f2ea6543483c2d103b5093 SHA512 d858682dbf539afe1b91087b6a0e0ebeea6658a0ef02c96d68259f3d8c58d1e6d02dd8b69db1b3c55f6d5df0f4d7e41c6165f668f09763dd3f9c3beb48f8bcf5
 EBUILD flatpak-1.12.8.ebuild 2525 BLAKE2B 9418a05e30311a3af4656e4957afdd4f700b3a8a57a129ecf59c9f9005fb8d9baca8fb496ee15319343856270bc5cf27c76377f1a5d6a7defd7b1086344bfe9f SHA512 e743fb13d1faf2939eb9a1eb0e9c48d19cc1a69136eb46275251822c2df242dd02c8536511e82a8c3516bdd5386c86f880de87f8f27600aa2240798a0ebb63c0
 EBUILD flatpak-1.12.9.ebuild 2535 BLAKE2B 809bc2d9ef829f014e5385ba506bf9d18eb57bdb701d190eae959064c9427a257c4ac57b78fc09290afd355846624a24175c328a7f425507fdf64d70cd60ce3b SHA512 b343e523fa31858eb24fc1ca386d85d868bafc9275d815fa779bdf85f265b32d34648c1f24de85a5ab1ae174b73030a30719f86efc5239b691e2b262aad70e85
-EBUILD flatpak-1.14.4-r3.ebuild 2731 BLAKE2B 29301005c3793ac7236b957e0d1a93bcfcc0f391b133536e87477ebdb3fb4a185de695665372527002d07ffe0507bbead9f34f6b9e8b741e857bd26fcb94b781 SHA512 2b847411417d5d6981705b588c0debd86e8a317c65bf137ec61065796fa58d71f3e4e3d5c763a13c0065ce8b4815335b11de0ec0ccfbdee6c3ed1c9736b8cbca
-EBUILD flatpak-1.14.5.ebuild 2838 BLAKE2B 5bd244a156c43895d0affad7e8ab261c580a0ea661647d81c71c3e27bcced00bd00c16abf35d36343e75a8b1fc4835a9c59f9a4c2625b89e677308b8072ab6e9 SHA512 752eced61372343b48bf9b5217882149a0fba025c678e0f19106e8b4a2c58392f01fc29882ed2cb8dd109bbab7e16d8e2163a51d284bbe340d4272323698d17d
-EBUILD flatpak-1.14.6.ebuild 2838 BLAKE2B c2ff4cc9bfab4fbf02fadb8bc032e16f971da7ae4306d0dfffbb641143d039d64a8d85193870a652a9910cc09a1454efc345e04815eaba510fc34e1e09ba7d32 SHA512 2499688d0287ca719f94748f4e1f186ce0d6729c40f9afdb64f638e3a454cfe1c8bc2eab4854067d35e40ef43bb30cc06619c20a6a4a95bc3152e176a820b26e
+EBUILD flatpak-1.14.4-r3.ebuild 2752 BLAKE2B 19d048372d4dc159697de9440ea5cbf3c79f42b146e2529d5e0f5192b7c8c9dfe7e266792087034f75a28813b1c4b0de8291567581e2b64b2dab62e3ef78bef8 SHA512 731dd34eb42f8ad8e1dca7ca935b1c2f61e5d6332df88448940cf557aedc5a25411cc7b752cd9380b7845d3a0a4903dfe1eaf1c951e4983150526b99b481b5ee
+EBUILD flatpak-1.14.5.ebuild 2859 BLAKE2B 5a40035ec6c72ac3a7f85058d883d12ea798448f900d6f578b7ce7feb5b37df37ea497f1c2c5bda8682ebaf1c760c32c470921fecc6f4abae4bb2e7222ff3328 SHA512 e6784bb2223353d716e0ebfadc6ee69f73efd45a2fa3e19525e5e17e4c22f015d204f6f310bcf14fd261b8c44b4d8c27b9a1a62d56b763b4481d5e942e0c0aa8
+EBUILD flatpak-1.14.6.ebuild 2859 BLAKE2B 821b169e47ec599dd0399bc596cf8139bc1c59f6e3d4615e105407e8ff81a017eb3442e4bb9217a09f41c7f1971380306cc31413b381a92f27b6418ebe519453 SHA512 1996d01dfca540116494a25c038290f8fde19205d8151687e83f1b8d77a5515fa50147e3844307659cca8367a1b67af30f55765d0ab58deb0fc0359d3b4ba141
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild b/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild
index b5359b986a75..56f002420b8c 100644
--- a/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild
@@ -53,6 +53,7 @@ BDEPEND="
 	>=sys-devel/gettext-0.18.2
 	virtual/pkgconfig
 	dev-util/gdbus-codegen
+	dev-util/glib-utils
 	app-alternatives/yacc
 	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
 	introspection? ( >=dev-libs/gobject-introspection-1.40 )
diff --git a/sys-apps/flatpak/flatpak-1.14.5.ebuild b/sys-apps/flatpak/flatpak-1.14.5.ebuild
index 517a31bce219..d066eadb7eb0 100644
--- a/sys-apps/flatpak/flatpak-1.14.5.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.5.ebuild
@@ -53,6 +53,7 @@ BDEPEND="
 	>=sys-devel/gettext-0.18.2
 	virtual/pkgconfig
 	dev-util/gdbus-codegen
+	dev-util/glib-utils
 	app-alternatives/yacc
 	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
 	introspection? ( >=dev-libs/gobject-introspection-1.40 )
diff --git a/sys-apps/flatpak/flatpak-1.14.6.ebuild b/sys-apps/flatpak/flatpak-1.14.6.ebuild
index d8cfe2b1993d..71f8492997bb 100644
--- a/sys-apps/flatpak/flatpak-1.14.6.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.6.ebuild
@@ -53,6 +53,7 @@ BDEPEND="
 	>=sys-devel/gettext-0.18.2
 	virtual/pkgconfig
 	dev-util/gdbus-codegen
+	dev-util/glib-utils
 	app-alternatives/yacc
 	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
 	introspection? ( >=dev-libs/gobject-introspection-1.40 )
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index b17ee08f114a..046565e056ce 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -1,5 +1,7 @@
 DIST hwdata-0.375.tar.gz 2367434 BLAKE2B 9fe350d9ba0c38d1b765cb38d3e6f3a969c0d9847f0453b0e6709e3a992ae2daffd52871ea730da6bcf297785fa44dc7c745ffa4579b85ba08df7a98144b6b32 SHA512 6d3a796be26d5e50991354e6859d69145c09003fd04dafce93ea20e72909ce2f0572004c0270832ab99fed780497234c526f3fbf3b154162f449373be7039a83
 DIST hwdata-0.376.tar.gz 2375353 BLAKE2B dabc8e7006d00e38e328e074967a1c92e2d7b2f8411a7d9ea2e2df596f861dc8d36ce9f2311cb9c23ee8e7d7b4f63bf8397d3cbf43da0b7d600c24d047ddb0e0 SHA512 3b38a485baa62bd7908083ae13202aa5202ace16a993be0ea60cb658c4e2b9f6ba32dccf58a17d69036798c95109a684d878b9f9bb8149a8713248e5b8f1bda9
+DIST hwdata-0.382.tar.gz 2423254 BLAKE2B d5f2b2d9497c6a8652c02b49fde008845ac36085079e126a960b048bc1861ae46cbc859e044b10a6a07942166aefe1120e9c283345a6809acb981f6d06853c57 SHA512 0ab3ef561c1f71188a513bcec97e5790483b612844bbb2b40b99cb04a81f10285d2bcf03714ef1c66b8984580193739b7c26593c8c69e880f1d23c8e6ea80da3
 EBUILD hwdata-0.375.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.376.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
+EBUILD hwdata-0.382.ebuild 702 BLAKE2B f9b23f4f07d7e4b8d58f6802221703cae82ef55ccde4c4ef948d27912241d5ef19b8d9d76cb41432ae28bd42f568aad8eea15f3b9e862c352015b7c0608b7d57 SHA512 f647ab18b6ebfeee6e14d6787a6dfcbdc3ae76631eb356889986c561bfdf31353668f3a52bf364c34f8344933c12a08fd9613b3800dad7334eb17559351e69fa
 MISC metadata.xml 328 BLAKE2B cf72c9663e944154e41475067b5e89dbfcd50f0c771e17dddfb6042a2ccb10693d7ef6eb7508e9ec7a50cbc59e8e47698030a5c1e18accd79040d4318416eb54 SHA512 f366d006f709fabe624840768aa780982884ba8a74f3ac121e323995e218a577dc5a4d34d9dcbec44571580d388967d78350d4540316444ddaf014b99db804e7
diff --git a/sys-apps/hwdata/hwdata-0.382.ebuild b/sys-apps/hwdata/hwdata-0.382.ebuild
new file mode 100644
index 000000000000..aa8f1bb9c78f
--- /dev/null
+++ b/sys-apps/hwdata/hwdata-0.382.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo
+
+DESCRIPTION="Hardware identification and configuration data"
+HOMEPAGE="https://github.com/vcrhonek/hwdata"
+SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="test"
+
+src_configure() {
+	# configure is not compatible with econf
+	local conf=(
+		./configure
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/lib"
+		--datadir="${EPREFIX}/usr/share"
+	)
+
+	edo "${conf[@]}"
+}
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index df7053a89a48..ea602b610eb7 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -2,8 +2,9 @@ AUX irqbalance-1.9.3-systemd-journal-noise.patch 800 BLAKE2B f5609765324ec769084
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
 AUX irqbalance.confd-2 487 BLAKE2B 37a5d8aa38e11b6799417624451c463d2fa5a8a45fe9f2d9d5d47669f44ae318790a7204dc7581412408089bd7809ddb43e28f5508c10870ea0ac7db3d76904c SHA512 7cf4f603eba1cba6f8825768b94da0bf8d2c0197897e94e811d2295b3a069a4455417f6e03226388b422e785e83b51ddec52bf4c038c235fd1182c5dfa9495fc
 AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
+AUX irqbalance.init.5 554 BLAKE2B bf30637a0840299457231548edbbbb9d7c28c83ed16743bd57af5c2b46cf707635b83bd7ea74675312db5cf32ff54a1ba6fc36bdcbaf319236b1ec98a735b566 SHA512 aaa2e9d278a02170ef5dd44be86ca8480b49d3f6368b26c54f547f1f4a0fa3ec60780e462b18a9248477de5f5eaa44462a100f79511d7506dcdee38a557641a5
 DIST irqbalance-1.9.3.tar.gz 62573 BLAKE2B 0f7b3b62c3784c009c6829078cdf5496910ec3f3c8c13de5f0dfbaed510fb5e3dab4953810c646ece962ef130af3aaa0bb9fa8c2e013485751cc661c9458e87a SHA512 5638fb59f5a59901333b90289ee70c960df0e2b9e55731805397797b8e630bb3703e36a4dfd05bf01de49334dab9d6fc95bde4967eeab131534950d281103fa1
 DIST irqbalance-1.9.4.tar.gz 63005 BLAKE2B 6b8bf28e11686713ca9c00a1b98c5f3afb38c26e919a9d7de126145d12c4e8e23e8ea00b2534bb0339e5990ed5cb642291df975ba9868835e9c4e8a23c98f2ef SHA512 abdcac9dccabb18ae644b73dc2a8528c03279811c1f9182a5a5b0af43b30c5982d7bb14e79d4430b5d4f2cea8e17115e6038851c74de1ff3bdfc4e303392479a
 EBUILD irqbalance-1.9.3-r1.ebuild 1708 BLAKE2B 63b23313c3c05017af1c180244422f4c305f441237c9fa4f741de2e3eaa916e63076af87ce6eea8b85dc2df20a5e2f2422b404477a8aac7668d88b7eae0a7612 SHA512 629e0132c02f68ca162e80f7696ba72efc5f1f872ec8deb08f2a7219e26fa852cd3027affdc2205599b1a2d4807959e27c737962956a4ba22e756f5842b1148f
-EBUILD irqbalance-1.9.4.ebuild 1766 BLAKE2B 7e6e99fe05063fbba7a89b2d29f5e0df8887c592077392a36974b995928b305cbbe62dfa7a8da13634f51daf9d6105877dd5ba6a9b69368eaeb33f20886d3c3e SHA512 83b60c7eaeebb4337aae2dbb60090faf0eb553bbecacc5001dd6d8d5b8d09929b999156dcb5401cc732bfd403f88eb17897423f35ada2c0bb720feb6c6158e2e
+EBUILD irqbalance-1.9.4-r1.ebuild 1766 BLAKE2B d32d6eec7ffa636f9ac2ed82e6b0feec0f212366514d8b66147a6bd973196fba2c82871a1705b7c9eb45530bd1602e05034b16ec44eda5050eeb7d00db2d37b2 SHA512 644ad7235e964984a9cd7c07f32c021b3ab7e0a6a54902516dcdeb4a2bcb0fc950a38abbbe303e0063e6716cc203bbdba729129682eea1c794c3d877094478ad
 MISC metadata.xml 643 BLAKE2B 14358d1eef80f7ac2f13ae99f4ae14be61f2f4d0ef8d9e1037ef406a609c0d9258aa463bf2519227aeaf8bf36c324cce8017215ded3838227ef8c630d7fd9216 SHA512 9d9eed0adc40b08d6a88cace8b90fe4b0a051ea49ef45ace63e9d99a86fa5993af9716700fcae4dfe93b659ea6a735be86d6a3edd851ed1e025d0e58854f516b
diff --git a/sys-apps/irqbalance/files/irqbalance.init.5 b/sys-apps/irqbalance/files/irqbalance.init.5
new file mode 100644
index 000000000000..511e4fee023a
--- /dev/null
+++ b/sys-apps/irqbalance/files/irqbalance.init.5
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need localmount
+	after bootmisc
+}
+
+command="/usr/bin/irqbalance"
+command_args="${IRQBALANCE_OPTS}"
+
+start_pre() {
+	if grep -q MSI /proc/interrupts 2>/dev/null && \
+	test -z "$(find /sys/devices -type d -name msi_irqs 2>/dev/null)"; then
+		eerror "MSI interrupts found in /proc/interrupts but none found in sysfs."
+		eerror "You need to update your kernel."
+		return 1
+	fi
+
+	checkpath -q -d /run/${SVCNAME}
+}
diff --git a/sys-apps/irqbalance/irqbalance-1.9.4.ebuild b/sys-apps/irqbalance/irqbalance-1.9.4-r1.ebuild
index d15ff251b576..ba4b5355945e 100644
--- a/sys-apps/irqbalance/irqbalance-1.9.4.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.9.4-r1.ebuild
@@ -64,7 +64,7 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
+	newinitd "${FILESDIR}"/irqbalance.init.5 irqbalance
 	newconfd "${FILESDIR}"/irqbalance.confd-2 irqbalance
 	systemd_dounit "${WORKDIR}"/${P}/misc/irqbalance.service
 	udev_dorules "${WORKDIR}"/${P}/misc/90-irqbalance.rules
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index 3997f78233bc..af243c6d85f2 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -1,16 +1,10 @@
-DIST moar-1.22.3-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086fb7a14b1d1023caf7594cbda16772776751a80d44f451a9c5c765bd03d25687a63b5a00c4a50603b4598162920d840 SHA512 44c924339dbde95b647c464a00382786dfd8adfc72f307a9df63ed39f85fefe76260fde082a39738fb97c571217e8d591bdeada054dbe75ed56aa0156e7cf2fa
-DIST moar-1.22.3.tar.gz 2799819 BLAKE2B 681297e9a84f6846d7ea6cd591403fd3100079fc8418ce5841a50755927239eca5abbfc0477d1a74e3af687ef1ebe372d4f708c38a64ba61b3095ac161f1cb8e SHA512 377cdf4916b036088f48abd4aa9818f002dd5ab025a54f4d91626380bb3d370daf046da6f3dc31fcc11a375d7da1a84288fb3e2e3357181a6ecc6a46af78c452
 DIST moar-1.23.10-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086fb7a14b1d1023caf7594cbda16772776751a80d44f451a9c5c765bd03d25687a63b5a00c4a50603b4598162920d840 SHA512 44c924339dbde95b647c464a00382786dfd8adfc72f307a9df63ed39f85fefe76260fde082a39738fb97c571217e8d591bdeada054dbe75ed56aa0156e7cf2fa
 DIST moar-1.23.10.tar.gz 2804040 BLAKE2B f3e4b53b3457461766c04d81f081c01a7d12a261502b1c59970099b403c562bd3276510ab0b59d1629e9d5e97922cc6a9839ae4525f62cecad752b5d65ce27ac SHA512 835b9910fb6451a58e04008517ede25644b897e94cfd5fc7ed5d7104107e91458b77e2a6230668169c9f213df297335767de6bc467a6f6e928b53d2e1060e4e9
-DIST moar-1.23.6-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086fb7a14b1d1023caf7594cbda16772776751a80d44f451a9c5c765bd03d25687a63b5a00c4a50603b4598162920d840 SHA512 44c924339dbde95b647c464a00382786dfd8adfc72f307a9df63ed39f85fefe76260fde082a39738fb97c571217e8d591bdeada054dbe75ed56aa0156e7cf2fa
-DIST moar-1.23.6.tar.gz 2801847 BLAKE2B d9e638d15ac363d3787fcce4bdc640c497a400ecaf5f40763dd8efed28cc3f5e479733d4b1f9a457395e4b9dda844748459a07fa674f50e3d6b630755af3ac4f SHA512 94103263f2c07464fbc0c5a90519a3a03ef5f163a67ca451a703c11bf46b98011b6e29a038b08bb47dc08230c28ae822ced49f2aec2bf8b6e83c6a4c1f330aa4
-DIST moar-1.23.7-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086fb7a14b1d1023caf7594cbda16772776751a80d44f451a9c5c765bd03d25687a63b5a00c4a50603b4598162920d840 SHA512 44c924339dbde95b647c464a00382786dfd8adfc72f307a9df63ed39f85fefe76260fde082a39738fb97c571217e8d591bdeada054dbe75ed56aa0156e7cf2fa
-DIST moar-1.23.7.tar.gz 2802061 BLAKE2B 767efc6919415f342a3c31dc99692f23d991c22e92f2c7387765aa63ab591c5791d9bf5c6ddea704456924c55b976af141af7b39e726fe651262fce21dd353fe SHA512 56958508d9ee710cb91df90f6b18bb7f0db95444e65eb8fa80a5ee33c4ad99f4f4482c1eec1ef44b64906e016e9465002571fa141ce03eeeaecc62cba102ead0
+DIST moar-1.23.11-deps.tar.xz 1228028 BLAKE2B f8895cef15f6ab0eb5dcf826d86deb7dc2c67dd6e692e456d5d98830fba93b3a17e5d3b3026c0f7ea10e3810db1f17ccb27b3cb704cff1c9bcbd267fbf68acbd SHA512 f12f2fa563b5170c8fe092f15476692815c2e0ab341d8becff504e5ded426efae5fc20697ef935ca5d037fa40abbfebbe5d0f59ac4e805e2d7d60e19070df3d4
+DIST moar-1.23.11.tar.gz 2804497 BLAKE2B 5472aa0cbcf3e781e0ef57ebf7d5424e481f96acd04f82e8e816adf4e0182a85fcd16567daa986564f09f0a54416cbf02b90f6a5cd50250d4593392a6bed1b45 SHA512 31d64d97475e2f82af19d770010d0972c469105d1b797cf63521021906a5eef666932b9227ff94d60cca20dfcb956193954687939b92e1042a1473052d4539f4
 DIST moar-1.23.9-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086fb7a14b1d1023caf7594cbda16772776751a80d44f451a9c5c765bd03d25687a63b5a00c4a50603b4598162920d840 SHA512 44c924339dbde95b647c464a00382786dfd8adfc72f307a9df63ed39f85fefe76260fde082a39738fb97c571217e8d591bdeada054dbe75ed56aa0156e7cf2fa
 DIST moar-1.23.9.tar.gz 2804191 BLAKE2B d5663fedd70fc80d70a206c276ece6ec11da4f4b4dc396a3e11b1fb8edd5bd9f3395e943158c4bb297b5ebfeecd8f61bdbaaff79e78c4a89458f1b1a02db0e71 SHA512 9ab4a3e49b66b39f642b6a1f882c0980a4e755e3e127ca37d1319615ae836fe3250676a8c0e95ccd0f8e714357df5dc00235bf67be6097a7b2811f0e3bf02e9f
-EBUILD moar-1.22.3.ebuild 984 BLAKE2B 59e8ecfe756c1a600b9ca5e39bc43663264434288be4e7a1a7064c8e2b7dbbf47f130ebe847e6385e28d92aba622d5999a1f48777fe2eae62cf0aec56c24d78e SHA512 a4e31acdd2bc81ff9789e9b1c871a3d080dccf2532c4210f7c1b4a02b2a6366a98cf46eb785f9b896523ef401b71c4e3cda313c9162f1d8ea6151a2b54db8fd7
 EBUILD moar-1.23.10.ebuild 986 BLAKE2B e9f5c41907da162be3ffaea0fe77bc7aea55176d4c15ad3833fc72806c7bd24fdcb9ccf9b389d20ea037628f6c6858553465dd5f6710971d46ae0489d7acc28a SHA512 a65b9b98e31c52869882d4b0b4ad855383a2ddd444c74883d70a64be377c4d6706eed78d930ebbfc7cc61a83cad793d4f0d9d652ab96ac03d59753456f226b6a
-EBUILD moar-1.23.6.ebuild 986 BLAKE2B e9f5c41907da162be3ffaea0fe77bc7aea55176d4c15ad3833fc72806c7bd24fdcb9ccf9b389d20ea037628f6c6858553465dd5f6710971d46ae0489d7acc28a SHA512 a65b9b98e31c52869882d4b0b4ad855383a2ddd444c74883d70a64be377c4d6706eed78d930ebbfc7cc61a83cad793d4f0d9d652ab96ac03d59753456f226b6a
-EBUILD moar-1.23.7.ebuild 986 BLAKE2B e9f5c41907da162be3ffaea0fe77bc7aea55176d4c15ad3833fc72806c7bd24fdcb9ccf9b389d20ea037628f6c6858553465dd5f6710971d46ae0489d7acc28a SHA512 a65b9b98e31c52869882d4b0b4ad855383a2ddd444c74883d70a64be377c4d6706eed78d930ebbfc7cc61a83cad793d4f0d9d652ab96ac03d59753456f226b6a
+EBUILD moar-1.23.11.ebuild 1097 BLAKE2B 17e50fb8feed6ce38e7016cc781fa39256b5d8090480386fc7172e49423126dc898b857c154323a2647e47c5ad390a8915b2797428adca544239e42b5456c0c6 SHA512 886afe4a9d3bf1ef75859fd59856b94644f8ddcdc4de3d0d99f9abae96f69781e799cefc5dd064f3618bb08ffc2743025b0b42285b4f1404dbf1fc4c70bc4037
 EBUILD moar-1.23.9.ebuild 984 BLAKE2B 59e8ecfe756c1a600b9ca5e39bc43663264434288be4e7a1a7064c8e2b7dbbf47f130ebe847e6385e28d92aba622d5999a1f48777fe2eae62cf0aec56c24d78e SHA512 a4e31acdd2bc81ff9789e9b1c871a3d080dccf2532c4210f7c1b4a02b2a6366a98cf46eb785f9b896523ef401b71c4e3cda313c9162f1d8ea6151a2b54db8fd7
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.22.3.ebuild b/sys-apps/moar/moar-1.22.3.ebuild
deleted file mode 100644
index 588769858549..000000000000
--- a/sys-apps/moar/moar-1.22.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moar"
-SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moarvm: https://github.com/walles/moar/issues/143
-RDEPEND="!dev-lang/moarvm"
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_compile() {
-	# https://github.com/walles/moar/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moar
-	doman moar.1
-	einstalldocs
-}
diff --git a/sys-apps/moar/moar-1.23.7.ebuild b/sys-apps/moar/moar-1.23.11.ebuild
index 7ba82f9aa27b..9d3c0a33a8a3 100644
--- a/sys-apps/moar/moar-1.23.7.ebuild
+++ b/sys-apps/moar/moar-1.23.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module
+inherit go-env go-module
 
 DESCRIPTION="Pager designed to do the right thing without any configuration"
 HOMEPAGE="https://github.com/walles/moar"
@@ -25,6 +25,12 @@ BDEPEND="
 	)
 "
 
+src_unpack() {
+	default
+	mv "${WORKDIR}"/vendor "${S}"/vendor || die
+	go-env_set_compile_environment
+}
+
 src_compile() {
 	# https://github.com/walles/moar/blob/master/build.sh#L28
 	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
diff --git a/sys-apps/moar/moar-1.23.6.ebuild b/sys-apps/moar/moar-1.23.6.ebuild
deleted file mode 100644
index 7ba82f9aa27b..000000000000
--- a/sys-apps/moar/moar-1.23.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moar"
-SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moarvm: https://github.com/walles/moar/issues/143
-RDEPEND="!dev-lang/moarvm"
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_compile() {
-	# https://github.com/walles/moar/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moar
-	doman moar.1
-	einstalldocs
-}
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 33f05ef8eb6a..875fe7bebf44 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,5 +1,7 @@
 DIST nvme-cli-2.7.1.gh.tar.gz 902081 BLAKE2B 7d14838f7f0fd6d1ab1cb30041f862fe2db6f40fe72c13cb4ce227831cac6e141ff5cec2924c846f30629188754b0ce0630ad9009d2a490c193da20e8b8a45d1 SHA512 6a9f3574dfd4375e6f7a76ed95f698efb26da5b72a490579caeba9d46c4811ae31650844e0a0e1047dc627158d5ffbdc020112a5059d3195e7eadff902b70b19
 DIST nvme-cli-2.8.gh.tar.gz 910994 BLAKE2B c231fc087219622736bdc400c83d2a320670f247f77b53f0cad20c8117e620703badba7cd9a6f267ba79223be9c0d6710c2be968683f77fe72e45957e0c8b899 SHA512 1be0bed4e1bf8a25229f301c2b00b78d2de4eaf8ff2b815fa75e44dd35ddd7787604152bdf00696130df3281206a734c5f408c3f2127440e05c2e4b1cdbb79d4
+DIST nvme-cli-2.9.1.gh.tar.gz 932210 BLAKE2B 865808c17f2098f8d0be8ba928869801023f77f0ffd44b5d2424b9f75e01180f8d1990684e3e4a79363e650a44e58abe213b5ab55328f0bde9ed699eba9a215c SHA512 c9c86e7567c2d4c59aff1eb9d18f4775923db3c81a89c628b819121c32150d4bc2d65d0dacac764c64594369890b380d0fd06bc7c1f83f4a7f3e71a51a6fee24
 EBUILD nvme-cli-2.7.1.ebuild 926 BLAKE2B ffdaa6599c97b85a07f8e08e51c06d74157bfeff083c034bb93c023406689216e715537bfb8a47b289982a5ec1d83a5f273c4a903bed38207dfc43514a34c7da SHA512 48f4e66972e0594775f735e0dcc6900e009361ec03f06200e288922262f4a63e57e98cddc7bff820172f7fc9b02015dead97ec10f2479934be5dc4b61594b726
 EBUILD nvme-cli-2.8.ebuild 948 BLAKE2B 6c0e31aaffb9b82a0d2173f33efcac65e2905d5a626b675e50fc48f54e4addb9a40f354d8e755628c438c4467da5865b3711e923dd4fb560bb364c0cdf7a09d6 SHA512 e16822d2851c816cb7caa2c5e2ed54ac29cd2b7ea6a5d6b82e38e3d7882524feb703359132bb434178576960130e7745e2d0d1bce1137378912770f2d1ae8806
+EBUILD nvme-cli-2.9.1.ebuild 950 BLAKE2B bbc4b0257e1e16ef4bceb4f66b9052b696c72dc2ee1a318778473f4d21f76550b485f80176367f295f89a5dbab6bf4cf0a0824eb299503b0ecf4c855674fc7e4 SHA512 ced3a356d71b62d1826885c8183ff10a43aab31981b50d5afd4081df676cb835d118e6ee8d347cc0043af7eca2c41b06b0001de91f9c7eb9f19d1b14cf5cc651
 MISC metadata.xml 435 BLAKE2B 6756d3cbc2fa183946f5cb5fe2e6cc3e19ffef2a63f6c5ba6cf203bbcc6eb0df68d615b8ad266dc89ce23cd06a5d843bddeae8eaf574bf45ad1c06442f50c9c5 SHA512 2b05f8e31378564378339755d80da4244524c8f261fc0fda47a1350bf5a6309b5cca68c74bad06566d6f2bf9e1cc1747b7ce2ebf783c46a9015d27fdcff44b7d
diff --git a/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild
new file mode 100644
index 000000000000..ec7eb940d65c
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd udev
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+json"
+
+RDEPEND="
+	>=sys-libs/libnvme-1.9:=[json?]
+	json? ( dev-libs/json-c:= )
+	sys-libs/zlib:=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dversion-tag="${PV}"
+		-Ddocs=all
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		-Dsystemddir="$(systemd_get_systemunitdir)"
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		$(meson_feature json json-c)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index a2d6f9a215bb..570dfeca954d 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -11,12 +11,9 @@ DIST shadow-4.13.tar.xz 1762908 BLAKE2B 315ab8a7e598aeefb50c11293e20cfa0982c3c3a
 DIST shadow-4.13.tar.xz.asc 488 BLAKE2B de1f8285c5713a772343a2a7c638d1d13429dd4fa867d4f91d4922aa0d083b4a3110d38e8a8ab82137fdf4fecb12ba3677f3fb235401fc6438ae663fbd9bfbd2 SHA512 f8549c4e699c65721d53946d61b6127712572f7ad9ee13018ef3a25307002992aa727471c948d1bb22dcddf112715bed387d28f436123f30e153ae6bc0cd3648
 DIST shadow-4.14.2.tar.xz 1799548 BLAKE2B 419f0a516753616ef691f71ec9002eef6fd7568c013ac71900d7481eff1bd9165c69d9587b7ca25800543a2eac58cfb7ce4224063e8af7b278f589640485c28f SHA512 b417dbe0fbbeced1022e64efe9dcd8b41d14779c45163e6de63891ac63f837d43f3e559f99f884099aa45282299ceb4dcb9fd29d21c9925687ff8462fe6ead2f
 DIST shadow-4.14.2.tar.xz.asc 833 BLAKE2B 9e085c79ccd3aa77489eb92e947dd4875dea84be2dbcbd2b8443e70b3dc065d288171ee024f81c6c3bf44d0ebfcabbb69937a906fdb26b6622d5a369aa415e8e SHA512 47a2607fa782a48b0333e353343a32f358115bb40225ea962fab86d4a8dbed1df976eb6231baf5b95f34a13139b99d6b719521626e5d3e9c80fc4c685767d9b7
-DIST shadow-4.14.5.tar.xz 1806416 BLAKE2B 885d2b23ed670cf26452eb208d561478b7410ffbb04a054feb65efb7da6f1d51eb992da61b72409f8991ee35efd7e7cf7a9bc770edec5f855ace32f82aaa7b55 SHA512 30de7837874b3ad41d579ffe337a6defa22fbe151fdbf8a32c54f267af1f565c7e06b92d953571482e3b622f98291f08f3155179a23266a3e54df1546b87b156
-DIST shadow-4.14.5.tar.xz.asc 833 BLAKE2B 191b6a26993f9276ea712e926d5e429112b6f6c3d55e6ac7ba9bacd5ffd1f26ea687a9021fdb1c61d7d5032dd103d0c58b963020504549237b070a7025d0de4a SHA512 94fa6939b681ef286803300d12d519370e03fc08018b44779217ae877021f9d77a0b3e39e72fbdfa463191a126b41aedc0be1471d1d5594825d8435c45f6c23f
 DIST shadow-4.14.6.tar.xz 1805900 BLAKE2B e910131eab6527c1222afadf02ebd7bd6a3460baf95c23cc9eefa7aa21ddb70c02e58e4f58db2cb24fa8e2996c82b11664420545a8b1af573e4e6a25ceb3f921 SHA512 994a81afbafb19622a1d0f84527f96a84b0955c4ffa5e826682ead82af7940b8e3a091514bd2075622ebdf7638643c9c6b6b7ac3e48d985278db896249d70ae6
 DIST shadow-4.14.6.tar.xz.asc 833 BLAKE2B 2fdcbd073687de829006ed9eb3ffd0b5f1312a94fe81b9c6840b25807e1268c58136d378da87f481c3cb53dc262d7afb6d97c77528e14dfbf5d54212fa7f84f2 SHA512 41f8fa92379392d4caa83987f9ea513ec18103dacfc01461f7bfb67ee6738a67e097fe76e7aa1f6004dfe14d5c55973667037c683fdd8ebb082264cb62222d27
 EBUILD shadow-4.13-r4.ebuild 6834 BLAKE2B da0e190f18aa68350ac8689505c0399252ab54036583ee2b4fa865433406f64469d6a43162f422da5e315cf7378e0accc595c8a2eaccf801353947cc504c3983 SHA512 dc4dad7bd7c4f4206f9cbc83166269dde3b868eca3a5a83f2698795efb7696c438468c8c22293963a52597735888efb8b959bccddb6d19b6eefc3cbeb5564dd7
-EBUILD shadow-4.14.2.ebuild 7216 BLAKE2B 93bcce72598fc8669416d440fc6605819aa68f03a8acadc3280337b62626efac4911a39e79bc6b0d4bb724377d1891fc8343c0f716d2fc15b73ee9b2f351ce76 SHA512 98736041a51b60443a28019e5fb2c8406c7a8eeb2dd8c54a39d2718690c251c53b1bd214100998be18202e29ad62ec6327220ec9f35d0e1992b9d96eef048bb1
-EBUILD shadow-4.14.5.ebuild 7224 BLAKE2B 0c9d1086a3d938eff1b3e80b86b8ad7daa28d5843b87da99855ecc02e7320461da5a3371c3678efdaa6af68d0cf35ed32fe97490338cdd1d7f03967025475375 SHA512 90efe2ad8e141a6ae8d8b582632c7d32db1212aaf481d456fc641a65ab29599021135bb17b90ba156308d95ccbc127f4ba6149c4ebc8c0902163a2e651962848
-EBUILD shadow-4.14.6.ebuild 7224 BLAKE2B 0c9d1086a3d938eff1b3e80b86b8ad7daa28d5843b87da99855ecc02e7320461da5a3371c3678efdaa6af68d0cf35ed32fe97490338cdd1d7f03967025475375 SHA512 90efe2ad8e141a6ae8d8b582632c7d32db1212aaf481d456fc641a65ab29599021135bb17b90ba156308d95ccbc127f4ba6149c4ebc8c0902163a2e651962848
+EBUILD shadow-4.14.2.ebuild 7230 BLAKE2B 339fbc2f07bf21238b4b606d1a3c5abff09f3521eda90630a3bb3b0d14ac990ea33369cf8d5914f67a2982d3e6b503d90046b5da946c3288691c273426174154 SHA512 15f1a137409709d23a223db1b346f1dc04543870a29fbf28ab9dd6fda7ce290dbb6aaf2e02ad5f38016c90be733b900636e6592d8b0c13a0e66a1034b385aa31
+EBUILD shadow-4.14.6.ebuild 7238 BLAKE2B 49d886d595c257f2db3f8316a55ca8de5692041d533849ec1f43c49c62936cfc8ae6aef8f97e3b9b06ab17ac4b27634e207571b1305f87fa9e047ada8bfde6d2 SHA512 1a95d6948e5a035d81b3119c12001773c84ce4346af65f5e17b32ac29ebd3f1636182920f767f0aca0c77c0c94daa02ac18079da40fa427d6ae8325b6f52d597
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/shadow-4.14.2.ebuild b/sys-apps/shadow/shadow-4.14.2.ebuild
index a82a8ce5ef70..25b40053cf39 100644
--- a/sys-apps/shadow/shadow-4.14.2.ebuild
+++ b/sys-apps/shadow/shadow-4.14.2.ebuild
@@ -90,7 +90,7 @@ src_configure() {
 		--with-bcrypt
 		--with-yescrypt
 		$(use_enable nls)
-		# TODO: wire up upstream for elogind too
+		# TODO: wire up upstream for elogind too (bug #931119)
 		$(use_enable systemd logind)
 		$(use_with acl)
 		$(use_with audit)
diff --git a/sys-apps/shadow/shadow-4.14.5.ebuild b/sys-apps/shadow/shadow-4.14.5.ebuild
deleted file mode 100644
index 104e0f560ccf..000000000000
--- a/sys-apps/shadow/shadow-4.14.5.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream sometimes pushes releases as pre-releases before marking them
-# official. Don't keyword the pre-releases!
-# Check https://github.com/shadow-maint/shadow/releases.
-
-inherit libtool pam verify-sig
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz.asc )"
-
-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"
-IUSE="acl audit cracklib nls pam selinux skey split-usr su systemd 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 )
-
-REQUIRED_USE="?? ( cracklib pam )"
-
-# TODO: Revisit libbsd dep once glibc-2.28 is stable as it provides strlcpy.
-COMMON_DEPEND="
-	dev-libs/libbsd
-	virtual/libcrypt:=
-	acl? ( sys-apps/acl:= )
-	audit? ( >=sys-process/audit-2.6:= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:= )
-	skey? ( sys-auth/skey:= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:=
-		sys-libs/libsemanage:=
-	)
-	systemd? ( sys-apps/systemd:= )
-	xattr? ( sys-apps/attr:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.14
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	!<sys-apps/man-pages-5.11-r1
-	!=sys-apps/man-pages-5.12-r0
-	!=sys-apps/man-pages-5.12-r1
-	nls? (
-		!<app-i18n/man-pages-it-5.06-r1
-		!<app-i18n/man-pages-ja-20180315-r1
-		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
-	)
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-
-if [[ ${PV} == *.0 ]]; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-sergehallyn )"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sergehallyn.asc
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alejandro-colomar.asc
-fi
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		# Negate new upstream default of disabling for now
-		--enable-lastlog
-		--disable-account-tools-setuid
-		--disable-static
-		--with-btrfs
-		# shadow uses a bundled copy of readpassphrase if --without-libbsd
-		--with-libbsd
-		--without-group-name-max-length
-		--without-tcb
-		--with-bcrypt
-		--with-yescrypt
-		$(use_enable nls)
-		# TODO: wire up upstream for elogind too
-		$(use_enable systemd logind)
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with cracklib libcrack)
-		$(use_with elibc_glibc nscd)
-		$(use_with pam libpam)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with su)
-		$(use_with xattr attr)
-	)
-
-	econf "${myeconfargs[@]}"
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
-	emake DESTDIR="${D}" -C man install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	if use split-usr ; then
-		# move passwd to / to help recover broke systems #64441
-		# We cannot simply remove this or else net-misc/scponly
-		# and other tools will break because of hardcoded passwd
-		# location
-		dodir /bin
-		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-		dosym ../../bin/passwd /usr/bin/passwd
-	fi
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chsh chfn ; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chpasswd newusers ; do
-			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
-		done
-
-		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
-
-		# Comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# Remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man -type f \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd} || die
-		if use su ; then
-			rm "${ED}"/etc/pam.d/su || die
-		fi
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man -type f \
-		'(' -name id.1 -o -name getspnam.3 ')' \
-		-delete || die
-
-	if ! use su ; then
-		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
-	fi
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-
-	if use elibc_musl; then
-		QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent )
-	fi
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Missing entries from /etc/passwd can cause odd system blips.
-	# See bug #829872.
-	if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
-		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
-	fi
-
-	# Enable shadow groups.
-	if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then
-		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
-			grpconv -R "${EROOT:-/}"
-		else
-			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/shadow/shadow-4.14.6.ebuild b/sys-apps/shadow/shadow-4.14.6.ebuild
index 104e0f560ccf..60ab0fa7c897 100644
--- a/sys-apps/shadow/shadow-4.14.6.ebuild
+++ b/sys-apps/shadow/shadow-4.14.6.ebuild
@@ -90,7 +90,7 @@ src_configure() {
 		--with-bcrypt
 		--with-yescrypt
 		$(use_enable nls)
-		# TODO: wire up upstream for elogind too
+		# TODO: wire up upstream for elogind too (bug #931119)
 		$(use_enable systemd logind)
 		$(use_with acl)
 		$(use_with audit)
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index f13a2dd7530f..94244c55d97c 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -15,9 +15,9 @@ DIST util-linux-2.39.4.tar.sign 833 BLAKE2B cbefaa4968ac82491c9eaa467c5e84e9b4a0
 DIST util-linux-2.39.4.tar.xz 8541176 BLAKE2B 53fef6f36b802d5e4c1112376c77e5cd832280d9eaeb9a6a98b2371334a1a3a8a48f5589d16f67c623a5050ae3b16dafc43ee26a9e8cb77079f9b6a2ee6c9480 SHA512 94e0282ac9705ca666d3c3864f2656bd1a21d879339164edd2c413ae7665b1cfec01f9c58a83b3148b8c4b4e857653447e5523c3b27230b175dd39f75ac6fae0
 DIST util-linux-2.40.1-rc1.tar.sign 833 BLAKE2B ba3b6d9314f23b6d9ff810c3de42c3f15ea5f5b372995bf1a9b4b3ab9946d037eda8fac3f5f61b14db7c9491e693e09738140a20477b0cc508f44a08f81cf8d5 SHA512 eaeba8f822f84a399ce0a7df2bac6a609c1802c7c33877b3cd18279869d007c32d6d267488222475846acc05ec0dc2b93b90975fd67b7df3dc17c50a46d8cf2d
 DIST util-linux-2.40.1-rc1.tar.xz 8766372 BLAKE2B 7903f75c01ba18fd73ac3f65ab7233f6d3e77954c19f28236744dbd9eec6539774a130fb20aea887e9d77d960bef62281feec1fe71623fde4d8a81932b04c33c SHA512 6023ed8f98599e1145e8d74ed5bdfe6877da5e806ac05f5e5737cf3150aac4d473e38c63e3ae7ae3d81862936bff1000bcba080166b6e673d5f226dbe271d2ff
-EBUILD util-linux-2.39.3-r2.ebuild 10816 BLAKE2B 675a18c3b90136b7f9dcdf80f32af95e762c34499fafb8955a4e65e8aafd275e1c1fd26ff42602c43e5448e45e657de00bf1e073d28b7a27724353fdc9384356 SHA512 549a47fb5864403951a9b4829d920e7856770d35758fb4fd00b6294dfe5926bbc538dbe70d62781f6de600650a14480f15a859c9d051c6cc74037ce360741efc
-EBUILD util-linux-2.39.3-r7.ebuild 11176 BLAKE2B f708b14040dfd3709330f706c05fbfe060bd841c79d682506e17416007cbe4bc3f34fda0b3672a0356dfcd8dd1b723ceb288865037accc8bf0f8e77ab964aa44 SHA512 0692c8ff4c1710c3d2a6232117b1cbb586efb37c4909a52a26a52233d5af58c703eda1cd22ad8a4c711998cec897e89f50a632f93c93117d1d5660cf6c986d05
-EBUILD util-linux-2.39.4.ebuild 11036 BLAKE2B 034d6da1c589ebc03ec2c3f02bd2dd3dad708985a08574d138ceea45d6e5f4ef83b5ffd51b2ec2d484fc379238f79556b9f7382b5b0b27e64a15452e9d2b0c0a SHA512 68a0761c4974cd6b1dbeb1e100087f2591894feab135d5e3be6608e6885b427614fe72cf381a2a3326d5ba77137bc20933fabb0c8bd19f5d25d458e109bf82bf
-EBUILD util-linux-2.40.1_rc1.ebuild 10770 BLAKE2B c5f94956a4e4a5536a1b8ed5733a8cf2ccff220665ac0f7ae91c85207164bd0d9cdfc2af0399a85fb18cf1b02b5a72309413b0ddc427ce3849901540b020727a SHA512 20ecc6e0f19cb301159ab04c80e9a274d0d6c4e7c0ec4c8089bb7d8ef3e2cef2b1a1acfa8448bf428b2e844cbfe033bf878c3062351c4b9edcd0fcdee14ef487
-EBUILD util-linux-9999.ebuild 10770 BLAKE2B c5f94956a4e4a5536a1b8ed5733a8cf2ccff220665ac0f7ae91c85207164bd0d9cdfc2af0399a85fb18cf1b02b5a72309413b0ddc427ce3849901540b020727a SHA512 20ecc6e0f19cb301159ab04c80e9a274d0d6c4e7c0ec4c8089bb7d8ef3e2cef2b1a1acfa8448bf428b2e844cbfe033bf878c3062351c4b9edcd0fcdee14ef487
+EBUILD util-linux-2.39.3-r2.ebuild 10872 BLAKE2B c44068bc288acf9c77d4c697cc8b7848e3c85ab0d548672283cc76bf34eae1bf80aa39cc9afaa7105e5ad9bf0ed0494ddbebe062e7dba6aa9ec0616ee77a7eb2 SHA512 b8cc2a20122f1c094cfbd4fb3652672cf7def1d6d9b38971f2f52511893f9de1e7774ed06c03a17c4b19d58cc564a1291833974ffe0c43778d077165f6f6f538
+EBUILD util-linux-2.39.3-r7.ebuild 11232 BLAKE2B 09dcc169238dbec2e428420511062be1571484086784925f8c727ad89c10e4db37d164f2777c7f259f43ef6399c8a36d7478fe2ccb5215fbb683f6e79a81a73a SHA512 ca017f44d330ca86e64413fc78353118cbb75304e60d8c700f1e30e466a614fd888670e9232a12445311828bc356fa00008ea60b935840115da7b96347b40e42
+EBUILD util-linux-2.39.4.ebuild 11092 BLAKE2B eddaf690fd796e95c66a8965c207960ba8184833e40593b590d78d58baf58bfaa369055d1a5766a6ff8c7a33a549289d6dec316c0661ac1c7b2e632375e89acb SHA512 43467deb4af0e6a9de45f3c9f9af49b741e457d564e6cb5928a580d3e605b09c8f612b09d5493f0903a0e8cb1a0e1b2b1f58c4e7ef43dc467a2bec32bfc1f2d7
+EBUILD util-linux-2.40.1_rc1.ebuild 10897 BLAKE2B 2069f34b0066525e8c8c11d1a4f1bbe98f183066f62d18fa99943ae57bf7eb7c66ac81515b1796d89a2f4b19b84581103de226a03a4f30c0fa8ba162eaaa4428 SHA512 1cee6021f2ed2cdb729e83f0100503629724e80fae3fcb10abe17d62d7b25c88f64986b64f59efeebb35c1deeb1a5a121bc9c16e68ad1747c01f64e4f3834b1b
+EBUILD util-linux-9999.ebuild 10897 BLAKE2B 2069f34b0066525e8c8c11d1a4f1bbe98f183066f62d18fa99943ae57bf7eb7c66ac81515b1796d89a2f4b19b84581103de226a03a4f30c0fa8ba162eaaa4428 SHA512 1cee6021f2ed2cdb729e83f0100503629724e80fae3fcb10abe17d62d7b25c88f64986b64f59efeebb35c1deeb1a5a121bc9c16e68ad1747c01f64e4f3834b1b
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
index 33249fda2a28..03c9e04f677b 100644
--- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
@@ -236,6 +236,9 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
+
+		# TODO: Wire this up (bug #931118)
+		--without-econf
 	)
 
 	if use build ; then
diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild
index 8b0173d9239e..b54bdcad2d03 100644
--- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild
@@ -241,6 +241,9 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
+
+		# TODO: Wire this up (bug #931118)
+		--without-econf
 	)
 
 	if use build ; then
diff --git a/sys-apps/util-linux/util-linux-2.39.4.ebuild b/sys-apps/util-linux/util-linux-2.39.4.ebuild
index 4ab9b929aade..4b340e5f7039 100644
--- a/sys-apps/util-linux/util-linux-2.39.4.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.4.ebuild
@@ -238,6 +238,9 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
+
+		# TODO: Wire this up (bug #931118)
+		--without-econf
 	)
 
 	if use build ; then
diff --git a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild b/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild
index d53436745abc..6bf89abd6a80 100644
--- a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild
@@ -138,6 +138,7 @@ src_prepare() {
 			hardlink/options
 
 			# Fails in sandbox
+			# re ioctl_ns: https://github.com/util-linux/util-linux/issues/2967
 			lsns/ioctl_ns
 			lsfd/mkfds-inotify
 			lsfd/mkfds-symlink
@@ -230,6 +231,9 @@ multilib_src_configure() {
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
 
+		# TODO: Wire this up (bug #931118)
+		--without-econf
+
 		# TODO: investigate build failure w/ 2.40.1_rc1
 		--disable-liblastlog2
 		--disable-pam-lastlog2
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index d53436745abc..6bf89abd6a80 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -138,6 +138,7 @@ src_prepare() {
 			hardlink/options
 
 			# Fails in sandbox
+			# re ioctl_ns: https://github.com/util-linux/util-linux/issues/2967
 			lsns/ioctl_ns
 			lsfd/mkfds-inotify
 			lsfd/mkfds-symlink
@@ -230,6 +231,9 @@ multilib_src_configure() {
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
 
+		# TODO: Wire this up (bug #931118)
+		--without-econf
+
 		# TODO: investigate build failure w/ 2.40.1_rc1
 		--disable-liblastlog2
 		--disable-pam-lastlog2