gentoo auto-resync : 19:09:2022 - 05:21:10

15 files changed, 452 insertions, 15 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6d60cc08f890..dc4a9df9f3ee 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index cc1b46e57880..cf970648f016 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,7 +1,9 @@
 DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
 DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a
+DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02
 EBUILD baselayout-2.7-r3.ebuild 11228 BLAKE2B 347ce18e044de38deea4d85f5409bb6987a81abea68f1cf0a4fc6374c698f4b2ffebd1fbb5becb0ac0c7c1f8572be908bde71600008246c59450e07fe5d9fe28 SHA512 768412405896189e96a4ac59303bc6e96208c04d0518e0f980714d07db25389b97c4b84c2b070623765c3be6e6e609989267a306389d32da4c420dc3d329203c
 EBUILD baselayout-2.8-r3.ebuild 11826 BLAKE2B 0d606ac53b5028a2189d2b943b497990da280279aa38bdd65404c9a4c497c7dcb808fd4e9a6f058ed3edd217a24a9b81709142bfdb3398f4252acb5ae694d998 SHA512 b457cbcbdb2f4f276337b1f5da9099d40e3c4ab065e06d18f4a5cbf8b29920d7228df96d0f43c7b0ff82f0cc2c7b161543a808ba8787a6a61e02f8bbd7628896
 EBUILD baselayout-2.8.ebuild 10848 BLAKE2B 26d38e365dbf423731b1cf35fcd2efe208961ccccdafc184b2fecc78eee79a1d73f3393cde33ea4c95baa8b834514f08d936c321d7e872372c981656c6172801 SHA512 c995e87684b5fd1c66553aeb60623d713b3eeaf6719af0d237ae4f26b3ad2e3422fb27dcb0c89d6f2b4b0e03be40985804181a045457ff4178e06d910e464102
+EBUILD baselayout-2.9.ebuild 11826 BLAKE2B 0d606ac53b5028a2189d2b943b497990da280279aa38bdd65404c9a4c497c7dcb808fd4e9a6f058ed3edd217a24a9b81709142bfdb3398f4252acb5ae694d998 SHA512 b457cbcbdb2f4f276337b1f5da9099d40e3c4ab065e06d18f4a5cbf8b29920d7228df96d0f43c7b0ff82f0cc2c7b161543a808ba8787a6a61e02f8bbd7628896
 EBUILD baselayout-9999.ebuild 11826 BLAKE2B 0d606ac53b5028a2189d2b943b497990da280279aa38bdd65404c9a4c497c7dcb808fd4e9a6f058ed3edd217a24a9b81709142bfdb3398f4252acb5ae694d998 SHA512 b457cbcbdb2f4f276337b1f5da9099d40e3c4ab065e06d18f4a5cbf8b29920d7228df96d0f43c7b0ff82f0cc2c7b161543a808ba8787a6a61e02f8bbd7628896
 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-2.9.ebuild b/sys-apps/baselayout/baselayout-2.9.ebuild
