7 files changed, 50 insertions, 3 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3a7aab5d85e5..d863e6c8fb03 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index ae58035e8479..0cb52f131e50 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,8 @@
 DIST gentoo-functions-0.19.tar.bz2 12079 BLAKE2B be0a3a54d4dee1755866047b670a69cd6fec368239123c3f0c08180b79a33c20147bca0e35e568faef6877513551e731bdf0c181aeb0460f6574d2d708219373 SHA512 2674d3fe5724cc6d685ae58bf0ee33f4a1bdba2c5e5809cfb193fd0a710d4678c2d9392c2c62d2321cf455f524950266dc1629ab684fe46632d179e539d5a39e
 DIST gentoo-functions-1.5.tar.bz2 15808 BLAKE2B 99c330eb4c7f1d7af67b6f93dba565f9ea37c15e82d0b97157067279671dc3918668bf8120f7c410f018d67761cee41320efaec4df43639765d023b23a3a9a7f SHA512 f7add7770f40e110864f16978e968bfd937c1a5099e336cc04f6861483bae36ff7932f502994df1ddfa347beef8736bd39bd276bafbe04190c9915446457ce15
+DIST gentoo-functions-1.6.tar.bz2 16795 BLAKE2B c901cdb8f2fcb507b5397e9ce674a12641f2129b9be05776bb272e09b9db3a6d205e6a00ef51f71b3203eac4e333b297cfe5ae5d61f9dd43074073a749ca171e SHA512 922b801c79f12d15bcabdb6cd52246cc60a4b512dfcc10bb3933f07d2ec03e01fe5be72502ae34c87374c8a7e880ce268e7dc8d1afcbd28b65efb51b9e467306
 EBUILD gentoo-functions-0.19.ebuild 877 BLAKE2B 457e5c405c05e9e928c4f8e9e764fe07b7ace335750bebb01d7226e9b7b1f7ceac0fcb49148087439c8a6b42c034aa1f7590b4203e9d42f06031f2b3acee58d4 SHA512 c846b3451c764b64ec601e9d579542a47d68775e94eac97b8680a08891076226279f0611a19a72ba1b75b0cb35941b22ff3c734831e6c8665c2ca5b65cd1f5b4
 EBUILD gentoo-functions-1.5.ebuild 1025 BLAKE2B ec059aed56465fcfd1ee9e057b77c1d1f9c4c251a863c742806a191459b2432a1bc5c7d339d4028fd80f4a77de2c8a21bd7d3724e2dd7c17fa628e7110d658c6 SHA512 0e0b913559b3bd975a53a69bdebb1b04350f59c6c3f5e761ad3ac6472db70a8cbe4c3273158569ce35597d4e81a0e4e15c5805e2585e6ff3025967b02e0b503d
+EBUILD gentoo-functions-1.6.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.6.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.6.ebuild
new file mode 100644
index 000000000000..8df3a1e88bad
--- /dev/null
+++ b/sys-apps/gentoo-functions/gentoo-functions-1.6.ebuild
@@ -0,0 +1,36 @@
+# 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/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 240e0e7e9e59..8651c60c76ed 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -19,7 +19,7 @@ DIST util-linux-2.40.1.tar.sign 833 BLAKE2B 2f8537cd4f52e0c203360d081a91f17c2db1
 DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923fdeb5a649a5c59d2d44888e5e741dfd95e589247355296e050d9ec8dc4334c5898453af055abcb30082af6b835a3e3 SHA512 58ec6eb41d4b6bfc544a80e95c71b5f3798ab4d2a9435d3ee9e5edd56f9b3f09bcb154bdd70e002dc018938937e2e946ae731dcda0f86b362fc43423689e41fc
 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.40.1-r3.ebuild 11359 BLAKE2B 73223610da28fa2866598a1c3ee303116c0d1ed72e5dea37e37a2ec6567a05e3f7711896d221bdc947384e8fa09a4712536fc2af532cff8431b885424df16385 SHA512 53303e45451635c137225a168015598dec0e895fa7b50eac1d61543a66440bd692df370528291c075c900f3aec359d33310a3edce31fc8a0f302da5646d8e2fb
-EBUILD util-linux-9999.ebuild 11303 BLAKE2B 9f11f485707d401119e1dc7bc8c1e2808d27e84d9b8e8d4a522f6ea23b5b9274df99d4627ab4421a20692babaaef0a05d066ddd97ad82608b3fab4e5c3970c40 SHA512 aa0e0bce5b200a7b7ecf08d81c187c09276299d7bd2c7bce3b494b55fb78f73fb2d39f5a65226a78f93cdb9093f4f2d4444c1bf7c1f44280d4923834b51eda99
+EBUILD util-linux-2.39.4-r1.ebuild 11171 BLAKE2B 40e06d4c563271a3e891270007d0a21e1743eab09e5385a21f6dcca02d2c6bf3a7c0620ff569b81a3e9fc48c9ee125f16a10d7baf71cf9ce3700cfc653905f59 SHA512 f0cbc998a7d908960bc0b9f767998280c09c02417d206ed833fb6ebf6bf3265212337ae7b5e6418221f50e14601b55df4a3d9b8cb0ffc02536f4223ccda0d14f
+EBUILD util-linux-2.40.1-r3.ebuild 11388 BLAKE2B c16ff38eb6ad3096318412e8667a3e6b6c9757cada2fde17960d2a1a8322feaf325698c45d43cdf18fe8e89e11273a4f420ef9d2bfc4b02dc4b1d1785cbd9b4f SHA512 225391cd312a2da0befcec59ae39a7772f7c2cfc1e5c762ee1c883e76175656ab65f6b7af8fc8e429e8f99e64c31ac96d8cbdd075cb050369b97d29659db0f14
+EBUILD util-linux-9999.ebuild 11332 BLAKE2B 27901988f579bb0bf9042881de771e19650f2cdd980140e953165ae2ef094b8287c80778a9ba20b9239952ac0de578baaa22da7065a2341aa82630ad0d34a08f SHA512 61b70ca620bec03ca32d049d00568200aaefa1256a931c928e27846315fb250825c4bd8ec9a430c830874b973777461f9b1a125a940ae104961b2ffcb761fb1a
 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild
index 0230482e78cd..e61811263ec4 100644
--- a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild
@@ -155,6 +155,9 @@ src_prepare() {
 			# Fails with network-sandbox at least in nspawn
 			lsfd/option-inet
 			utmp/last-ipv6
+
+			# Flaky
+			rename/subdir
 		)
 
 		local known_failing_test
diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
index a9980ed89514..340527c06ae4 100644
--- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
@@ -152,6 +152,9 @@ src_prepare() {
 			lsfd/option-inet
 			utmp/last-ipv6
 
+			# Flaky
+			rename/subdir
+
 			# Permission issues on /dev/random
 			lsfd/mkfds-eventpoll
 			lsfd/column-xmode
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index f3ea42edeeff..90d69b34f877 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -152,6 +152,9 @@ src_prepare() {
 			lsfd/option-inet
 			utmp/last-ipv6
 
+			# Flaky
+			rename/subdir
+
 			# Permission issues on /dev/random
 			lsfd/mkfds-eventpoll
 			lsfd/column-xmode