gentoo auto-resync : 07:04:2024 - 12:30:41

15 files changed, 219 insertions, 787 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f8657f3473dd..03d74f12b305 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index deeae6e67396..a3910beee373 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -1,30 +1,10 @@
 AUX darwin-miscutils-12-md-register.patch 245 BLAKE2B 721b90f61f15757f7238e54ebd085e78bbd4e6c5b70b5245827567a71248772027fca1f2779a9011f4df3c2f3e2229d39da3c46db7d9f927fd3f27cf07245e23 SHA512 06d6d561bb2a8162b8e158d53e28f22716594376b6d943513c2dcb59c44061d1b65a2302988619f1f3f3b8544c3adc3b60d9dd3ec4bf3875ae4104136438f24f
-AUX darwin-miscutils-5-error.patch 269 BLAKE2B 6bd32d601bbb365bbaa31f41aad8301e985631206e34841cee0ee38218c26bcb4cd433a942bbbbacab4ac4a4db75ebffc4df26549ff5c5f81f5f9659edf39d88 SHA512 169b592c4a1563489d5581fdd5fde1139c9384577b1e8e8d7f221b64835311ff927ec15f166686a6996115d135f7f2d7c35e0207387c203bb8fdc25525605e3a
-AUX darwin-miscutils-5-stdlib.patch 540 BLAKE2B 94948893634901595e2798c0fb44ac2ae05ee610942f08a78ec08024fed61238f220cc6868422ac2663fe6e0afee665d66fc2ad31959e3c53a87cd9d43f0aa6a SHA512 b9ec8b65cc17da06a88fe7570be66682c8dadecd7af1ee6fe95b560340d9bf71516417338fef4ae99fca22069773f5baba499723e78d2b73f5eb5aa5e2eb7463
-AUX darwin-miscutils-5-w.patch 201 BLAKE2B 37af30361b416fa138dc1f2ec0fac35ef6e246a22375651cc84e67e4fd3d479d54ae7337ee93d73c960f2c7c2cc4cd9603271eeb8a502b91c157dca11b94114d SHA512 5fa14a48c74d6b99b135b3c1c8135756a15f3bde9844f25408cabde9e752caee95e891fbb6ea71bdf428b68be0d41219dcaa660e8a936460fe8ab59fe44f7bc4
 AUX darwin-miscutils-6-w64.patch 584 BLAKE2B 00eeab82ac846718a03330bc2a6359e374967429598251c03fa4d952b4af6aa66e13f203f234e474c6d03c877a41264e47f6fbea1d2e51187eb630673293bdf9 SHA512 590b2af77934a66e1e41b2e22440038991ab258854b690d29527b84a06f0ffe1c19d5ff9022f024796c9cec84fefb80afc098749033dfd60ccda337f0059ce40
 DIST adv_cmds-md-147-compile.patch 5423 BLAKE2B f54aaaa8fcecb81fd8e628bcb384f537e572095b8210612c0748017f033e7bb6f9c5b1bd2c544fec23e8002a2ac7b99d840c85a8ca6faadac3b4da2edb77b459 SHA512 951e981b57e7d3d6ef51d638759559581dd4995ce66ec17bb2658f8a298683feb0842d10fd834b713ec39b2a0f671df56049b876d55f17bf1e988d76839fead1
 DIST adv_cmds-md-147.1 3623 BLAKE2B 18b856770f0490ef241e19cc6f1661f6521bcc7f363bff41fbec548388d8f1e2d9e6aea879064cd3d7e7d16f8e0b2ff17ead990051a068a66f520a5ff504afa3 SHA512 459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718
 DIST adv_cmds-md-147.c 25945 BLAKE2B 38af9e06e18a15cc74a81464a4c1ecdf98b800eb34f33f6ab6203b60540e693d459805432e51bae1008661aa566830c87357432428f62d8cbea9973b1e5fc59a SHA512 93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592
-DIST developer_cmds-49.tar.gz 307753 BLAKE2B 774259d7b82efc85bf487111e5a3c4c0d4aa3f8a788463b503e4d108c684837327b97882114d3646dfba5f60a1a1a2671e0e574d92e159b5ea014fc9e2c61015 SHA512 3750374c891f6d681829986291d887cacf2c5b1c7a5de94f12c92ded0b3456157b85e57653c6061526d1f6626a7be8a9e6db9c1df09e2bb3e40c7fa20b9b4103
-DIST developer_cmds-53.1.tar.gz 139637 BLAKE2B cd61d6f86195ee43705b4b8e8802d7c1c578e2d64869ec33ed7acd7894a3231cab4152e08aa44694836fc542b4c3ab29d83b8a30b8b69545a25b12921c547fc9 SHA512 ac15b499d0642332e8deae2f498e5ffb0c64502e2d877bbdfe0fac4118e17fe525b169f3b015cfe8c9f40e2688bd30df4b050fe50eaa706b21a2e62ca9dd4b80
-DIST developer_cmds-55.tar.gz 139664 BLAKE2B 2dcd3b3e5ac9ebd8c15dbffe388fc016c037bfe8cbe0ae600552bf7de7dfc4351380eb0b16df0ecec2a79937d970044d1e937703cef6fb5205c62bd0b5298c4e SHA512 062e4c4a2b1ba4cffe7e850d07f4351c736988958450735f9f653936d64defa3347c9dac7b5fea3dcd25f8efe076133dc9ac3edb4a3e512387d6842bd177c35e
 DIST developer_cmds-63.tar.gz 110662 BLAKE2B 383573203d124904d69e5dbc8f1c5e0aef1b5a2288e40449c8e95470b131c9dc1f181338c38f292a1bcc5a105a54010e23bc12e233d7a92d9c983eb975429474 SHA512 4f672835f0290feaf54c7c268b31774282325448f30c02e4f12ead84c41e15083784fac4c9c4916c098953bc61aa8f29bea24a7b51312428aa87448595be50a1