new file mode 100644
index 000000000000..b7fc36bdb833
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.9.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2022 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build +split-usr"
+
+RDEPEND="!sys-apps/baselayout-prefix"
+
+pkg_setup() {
+	multilib_layout
+}
+
+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
+					libdir="${libdir%%/*}"
+					dir="${prefix}${libdir}"
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die "Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+			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
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				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_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
+
+	# 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
+}
+
+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.Linux/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
+
+		# 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 \
+		OS=Linux \
+		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_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
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
+	fi
+
+	# 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
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ver_test 2.4 -lt ${x}; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ver_test 2.6 -lt ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}/{,usr" || die
+		fi
+	done
+
+	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/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 353894846780..d9bdb1d8bdb0 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -10,8 +10,8 @@ DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd
 DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
 DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
 DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
-EBUILD coreutils-8.32-r1.ebuild 5967 BLAKE2B e4111bbbcd2c83ee5f25783434a8d841f75bb14dd9cbeb223558bf6c3d22f93ec7ba3d6c4ec740243473c53575776e9700004a0f9695b91a5468837a62b6c4c6 SHA512 adbd3c99b3e3e126e13a468bc66109005a1abdd603c11ea02bf8d8c2c8232ea48f6e2da768439ce4480789df0aa412eaff3849a24f3c81def5efd4479c87c27c
-EBUILD coreutils-9.0-r2.ebuild 6543 BLAKE2B d8df4d40534c22482176f488be76b5f5905a527531b812b1eb34cd0a91ef3a4a1bd888676cd70b26e794584ea2d289af889b06bb5ce9775e9c4df39e01d9b2e7 SHA512 dc7cac6990f45cb1556fc59ae4d4fe01b35b701fec64e8d240d093b0771ea196144f148452d5b5d953804a3c126e2918676750c41698c8f3dae73bbb35a6fb54
-EBUILD coreutils-9.1-r1.ebuild 7044 BLAKE2B 810aef3fc79e73b87f9e73648c66a0481559327bce74c7703cc58cf448a67a345f43821571262bedf602f02f602b45c3b49a2b28be1c6c09cb1a05bd575dd6f8 SHA512 f47c76eb2a8ef6b8517179d2b49b680ee8d70323feb20a8b420bcf36819c85fec61e98cfd84fa912133343ea647ead0eba0e60d105473c02de6ee6d684e9cc3d
-EBUILD coreutils-9.1.ebuild 6777 BLAKE2B 4cbc8d7d2cac38d7a4308e5148d49cea96827a0507428b90c4f78cda3df451a21a22a86b3b2072b319a0040e2d4ef0881f81059584eb707bb83de7fd366a2c08 SHA512 7c4fc8adfb36c12b1b824f6a59091c7a9a9e26ab831ad530f9f3dea750c5e353a67dedacc4d940791ac350ae724e3f9a42d6761159d226c16c378cc937e37aaa
+EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B 37f5e49a8d45706ea17779f841523c5f876f29cd9d9d2c88dea33136b249c89853dcea87417f7e4b8c040e9a4b7d1691704301d11116baa567c0cb2b9fa0e17e SHA512 5e2b09e5e4fdb4c34aa0c75b8fbb6aadba98d93063aaf6eff01854e1a1527b9757c73ce35b8da17fe3eb480e04bff88d445305d95ad248bc9461723a9699e33c
+EBUILD coreutils-9.0-r2.ebuild 6544 BLAKE2B 75fbd687caf46c2bb97e5e6c9e81e8900a6041c4168770b1296df7095fb59e20c5a0b7c81145d14dae7c8dfe105024feb662ebf2fa7820216045cf043b3188e3 SHA512 28f0d629f7b18463217bc2d9efb4cf5d4ea74994de6ed9525a8bd22573c4d8b66cd05f52d049e02471ac0c242560b6d74214fce231841cbc16feef775404e83e
+EBUILD coreutils-9.1-r1.ebuild 7045 BLAKE2B 2511f0f6385dd1e9c4c6073a6a6fe370d4461708feca146603f203a6ec662adf92aca12ecc615dcaa4ce97b645b8f078db2117722305e9dd3a9c8cf276878c66 SHA512 49f93061af61f78fe51a078710ed1cbe745a5fd8adb52ad4a76de3b093c5d446a242acf6d0226451c5b8c655d34601b40571f09aae8c71fcd47eb7e74d6db68d
+EBUILD coreutils-9.1.ebuild 6778 BLAKE2B 0aaf6c5838efd7ecefd3644404972a58a87b26bbe453f3eba0cec31121ca4fcd937992fe7e369a78334c841c6e3e4efada538cfff24c765030f8c66c9f6831c2 SHA512 faeebc82ab7e02c92b489398622f76a86345ef24c7644f3611c0f60732537aaed850ff3c15e1b9bdfdac5df6225cbb77f944f218ee5f2723b477352afb9c1986
 MISC metadata.xml 959 BLAKE2B 7db7eff5a6e1c45c37e20d66e299b44b7a8334b20f970eac2bb7dbf0f8e149784bb19f28c0baa228bdbfbfe0335793080a99aee7f92a9976864ae53a35fc0ac8 SHA512 c69fdd7a27b7980c6e537387a510cfab65d0b252492576ffae3caac930bd2efad29edb604f654c194cc0a485894c8fbd3a5dc63e44359c95fc62fd055066b595
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 1a139279ad85..16c4445f3ae3 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 	)
 "
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
diff --git a/sys-apps/coreutils/coreutils-9.0-r2.ebuild b/sys-apps/coreutils/coreutils-9.0-r2.ebuild
index e55e9bf82f73..f759f70394f0 100644
--- a/sys-apps/coreutils/coreutils-9.0-r2.ebuild
+++ b/sys-apps/coreutils/coreutils-9.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 	)
 	verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
