8 files changed, 29 insertions, 435 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8c5f448cbddb..2358829598b4 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index 6dc796027505..17b0fafd28ae 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -1,10 +1,7 @@
-DIST moar-1.12.0-deps.tar.xz 26291664 BLAKE2B ebc16cbe23c26eacd84376b6e99d7484c753a065edd26d3d0ed7708595de61d6038f53f27c1bdc05032576eb11be3e2cbedbf9bdd2ecf8f8d467fd89eaf0a580 SHA512 dfd236a76bf4bb680b25a938e08bbd6874a554e9668f73af23d695c20403d1967f89fbeebfd54bb333bd86a7ca3e652a8418c6b9ada212aeb861cce4a70f0faf
-DIST moar-1.12.0.tar.gz 2777752 BLAKE2B fa2f442e2b0e6d909e77be8df873c7b08a82b43d881583a7f1c4a3591f2bbe90b5adc77524b92e0fcf071ce4a1c18d8c58c7cce18807974fae7342148d7fbe28 SHA512 bfa15f5fd3ffa4146adec9110fbf8fd3bc31c95877f5e24ab911d1ef9e357dd41b46e2f466f2ce7d2fc986e463dcf2e1132c0a42ebfe2c46a8cd216355c4b98b
-DIST moar-1.13.0-deps.tar.xz 4808044 BLAKE2B cd7808337af5acb2bd6cb4b9696c9d04803df033b5a1d4904418602dc629cef7c16172b0eaa57644be76a02b6727d36f767bfafba1377ea95eb827fbb4a1d34b SHA512 e51ca15137f4b5dc5ea447c200341aaeb06cd77118cd8f2fb3efca0ffc2d4199e00687f980803c4ff09c535621b58206b22bff2c944ad8786c73c3a7c886d6c6
-DIST moar-1.13.0.tar.gz 2778084 BLAKE2B 6f3dfc1b997c0176b57e613a822df4f25d7bb509ce245d3c9711bebc4dfccee4d423ce02dbf2845377b856a909cc9e5d8f88d9c65a85d8830bd713ef93729250 SHA512 fca30d496c2439cf5d1204eaa5c5114ef13522f38c8ddcc771ea45aee5faafb5aaf48a8947ff7d5846556130368625f47e851c2494489eb9371807eabb4c7c49
 DIST moar-1.14.0-deps.tar.xz 4808044 BLAKE2B cd7808337af5acb2bd6cb4b9696c9d04803df033b5a1d4904418602dc629cef7c16172b0eaa57644be76a02b6727d36f767bfafba1377ea95eb827fbb4a1d34b SHA512 e51ca15137f4b5dc5ea447c200341aaeb06cd77118cd8f2fb3efca0ffc2d4199e00687f980803c4ff09c535621b58206b22bff2c944ad8786c73c3a7c886d6c6
 DIST moar-1.14.0.tar.gz 2780033 BLAKE2B 42e985aef677830782e70c60748ce732a572352dad629126873bd9532314924ba4e8afc2be4ced0d3161b00b5d4088782908ee7a2f24d670aaf7ddf243473fb6 SHA512 ec0e851f031a03d8af3c4b8b11be2eab300d46adb08fd366d41c958f0d2227fb82800974af3fda72ac01a79e4d2c65e41816b2f1c4ec3b3c7534aeb9b9ded51e
