gentoo auto-resync : 04:11:2024 - 03:03:54

11 files changed, 370 insertions, 596 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ba74b5345c51..cd543bfd7700 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 0e147fcfd39a..2fe608c7ee4b 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,7 +1,9 @@
 DIST baselayout-2.14.tar.bz2 30182 BLAKE2B c5f67795233e565c2c75c97a55c000aec98e901bb0a25f1aeb52b01b44d7c09bfc6e67813234629ca71ff32d603e82ada8e66e5ab6007fa0664b95367256320d SHA512 bffd118f5e92975b9247d854fc5683a311dbcd03efa37a13dfd05d04e92a6e784858d3a55aa689f782229afc5985e829eb332c08a79eed081bf0a47720ca7e8a
 DIST baselayout-2.15.tar.bz2 30214 BLAKE2B 58d81b935c52deddeae60314f040a85767c7df30e38c694090dded4a9d593be8fb3c181e6e9496cc8e0987481b6b13f57a74038f9f21a0b27c76528d066cd5f5 SHA512 3d1a64e2802b53bcc537633fd23224ebea60b79d58f4b692175598cd43015e0d60dfdfb81c03f3541d28fe77f04022298236db726ea7e5119cc217d6bfb74d4b
+DIST baselayout-2.16.tar.bz2 30260 BLAKE2B 19c213d6ad25f0e200ea75bff481ab4aab45742df67e941211888f017f7ecd4054733878f7e4e19ebb242615fcb7f002765668f97a4f554733173251d4f836f5 SHA512 5668d1eb550c9b422f7ab732f25e0cb53d376501d2ba76b8219eab6a3b7aa60c485d9949bef498a394c099ee592553d8c7413266f4610555cb6dc1ccf7d05500
 EBUILD baselayout-2.14-r2.ebuild 11339 BLAKE2B 07fc32bb4153e5ebce26f27967d8ac6a049b3b818f90e64018f77efebf3a5fdc5de388e3d295fded16eec9eb6fb03101d2d02acf5e095cfcd191393e40ff0c6f SHA512 6112ff74282b2363cff0d0fa5ab26d94e6967274c2da7c2a9a150b20a21d6b017607c83ffe5999e7cb188874c20ae545d67cba1d8739230d91b8a834f217838b
 EBUILD baselayout-2.14-r3.ebuild 11612 BLAKE2B bf1373a141a640239d3156e92789f168141fd5e2d3460db692201dcec7f12803a826948be72ab1f7b8a6ba3c5bcf1876ba06a81953cd273c6fb0e7a9cb166875 SHA512 9ac58944861e0a0da77927df7f07892977116146526a5e461ebc64a99f7aad4b734fc3a8760ef0c1101b8f8af5e64b688141a1f9526b631cde94905b0ea1bf50
 EBUILD baselayout-2.15.ebuild 11757 BLAKE2B bb4859998453465dc472dafae3b48a287f78cc93fce90a857fa9642fd2eb74cbcda3b3bb2a5e643faa6cfda8bdd2c6ce8306b0fb0f4840c10f206a5a88447368 SHA512 0ad91c6bc2ea58ebe284392dbbc750c3d21a83f2e115293dbb974bcbfed5af1e326c0c2bff9a6bc4b6d892ea278d9ea5f613d4f364f8704f985d716a33956eac
+EBUILD baselayout-2.16.ebuild 11757 BLAKE2B bb4859998453465dc472dafae3b48a287f78cc93fce90a857fa9642fd2eb74cbcda3b3bb2a5e643faa6cfda8bdd2c6ce8306b0fb0f4840c10f206a5a88447368 SHA512 0ad91c6bc2ea58ebe284392dbbc750c3d21a83f2e115293dbb974bcbfed5af1e326c0c2bff9a6bc4b6d892ea278d9ea5f613d4f364f8704f985d716a33956eac
 EBUILD baselayout-9999.ebuild 11765 BLAKE2B 43d7318691707d15098888ae7c90b67cd8fae4c9ef4a9989e9fa70f9401d74efb7d4e0e4a267a3cad23744bc00ae05c03d16ebc7ff0bcb65d16986e630c06634 SHA512 0be38d0d40b35eb1cfca04d18a8126d1f7b61ba35e0df9337723f604a5136c72f886232e9390f0d6c81f87334b15d979fdd71f6b6ad71f2bf5e7e0ea4849e9dc
 MISC metadata.xml 528 BLAKE2B 74766eb4949cff7bc3c896dc2477058a121acdde032be40bb3d2cb35874a830fc1882b5c3e6887799ffcf9cddf9fef54001eadd1b510b635c081b84b9ffeb035 SHA512 08dc12b95610151124e7dcb454a353ed10b30202aac3a7f36013c929fd5ee94436452bb48dfc77fa96bd6bb33dba0eb9c98868ef2e978f32f73fef5defc8a040