diff --git a/sys-apps/coreutils/coreutils-9.1-r1.ebuild b/sys-apps/coreutils/coreutils-9.1-r1.ebuild
index 4594d9dae0bb..09f9e649bfa8 100644
--- a/sys-apps/coreutils/coreutils-9.1-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.1-r1.ebuild
@@ -31,7 +31,7 @@ fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/coreutils/coreutils-9.1.ebuild b/sys-apps/coreutils/coreutils-9.1.ebuild
index 7b78b8fa9d13..f91b65f9f59f 100644
--- a/sys-apps/coreutils/coreutils-9.1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.1.ebuild
@@ -27,7 +27,7 @@ fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index d8dec6148f83..27b5d4987df4 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -2,6 +2,6 @@ DIST gawk-5.1.1.tar.xz 3250860 BLAKE2B 35eec6f4c9bf52496ac16e4b0e1b98947ae0dd46d
 DIST gawk-5.1.1.tar.xz.sig 488 BLAKE2B 1c7813753f3e982e1ef31efc7a1d78da4b977064b395e7b138ce09e68c1b9cb9a7b7de0d0b36afd6d39a2e62d5563cf7ceac6fcc73e9124ab07eceb56c0aa040 SHA512 71ecfa1b3a9e3005f033e83a75abce5c576c7941c62ed571cb6124032426db0e220bcdd577395d1af00a53c13dd1c8e6de71702cbe9c71960d3a3ff76dc026bd
 DIST gawk-5.2.0.tar.xz 3385496 BLAKE2B c4df19fe59c67ca1de490febc218f7eebb7f9d99f383b908c0af4179f89570d9bc102c0f1c2235dd758e397717957352853b2efbf7282532f51b17538dd95bf1 SHA512 e81e1efb1be06f82602e704d10e8de4b78797d058d9718d353e0837660dc8adf952965240c0a3b1a71c3e295f2e9641eacf64496d1d896edd81b101e09a656ac
 DIST gawk-5.2.0.tar.xz.sig 488 BLAKE2B 541e06de12f720bfd890daae8f50263ec5eeebb1bff1e69510fcc004b0fd0b5c4b9e182557757e833ad10324ce51c4db47c0857b5feaf17002975dfd34be35ab SHA512 c9ae287fbb31e35384ed8814b4f51e7f7e214f499556b71eb4b8085b65c73d0e32f88eb17f83aed8dfc6880485e7a348887cdf9ae54f3b13265dbf653cf84665