-EBUILD moar-1.12.0.ebuild 813 BLAKE2B b2dbf35230b55ab7740758b96ce47eb5c0b2d96645a63af3492102fdf7cc63310fa0ad9e4749bb2412f7118384a4ac2a818fa9132136e66378c32502c092df5d SHA512 26eb33642cf62841cf2f1939e7c1898004446fd92ecd926fe367c6507de8e9e5e7b68e2252908212b7abbed50f3cf1ac8599cea2088f02f07a4a91bf5035f552
-EBUILD moar-1.13.0.ebuild 820 BLAKE2B 2e027326f5d58653b7e84d695d675495329c22abe4a107fe3534d181ae43a45394cd80b1d1d2951004d61b9b473fd964e6f69c70539ebb83af45fcf7553ccba3 SHA512 60dbd1af440d29010acdabd0d0a77ed2f5b3d4240acd18d46e9a7acf5a062bb3eb57bc08e8fa3215707473af81f45520c3f94c829ac0859912be0a3215906ce7
+DIST moar-1.15.0-deps.tar.xz 4808044 BLAKE2B cd7808337af5acb2bd6cb4b9696c9d04803df033b5a1d4904418602dc629cef7c16172b0eaa57644be76a02b6727d36f767bfafba1377ea95eb827fbb4a1d34b SHA512 e51ca15137f4b5dc5ea447c200341aaeb06cd77118cd8f2fb3efca0ffc2d4199e00687f980803c4ff09c535621b58206b22bff2c944ad8786c73c3a7c886d6c6
+DIST moar-1.15.0.tar.gz 2780805 BLAKE2B 6a50018596f34de7d43fcedf0155141a6cd8d5896f34a05b44cfc5180d00e17caaf46377ecc3bb273fd5e2fd4536ada94e82cc7a8788cd14b030390f22ba40a4 SHA512 deedb8bf6f28f68a1633296a32a690df109c867023980125f7550111a3cf20463980c95fbddbafb16175aa03c46f3bf6150fbe066508cedffce49dd9bf18a90c
 EBUILD moar-1.14.0.ebuild 820 BLAKE2B 2e027326f5d58653b7e84d695d675495329c22abe4a107fe3534d181ae43a45394cd80b1d1d2951004d61b9b473fd964e6f69c70539ebb83af45fcf7553ccba3 SHA512 60dbd1af440d29010acdabd0d0a77ed2f5b3d4240acd18d46e9a7acf5a062bb3eb57bc08e8fa3215707473af81f45520c3f94c829ac0859912be0a3215906ce7
+EBUILD moar-1.15.0.ebuild 820 BLAKE2B 2e027326f5d58653b7e84d695d675495329c22abe4a107fe3534d181ae43a45394cd80b1d1d2951004d61b9b473fd964e6f69c70539ebb83af45fcf7553ccba3 SHA512 60dbd1af440d29010acdabd0d0a77ed2f5b3d4240acd18d46e9a7acf5a062bb3eb57bc08e8fa3215707473af81f45520c3f94c829ac0859912be0a3215906ce7
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.12.0.ebuild b/sys-apps/moar/moar-1.12.0.ebuild
deleted file mode 100644
index 766ab4317b72..000000000000
--- a/sys-apps/moar/moar-1.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="A 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"
-
-RDEPEND="!dev-lang/moarvm"
-
-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.13.0.ebuild b/sys-apps/moar/moar-1.15.0.ebuild
index 177f577621ac..177f577621ac 100644
--- a/sys-apps/moar/moar-1.13.0.ebuild
+++ b/sys-apps/moar/moar-1.15.0.ebuild
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index b0de4915c5d8..83fd0f56c119 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -8,14 +8,11 @@ AUX util-linux-2.38.1-more-posix-exit-on-eof.patch 1216 BLAKE2B ee99884ef388a342
 DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7
 DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
