gentoo auto-resync : 19:05:2024 - 00:01:59

9 files changed, 4 insertions, 497 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 356616999031..2ffc9864b4e9 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index b6fb2dba5e35..314f36b90988 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -12,7 +12,7 @@ DIST coreutils-9.5-patches.tar.xz 5912 BLAKE2B 873fbe1a60f8f8034b3d35796146765ce
 DIST coreutils-9.5.tar.xz 6007136 BLAKE2B 6fd3a77697c9e85f31415c6ad66559faf18acc7d346677a89d4a999c2027886551e78842a7283e7b3b44fe8ef2fde04ba2f88df32a7844d5f69d45bcb7a04b6f SHA512 2ca0deac4dc10a80fd0c6fd131252e99d457fd03b7bd626a6bc74fe5a0529c0a3d48ce1f5da1d3b3a7a150a1ce44f0fbb6b68a6ac543dfd5baa3e71f5d65401c
 DIST coreutils-9.5.tar.xz.sig 833 BLAKE2B 37c29984bceee0ff3bffde76712f71dbb118c228e328dc230d5c53c37da12f5ec2130e0123b97fda4a561f556c3be307fdbe1f0c21279db2c84030818386f626 SHA512 029997e0f4ee64e561853cff7c8a124f58cc891598595b44c4a46f9813b4b71c9d677464bc8a26d294e9971832f4b87c23777fea4fac6e8e30f06ad93b9957d5
 EBUILD coreutils-8.32-r1.ebuild 5947 BLAKE2B 19f30ddaa57e16326db783e2396ce653c17c8def86422ac517b45ee3869266a6e8c600d926814720b1b79485f1db34e3d8dbad32dcc5ad285987c53ab2dbab27 SHA512 a552a58864edf6a768933f85b6624f82b3bd1bf94c169acf3577394523c2768d6768d5a141283abac760bdab950a1ea394c8f36cf2c0793b8b9a2a1c6dda9622
-EBUILD coreutils-9.4-r1.ebuild 8495 BLAKE2B 84709406bb0d596319581de88bd53acee945c89313fe91be573929533013f67d2820aa31b9639e15c9d5a952f5f392172d0b1178ef3a37df37cf87fed0ad4350 SHA512 1a55133b77da5bed19cc301d1def618ea0044e8262dd9c54f729297c75f9f89259daae13826c5d3bc9709414e040ebfee3a7314ce3d9b99f0945143ecff1d4ff
+EBUILD coreutils-9.4-r1.ebuild 8494 BLAKE2B fdf0bda691689ad97a0c938d91d09f787a8c39f17e99af3ef5720b9aa42f1cd087543fded417d403eac48515095e5a80e93f24037a37e938219696d0407c7f1a SHA512 b360a66ff906e07171ecc124ace3809388154756da4d6f5c19f8f8152d039bb21e3fbdd2db785c4323a98fb8057acb292b044b08acaf4d801f67342ff927916b
 EBUILD coreutils-9.4.ebuild 8396 BLAKE2B 726efb986d7746043c9cdff74c12a66ff74b7910ec5f4a9b437c644132589155c0351df548e38c8eec2f5681bf1906594aebac6b5611880f2d7d80eac3f5b888 SHA512 4ec7e3b01025800a50bc1b5f772ab621411c142891e65cd77c4bc7d163962ac10e13d66e3add569a4caa78d873afbde8f662151f330768af49f5a45fb2b07732
 EBUILD coreutils-9.5.ebuild 8454 BLAKE2B 7cc4549786900c7a728f0edd19b0d9d857c2af3f12fe5c4dfb9d67b122b7aad0a29d1c377b8d5e3eafd2c883771eab13265b10826ccb431fd6b27461e44cd1be SHA512 34bb1d653fc6be2999044129ab6bc7e109bb5bbb8f50e071fef19123f795ce24d8445bc6f1f6ea9a64f1b025dc7b45f49f15673b9053ff328e02ed06b9fd5ddd
 EBUILD coreutils-9999.ebuild 8359 BLAKE2B dd3778257afd7f85066e25ed006de8eab115f586be47918add7f6e9c64830cfe43e002339d2c65dc9b4a6552cc30366e92dc5c22f1bcfe136e72f49e76ca2555 SHA512 b2b5d5fa01ff9430d94de2cd81a5406b056fd6034c84241262ce6c320e823371a001a49dd3b5b9c863d7e142eef14f4ccbbfe82429d46feac2bb513cbf72c11a