-EBUILD gawk-5.1.1-r2.ebuild 2761 BLAKE2B 74c1bb46202545d260d5212e17f281d762e39fb6c687b75577f8ff776e77a4d759df71ad8b153bb27554522caa84de29044a9e49a4494a42a4189c2c064c8fa6 SHA512 f61fd217de6d8b5b1083839c5d4cc4656c7ca7fe26a3d4c4ecfd414ed2ebca3ade5621bc5076ed682d52c478b453b03ee6aa5db623910928bc1ed3426b6edbba
-EBUILD gawk-5.2.0.ebuild 2819 BLAKE2B dbe776b5c33764e3737478ab5397defbfd706867537355f54d7c1c1c00fed77ec5048c0eeeafc15f404855550246315c4a8246882a944349cabe3b082c799416 SHA512 ee0ab538f4b512a6624753bd716261bdf14ce5a6dc641972d4f8b1ed59b293a55f7f8d58ec49dfecf93e637da8fdd57a0acec7858bb4518e83b5c568f9e74d86
+EBUILD gawk-5.1.1-r2.ebuild 2762 BLAKE2B dc12406f53b61c3a99cfd3dfbbe0a430b4746920a78be5fb611b8d6c61a8de5e82ff2002d3b8c3d90562d408d26453ada810f60ceb4bef961875b677c8079e64 SHA512 96941cc2cf82f799bca38f8707b9cdce9764a817e5fdd950fd91be3de00f5ae6fee2660a2fd77b7effd9d42263a33ce40927525f076c2140a83d84b3af7fb887
+EBUILD gawk-5.2.0.ebuild 2820 BLAKE2B 0ac76815994e4b32c9a7705155cac2976f3a63ca7ca17830b6a276d4038d5f09e55cbe9894776b822dc90e3e851d6078f3bd0c7eff8e6c0c69c37800467e64bf SHA512 4918cdec84e66e56b557daa5c55e367ec0f1f30f8ea3ece0ce76591bc645463bf7a41021a0c857c78b772dfb8b355b2dfb96da4e17efe39b21aa1fc5729cdbca
 MISC metadata.xml 560 BLAKE2B 1aed2e5d317f114ce878410b1d800deedb4d49bd0ba1594c8406ed9fbd6b248361bafdad22c945092a7a03acb8f5e08d8ca907fd5aa9e990fe9b9c3111e434d1 SHA512 2ad4ddbbe166a199a96412f7b0b3217c7b4659ad6bbc10df2dce3e8e55b800362d5abf6c8222dccc461893794b9bd9a1846bf9a266eb4ccfe8bcef79521ebeb5
diff --git a/sys-apps/gawk/gawk-5.1.1-r2.ebuild b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
index 396c6f8f74f2..3bdae58c5637 100644
--- a/sys-apps/gawk/gawk-5.1.1-r2.ebuild
+++ b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
 SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
diff --git a/sys-apps/gawk/gawk-5.2.0.ebuild b/sys-apps/gawk/gawk-5.2.0.ebuild
index b792f8e7a54f..074bee40b5e5 100644
--- a/sys-apps/gawk/gawk-5.2.0.ebuild
+++ b/sys-apps/gawk/gawk-5.2.0.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="mpfr pma nls readline"
 
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 86ab81e4543a..5d93f99de659 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-disk-utility-42.0.tar.xz 1740332 BLAKE2B 4d05876364a475d1e16651569862fe3e9bb97549463146e69722c55922c0609069334e198eff91208448dc0baf7fcefe6bab56612e89fd7412fea42ba20549d2 SHA512 c47c37262295ba455b483a7ebe7799e92f94b97d177327817bb088cddcc3ff1f5840c3e270651287ff6a88257ec7cfcd1abe4167bf7454bbf55e145c8f1dc7c9
+DIST gnome-disk-utility-43.0.tar.xz 1752240 BLAKE2B 906183e7f61c4e9d2206fe2c99034f06a0aa3869d253587325ae18b336dffc6d8523a2f4d89c4338ed64947e73c5a24de15dfdb15a9d42d77fe51fd2321bf159 SHA512 8cb1b10fba21c90bceec9521103defe092dea9a4c89a39ae44e4d5981dd0d1958649e7a2743535f0135a3c9179cad0e0aced98dfc805e19bdec81651abcecf48
 EBUILD gnome-disk-utility-42.0.ebuild 1420 BLAKE2B f49175cccf7b980232eead9e9d9c8bb88c89c6b1fbd9e80d54f1d1d74505757995c40d50c70e6cf1b70866306ebf8d138f86c9d27aa8d0f630e676a72ca1c8d1 SHA512 07e8d01b90398ec739b4a2d1d421e7b340fde1b437707312e71b0572663c91a2d4881dc7fbd95cbe44819f77d383a1c6a9f6da0d0f56ebb77282680d832cd769