-DIST util-linux-2.39-rc2.tar.sign 833 BLAKE2B ec2ea0c2034b5e8f24c72610e53acc4c922d3d4b84ffd31c3b51849e60a99a6e9bf3e17b773e222f89bc1fe33fb06722e2770b981c7dcc4519bec4db797d8348 SHA512 20b1f2ec5368c74f751238451be9ec5f8f74d8c63d331365b00ed06144f6874fe3f44e062e7b52c5d0a05c650353a741c1594e150e58a16544e5ffc8ed100a5b
-DIST util-linux-2.39-rc2.tar.xz 8080452 BLAKE2B d2476d1aff1c2e4e3cb3d4b71fa3410ce4db26448139dc439865b03d108acf4c797eb92e9edc2451dca099116fda8950b529f1b22b657d47268164642fe794a6 SHA512 11f5b8ed1eb90a4e7161369eafcf0157b205aeded221cd435f95a79d01901bdef289660486849778b3d3c15500db593cad24e0a7f87f52968c9c292ea68040c0
-DIST util-linux-2.39-rc3.tar.sign 833 BLAKE2B da99dfaf40efd052414c30ae172ad1a42654d3fcd7fc41fe8ba48f99db3e3b88c2fde863351cd5d354d5a5191e191e21f4867a8e20453e2512e2cc815f591000 SHA512 8a311c1bb680f1c71221a9e512bf42f13c7d5f8fb0b888dc7aac04a2e0da6315f58631fc315aa73d34b8275a48c9adfe5d5676fcce905f75d5c88f8aac3abf0f
-DIST util-linux-2.39-rc3.tar.xz 8106892 BLAKE2B 514f26cf624a39f271a8987a38d51bd36e5494bea5f859abfd67fd4924495457e46519b712c52578c94210aa8bddab707a5ec699be3bb798c8ff22a17d3c4931 SHA512 8a93d32a5ceb38d50a4b2c8bfa48bcab7ec9b758c89b5a1a4f7fd74558dce37385bd7ea203345148d4389de4ea60ec42058f9d7889a8075d3e616773d085427e
+DIST util-linux-2.39.tar.sign 833 BLAKE2B f4b35d35f1d20094169c8651d127c6d1f37b0946bc72c40f4824d77f8c117a23ae2633ac2449e91ba316d4cac6e4f3c2afb9fd410302683384988dc794062d9e SHA512 f5df4f7e5c39995ad3c7b52f06bfc7759e53d4df82b2b42f09d4570faeff5c156e83e42be053b00b0bfb4a71e27bfa580fb996a92225eb8a0df46d9f296ef4ef
+DIST util-linux-2.39.tar.xz 8103428 BLAKE2B 39d415b6e303c21d2e5566bd29dd1803c67fbaed079fab85fab620db727a69c96f9c705a3671a639185c78ea1e70f374e21ef8694115ce42fa30c86b546023d1 SHA512 3d59a0f114c06be19ef7f86fca37ba5b9073823d011b3fc37997ddb00124b4505ea32903b78798a64dffbccf0ba645a692678ee845cc65a5b321824448a82a94
 EBUILD util-linux-2.37.4.ebuild 9445 BLAKE2B a454aac501dc9b95a9038fab62e87bf516664fb270ca1955262c89a935e6981cc75ff3500c386dd73739ed3e7f8d116a91611a2a8df25f041ab08d862fc2d9a8 SHA512 f92de648ba173d3a958add9214331566e85e68af266ff8e1bca241bf809f6ef3adcef5cc1f7e1e8d333e053030913602f00c3a10e3e339b60ab2db437ad8ba06
 EBUILD util-linux-2.38.1-r2.ebuild 10536 BLAKE2B ea36003f87fb328c0e3c478543a07fc0469e59859172f605a0ef879bfe65e4fc55e1c4caf2d86dda2306ff752754f162a4970b67abd9dd23ff98576cc3fc7c44 SHA512 075a4a012eb9464f4871baecdaf32a14c4e29fac0b6b04dfa8d55c90c69fd192f23fc248ae757fc231d8dfc57f1be168f1213d6de15170d27636c769bd03f451
 EBUILD util-linux-2.38.1.ebuild 10843 BLAKE2B e3d24c4e81db0b781fb525bad1d905028d424eeda3db9e3e0fcad360ea301dab23f60ee492af0aae2117b17f8926c860f3cc4308e85899c8161f647a57010428 SHA512 c3192b3fccf2b0d729f254eddcd3e4c363fd976f7819c50ab685f6cc7e0695ea937991d6a18f924353845cc091257fe3c492a86a66180532bbcac244a4467709