-DIST misc_cmds-23.tar.gz 114747 BLAKE2B 9c4a1376555775a6999437e0712f62200d10be972f6828c02cfc0215a6004b706e36030e66ebdca59fdb8bcb18fabe4e596ce485b45ffaa072f8262ee9b91d82 SHA512 0e02a939c308f4483cf11cb8b21face84f442589e3774b1827ed0ab5064ee2b433a4468ac634051fa0817919f5d39ac1ed56c67b1f5b011b83388a3806ed33c8
-DIST misc_cmds-27.tar.gz 116351 BLAKE2B 00aece4bc8679d9a7a1e114db65bca97e8f855ead64ee0672ac598c28069c56355f4a763fef0e56784ee9d2de9a081ef6f7e6d9390fc79cb0dec25dbe40ec881 SHA512 594560b179f7dafc651d3a336d33bcb7075f2199cf4964e95d63164faf19bd50ef3a6095124f0e4f91c50d1bceeb831fcd81ceecf740e2696a8e7445c1a690d2
-DIST misc_cmds-31.tar.gz 121187 BLAKE2B 3d12a13cbdc7c541b98596ab5ea675d27a0da93a913ee94945dc5b68b3238a85c3fd13472c3ead30219ae3317a6111ba8d22a6e702fe07f927318f5174870a70 SHA512 d49bb8a49c23aa7efaa7db1958676390b4d5ef1b2e57f80b0bea0f10b8b29a6c3ec6d2d7a1248d3af77d382c5113fb3cbf9d3632ca92bb51c01d8c286fd9f25f
-DIST misc_cmds-33.tar.gz 123114 BLAKE2B fb86518067b36de536503df521f1dc5e4f20fa1da74cfee4679dd728862b9ca4c1c272fd0ba39107d058f992acc04c2c98f3f44d6b2fc57386d3c458cfedd68f SHA512 34957adaebe4ce1569464a466e13aaaa6a567c582b784b99dd260c891a417d37a0297bf11acc9eb16dfabed18f42480058ae726e0a56b7d98ed93b59f75a5644
 DIST misc_cmds-34.tar.gz 124023 BLAKE2B 3c634ab540f4b1046e6abe05476a399ea00fd6d35d2d450f68cd7c3f52c8b9321039221659647b6623d5621af1789dba3798ec9f5cff8677653fbb3f295d1d1c SHA512 5e4040c49cc6aed8d4b471cc5d26d978717c9ad29315d40098090d0f7fee5a78289f2092fd6e8c7b7adea31b766cfefdef0da957b86ffb4e0781c13f4b5e4dbe
-DIST shell_cmds-118.tar.gz 162145 BLAKE2B 5f6a2264bcbd9322cb50e39ac6594f083f9d0c0ffa68d67fccc6e4979c59edfab617bb7ffefb4ef647111a1abc7b855a19a1f3b309ad50a6a1f92900305ece6d SHA512 efce064b76087451293a6992b7946fb0811856275796efa9e1e30459edf9eb0462929a1f0d28d189bf7e85fdde4d9e80b8637d042497b1e6e9216c8888d0d57b
-DIST shell_cmds-149.tar.gz 173740 BLAKE2B d1cc69f204925628f812acf0f69704c8c0f5b94ee9b3bd8898ec773657ee6c8a617f1666a9ce9e63898eff1cfbc915b7dfd7a91c51eebe642affa41c14f0f828 SHA512 e0f87db828c994bad73e4340f1957378ce5c84419172ed1d6b9d63809b90edfa447cce658e715565c5c2a7d2eaf0a9ee75e24fdb6d86080063621e0f83eb2a77
-DIST shell_cmds-162.tar.gz 179189 BLAKE2B 975728cbfe262072c9fcc3aee457d3814ceffbd4f3f87a25e5f30d3b581c4ce05c112b2e023e1c132bc836e337e9edf74f699dc3e6cb797be5b589a3cb5eed82 SHA512 784b6b8b3a90967d79f5a60a23e7f31f7bc92712dac9cdb625770f92b58bd6902669aa19bb59997cc654fcc0e27ddd45f60b1990e7da95d0e6c90fd7f2434f95
-DIST shell_cmds-170.tar.gz 212954 BLAKE2B a9616f7604bb73c0d88f8a065441c2f4769747d407458b3844e3e9126c224b42501bf546b1bc82ab6cdfc318861b43318a8a8877e7a054209cbbc7bdaaec0e24 SHA512 b267a9b5e922c9952451ca05e5f9e328504dc46b5776e1a8405f8e41a604d7f184d70742cb6fa6646875bc1789082097c74eabcc151ac5568ba26ed858269ce7
-DIST shell_cmds-198.tar.gz 411088 BLAKE2B 074efebfdc0fb408df54ce763018c74370049d7c977c912c69bc399f3b3551280f1ea76fbd7205ad54ce676422c642431e297f269cafd2ee5fcb4cd916c91548 SHA512 6e3a43f0cd9b1e3799d1ba79f4fcc4c3bb9be178c35cba2bef9227ecc259ca52c39b4d0e39c71d9af689e07f48dbeee6806bd623286f116f7d3ee3889dc7c71f
 DIST shell_cmds-203.tar.gz 428799 BLAKE2B 54103daa8a8758dd34a66f9c34a5fa4cad2e6a2dd36ff838498d82179566eb95c25c49126341ac481889381c2d39ebea3bf57959bb943536a7ba8a90fcf96f67 SHA512 ba9b00d6681d286e6210d49d70e1f526e86b0a76ed794050e9cdbdb8c0cc30dbe82ee9cd908578ddabb19c53c8994f1b84650f08bfeb88ea9f77d4de942c1cb1