+EBUILD gnome-disk-utility-43.0.ebuild 1420 BLAKE2B 86a4aa721ce5a0064388dbfdc39e598a754ccd475201e5717baabeee5a1019bd8321f98cfbda22287a758a682f252b593a428cad6d2c861afe349a2df22fb3af SHA512 dbd9f2153790c9d6524b4098264a54a112b63a56ea969cb0b924fa046ffcba8e21d8ca32d106cbdeb63f7a2e15868ec8911c9440539e48d06f3e409ba559287f
 MISC metadata.xml 598 BLAKE2B e9bd803739e63d5667cf9d84b27af2efeeac8e31591d022cfce00fa147f4ee267ea2c03624f43c2d822c00b853b1606f6663814a731182aaf557be259ab2fe45 SHA512 fa5f53e258f9db1447b28979f655b6794491af9eafd0d6f113d43fd2073d36fcedc126fef7fde4a21b99e2ad11e4442c7c333d9dfaeee92064b0de23c071c23e
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-43.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-43.0.ebuild
new file mode 100644
index 000000000000..7151173932fa
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-43.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=media-libs/libdvdread-4.2.0:0=
+	>=dev-libs/glib-2.31:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=gui-libs/libhandy-1.5.0:1
+	>=app-arch/xz-utils-5.0.5
+	>=x11-libs/libnotify-0.7
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=sys-fs/udisks-2.7.6:2
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+	dev-libs/libxml2:2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+		$(meson_use gnome gsd_plugin)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/xdg-desktop-portal-gnome/Manifest b/sys-apps/xdg-desktop-portal-gnome/Manifest
index 0524d8ee99c5..6b280044b72b 100644
--- a/sys-apps/xdg-desktop-portal-gnome/Manifest
+++ b/sys-apps/xdg-desktop-portal-gnome/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-desktop-portal-gnome-42.3.tar.xz 119228 BLAKE2B 1cafeda9e9ad5431eb52520db19350e9ee4c9f65e0923f6f320561893a29e32fc5033f3da540dd492c3341a8cb6bf29687cbf04b027e68ee388d102ac7023cac SHA512 0704eb29af5464fa0598cb4a05451866c8bacc20ad0638f7e799e7abdb4bbd86c41efbad963c493767190ae55f9d9c5d28360ee5fbbe1c42881969d03c7e84f5
-EBUILD xdg-desktop-portal-gnome-42.3.ebuild 831 BLAKE2B ab2e491a747b44eae012661a658ff16e4bf5bfc3b67696e4de2d41bfa742ae6eef93f4e75f792cff85f95538a0a07f9836395aace1aac01e54f35a717da39b7f SHA512 21089d3dcd2d66952a04bfe715982bd386232087e77495b4a830a9ab15e62dbfbf814554ac90ad80fe4e88846bd69dc38238959b760fef94696826ed9631de55
+EBUILD xdg-desktop-portal-gnome-42.3.ebuild 830 BLAKE2B 856d89e8fb635f5747c36611bfdcd7b8be3e22567551c3782eefe031ae14c8477a534fc211002d68db87ff9842bf01e68958653b14b38620cdd745bdd576f464 SHA512 3e336678ed9103c04d21b9f8c1f09b987b20cefc33d957f9aecaa4d924080d5e06c5d8d316fa1c732e944e7204f2b129f29a4717fa7adf51a5aa59ee2a674b0c
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild
index e4e6f252a73e..5e2de2bb4629 100644
--- a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild
+++ b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="wayland X"
 
 BDEPEND="