diff --git a/sys-apps/coreutils/coreutils-9.4-r1.ebuild b/sys-apps/coreutils/coreutils-9.4-r1.ebuild
index cd9bf44d0689..deea9ad182e5 100644
--- a/sys-apps/coreutils/coreutils-9.4-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.4-r1.ebuild
@@ -33,7 +33,7 @@ else
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 8cec2a265c79..ae58035e8479 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,10 +1,6 @@
 DIST gentoo-functions-0.19.tar.bz2 12079 BLAKE2B be0a3a54d4dee1755866047b670a69cd6fec368239123c3f0c08180b79a33c20147bca0e35e568faef6877513551e731bdf0c181aeb0460f6574d2d708219373 SHA512 2674d3fe5724cc6d685ae58bf0ee33f4a1bdba2c5e5809cfb193fd0a710d4678c2d9392c2c62d2321cf455f524950266dc1629ab684fe46632d179e539d5a39e
-DIST gentoo-functions-1.0.tar.bz2 18066 BLAKE2B a843de65d5d8f93396713dd5c80377dad478482d5749736ec3a08e0d0cc40f1a2ce5c967282b8060452d73f6377590f06e5c2a12cdfc753e7f6a18754cde4997 SHA512 057a7159a613108710a40f2ca54403adf64ab9649732be49d3a72314e2ca3c65d7a9093168e26ec12814203e1fe14cc1fc5cf2cefa2f923ec8bb714972d20f55
-DIST gentoo-functions-1.1.tar.bz2 14277 BLAKE2B 150b5481668b766a6d1c3d8fff331df66c352d03971adaf7cb0332aef32cd881bd49a64165dc5070f24033f6b0a3d91c07d2e762b4d915fb7f137b8269def76a SHA512 1345f5b87f70422ff9c8577e75743fdc9ae871be4605b7983b602918bd352a396cfd2bb9e34cb1586b951bbca7264967a5412b9c89646bdcb60646b501f946e8
-DIST gentoo-functions-1.2.tar.bz2 14277 BLAKE2B 17ce3a81a2563b11083553a51240f75b8fe174c573d06d645b475efdd7e537300ba656e10c814f30609eae15ed91cd00d4978b8bc0433935e6058d1ca8b7ccd7 SHA512 924f515c088811ddb7e2e7fd4fc75304866e2a159caa6619b2eb62eaab504b3720951bae8496f4faf93e9feae1c8b20ec3b4cbbc9cee1adbbdca703d5f87ee97
+DIST gentoo-functions-1.5.tar.bz2 15808 BLAKE2B 99c330eb4c7f1d7af67b6f93dba565f9ea37c15e82d0b97157067279671dc3918668bf8120f7c410f018d67761cee41320efaec4df43639765d023b23a3a9a7f SHA512 f7add7770f40e110864f16978e968bfd937c1a5099e336cc04f6861483bae36ff7932f502994df1ddfa347beef8736bd39bd276bafbe04190c9915446457ce15
 EBUILD gentoo-functions-0.19.ebuild 877 BLAKE2B 457e5c405c05e9e928c4f8e9e764fe07b7ace335750bebb01d7226e9b7b1f7ceac0fcb49148087439c8a6b42c034aa1f7590b4203e9d42f06031f2b3acee58d4 SHA512 c846b3451c764b64ec601e9d579542a47d68775e94eac97b8680a08891076226279f0611a19a72ba1b75b0cb35941b22ff3c734831e6c8665c2ca5b65cd1f5b4