-EBUILD darwin-miscutils-10.ebuild 4801 BLAKE2B 47a845f43e7b72157422f9ce1f67402f99ace2fbb80e28313233d2178deb4ec91beec8c0b7d128ed6c08deef3aed912cbbf34f9162cf0bcb93a5f8f878f2fe9b SHA512 a128f14916d4473098255742702cc3462671c10d147b0ca9929c5957c3b65a6e43adce6aa53a62b1e58170dc5f121a088cf5905e74786fe91e1c0da80de79fcb
-EBUILD darwin-miscutils-11.ebuild 4729 BLAKE2B 155f87f50f12a1eae5961ed42b42b01121f4d314ee748cb28a3a99ddf91ac7152e9600199a431785aa1ee00b46e891f19b38205ec70a6d7d5f0908f93a9dd8c6 SHA512 2301868374699ff445ed1c9fe726b8627deed0b98eb5a494807667f3aaaae216c1c39131a85552144d364b39949db24016ee283b2bf646620f399a3ff1049fe9
 EBUILD darwin-miscutils-12.ebuild 4377 BLAKE2B 2997dd12832e9ec457af0c49fc2376fa1bf91575948573067f95ead387b26150158db183415048484a7fa1a712c28da7c3ed7a00572735d1f29c54fe259e2f84 SHA512 10d52acb6c5e37e5febc5f17cf071f7c27c19ec87e93d1ae0683e967814f8574ec56f0f52a2800460dadb422ce526e338b072e49f120b36335a95088e57241c3