-EBUILD util-linux-2.39_rc2.ebuild 10496 BLAKE2B 0701da64679dc37e070675a01190c894177f59cd33e84722a47d1e7d84b27c7dc212c0b60ad6eac866a86022fa958eee3c131c844685e3c98634bf33937e1fcc SHA512 f4c194de69a6e8ed2ae670d8657f50e02c6275d085a0e37857764b0847c6a628bb60398a1c1f874b153e3f2900ef2dd8723d4e68a310b39e9932fe4a98d7d194
-EBUILD util-linux-2.39_rc3.ebuild 10496 BLAKE2B 0701da64679dc37e070675a01190c894177f59cd33e84722a47d1e7d84b27c7dc212c0b60ad6eac866a86022fa958eee3c131c844685e3c98634bf33937e1fcc SHA512 f4c194de69a6e8ed2ae670d8657f50e02c6275d085a0e37857764b0847c6a628bb60398a1c1f874b153e3f2900ef2dd8723d4e68a310b39e9932fe4a98d7d194
-EBUILD util-linux-9999.ebuild 10496 BLAKE2B 0701da64679dc37e070675a01190c894177f59cd33e84722a47d1e7d84b27c7dc212c0b60ad6eac866a86022fa958eee3c131c844685e3c98634bf33937e1fcc SHA512 f4c194de69a6e8ed2ae670d8657f50e02c6275d085a0e37857764b0847c6a628bb60398a1c1f874b153e3f2900ef2dd8723d4e68a310b39e9932fe4a98d7d194
+EBUILD util-linux-2.39.ebuild 10612 BLAKE2B e82ddf85a320fcc2e48ff9c152ee1dcc52628767c316a17ff87cdf2e245bbbf11702b39a003992e5d26724a6aad9d7c9f48a104051ee9bcb4c18d0fd0ae116c0 SHA512 4c9950c5ad9517fe7bbdb5d0b09869a3bbcb199949fc76cdc409d9944299ab3ba3b832b838b8fdfa99d7b1c5feafcff5d78011f4ed5322c3e2e0b66c85ea3170
+EBUILD util-linux-9999.ebuild 10612 BLAKE2B e82ddf85a320fcc2e48ff9c152ee1dcc52628767c316a17ff87cdf2e245bbbf11702b39a003992e5d26724a6aad9d7c9f48a104051ee9bcb4c18d0fd0ae116c0 SHA512 4c9950c5ad9517fe7bbdb5d0b09869a3bbcb199949fc76cdc409d9944299ab3ba3b832b838b8fdfa99d7b1c5feafcff5d78011f4ed5322c3e2e0b66c85ea3170
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.39_rc2.ebuild b/sys-apps/util-linux/util-linux-2.39.ebuild
index 80c3a3c10f94..209689b06193 100644
--- a/sys-apps/util-linux/util-linux-2.39_rc2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -59,7 +59,10 @@ RDEPEND="
 	udev? ( virtual/libudev:= )"
 BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
+	nls? (
+		app-text/po4a
+		sys-devel/gettext
+	)
 	test? ( sys-devel/bc )
 "
 DEPEND="
@@ -85,7 +88,7 @@ if [[ ${PV} == 9999 ]] ; then
 	# Required for man-page generation
 	BDEPEND+=" dev-ruby/asciidoctor"
 else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )"
 fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
@@ -137,6 +140,9 @@ src_prepare() {
 			# Subtest 'options-maximum-size-8192' fails
 			hardlink/options
 
+			# Fails in sandbox
+			lsns/ioctl_ns
+
 			lsfd/mkfds-symlink
 			lsfd/mkfds-rw-character-device
 		)