-EBUILD gentoo-functions-1.0.ebuild 1025 BLAKE2B ec059aed56465fcfd1ee9e057b77c1d1f9c4c251a863c742806a191459b2432a1bc5c7d339d4028fd80f4a77de2c8a21bd7d3724e2dd7c17fa628e7110d658c6 SHA512 0e0b913559b3bd975a53a69bdebb1b04350f59c6c3f5e761ad3ac6472db70a8cbe4c3273158569ce35597d4e81a0e4e15c5805e2585e6ff3025967b02e0b503d
-EBUILD gentoo-functions-1.1.ebuild 1025 BLAKE2B ec059aed56465fcfd1ee9e057b77c1d1f9c4c251a863c742806a191459b2432a1bc5c7d339d4028fd80f4a77de2c8a21bd7d3724e2dd7c17fa628e7110d658c6 SHA512 0e0b913559b3bd975a53a69bdebb1b04350f59c6c3f5e761ad3ac6472db70a8cbe4c3273158569ce35597d4e81a0e4e15c5805e2585e6ff3025967b02e0b503d
-EBUILD gentoo-functions-1.2.ebuild 1025 BLAKE2B ec059aed56465fcfd1ee9e057b77c1d1f9c4c251a863c742806a191459b2432a1bc5c7d339d4028fd80f4a77de2c8a21bd7d3724e2dd7c17fa628e7110d658c6 SHA512 0e0b913559b3bd975a53a69bdebb1b04350f59c6c3f5e761ad3ac6472db70a8cbe4c3273158569ce35597d4e81a0e4e15c5805e2585e6ff3025967b02e0b503d
+EBUILD gentoo-functions-1.5.ebuild 1025 BLAKE2B ec059aed56465fcfd1ee9e057b77c1d1f9c4c251a863c742806a191459b2432a1bc5c7d339d4028fd80f4a77de2c8a21bd7d3724e2dd7c17fa628e7110d658c6 SHA512 0e0b913559b3bd975a53a69bdebb1b04350f59c6c3f5e761ad3ac6472db70a8cbe4c3273158569ce35597d4e81a0e4e15c5805e2585e6ff3025967b02e0b503d
 EBUILD gentoo-functions-9999.ebuild 1025 BLAKE2B fdfa38a3fa0dbd7bceff4f1a211924f5efa890b6f4ee75e1a46d182a508eb89e153994a6d2805147f1c8cf0556460927479e598cb053ff716b6c81a45f1fca53 SHA512 31dd91c713f4172825d28c2d018baaf46b7e0e408cd2c0f1f9cfafaba6932d1a8ea80e9a9b9402b7d483295524a384de2320adae70ed63820e3334acfab1bc7b
 MISC metadata.xml 487 BLAKE2B c34b1b196d84a44ca3f2729101b826a6460f6b560f942e95e444d23b821256e9c4f330e5b7a2530dabd34b0f1e0a3844ed4b52ea5944500b0b4c72bd955f988a SHA512 3c3008734be30e74ccf3a1f34e4112eef2df0f4e8b0b5d1dd1e90037d130428b21b05ad3686a74c18e5a035a15b32e89cd04de4274e311aa1e30a42ad8cf97f0
diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.1.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.1.ebuild
deleted file mode 100644
index 8df3a1e88bad..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2014-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-inherit meson
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Specifically needs GNU find, as well.
-RDEPEND=">=sys-apps/findutils-4.9"
-
-src_configure() {
-	local emesonargs=(
-		# Deliberately avoid /usr as consumers assume we're at /lib/gentoo.
-		--prefix="${EPREFIX:-/}"
-		--mandir="${EPREFIX}/usr/share/man"
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.2.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.2.ebuild
deleted file mode 100644
index 8df3a1e88bad..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2014-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-inherit meson
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Specifically needs GNU find, as well.
-RDEPEND=">=sys-apps/findutils-4.9"
-
-src_configure() {
-	local emesonargs=(
-		# Deliberately avoid /usr as consumers assume we're at /lib/gentoo.
-		--prefix="${EPREFIX:-/}"
-		--mandir="${EPREFIX}/usr/share/man"
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.0.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.5.ebuild
index 8df3a1e88bad..8df3a1e88bad 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-1.0.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-1.5.ebuild
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index d8709b5d98e0..182f38bacb2f 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -20,7 +20,6 @@ DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923
 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-r1.ebuild 11142 BLAKE2B 1ee7d40ec8a47faafe30845a712be27f31689db47882d95195474970d0ad4dc8fc741782a6b2e8b46e8ed6a87d106f689f226c86e65bfd155bd7739271a282f8 SHA512 f7767ef10dfde3b1c8342a87f576ec2994018b7d22283e9dde2fed33e0711ade68d95f8a2d8e31ba2fea883f8720a9f6024ce02068950fead868436b9fc5ddaa
-EBUILD util-linux-2.39.4.ebuild 11092 BLAKE2B eddaf690fd796e95c66a8965c207960ba8184833e40593b590d78d58baf58bfaa369055d1a5766a6ff8c7a33a549289d6dec316c0661ac1c7b2e632375e89acb SHA512 43467deb4af0e6a9de45f3c9f9af49b741e457d564e6cb5928a580d3e605b09c8f612b09d5493f0903a0e8cb1a0e1b2b1f58c4e7ef43dc467a2bec32bfc1f2d7
 EBUILD util-linux-2.40.1-r1.ebuild 11331 BLAKE2B afff7841cc378a8ea14631f1cc4fc28cd93c23f5d1ed7ec5bc1b23f6f505c4ff37e5d60cc5508dac692554a1aeae10a6eba14230e8da7faabbd3c752d5480600 SHA512 525715bc25ef55a6f323c6d91151a36ab21d6483f098db83f001e9df964dc55e60b84a0e48896df4f4b263489608011916db235dc891832e3ec3bd0086349f01
 EBUILD util-linux-9999.ebuild 11275 BLAKE2B 7bb396dfafd83a1b8e3fe68792240277ca0f3a2b7c067c3b11e954be3231ad841ac0d98977df46133ef9d4373c9c6c7b72eef42b4f515a73b3f57ccd61239239 SHA512 e321c6ac7afb959707ad8d7ab2e65d9b1fc29de252424af0a77c687fe78a0f1c0dfedbf093bb054351b6847292260f582b50cf6eeebc9d87d61d104861ad31c4
 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/util-linux-2.39.4.ebuild b/sys-apps/util-linux/util-linux-2.39.4.ebuild
deleted file mode 100644
index 4b340e5f7039..000000000000
--- a/sys-apps/util-linux/util-linux-2.39.4.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
-
-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=/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}"
-
-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? (
-		app-text/po4a
-		sys-devel/gettext
-	)
-	test? ( app-alternatives/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-20230517 )"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.39.2-fincore-test.patch
-	"${FILESDIR}"/${PN}-2.39.2-backport-1d4456d.patch
-	"${FILESDIR}"/${PN}-2.39.3-musl-1.2.5-basename.patch
-	"${FILESDIR}"/${PN}-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch
-	"${FILESDIR}"/${PN}-2.39.3-fix-use-after-free.patch
-)
-
-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
-		# Known-failing tests
-		# TODO: investigate these
-		local known_failing_tests=(
-			# Subtest 'options-maximum-size-8192' fails
-			hardlink/options
-
-			# Fails in sandbox
-			lsns/ioctl_ns
-
-			lsfd/mkfds-symlink
-			lsfd/mkfds-rw-character-device
-			# Fails with network-sandbox at least in nspawn
-			lsfd/option-inet
-			utmp/last-ipv6
-		)
-
-		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=(
-		--localstatedir="${EPREFIX}/var"
-		--runstatedir="${EPREFIX}/run"
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-
-		# Temporary workaround until ~2.39.2. 2.39.x introduced a big rewrite.
-		# https://github.com/util-linux/util-linux/issues/2287#issuecomment-1576640373
-		--disable-libmount-mountfd-support
-	)
-
-	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_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 nls poman)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-
-		# TODO: Wire this up (bug #931118)
-		--without-econf
-	)
-
-	if use build ; then
-		myeconfargs+=(
-			--without-systemd
-			--without-udev
-		)
-	else
-		myeconfargs+=(
-			$(multilib_native_use_with systemd)
-			$(multilib_native_use_with udev)
-		)
-	fi
-
-	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
-			--disable-poman
-
-			# 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
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	dosym hexdump /usr/bin/hd
-	newman - hd.1 <<< '.so man1/hexdump.1'
-
-	# 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
-}