-EBUILD darwin-miscutils-6-r1.ebuild 4254 BLAKE2B 92b5706e37e7930ec57819f905310ba58e62ea75d07c7af71ba5d02e36d4b2d700af7b74e468713c274cf74b2562b26fa9dcde685ee77c2fbb61645f5e17479e SHA512 370674632275d9faaf9055d9d67b02b659b09a9134ae2a931c44b30b5f7fc8665c9edfe4b925b7b344287966dc7cf28ba1589f6d075d11575e8c6ac9fc98035d
-EBUILD darwin-miscutils-8.ebuild 4094 BLAKE2B c023d517f7886968f037035a36a7be21096ec9b80b803033167bf0fef7aa949b67615c83146705fe8b10b849cb6b4178896f3079b00c86101cade2f8bc0af87d SHA512 80b0d3b298333e586cfa22b653948cd320955baba9688bb3027551af3c0d9481453c21a679167cf5d9ef97e62825ee7b9ca181f7b35b27d356d8a704ec68206a
-EBUILD darwin-miscutils-9.ebuild 3954 BLAKE2B 6df3260a29a7bebe0232ba11784aeaa6d88d4d8d8a2fb91919fd9995470eecc63e4918c017938f9bee3cf269edb5a64c46314ef5e69a99ccbd53a7103559a64c SHA512 7d17de0bd54f4f3802098fb2298eaa214c4eef07e243e97bae13dc3c3f24336b9215c1a822c4e480caf13bcb88d024100261b262ef71a86ef7080ebfbfb56e60
 MISC metadata.xml 248 BLAKE2B 92ffbf5df7cedae395e3af770765075073d9dd2ddcc887b34b1eca1997d449a5dc827cb3513863a21f26efebf75700fc87e1228c8614a47e951da4b270f264d4 SHA512 5dca2496f2ab8cbdb810fd11c488d84ab9822448794d7e6e3edbb1f71a9f1865248685e25d3e54524b43d781b8e073082773606f8e91943a71fd2bafe63f7b73
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
deleted file mode 100644
index d35a067aea60..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-# from 10.8
-MISC_VER=31
-SHELL_VER=170
-# from 10.7.4
-DEV_VER=55
-MD_VER=147 # 148 in 10.8 has no md, bug #428530
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Mountain
-Lion 10.8"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz
-	http://www.opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.c?txt -> adv_cmds-md-${MD_VER}.c
-	http://www.opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.1?txt -> adv_cmds-md-${MD_VER}.1"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/shell_cmds-${SHELL_VER} || die
-	epatch "${FILESDIR}"/${PN}-6-w64.patch
-
-	mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die
-	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c \
-		"${S}"/adv_cmds-${MD_VER}/md/md.c || die
-	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 \
-		"${S}"/adv_cmds-${MD_VER}/md/md.1 || die
-
-	eapply_user
-}
-
-src_compile() {
-	local flags=(
-		${CFLAGS}
-		-I.
-		-D__FBSDID=__RCSID
-		-Wsystem-headers
-		-Du_int=uint32_t
-		-include stdint.h
-		${LDFLAGS}
-	)
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by corepatch
-	for t in leave units calendar; do
-		cd "${TS}/${t}"
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-	# compile cal separately
-	cd "${TS}/ncal"
-	echo "in ${TS}/ncal:"
-	echo "$(tc-getCC) ${flags[@]} -c calendar.c"
-	$(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c easter.c"
-	$(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c ncal.c"
-	$(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
-	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by corepatch, findutils
-	for t in \
-		apply getopt hostname jot kill killall \
-		lastcomm renice script shlock time whereis;
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	cd "${TS}/w"
-	sed -i -e '/#include <libutil.h>/d' w.c || die
-	echo "in ${TS}/w:"
-	echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
-	$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
-		|| die "failed to compile w"
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	# only pick those tools that do not conflict (no ctags and indent)
-	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
-	# shell scripts
-	# don't install rpcgen, as it is heavily related to the OS it runs
-	# on (and this is the Snow Leopard version)
-	for t in asa hexdump unifdef what ; do
-		echo "in ${TS}/${t}:"
-		cd "${TS}/${t}" || die
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-
-	TS=${S}/adv_cmds-${MD_VER}
-	for t in md ; do
-		echo "in ${TS}/${t}:"
-		cd "${TS}/${t}" || die
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-}
-
-src_install() {
-	mkdir -p "${ED}"/bin
-	mkdir -p "${ED}"/usr/bin
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	for t in leave units calendar ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-	# copy cal separately
-	cp "${TS}/ncal/cal" "${ED}"/usr/bin/
-	dosym /usr/bin/cal /usr/bin/ncal
-	doman "${TS}/ncal/ncal.1"
-	dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	for t in \
-		apply getopt jot killall lastcomm \
-		renice script shlock time w whereis;
-	do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
-		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
-	done
-	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
-	doman "${TS}/w/uptime.1"
-	for t in hostname kill; do
-		cp "${TS}/${t}/${t}" "${ED}"/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	for t in asa hexdump unifdef what ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/adv_cmds-${MD_VER}
-	for t in md ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild
deleted file mode 100644
index 7855631541ef..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# from macOS 10.12
-MISC_VER=33
-SHELL_VER=198
-# from DT 8.1
-DEV_VER=63
-# from 10.7.4
-MD_VER=147 # 148 in 10.8 has no md, bug #428530
-
-DESCRIPTION="Miscellaneous commands used on macOS, Sierra 10.12"
-HOMEPAGE="https://www.opensource.apple.com/"
-SRC_URI="https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.tar.gz
-	https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-${SHELL_VER}.tar.gz
-	https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-${DEV_VER}.tar.gz
-	https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.c -> adv_cmds-md-${MD_VER}.c
-	https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.1 -> adv_cmds-md-${MD_VER}.1"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/shell_cmds-${SHELL_VER} || die
-	eapply "${FILESDIR}"/${PN}-6-w64.patch
-
-	mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die
-	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c \
-		"${S}"/adv_cmds-${MD_VER}/md/md.c || die
-	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 \
-		"${S}"/adv_cmds-${MD_VER}/md/md.1 || die
-
-	eapply_user
-}
-
-src_compile() {
-	local flags=(
-		${CFLAGS}
-		-I.
-		-D__FBSDID=__RCSID
-		-Wsystem-headers
-		-Du_int=uint32_t
-		-include stdint.h
-		${LDFLAGS}
-	)
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by coreutils
-	for t in leave units calendar; do
-		cd "${TS}/${t}"
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-	# compile cal separately
-	cd "${TS}/ncal"
-	echo "in ${TS}/ncal:"
-	echo "$(tc-getCC) ${flags[@]} -c calendar.c"
-	$(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c easter.c"
-	$(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c ncal.c"
-	$(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
-	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by coreutils, findutils
-	for t in \
-		apply getopt hexdump hostname jot kill killall \
-		lastcomm renice script shlock time whereis;
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t} *.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-	cd "${TS}/w"
-	sed -i -e '/#include <libutil.h>/d' w.c || die
-	echo "in ${TS}/w:"
-	echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w *.c"
-	$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w *.c \
-		|| die "failed to compile w"
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	# only pick those tools that do not conflict (no ctags and indent)
-	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
-	# shell scripts
-	# don't install rpcgen, as it is heavily related to the OS it runs
-	# on (and this is the Sierra version)
-	for t in asa unifdef what ; do
-		echo "in ${TS}/${t}:"
-		cd "${TS}/${t}" || die
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-
-	# provide this one for gcc-apple
-	TS=${S}/adv_cmds-${MD_VER}
-	for t in md ; do
-		echo "in ${TS}/${t}:"
-		cd "${TS}/${t}" || die
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-}
-
-src_install() {
-	mkdir -p "${ED}"/bin
-	mkdir -p "${ED}"/usr/bin
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	for t in leave units calendar ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-	# copy cal separately
-	cp "${TS}/ncal/cal" "${ED}"/usr/bin/
-	dosym /usr/bin/cal /usr/bin/ncal
-	doman "${TS}/ncal/ncal.1"
-	dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	for t in \
-		apply getopt hexdump hostname jot killall lastcomm \
-		renice script shlock time w whereis;
-	do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
-		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
-	done
-	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
-	doman "${TS}/w/uptime.1"
-	for t in hostname kill; do
-		cp "${TS}/${t}/${t}" "${ED}"/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	for t in asa unifdef what ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/adv_cmds-${MD_VER}
-	for t in md ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
deleted file mode 100644
index 925ecd40fb14..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-MISC_VER=23
-SHELL_VER=118
-DEV_VER=49
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Leopard"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5-w.patch
-	epatch "${FILESDIR}"/${PN}-5-stdlib.patch
-	epatch "${FILESDIR}"/${PN}-6-w64.patch
-	cd "${S}"/developer_cmds-${DEV_VER}
-	epatch "${FILESDIR}"/${PN}-5-error.patch
-	# deal with OSX Lion and above
-	sed -i -e 's/getline/ugetline/g' unifdef/unifdef.c || die
-
-	eapply_user
-}
-
-src_compile() {
-	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by corepatch
-	for t in leave units calendar; do
-		cd "${TS}/${t}"
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) -o ${t}" *.c
-		$(tc-getCC) -o ${t} *.c || die "failed to compile $t"
-	done
-	# compile cal separately
-	cd "${TS}/ncal"
-	echo "in ${TS}/ncal:"
-	local flags
-	flags[0]=-I.
-	flags[1]=-D__FBSDID=__RCSID
-	flags[2]=-Wsystem-headers
-	echo "$(tc-getCC) ${flags[@]} -c calendar.c"
-	$(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c easter.c"
-	$(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c ncal.c"
-	$(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
-	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by corepatch, findutils
-	for t in \
-		alias apply getopt hostname jot kill \
-		lastcomm renice shlock time whereis;
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	# script and killall need additonal flags
-	for t in \
-		killall script
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	cd "${TS}/w"
-	echo "in ${TS}/w:"
-	echo "$(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
-	$(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
-		|| die "failed to compile w"
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	# only pick those tools that do not conflict (no ctags and indent)
-	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
-	# shell scripts
-	# don't install rpcgen, as it is heavily related to the OS it runs
-	# on (and this is the Leopard version)
-	for t in asa error hexdump unifdef what ; do
-		echo "in ${TS}/${t}:"
-		cd "${TS}/${t}"
-		sed -i -e '/^__FBSDID/d' *.c
-		echo "$(tc-getCC) -o ${t}" *.c
-		$(tc-getCC) -o ${t} *.c || die "failed to compile $t"
-	done
-}
-
-src_install() {
-	mkdir -p "${ED}"/bin
-	mkdir -p "${ED}"/usr/bin
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	for t in leave units calendar ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-	# copy cal separately
-	cp "${TS}/ncal/cal" "${ED}"/usr/bin/
-	dosym /usr/bin/cal /usr/bin/ncal
-	doman "${TS}/ncal/ncal.1"
-	dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	for t in \
-		alias apply getopt jot killall lastcomm \
-		renice script shlock su time w whereis;
-	do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
-		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
-	done
-	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
-	doman "${TS}/w/uptime.1"
-	for t in hostname kill; do
-		cp "${TS}/${t}/${t}" "${ED}"/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	for t in asa error hexdump unifdef what ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
deleted file mode 100644
index e9a8334e4054..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-MISC_VER=27
-SHELL_VER=149
-DEV_VER=53.1
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Snow Leopard 10.6.3"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/shell_cmds-${SHELL_VER}
-	epatch "${FILESDIR}"/${PN}-6-w64.patch
-	# deal with OSX Lion and above
-	cd "${S}"/developer_cmds-${DEV_VER}
-	sed -i -e 's/getline/ugetline/g' unifdef/unifdef.c || die
-
-	eapply_user
-}
-
-src_compile() {
-	local flags=(
-		${CFLAGS}
-		-I.
-		-D__FBSDID=__RCSID
-		-Wsystem-headers
-		-Du_int=uint32_t
-		-include stdint.h
-		${LDFLAGS}
-	)
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by corepatch
-	for t in leave units calendar; do
-		cd "${TS}/${t}"
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-	# compile cal separately
-	cd "${TS}/ncal"
-	echo "in ${TS}/ncal:"
-	echo "$(tc-getCC) ${flags[@]} -c calendar.c"
-	$(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c easter.c"
-	$(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c ncal.c"
-	$(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
-	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by corepatch, findutils
-	for t in \
-		alias apply getopt hostname jot kill killall \
-		lastcomm renice script shlock time whereis;
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	cd "${TS}/w"
-	sed -i -e '/#include <libutil.h>/d' w.c || die
-	echo "in ${TS}/w:"
-	echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
-	$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
-		|| die "failed to compile w"
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	# only pick those tools that do not conflict (no ctags and indent)
-	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
-	# shell scripts
-	# don't install rpcgen, as it is heavily related to the OS it runs
-	# on (and this is the Snow Leopard version)
-	for t in asa hexdump unifdef what ; do
-		echo "in ${TS}/${t}:"
-		cd "${TS}/${t}" || die
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-}
-
-src_install() {
-	mkdir -p "${ED}"/bin
-	mkdir -p "${ED}"/usr/bin
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	for t in leave units calendar ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-	# copy cal separately
-	cp "${TS}/ncal/cal" "${ED}"/usr/bin/
-	dosym /usr/bin/cal /usr/bin/ncal
-	doman "${TS}/ncal/ncal.1"
-	dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	for t in \
-		alias apply getopt jot killall lastcomm \
-		renice script shlock time w whereis;
-	do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
-		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
-	done
-	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
-	doman "${TS}/w/uptime.1"
-	for t in hostname kill; do
-		cp "${TS}/${t}/${t}" "${ED}"/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	for t in asa hexdump unifdef what ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
deleted file mode 100644
index 8e33203bfe72..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-MISC_VER=31
-SHELL_VER=162
-DEV_VER=55
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Lion 10.7"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
-	http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/shell_cmds-${SHELL_VER}
-	epatch "${FILESDIR}"/${PN}-6-w64.patch
-
-	eapply_user
-}
-
-src_compile() {
-	local flags=(
-		${CFLAGS}
-		-I.
-		-D__FBSDID=__RCSID
-		-Wsystem-headers
-		-Du_int=uint32_t
-		-include stdint.h
-		${LDFLAGS}
-	)
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by corepatch
-	for t in leave units calendar; do
-		cd "${TS}/${t}"
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-	# compile cal separately
-	cd "${TS}/ncal"
-	echo "in ${TS}/ncal:"
-	echo "$(tc-getCC) ${flags[@]} -c calendar.c"
-	$(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c easter.c"
-	$(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -c ncal.c"
-	$(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
-	echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
-	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by corepatch, findutils
-	for t in \
-		alias apply getopt hostname jot kill killall \
-		lastcomm renice script shlock time whereis;
-	do
-		echo "in ${TS}/${t}:"
-		echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c"
-		cd "${TS}/${t}"
-		$(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t"
-	done
-	cd "${TS}/w"
-	sed -i -e '/#include <libutil.h>/d' w.c || die
-	echo "in ${TS}/w:"
-	echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
-	$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
-		|| die "failed to compile w"
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	# only pick those tools that do not conflict (no ctags and indent)
-	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
-	# shell scripts
-	# don't install rpcgen, as it is heavily related to the OS it runs
-	# on (and this is the Snow Leopard version)
-	for t in asa hexdump unifdef what ; do
-		echo "in ${TS}/${t}:"
-		cd "${TS}/${t}" || die
-		echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
-		$(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
-	done
-}
-
-src_install() {
-	mkdir -p "${ED}"/bin
-	mkdir -p "${ED}"/usr/bin
-
-	local TS=${S}/misc_cmds-${MISC_VER}
-	for t in leave units calendar ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-	# copy cal separately
-	cp "${TS}/ncal/cal" "${ED}"/usr/bin/
-	dosym /usr/bin/cal /usr/bin/ncal
-	doman "${TS}/ncal/ncal.1"
-	dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
-	TS=${S}/shell_cmds-${SHELL_VER}
-	for t in \
-		alias apply getopt jot killall lastcomm \
-		renice script shlock time w whereis;
-	do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
-		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
-	done
-	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
-	doman "${TS}/w/uptime.1"
-	for t in hostname kill; do
-		cp "${TS}/${t}/${t}" "${ED}"/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-
-	TS=${S}/developer_cmds-${DEV_VER}
-	for t in asa hexdump unifdef what ; do
-		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
-		doman "${TS}/${t}/${t}.1"
-	done
-}
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-error.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-5-error.patch
deleted file mode 100644
index 391dceb39188..000000000000
--- a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-error.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- developer_cmds-48/error/error.h
-+++ developer_cmds-48/error/error.h
-@@ -194,11 +194,7 @@
-  */
- extern	int	nerrors;
- extern	Eptr	er_head;
--#ifdef __APPLE__
--__private_extern__
--#else
- extern
--#endif
- 	Eptr	*errors;	
- /*
-  *	Resources for each of the files mentioned
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-stdlib.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-5-stdlib.patch
deleted file mode 100644
index 0605310bff42..000000000000
--- a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-stdlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc_cmds-23/leave/leave.c
-+++ misc_cmds-23/leave/leave.c
-@@ -34,6 +34,7 @@
-  */
- 
- #include <sys/cdefs.h>
-+#include <stdlib.h>
- #ifndef lint
- __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\
- 	The Regents of the University of California.  All rights reserved.\n");
---- shell_cmds-118/alias/alias.c
-+++ shell_cmds-118/alias/alias.c
-@@ -3,6 +3,7 @@
-    the shell scripts. It does not lead to any deliverable. Do not remove this
-    file from this (..../shell_cmds/alias) directory.
- */
-+#include <stdlib.h>
- int main()
- {
-   exit(0);
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-w.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-5-w.patch
deleted file mode 100644
index f6db3753d930..000000000000
--- a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-w.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- shell_cmds-118/w/w.c
-+++ shell_cmds-118/w/w.c
-@@ -75,7 +75,6 @@
- #include <kvm.h>
- #endif
- #include <langinfo.h>
--#include <libutil.h>
- #include <limits.h>
- #include <locale.h>
- #include <netdb.h>
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 8a42cf890cb8..38108426c7f0 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -2,7 +2,9 @@ AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70e
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.11.2.tar.xz 1953276 BLAKE2B 80ac565cdb69736c0f922b9cbfddcae753d176329781deaf9434d87d7718f9b6ce0b6d4642a03f22a04c7f042dda7f8986b5bce0038f0748461ca55d66964ccc SHA512 edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391
 DIST man-db-2.12.0.tar.xz 1987444 BLAKE2B a6258c1fc9cd81be5d288298660f5b9bda22d726ef98dd5c0a1998809a32391f7244be6897ee8e03483e705a426d6a59d442de3dc2e84f45500daa825ac639db SHA512 4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf
+DIST man-db-2.12.1.tar.xz 2041380 BLAKE2B b06c48431608cf798659d19df754d992dca8ba31842613a3326e376e80fe74d913146f45a7f3c5e70c421a2401aeabdb091de78ebb3102b9d70c194286c245a7 SHA512 0f79f4205ce116c3148dc6caf561c1b7d793aac234188ef8edd1b1f5aaaebcca32c65ef403dff65896920535077fb63ddc2e9cb293efdb6ef3037c33916aa329
 EBUILD man-db-2.11.2.ebuild 5086 BLAKE2B 406c4420f624699316cd0fede3756738f38b84033dbb3ca884b7921729738b098db428156faa6cdca1a7a2aee4128f6e0c9107473f2965f2e83a67f2672fc118 SHA512 6f2b1b64720de1aca1c009218dabe589a4be49e649d08eeb51187750719fb42a60f3795246f4334d78d57917ef86fe349d73af499fb7aeb93229ea5b4af90601
 EBUILD man-db-2.12.0.ebuild 5114 BLAKE2B 9e11654946a22c91339940ef7fe676935f1108756e7db938757c59bdacd068010feea0d1f3213d93eb17e09a832500312aecdeed5ec5a8be6699246370d111c6 SHA512 ee12a25768839a03616abe45a648b019abf9ab5cf1d4bc73abd35d6864d0c776c090a09174bbba20d6e6f47a43b6e540130fd26535f07c49ba0c1d85e27f90d9
-EBUILD man-db-9999.ebuild 5122 BLAKE2B ae50ef37e0aad239e9dc6cbb86317553432cc9b0db20eaecc91bd3d502ad7c7f5cd48cdf7b5ddf912bbb197d67d75e9aae9e814f949b746b6d7af304264c9f43 SHA512 e462965d23575d33c9906861c4a6eb589206a564863494361811bf4a516b3fc797cc4e1b85b5a2296cd330714d8dbb3bc3e560697958e01c872f9bf59fc86518
+EBUILD man-db-2.12.1.ebuild 5205 BLAKE2B b6834b3d9024977301c33fdc2305d4d3c7dd00675b979f0b09828efb69530dfbc8f792f4eb1fe21ab86642f529bd73261ccd0fc202be9d8292083b16d4f41c0d SHA512 c923727d67834b33e90e63e04b068f4dd44fd2f0cf7e3bc3e8b26295b586ad91c5b4d6489886f4700df5e4d5c924baebf0f1c71ab618cea4dbb2702616c672b1
+EBUILD man-db-9999.ebuild 5205 BLAKE2B b6834b3d9024977301c33fdc2305d4d3c7dd00675b979f0b09828efb69530dfbc8f792f4eb1fe21ab86642f529bd73261ccd0fc202be9d8292083b16d4f41c0d SHA512 c923727d67834b33e90e63e04b068f4dd44fd2f0cf7e3bc3e8b26295b586ad91c5b4d6489886f4700df5e4d5c924baebf0f1c71ab618cea4dbb2702616c672b1
 MISC metadata.xml 493 BLAKE2B 33282cbeba0e727dbe080ce8dab8b903590f4139d346e260d950d531fadee3c9a36451b8ec37564b313c8c2fa3ce0accf41cb632db2b2f709287fae4c57bcfd5 SHA512 2ac84cdda859f02a19005ca0cc43b84160171f9080a100491cef5451d0ba3f6d38cdbfb4da35bf38b1942f14eae8ea705774820c2c7a0cd86d4bc9540c9c5490
diff --git a/sys-apps/man-db/man-db-2.12.1.ebuild b/sys-apps/man-db/man-db-2.12.1.ebuild
new file mode 100644
index 000000000000..edcfb60226c1
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.12.1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd prefix tmpfiles
+
+DESCRIPTION="A man replacement that utilizes dbm instead of flat files"
+HOMEPAGE="https://gitlab.com/man-db/man-db https://www.nongnu.org/man-db/"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.com/man-db/man-db"
+else
+	# TODO: Change tarballs to gitlab too...?
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	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
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+manpager nls +seccomp selinux static-libs zlib"
+
+CDEPEND="
+	>=dev-libs/libpipeline-1.5.0
+	sys-apps/groff
+	sys-libs/gdbm:=
+	seccomp? ( sys-libs/libseccomp )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}"
+BDEPEND="app-arch/xz-utils
+	virtual/pkgconfig
+	nls? (
+		>=app-text/po4a-0.45
+		sys-devel/gettext
+		virtual/libiconv
+		virtual/libintl
+	)"
+RDEPEND="${CDEPEND}
+	acct-group/man
+	acct-user/man
+	selinux? ( sec-policy/selinux-mandb )"
+PDEPEND="manpager? ( app-text/manpager )"
+
+PATCHES=(
+	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs
+	unreachable MIN alignof static_assert
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_src_unpack
+
+		# We need to mess with gnulib
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		local bootstrap_opts=(
+			--gnulib-srcdir=../gnulib
+			--no-bootstrap-sync
+			--copy
+			--no-git
+		)
+		AUTORECONF="/bin/true" \
+		LIBTOOLIZE="/bin/true" \
+		sh ./bootstrap "${bootstrap_opts[@]}" || die
+
+		eautoreconf
+	fi
+
+	hprefixify src/man_db.conf.in
+	if use prefix ; then
+		{
+			echo "#"
+			echo "# Added settings for Gentoo Prefix"
+			[[ ${CHOST} == *-darwin* ]] && \
+				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
+			echo "MANDATORY_MANPATH /usr/share/man"
+		} >> src/man_db.conf.in
+	fi
+}
+
+src_configure() {
+	# Set sections we want to search by default
+	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
+	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
+	case ${CHOST} in
+		*-solaris*)
+			# Solaris tends to use sections named after the pkgs that
+			# owns them, in particular for libc functions we want those
+			# sections
+			local s
+			for s in $(cd /usr/share/man/ && echo man*) ; do
+				s=${s#man}
+				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
+			done
+			;;
+	esac
+
+	export ac_cv_lib_z_gzopen=$(usex zlib)
+	local myeconfargs=(
+		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--disable-setuid # bug #662438
+		$(use_enable !prefix cache-owner man)  # bug #917024
+		--with-sections="${sections}"
+
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_with seccomp libseccomp)
+
+		--with-db=gdbm
+	)
+
+	case ${CHOST} in
+		*-solaris*|*-darwin*)
+			myeconfargs+=(
+				$(use_with nls libiconv-prefix "${EPREFIX}"/usr)
+				$(use_with nls libintl-prefix "${EPREFIX}"/usr)
+			)
+			;;
+	esac
+
+	econf "${myeconfargs[@]}"
+
+	# Disable color output from groff so that the manpager can add it. bug #184604
+	if use manpager; then
+		sed -i \
+			-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+			src/man_db.conf || die
+	fi
+
+	cat > 15man-db <<-EOF || die
+	SANDBOX_PREDICT="/var/cache/man"
+	EOF
+}
+
+src_install() {
+	default
+	dodoc docs/{HACKING.md,TODO}
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #289884
+
+	insinto /etc/sandbox.d
+	doins 15man-db
+}
+
+pkg_preinst() {
+	local cachedir="${EROOT}/var/cache/man"
+	# If the system was already exploited, and the attacker is hiding in the
+	# cachedir of the old man-db, let's wipe them out.
+	# see bug  #602588 comment 18
+	local _replacing_version=
+	local _setgid_vuln=0
+	for _replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test '2.7.6.1-r2' -le "${_replacing_version}" ; then
+			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
+		else
+			_setgid_vuln=1
+			debug-print "Applying cleanup for security bug #602588"
+		fi
+	done
+	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
+
+	# Fall back to recreating the cachedir
+	if [[ ! -d ${cachedir} ]] ; then
+		mkdir -p "${cachedir}" || die
+		chown man:man "${cachedir}" || die
+	fi
+
+	# Update the whatis cache
+	if [[ -f ${cachedir}/whatis ]] ; then
+		einfo "Cleaning ${cachedir} from sys-apps/man"
+		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process man-db.conf
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		local _replacing_version=
+
+		for _replacing_version in ${REPLACING_VERSIONS} ; do
+			if [[ $(ver_cut 2 ${_replacing_version}) -lt 7 ]] ; then
+				einfo "Rebuilding man-db from scratch with new database format!"
+				su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
+
+				# No need to run it again if we hit one
+				break
+			fi
+		done
+	fi
+}
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index 2805d67ac3cb..edcfb60226c1 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,11 @@ PATCHES=(
 	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
 )
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs
+	unreachable MIN alignof static_assert
+)
+
 src_unpack() {
 	if [[ ${PV} == *9999 ]] ; then
 		git-r3_src_unpack
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index e8caec39badb..9df35dd5077a 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,5 @@
 DIST osinfo-db-20231027.tar.xz 143660 BLAKE2B 212abe98a09165fdae9b7069ab00c120f90ccf944242cdb355b6c2cf8085086c29d08779123a2fd6c72abd6b7dad88a6d473368cf659f2682b342692bc04d6f0 SHA512 2a0729f99ff840ab29d90b3174da6fa6ebf0665786f17079a592ee4988a95fbf2b1453834139c6f62c491d777eefb1d094dc39b80ac13398e2db32e1033e9900
 DIST osinfo-db-20231215.tar.xz 149836 BLAKE2B bbc4cabbb2ef09dd58f0340c250ac9d014dbb7f38e7db96ecdb70bc4f7a6583f4a6c807262a52c5ada0eed7e69888b34bcf09a0041a943d0a3867ab9518e9005 SHA512 fed7b1fc28aa625a73242768776c451fc459bbbba71dcda33194e9e0d8d049cdfdfcc354ca4289e1a97f82b23d4ec3a105e23d18438789fe1fe64e7bbb84a6b7
 EBUILD osinfo-db-20231027.ebuild 698 BLAKE2B 3be6e49cb82e52262006eb041ddf3ca084a46cc8e7189acb4746cd38e19dcaa033cdb3d170edd31627e510da793cc0ff2af5a4e549f1864a3b2e40a731523fe0 SHA512 f10f94eb213fb256656abf268339d75713752dad50a9be64032b3d63f082d7850af7fb93d43303bbd0ffbb029d448523fe094a07d40bb617c3d95c62e01823a5
-EBUILD osinfo-db-20231215.ebuild 702 BLAKE2B aed80acb9e0fc6ff63169d46fe5638896690fcd71079c1dbb34dea39ed3560d960a234b6f8d592ff92ba0368bc421e478c3719eb041bea2ddbfd070d5fc8ee62 SHA512 2a0ac89589cda2a2432a02110e8bb7361f52f0ba668c724027136c83f7fe6dc94d3715112fc2ea85f9fd842a08dcb59def59bbaa371fc240216e80fa88378af2
+EBUILD osinfo-db-20231215.ebuild 698 BLAKE2B 3be6e49cb82e52262006eb041ddf3ca084a46cc8e7189acb4746cd38e19dcaa033cdb3d170edd31627e510da793cc0ff2af5a4e549f1864a3b2e40a731523fe0 SHA512 f10f94eb213fb256656abf268339d75713752dad50a9be64032b3d63f082d7850af7fb93d43303bbd0ffbb029d448523fe094a07d40bb617c3d95c62e01823a5
 MISC metadata.xml 373 BLAKE2B 76c02900ad2c6c313bcc5f3806b1e9911ec01f23c057847bbbdb70ff7de957541d131fe6f57ab74473d20389c1562b1938fd2248ab70747fae68fa664fce2a28 SHA512 6759db491e7ce75a4a0b9805b8ff7e2bd1800fc626560e47af4e14de6ca4632e7dfc9fe7fe7ae1da8ca5b56b94854a92c5057bda98601e134012e63ff9c756a5
diff --git a/sys-apps/osinfo-db/osinfo-db-20231215.ebuild b/sys-apps/osinfo-db/osinfo-db-20231215.ebuild
index 7e40fd5536dc..f2ac1ce4693f 100644
--- a/sys-apps/osinfo-db/osinfo-db-20231215.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20231215.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="sys-apps/osinfo-db-tools"