@@ -215,6 +221,7 @@ multilib_src_configure() {
 		$(multilib_native_use_with audit)
 		$(tc-has-tls || echo --disable-tls)
 		$(use_enable nls)
+		$(use_enable nls poman)
 		$(use_enable unicode widechar)
 		$(use_enable static-libs static)
 		$(use_with ncurses tinfo)
@@ -263,6 +270,7 @@ multilib_src_configure() {
 			--disable-asciidoc
 			--disable-bash-completion
 			--without-systemdsystemunitdir
+			--disable-poman
 
 			# build libraries
 			--enable-libuuid
diff --git a/sys-apps/util-linux/util-linux-2.39_rc3.ebuild b/sys-apps/util-linux/util-linux-2.39_rc3.ebuild
deleted file mode 100644
index 80c3a3c10f94..000000000000
--- a/sys-apps/util-linux/util-linux-2.39_rc3.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
-	inherit verify-sig
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
-	fi
-
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	virtual/libcrypt:=
-	audit? ( >=sys-process/audit-2.6:= )
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
-	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)?]
-		magic? ( sys-apps/file:0= )
-	)
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	rtas? ( sys-libs/librtas )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	acct-group/root
-"
-RDEPEND+="
-	hardlink? ( !app-arch/hardlink )
-	logger? ( !>=app-admin/sysklogd-2.0[logger] )
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	su? (
-		!<sys-apps/shadow-4.7-r2
-		!>=sys-apps/shadow-4.7-r2[su]
-	)
-	!net-wireless/rfkill
-"
-
-if [[ ${PV} == 9999 ]] ; then
-	# Required for man-page generation
-	BDEPEND+=" dev-ruby/asciidoctor"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	if use su && ! use suid ; then
-		elog "su will be installed as suid despite USE=-suid (bug #832092)"
-		elog "To use su without suid, see e.g. Portage's suidctl feature."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if use test ; then
-		# Prevent uuidd test failure due to socket path limit, bug #593304
-		sed -i \
-			-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-			tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-		# Known-failing tests
-		# TODO: investigate these
-		local known_failing_tests=(
-			# Subtest 'options-maximum-size-8192' fails
-			hardlink/options
-
-			lsfd/mkfds-symlink
-			lsfd/mkfds-rw-character-device
-		)
-
-		local known_failing_test
-		for known_failing_test in "${known_failing_tests[@]}" ; do
-			einfo "Removing known-failing test: ${known_failing_test}"
-			rm tests/ts/${known_failing_test} || die
-		done
-
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-		--enable-libblkid
-		--enable-libmount
-		--enable-pylibmount
-	)
-
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. bug #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-
-	# bug #485486
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
-	# bug #545042
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config.
-	# bug #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# Avoid automagic dependency on ppc*
-	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-	)
-
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-
-	if multilib_is_native_abi ; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-newgrp
-			--disable-nologin
-			--disable-pylibmount
-			--disable-raw
-			--disable-vipw
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-		if [[ ${PV} == *9999 ]] ; then
-			myeconfargs+=( --enable-asciidoc )
-		else
-			# Upstream is shipping pre-generated man-pages for releases
-			myeconfargs+=( --disable-asciidoc )
-		fi
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-asciidoc
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-			--enable-libmount
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_configure
-	fi
-}
-
-src_configure() {
-	append-lfs-flags
-	multilib-minimal_src_configure
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_install
-	fi
-
-	# This needs to be called AFTER python_install call, bug #689190
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		# Need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didn't install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if use pam ; then
-		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-
-		newpamd "${FILESDIR}/su-l.pamd" su-l
-	fi
-
-	if use su && ! use suid ; then
-		# Always force suid su, even when USE=-suid, as su is useless
-		# for the overwhelming-majority case without suid.
-		# Users who wish to truly have a no-suid su can strip it out
-		# via e.g. Portage's suidctl or some other hook.
-		# See bug #832092
-		fperms u+s /bin/su
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-
-	local ver=$(tools/git-version-gen .tarballversion)
-	local major=$(ver_cut 1 ${ver})
-	local minor=$(ver_cut 2 ${ver})
-	local release=$(ver_cut 3 ${ver})
-	export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
-}
-
-pkg_postinst() {
-	if ! use tty-helpers ; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 80c3a3c10f94..209689b06193 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -59,7 +59,10 @@ RDEPEND="
 	udev? ( virtual/libudev:= )"
 BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
+	nls? (
+		app-text/po4a
+		sys-devel/gettext
+	)
 	test? ( sys-devel/bc )
 "
 DEPEND="
@@ -85,7 +88,7 @@ if [[ ${PV} == 9999 ]] ; then
 	# Required for man-page generation
 	BDEPEND+=" dev-ruby/asciidoctor"
 else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )"
 fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
@@ -137,6 +140,9 @@ src_prepare() {
 			# Subtest 'options-maximum-size-8192' fails
 			hardlink/options
 
+			# Fails in sandbox
+			lsns/ioctl_ns
+
 			lsfd/mkfds-symlink
 			lsfd/mkfds-rw-character-device
 		)
@@ -215,6 +221,7 @@ multilib_src_configure() {
 		$(multilib_native_use_with audit)
 		$(tc-has-tls || echo --disable-tls)
 		$(use_enable nls)
+		$(use_enable nls poman)
 		$(use_enable unicode widechar)
 		$(use_enable static-libs static)
 		$(use_with ncurses tinfo)
@@ -263,6 +270,7 @@ multilib_src_configure() {
 			--disable-asciidoc
 			--disable-bash-completion
 			--without-systemdsystemunitdir
+			--disable-poman
 
 			# build libraries
 			--enable-libuuid