diff --git a/sys-apps/baselayout/baselayout-2.16.ebuild b/sys-apps/baselayout/baselayout-2.16.ebuild
new file mode 100644
index 000000000000..a9bf8ec222fb
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.16.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build +split-usr"
+
+RDEPEND="!sys-apps/baselayout-prefix"
+
+riscv_compat_symlink() {
+	# Here we apply some special sauce for riscv.
+	# Two multilib layouts exist for now:
+	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
+	#    these are chosen by us to closely resemble other arches
+	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
+	#    this is the glibc/gcc default
+	# Unfortunately, the default has only one fallback, which is "lib"
+	# for both 32bit and 64bit. So things do not break in 1), we need
+	# to provide compatibility symlinks...
+
+	# This function has exactly two parameters:
+	# - the default libdir, to determine if 1) or 2) applies
+	# - the location of the symlink (which points to ".")
+
+	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
+	# there never was a ${SYMLINK_LIB} = yes riscv profile.
+
+	case ${CHOST} in
+	riscv*)
+		# are we on a one level libdir profile? is there no symlink yet?
+		if [[ ${1} != */* && ! -L ${2} ]] ; then
+			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
+		fi
+		;;
+	esac
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+		for prefix in "${prefix_lst[@]}"; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
+					# for the special case of riscv multilib, we drop the
+					# second part of two-component libdirs, e.g. lib64/lp64
+					libdir="${libdir%%/*}"
+					dir="${prefix}${libdir}"
+					if [[ -h "${dir}" ]] ; then
+						if use riscv ; then
+							# with riscv we get now double entries so we
+							# need to ignore already existing symlinks
+							einfo "symlink ${dir} already exists (riscv)"
+						else
+							die "symlink ${dir} already exists"
+						fi
+					else
+						einfo "symlinking ${dir} to usr/${libdir}"
+						ln -s usr/${libdir} ${dir} ||
+							die "Unable to make ${dir} symlink"
+					fi
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+			[[ -d "${prefix}${def_libdir}" ]] && riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep || die
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" || die #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep || die
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die "Unable to make ${EROOT}${libdir} symlink"
+			fi
+		done
+	fi
+}
+
+pkg_setup() {
+	multilib_layout
+}
+
+src_prepare() {
+	default
+
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr && ! use prefix-guest; then
+		sed \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/shells share/passwd
+		hprefixify -w '/PATH=/' etc/env.d/50baselayout
+		hprefixify -w 1 etc/env.d/50baselayout
+		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+		echo MANPATH=/usr/share/man >> etc/env.d/99host
+
+		# change branding
+		sed -i \
+			-e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \
+			-e '/make_os_release/s/${OS}/Prefix/' \
+			Makefile || die
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		if use split-usr || use prefix-guest; then
+			ldpaths+=":${EPREFIX}/${libdir}"
+		fi
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		install
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# add SDK path which contains development manpages
+		echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
+			> "${ED}"/etc/env.d/98macos-sdk
+	fi
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+
+	dodoc ChangeLog
+
+	# bug 858596
+	if use prefix-guest ; then
+		dodir sbin
+		cat > "${ED}"/sbin/runscript <<- EOF
+			#!/usr/bin/env sh
+			source "${EPREFIX}/lib/gentoo/functions.sh"
+
+			eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
+			exit 1
+		EOF
+		chmod 755 "${ED}"/sbin/runscript || die
+		cp "${ED}"/sbin/{runscript,openrc-run} || die
+	fi
+}
+
+pkg_preinst() {
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile || die
+
+	# Create symlinks in pkg_preinst to avoid Portage collision check.
+	# Create the symlinks in ${ED} via dosym so that we own it.
+	# Only create the symlinks if it wont cause a conflict in ${EROOT}.
+	if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then
+		dosym ../run/lock /var/lock
+	fi
+	if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then
+		dosym ../run /var/run
+	fi
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		if [ -e "${EROOT}/etc/${x}" ] ; then
+			chmod o-rwx "${EROOT}/etc/${x}" || die
+		fi
+	done
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run || die
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index cb71cf2de3fa..0488f5a067b5 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -4,12 +4,9 @@ AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 AUX lesspipe-r3.sh 9154 BLAKE2B d75a0045fdb33a6e5f0eff3c1b3ad85c928dbb65755a8da89464550f65cb9e7390807d332718262f85527766a797d71cc322e3fc9727024d48f6eb4a7fc5d3ef SHA512 fa82613441a0a30a5872be9f3a6387fcad84cd6622621b90641323f571a5aa78f1e369d5798bcad5992131dc79b2b1cc38288e84203108a495982d125d4da99c
 AUX lesspipe-r4.sh 9208 BLAKE2B 446ce47a46145e3e6e24232c26bb7b8c6d1f22338522413d5f26b3b30632a24cf87133788c835b0ef08429d3b1cc6521e078ef7e29fe7294fc7abe5790608e38 SHA512 31ae9e2c87babb9a17cebbfd55a61c6a7de0ef5191123b37d0a20f46963e4c0c46aee07623e0df69de427a8ed64a975c2b00569d6cdf13de5bbcb1ba0610d3ee
-DIST less-633.tar.gz 375733 BLAKE2B e9df180794af365f86734c6b8fde766c1bba42b111717ee5e1cf11001fc7ec3d78910db9bb7c51a76816086f599808b1b60f514011ec40e37650d6bc4f8b3d5c SHA512 a29aaf72abca07fb29d12f218bbd422a39e3898b3d53e8dbd5265ae47ecf68b88c3381aa3a9bf7caa8db1e2d8e2c138b333f0d69fddd4cf014e39118c53f7fb1
 DIST less-643.tar.gz 592291 BLAKE2B 6dc60dc2e8db05afdae466877a1d26a3008ff5378bbbf2fbdf9efc4f87c0fcfde5703d44a24d4355c98d3a5f438bdb51173150f2a69f801d9c8e4a7401d71b53 SHA512 6a324ac54e22429ac652dc303bc1fe48933555d1cbf8ad7ecf345940910c014fef9551a3219743cfb7115e356b5841ae97d6ce62e7a1ba1e3300d243efca34d9
 DIST less-661.tar.gz 648198 BLAKE2B c1fa9a7a646fcc1203945e00c35fe41bddef0c564e30f120a37e417ecd5c60d234e0253a2e18123508dd5c0313bce346dc7752e96cdc1b067bd07a2a39818b42 SHA512 49d81ff9e79d43ce0271490e3bffd590b4aed5fcb387bc8eb3128de99e5b5a5ede2e2818b546f6e3a140fa6261f1de3dfba1231f7ff7ef18502bb7030eaea1b5
 DIST less-668.tar.gz 649770 BLAKE2B 0f6a85a1c66577dd2a28682a6f8399e42fdbe9fc1498b2e89c6bb7c47109e8d3ab934abe5dd998b2c8dfacfb174ad9daeb79b3d4c13df22fa035ea792b2eaf5e SHA512 6527741a609849ec27b6ab35de46f2c5c2b2771391e3efe263207bee28915946f44331a42f832a7cb42231a19b135cbadc15ae02cd997b83a13cdfbc7213fc27
-EBUILD less-633.ebuild 2182 BLAKE2B 1a5a202447ca66b4ad3cc7bbcf21bff860e5f557792caacc573498824d59a43e33af208961a38430c3842327c0cc54abe2c9f3fb1ab87c689d950c50d33883ec SHA512 bf13c291d84a637cef44c122e26269851ac97b0e8df8ab18cd7a49666c4d5e54f4eed74d83d5bdc7cc67fdd86f32bb2d6872acba744d5d978b4783ac6dcc6314
-EBUILD less-643-r1.ebuild 2442 BLAKE2B d96f9cef2174a018279c145ba535da3bbf9d9a2de3a34380e06a67c4bbc94ee8dd6e79b6bfa08a167facf510cebfd9bd5ebe28b9858f46373da0b9e4fdf9fdbf SHA512 28ab83c17d750d8699fff9195987ebf101e1bf5c4ae61255d42cf9abb4f1bc01da2b50ffeb1708806fb31d631df08a95b0525f97c3b155c282af86a21549ffaa
 EBUILD less-643-r2.ebuild 2489 BLAKE2B b2622a797822983191b332d4c4eaf3694c97ac64c1d5b0f81091065bc9c48ef274329e3c36c160aa56d3994c3f41f9ef17f55cee552fa87f2b30ac2104b66aa5 SHA512 82ef0fddf3a2a81554b8e5456897736ae08df449b6a6b9630cf6d8aa67afb50996965c377ce8fc4106cc70bd3f6d4158e404e3642c1975625ea69f4b947a003c
 EBUILD less-661.ebuild 2450 BLAKE2B ea84bafd31eda6661658a4cbdb8824a25cb9fdfc48517ef9bf6d1d430f940cc4e11c7aa1307284e7942705fc5edbaaf30250ce171b358103675183ddb95a99f9 SHA512 fd12c291d4beea78abfb930b4d0519ed91fee478536a48a8d1acbb6a8c0535de73370fc61122437d4d38784a82136c934a4bb3ad14fdcd52e6e4e3bf6c4a7c81
 EBUILD less-668.ebuild 2450 BLAKE2B ea84bafd31eda6661658a4cbdb8824a25cb9fdfc48517ef9bf6d1d430f940cc4e11c7aa1307284e7942705fc5edbaaf30250ce171b358103675183ddb95a99f9 SHA512 fd12c291d4beea78abfb930b4d0519ed91fee478536a48a8d1acbb6a8c0535de73370fc61122437d4d38784a82136c934a4bb3ad14fdcd52e6e4e3bf6c4a7c81
diff --git a/sys-apps/less/less-633.ebuild b/sys-apps/less/less-633.ebuild
deleted file mode 100644
index 49500b83af65..000000000000
--- a/sys-apps/less/less-633.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE=none
-WANT_LIBTOOL=none
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gwsw/less"
-	inherit git-r3
-fi
-
-inherit autotools
-
-# Releases are usually first a beta then promoted to stable if no
-# issues were found. Upstream explicitly ask "to not generally distribute"
-# the beta versions. It's okay to keyword beta versions if they fix
-# a serious bug, but otherwise try to avoid it.
-
-MY_PV=${PV/_beta/-beta}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="https://www.greenwoodsoftware.com/less/"
-[[ ${PV} != 9999 ]] && SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P/?beta}
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-IUSE="pcre"
-# As of 623_beta, lesstest is not included in dist tarballs
-# https://github.com/gwsw/less/issues/344
-RESTRICT="test"
-
-DEPEND="
-	>=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:=
-	pcre? ( dev-libs/libpcre2 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	# Per upstream README to prepare live build
-	[[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles
-	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
-	# https://bugs.gentoo.org/870412
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre2 posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-643-r1.ebuild b/sys-apps/less/less-643-r1.ebuild
deleted file mode 100644
index 6af92aeb9214..000000000000
--- a/sys-apps/less/less-643-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Releases are usually first a beta then promoted to stable if no
-# issues were found. Upstream explicitly ask "to not generally distribute"
-# the beta versions. It's okay to keyword beta versions if they fix
-# a serious bug, but otherwise try to avoid it.
-
-WANT_AUTOMAKE=none
-WANT_LIBTOOL=none
-inherit autotools flag-o-matic optfeature toolchain-funcs
-
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="https://www.greenwoodsoftware.com/less/"
-
-MY_PV=${PV/_beta/-beta}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gwsw/less"
-	inherit git-r3
-else
-	SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
-
-	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	fi
-fi
-
-S="${WORKDIR}"/${MY_P/?beta}
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-IUSE="pcre test"
-# chinese1, utf8-2
-RESTRICT="test !test? ( test )"
-
-DEPEND="
-	>=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:=
-	pcre? ( dev-libs/libpcre2 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( virtual/pkgconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-643-lesstest-pkg-config.patch
-)
-
-src_prepare() {
-	default
-	# Per upstream README to prepare live build
-	[[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles
-	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
-	# https://bugs.gentoo.org/870412
-	eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags # bug #896316
-
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre2 posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check VERBOSE=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	default
-
-	keepdir /usr/lib/lessfilter.d
-	keepdir /etc/lessfilter.d
-
-	newbin "${FILESDIR}"/lesspipe-r3.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	optfeature "Colorized output support" dev-python/pygments
-
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-643" ; then
-		elog "less now colorizes by default. To disable this, set LESSCOLOR=no."
-	fi
-}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index e8382ba0c3ff..59800136d379 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,11 +1,7 @@
 AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b
 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
 DIST man-db-2.13.0.tar.xz 2071032 BLAKE2B 7ce91a7abc6d3bbd92d4707f13caacd8ab5caee0502a2b115f8aa53f4d38df05b0e03346f70584618cce6f5457113e826828a02b847bff57abd6ba6ec1b2d407 SHA512 612ce39bb1e11aa7797e8e3a26f06a7154c48a13b2d74217c2c6701e0d33fa8f77ae2b8c9ee84353e364d16918f884115f2dfbf3cd743edd4ed32b763b87f723
-EBUILD man-db-2.11.2.ebuild 5080 BLAKE2B dd2113d2f22eca247879850d7f9bb0f3b6884b2f5a284fbc530d91b4e849bb850311ba7a3a43d195c195e0ab1d1236740f8e854bc78b5ddd2c41315e6d16710e SHA512 8c7248e6cb6e2bbc5fc265257805676753db41e930d46ee5992ebf496578b629308777f860d1b1b0baf60c8d02008334d5e6ebf658fd05d219ddd700b7fa1753
-EBUILD man-db-2.12.0.ebuild 5145 BLAKE2B 7dab620913a3d7b72d7ad9500c0710e18a547df57c139186b5a56f60f74115d5efc1d6d3bdff46dba382dfcd783676274f1e51d945d0343d30fc3c5e2b08993a SHA512 56f80c5238155e0003063fa623a07ab90d76acd0033fbf29268f12d711199143ecf8990e02da8f580bf32a83150ee9ce36eead0081c2221d4dea0bf26f07c639
 EBUILD man-db-2.12.1.ebuild 5228 BLAKE2B 8093da7aa13374fee25b33f7dee27305744a06c466d19f814b8feddad9fd361a0166a4090f5b785bdde56d7e37507ea72f80ee3e71df69cf25f24d6b3b607571 SHA512 87add84e689c08e3c2ce857a383cfc88f2ce5f79ea6a6a87377eb25f2ebbf748d83bcae902fc8b06511fcfd2f968e98443f8b5e401fa742b04f2b5cfdabc2c93
 EBUILD man-db-2.13.0.ebuild 5245 BLAKE2B 4a516e7d7250d1e3bf3e1cdceb2a6eaff419c984faf1153d58119990e5b3469b4b8bfc6baceab84cd45cab28051bed1367e50018ef2ebe339b5a1004cbfd1acf SHA512 1a83c8636ecd287061f0cd8b6fd9d53b118608fd2d469df568e519850a7b80963e279e6d0639a8ac1571e85564933451a38aab11ebbf61f7c91e62457817088a
 EBUILD man-db-9999.ebuild 5236 BLAKE2B 27f6f1c1661d6d6fe59bcb7fb7f6eab680630ee745fcb7c95673b056ea16bcbbd500ceda2d6bfad1de63c2879aab912600881a9d2ba0f4ac4e7ebb02001ff75f SHA512 bcb6d7f3c64e3f9e3db4a5957e77cdd6d4b25a64279f6d5a86e7f80ee3a6446d307c236e9864e7984d497f4fe4c6e27675d72b40d5babc3baca0c96958d52779
diff --git a/sys-apps/man-db/man-db-2.11.2.ebuild b/sys-apps/man-db/man-db-2.11.2.ebuild
deleted file mode 100644
index 26e6d6874674..000000000000
--- a/sys-apps/man-db/man-db-2.11.2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2023 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 ~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
-)
-
-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
-		--enable-cache-owner=man
-		--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-2.12.0.ebuild b/sys-apps/man-db/man-db-2.12.0.ebuild
deleted file mode 100644
index 6450925d8d44..000000000000
--- a/sys-apps/man-db/man-db-2.12.0.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# 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
-	inherit libtool
-	# TODO: Change tarballs to gitlab too...?
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~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
-)
-
-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
-	else
-		elibtoolize
-	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/polychromatic/Manifest b/sys-apps/polychromatic/Manifest
index 509103c84121..995c769e335d 100644
--- a/sys-apps/polychromatic/Manifest
+++ b/sys-apps/polychromatic/Manifest
@@ -1,6 +1,6 @@
-DIST polychromatic-0.9.1.tar.gz 1786276 BLAKE2B 46865d85aefa99ebc06ea145fe3afd3e4388d94529b8835ff4c4990d241031ee069801c7183ef89c811bde170a2211583dae7bb5bde8b3d65ebdf04421cef349 SHA512 def2d488fb52091ecddea5f11bf066efec5caf43b2c53f3b1a63d6de59c4ca9b62eb5da84faa08581050dbcc8ebcb98681b6d5c4376d04699a736d7122b79cb3
 DIST polychromatic-0.9.2.tar.gz 1786196 BLAKE2B 4495114014a8467e77e165e4946d1b56b1c4c072de2d144238c61a971193bb34d288314436ba445a5ba2c3aa94b8913d968f236ea47fa7de89fca82845cde774 SHA512 0fafac6b00e6684cf78e898da075ed2b8e5ae78af0f224072fc413e2e36453b64d002d87d4369ddeb108cf87d78154ff48605b9ec20aa75cd142b8c159b8d169
-EBUILD polychromatic-0.9.1.ebuild 2070 BLAKE2B 293333df8d16d4e76f7adfa8f2f65f6bfac2bb0782c3452db047bc4661934faf1b6e6a8e36d0b5eb21505b4bcc7576dd022519581431fec7b170c3d5d2b6514a SHA512 359c066e84a796aa2d21397b0fe0af96bbfafc40d9f87f9a1e5b32a137033e51bcaa3ef49d4a1197192e120b864174ce4efb9f008113c95769950d37907d0599
+DIST polychromatic-0.9.3.tar.gz 1809140 BLAKE2B 8b3397a234e45a4e72635207bf2ce8d8fc3454e62494cd84128908fffe1d3155255d74ea41d17584cb1dbfd2e68e8b6cb629e8dedab43e22eba3ff8204f271b0 SHA512 a1805bce9986915164fdf61b5fd194ebd16cd7f1528febe0dcf7c09ecde5edf6ed7b404c97a3ea27427727d0134d9e26b71d8a810b5649e659febc403146bc4a
 EBUILD polychromatic-0.9.2.ebuild 2070 BLAKE2B 293333df8d16d4e76f7adfa8f2f65f6bfac2bb0782c3452db047bc4661934faf1b6e6a8e36d0b5eb21505b4bcc7576dd022519581431fec7b170c3d5d2b6514a SHA512 359c066e84a796aa2d21397b0fe0af96bbfafc40d9f87f9a1e5b32a137033e51bcaa3ef49d4a1197192e120b864174ce4efb9f008113c95769950d37907d0599
+EBUILD polychromatic-0.9.3.ebuild 2071 BLAKE2B 1a3abb18eaa99cc68eb0054eb5e8008ecbd85fe423a12682ec80f984f3ea63a20c26a78258f4248a09e4b9774be22a4c4dba844f0d04283d3937666fa5dbb3e4 SHA512 b7615ef78b5e2ba050d04a8779552ef167357e7d97d28f6fde3b6be551fedf97119682245274413f98ab228782ca9a53b4bc119f99122170c222e945def1af53
 EBUILD polychromatic-9999.ebuild 2071 BLAKE2B 47b2a3c11b2a524e23fe7afd494d1708c15679997197960011617ddbd94adc3dc58140561a6de759d0d333430a83046d1db0d9cf6e3366632fd407fe0ec8b2b3 SHA512 e8dff2dec0a6f4ddb5b70a0717cbf30ecf0c9da428ef28396713770b2ae0895c3483b733cc6b1d033d184959a9e8194c76ea127227edcf9eeeb85737ceeb6bc4
 MISC metadata.xml 993 BLAKE2B 193ed9d7f922efa078e7856084b828ff4f97d8606a1979206b3ff4a36ddcc6ff88a1adc3d0d899261fef5ae5751a1204fb27a03b0a8ff7510578f431a89a0cd2 SHA512 245f395c90cfbe36dae2bc1da5f1c6d2513ebde78a44e7a785a4bb9c01cf24ea0be81405c82eb8f4fbc34d34a4990a36359e98658d1340e47172257a867aa8db
diff --git a/sys-apps/polychromatic/polychromatic-0.9.1.ebuild b/sys-apps/polychromatic/polychromatic-0.9.3.ebuild
index 364b9f2920d6..d7b141d01942 100644
--- a/sys-apps/polychromatic/polychromatic-0.9.1.ebuild
+++ b/sys-apps/polychromatic/polychromatic-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 
 inherit meson python-single-r1 readme.gentoo-r1 xdg
 
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3+"