gentoo auto-resync : 09:06:2023 - 15:48:36

21 files changed, 458 insertions, 22 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index cf29ceb2ca1f..b74583d66825 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 8e903662cda6..4dce13778b95 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -4,6 +4,7 @@ AUX coreutils-9.1-fix-rename-simple-backups.patch 1343 BLAKE2B b284b2b7d33fe7650
 AUX coreutils-9.2-cksum-result-reporting.patch 2601 BLAKE2B 934e21d41fa93074aca8395bcb860c8bce6ac6de18120bcac728d67c0731242aa8163c411468caf7e64f71c731095e3e8070e5889d2fd93945a53ef50e31b831 SHA512 f1cb22d77d4b4c50f85e94153418cc6b774eeefc8955df725a4370844c8ceeb17ae0b3844269455ae36d23328a2faae1c5c762891384ea6f7eae46e89c291218
 AUX coreutils-9.2-cp-reflink-auto-fallback.patch 5690 BLAKE2B d0fe6e930a83675c7490c46edf16236d1c58edf734ec292df9148f13923e7467ae84dc3eb8c61789b4c4365dae537a32071b9db14e118f1171fe34b59c089d93 SHA512 d30aee98d9fe60e28534ffd388cb6a6911ffa751f2b03cd5d2339ccdd41cf512099afd9e67137da1690d489948faf1ed265ae1f6875379b558a25e9eee5a214f
 AUX coreutils-9.3-cp-parents-preserve-permissions.patch 3436 BLAKE2B de9fa1038b34ec2134c39758840e5a619ed5b3e60ebd9ad280e3e1a117f76143ccec852f74ac8da3f29604e8bdc92dcc134a19da756b759fb15d5bc632dda74c SHA512 e19afd35150c188a4ad14844463181f391ab6fbc9b4b812677df693f6181045f3dc63c42f2755e19f03bc2a608d041f3e0943537bc9d783b03819ce9928a962b
+AUX coreutils-9.3-old-kernel-copy_file_range.patch 3009 BLAKE2B 29be489f9544a1434708c73bc886605002e34fe430cbda062396cebb7fcb12bfb6062e1c032bb7ca2e49e2306b35150ca14e49a0a84d9b3a40ce0603dfa14c09 SHA512 5106a85a00aa7781514102e64ea2528221399009e9bfe842b0717bc1746cf9e4875aa00f9a3e56326ce2edc65a4cfc19c140a50a6528cd9131a7e41b4c785514
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
@@ -17,6 +18,7 @@ EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B ae5871d55509dbcd48c3f8b33938edfffca
 EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B 6f52424f7e9f065d56dacc6fbbee0ac279289b2604a0b964267c5cfa05dbe881b14811ad6a3194bbd072701f1213df2f59320c0999a2d32c21722d521f297f4a SHA512 172d981fb9297862b6b2a8b69f549973fd04ea5e25a7375255ccf40b619054f599b6fe971161e687a5d868449b40f421511e83c7551b24262b200a1c2f790236
 EBUILD coreutils-9.2-r2.ebuild 7602 BLAKE2B 858fd03a8ff42630b11bdd4a3c26d195d40ec93073fed28ee309475731c2ff054e54f3580ca17a536b88751293e26cd95cb82130431b963cd2d0abf5e6167faf SHA512 2934bf8602114f68e10f5f72c24b4e0cb07e95ab1d24f738b208754d3d58df21f0d72b1d01ba29897827bf9f961bd6536e1f3190a5a79d91839909e955812a53
 EBUILD coreutils-9.3-r1.ebuild 7604 BLAKE2B 2dfda62928900111a402e353402ac7e7f545ab72d37a626202933806a8591095b35c8e86b149f0aa784e7d5ac9b6325f72d5c8c7b49f2d6adb049fb42b9379dd SHA512 76430d1fa83857e9392a2973d797479ee130256c232f911157ae4056493b826ec436fdeb7e0ed93a01cf9de925f29cb0f7b5f29c1eb3059bf3a7031a9f97a5d6
+EBUILD coreutils-9.3-r2.ebuild 7794 BLAKE2B 5b043bc597928643cd313d14941c32d8a9fe495090c4577eee02115775fe5605ca1f2c1c704e71f24ad5353520e36ba34b05fe814be072f38e486f750fde28fd SHA512 b4d7c5bbba946f60af46e4a2f1dec9f449d48c71dc18d592a2f30ac0c44c8ea5a75aedb86f0d15398c931cde2c7a73f3209ad2c6a22a8e4c6d122454be09fd15
 EBUILD coreutils-9.3.ebuild 7478 BLAKE2B 8e857aeeb4a557ade9a6a85eb88814a414ba9f1a5c99efafd859c87cf644d21eac3592c033b505564ac54c0b827184faa295a2a7632fa2270a9c6225b790ce1f SHA512 7ec70783e2c978f6591ac16d1b137677e2927b961053a3e3e66a40dc5f9e576d9fbfae27f07f79110d3a2c4d93017ce92e3b32358e94cf5fe0509258ca2e4112
 EBUILD coreutils-9999.ebuild 7550 BLAKE2B a169a42a5e795e8cfb568d05c9744a46e687627bcc905178f5d0f5ee977f4a5c661a6cfe6f46c7dbaa04ab941f49de950af4546d22daf8ccd66e83a0df667c88 SHA512 cfb15372aa67eff7c67fee803b9d53500205e9d2e093cc9495e09fc48b453894ff183536d984b3ffc0fef25244f5285ebbf598ebeb3c74fe8bf35de0a99c0a7e
 MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1
diff --git a/sys-apps/coreutils/coreutils-9.3-r2.ebuild b/sys-apps/coreutils/coreutils-9.3-r2.ebuild
new file mode 100644
index 000000000000..a85afed513e4
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-9.3-r2.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
+# The upstream coreutils maintainers also maintain the package in Fedora and may
+# backport fixes which we want to pick up.
+#
+# Also recommend subscribing to the coreutils and bug-coreutils MLs.
+
+PYTHON_COMPAT=( python3_{9..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
+inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
+
+MY_PATCH="${PN}-9.0_p20220409-patches-01"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/coreutils.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Note: could put this in devspace, but if it's gone, we don't want
+	# it in tree anyway. It's just for testing.
+	MY_SNAPSHOT="$(ver_cut 1-2).18-ffd62"
+	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
+	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
+else
+	SRC_URI="
+		mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+	"
+
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
+fi
+
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="
+	acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	openssl? ( dev-libs/openssl:=[static-libs] )
+	xattr? ( sys-apps/attr[static-libs] )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		dev-util/strace
+		${PYTHON_DEPS}
+	)
+	verify-sig? ( sec-keys/openpgp-keys-coreutils )
+"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!app-misc/realpath
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+
+		sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
+	elif use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	local PATCHES=(
+		# Upstream patches
+		"${FILESDIR}"/${P}-cp-parents-preserve-permissions.patch
+		"${FILESDIR}"/${P}-old-kernel-copy_file_range.patch
+	)
+
+	if ! use vanilla && [[ -d "${WORKDIR}"/patch ]] ; then
+		PATCHES+=( "${WORKDIR}"/patch )
+	fi
+
+	default
+
+	# Just for ${P}-old-kernel-copy_file_range.patch
+	touch aclocal.m4 configure.ac Makefile.in gnulib-tests/Makefile.in configure || die
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	#
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1} || die
+
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		# kill/uptime - procps
+		# groups/su   - shadow
+		# hostname    - net-tools
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		$(usex caps '' --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp libgmp)
+		$(use_with openssl)
+	)
+
+	if use gmp ; then
+		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
+	fi
+
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		# bug #311569
+		export fu_cv_sys_stat_statfs2_bsize=yes
+		# bug #416629
+		export gl_cv_func_realpath_works=yes
+	fi
+
+	# bug #409919
+	export gl_cv_func_mknod_works=yes
+
+	if use static ; then
+		append-ldflags -static
+		# bug #321821
+		sed -i '/elf_sys=yes/s:yes:no:' configure || die
+	fi
+
+	if ! use selinux ; then
+		# bug #301782
+		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}" || die
+	chmod a+rx "${WORKDIR}" || die
+
+	# coreutils tests like to do `mount` and such with temp dirs,
+	# so make sure:
+	# - /etc/mtab is writable (bug #265725)
+	# - /dev/loop* can be mounted (bug #269758)
+	mkdir -p "${T}"/mount-wrappers || die
+	mkwrap() {
+		local w ww
+		for w in "${@}" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
+			EOF
+			chmod a+rx "${ww}" || die
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
+		emake -k check VERBOSE=yes
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if use split-usr ; then
+		cd "${ED}"/usr/bin || die
+		dodir /bin
+
+		# Move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
+			mv hostname ../../bin/ || die
+		fi
+
+		if use kill ; then
+			mv kill ../../bin/ || die
+		fi
+
+		# Move critical binaries into /bin (common scripts)
+		# (Why are these required for booting?)
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "Could not move common bins!"
+
+		# Create a symlink for uname in /usr/bin/ since autotools require it.
+		# (Other than uname, we need to figure out why we are
+		# creating symlinks for these in /usr/bin instead of leaving
+		# the files there in the first place...)
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+}
diff --git a/sys-apps/coreutils/files/coreutils-9.3-old-kernel-copy_file_range.patch b/sys-apps/coreutils/files/coreutils-9.3-old-kernel-copy_file_range.patch
new file mode 100644
index 000000000000..27767e312500
--- /dev/null
+++ b/sys-apps/coreutils/files/coreutils-9.3-old-kernel-copy_file_range.patch
@@ -0,0 +1,89 @@
+https://bugs.gentoo.org/907474
+
+From 87b95c17dc8611f9483b966d052eefc930f43927 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Mon, 5 Jun 2023 22:04:37 -0700
+Subject: [PATCH] copy-file-range: support building for older kernels
+
+* m4/copy-file-range.m4 (gl_FUNC_COPY_FILE_RANGE):
+Remove static check, to support the dubious practice of
+building for platforms that predate the build platform.
+On working kernels this adds an extra syscall the first time
+that copy_file_range is used.  Problem reported for Gentoo by
+Sam James <https://bugs.gnu.org/63850>.
+--- a/m4/copy-file-range.m4
++++ b/m4/copy-file-range.m4
+@@ -39,21 +39,9 @@ AC_DEFUN([gl_FUNC_COPY_FILE_RANGE],
+ 
+     case $host_os in
+       linux*)
+-        AC_CACHE_CHECK([whether copy_file_range is known to work],
+-          [gl_cv_copy_file_range_known_to_work],
+-          [AC_COMPILE_IFELSE(
+-             [AC_LANG_PROGRAM(
+-                [[#include <linux/version.h>
+-                ]],
+-                [[#if LINUX_VERSION_CODE < KERNEL_VERSION (5, 3, 0)
+-                   #error "copy_file_range is buggy"
+-                  #endif
+-                ]])],
+-             [gl_cv_copy_file_range_known_to_work=yes],
+-             [gl_cv_copy_file_range_known_to_work=no])])
+-        if test "$gl_cv_copy_file_range_known_to_work" = no; then
+-          REPLACE_COPY_FILE_RANGE=1
+-        fi;;
++        # See copy-file-range.c comment re pre-5.3 Linux kernel bugs.
++        # We should be able to remove this hack in 2025.
++        REPLACE_COPY_FILE_RANGE=1;;
+     esac
+   fi
+ ])
+
+--- a/configure
++++ b/configure
+@@ -39903,42 +39903,9 @@ printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+ 
+     case $host_os in
+       linux*)
+-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether copy_file_range is known to work" >&5
+-printf %s "checking whether copy_file_range is known to work... " >&6; }
+-if test ${gl_cv_copy_file_range_known_to_work+y}
+-then :
+-  printf %s "(cached) " >&6
+-else case e in #(
+-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <linux/version.h>
+-
+-int
+-main (void)
+-{
+-#if LINUX_VERSION_CODE < KERNEL_VERSION (5, 3, 0)
+-                   #error "copy_file_range is buggy"
+-                  #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"
+-then :
+-  gl_cv_copy_file_range_known_to_work=yes
+-else case e in #(
+-  e) gl_cv_copy_file_range_known_to_work=no ;;
+-esac
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+-esac
+-fi
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_copy_file_range_known_to_work" >&5
+-printf "%s\n" "$gl_cv_copy_file_range_known_to_work" >&6; }
+-        if test "$gl_cv_copy_file_range_known_to_work" = no; then
+-          REPLACE_COPY_FILE_RANGE=1
+-        fi;;
++        # See copy-file-range.c comment re pre-5.3 Linux kernel bugs.
++        # We should be able to remove this hack in 2025.
++        REPLACE_COPY_FILE_RANGE=1;;
+     esac
+   fi
+ 
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 23de8e2e0144..4c5ac9fd41d8 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -8,7 +8,7 @@ DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe
 DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
 DIST diffutils-3.9.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
 DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed
-EBUILD diffutils-3.10.ebuild 1688 BLAKE2B 85c0fd72fa06a6b2c3a23010a5084c3aac8c76258ce2ae20c268d190fbbb5636e8ce852707d47441094004ff4e92db7d9e823c961e7162e14fb5cfe929a394f8 SHA512 c9ff1458d4069849f0c991d2c7501b95aeb59126281d49e2a2d2437e8e1234b1dfa52862ea5b70a41c8b4341f15aff255034178c448a217643c8b3bc1e701253
+EBUILD diffutils-3.10.ebuild 1681 BLAKE2B 649f06d00d2fcbca232fc8c75888ca522661683671a4d3e81a715ebb3e1e8461a588a139c1daba4defff4f6219a797cf5d9b3604f94ab6ec79c8c182f5712ed0 SHA512 3aabb74759a8e37663fd437bcae8c74bddb5f9215142d31d115bc34b6a19ce80acd540922297e4eb8734036e721a63da5c5323db07d2d631d8d79c64011ba26e
 EBUILD diffutils-3.8.ebuild 1629 BLAKE2B 10da939a4cd1b1c7758a4cc3923d6059292dbc93b3659eb5bc1f587edc13e1c566223cdee1565b847f8df3615563072cce0fb48a13161112b2dd631e16b0c740 SHA512 bd9951c8bf3980c8b78eaabdb0845f8df59194c79dca242e689c8037a661ef7cfacd4f5811083288e395fe6a544dbbbef40dde12414e445a9be132b7aeed7cad
 EBUILD diffutils-3.9-r1.ebuild 1789 BLAKE2B 164630191651f897df865497013e58f71c560d098f74a55fd36ecd2d8ff728d4265654544af7fd2435ab3d9afd24818e013f34fc188c4da6bd09cb2583006427 SHA512 f8ea26537cf4de24cce2d35704acdc71b91e5084a9eab722c4c0de5355c4749467d1e4cbd3adb80a924ac75ea9119852eff5770161c31a79f422c56a1caf1d13
 EBUILD diffutils-3.9.ebuild 1691 BLAKE2B 51a7b026994b00abd945151396e46c331775559acffa6debc8f9643d2074f616517ef2b23cbbb33f0ded6e163a59b2b25c1b2edf3a028e8988829ad8e44486d2 SHA512 5b3c1a5280280bd14d6a7e0895f30f5bc59cd94c6303765d7d00ed4b40c110689c7974e4e725571bf89c81ae85aff32b54a186533f1811ba4509baa0cf9d291f
diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild b/sys-apps/diffutils/diffutils-3.10.ebuild
index 7dc0044edd42..2cb9c5205911 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	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-2"
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 488d611e478b..8d77b2ef346b 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -2,5 +2,5 @@ DIST gentoo-functions-0.17.tar.bz2 10798 BLAKE2B 1b725945421ab36b1412f9addc22e9f
 DIST gentoo-functions-0.19.tar.bz2 12079 BLAKE2B be0a3a54d4dee1755866047b670a69cd6fec368239123c3f0c08180b79a33c20147bca0e35e568faef6877513551e731bdf0c181aeb0460f6574d2d708219373 SHA512 2674d3fe5724cc6d685ae58bf0ee33f4a1bdba2c5e5809cfb193fd0a710d4678c2d9392c2c62d2321cf455f524950266dc1629ab684fe46632d179e539d5a39e
 EBUILD gentoo-functions-0.17.ebuild 801 BLAKE2B 4978d1de5281924566ba4f25eb79c7b4960fad0288a6bf6a51a2e1815a1bce61bd8f284c2ba4912812e3be8a703fcbe52b95ccc489b4de726ed22684fd34c5c2 SHA512 96e464b073d00a9901e8d899a3d88371267966f58a314b3c800f475d112ef349f77ddcfd0d78b68c508a4707d15c81f4fe4c0a1e1d5cdfa557352ead09729797
 EBUILD gentoo-functions-0.19.ebuild 877 BLAKE2B 457e5c405c05e9e928c4f8e9e764fe07b7ace335750bebb01d7226e9b7b1f7ceac0fcb49148087439c8a6b42c034aa1f7590b4203e9d42f06031f2b3acee58d4 SHA512 c846b3451c764b64ec601e9d579542a47d68775e94eac97b8680a08891076226279f0611a19a72ba1b75b0cb35941b22ff3c734831e6c8665c2ca5b65cd1f5b4
-EBUILD gentoo-functions-9999.ebuild 885 BLAKE2B fd04a8b67e45517aa030500507ca31d2e77e119a614d74e1ce4d17b243993b949a44912ff860f451d61c387868fc1bbe8b41d157989054d336baa818456ef616 SHA512 7dac7df3ec5f0acec19c0d4ccdc35e398772bb133de879378602357a60cc8ee06f82d850db4ffe52b70baf85ada46a0da52fc975d0e7ca734f93e0c8f957df7c
+EBUILD gentoo-functions-9999.ebuild 1011 BLAKE2B cf8c057f158e46b8c3eca48663d82ae42dcb4ebdd213e7f37bbddfe908dc7bbc0b209fa25831d485f15914fadf943468b2d605a564644b2acbde1d5987ced1d6 SHA512 a69705a6b57437e5e29b244c7d43e58c186a85053fe7b809e2758064df7518bbe056aa78fa2e1113413713552787e93aecd527f53c87682f4d2c9e28ec02643e
 MISC metadata.xml 416 BLAKE2B 08b6d649521646ff28c4738fbc3b9a292740bceb2430dab5ee4391bded078bd0c05dff69a28f722a1c23bbbb86af546935a055f93720ea759b141902f367394a SHA512 88409b09c14a2eb4859166e88f4a59ffc2e84e18a246b942f50ebd58bf83f0e6710f0405f08d102853cbd94562140a267cb60db29b4170893b7c3b3e24ec1ae3
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index d704dea16611..b43489741598 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -11,20 +11,26 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
-inherit toolchain-funcs flag-o-matic
+inherit meson
 
 DESCRIPTION="Base functions required by all Gentoo systems"
 HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 # Specifically needs GNU find, as well.
 RDEPEND=">=sys-apps/findutils-4.9"
 
 src_configure() {
-	tc-export CC
-	append-lfs-flags
-	export ROOTPREFIX="${EPREFIX}"
-	export PREFIX="${EPREFIX}/usr"
+	local emesonargs=(
+		# Deliberately avoid /usr as consumers assume we're at /lib/gentoo.
+		--prefix="${EPREFIX:-/}"
+		--mandir="${EPREFIX}/usr/share/man"
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
 }
diff --git a/sys-apps/goawk/Manifest b/sys-apps/goawk/Manifest
index 8570827a047d..42b78a96cedc 100644
--- a/sys-apps/goawk/Manifest
+++ b/sys-apps/goawk/Manifest
@@ -1,3 +1,5 @@
 DIST goawk-1.23.1.tar.gz 1678471 BLAKE2B f87037cdb5f256d5c3848f7fb0e64d81672abfa03c15d9b778fac14804c252ea140b3b436a09ab2189364b180bd1b638ecd66e767dd72532cc0f051ca2255097 SHA512 64f56f5ffa512929aa83d4df0360894ef231fdffe1879a72ed723606db77bf001ee744b646221a6042ef2cd3cb79fc8c80e33cec992b0b8c61da9f41ba78650b
+DIST goawk-1.23.2.tar.gz 1682245 BLAKE2B 6f7c87717ae3539272688c600705ca9757f38671dd2d73688ff4b3e345d66e2cf7b16f7bc6d0dd97340cf84b8a09bb116207ec5dfb361ff5721ffe99c048c118 SHA512 b448b99cb880b23de72fc77948217291b9da6733ad8538d7978e3dbd83e233ac6c558a39bc7d995002bb6b67c6b6ed5ac3a4131b90f43443bdd7c639b793f5ee
 EBUILD goawk-1.23.1.ebuild 486 BLAKE2B d195a4f565f757be6c106908a92ba39067ece0bddcfc993e69ec2f3681f129f9c2acc94cfcf28ff51267e7a2452757c56384a8a2168663bed9a701bffeb7a27f SHA512 3be176b228282405c66fa4e5b99fa5ade79fb3ae625fa8d20c439b62cb57ef5c83f011d2a6e27336152d3a1c2fac6a3ed2b81467334c4b633d82cac33afee351
+EBUILD goawk-1.23.2.ebuild 486 BLAKE2B d195a4f565f757be6c106908a92ba39067ece0bddcfc993e69ec2f3681f129f9c2acc94cfcf28ff51267e7a2452757c56384a8a2168663bed9a701bffeb7a27f SHA512 3be176b228282405c66fa4e5b99fa5ade79fb3ae625fa8d20c439b62cb57ef5c83f011d2a6e27336152d3a1c2fac6a3ed2b81467334c4b633d82cac33afee351
 MISC metadata.xml 318 BLAKE2B 1bc03337ba487236a6383f479302000f84b599ed693cc52e438f17c7fa41385b30879bf3ff6e13756f80a1cd9c82b8482b9baf607705e72cdceb540b4a83c420 SHA512 bea14196826043116194b13ab92a5cf54af3df5ea414208415f88067a87ddcc86acfe0b6967f1cb2aa077e4d55a8142192da55cf668cb1d0d4c07042249d5e03
diff --git a/sys-apps/goawk/goawk-1.23.2.ebuild b/sys-apps/goawk/goawk-1.23.2.ebuild
new file mode 100644
index 000000000000..e138a7adbd3d
--- /dev/null
+++ b/sys-apps/goawk/goawk-1.23.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="POSIX-compliant AWK interpreter written in Go, with CSV support"
+HOMEPAGE="https://github.com/benhoyt/goawk"
+SRC_URI="https://github.com/benhoyt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+src_compile() {
+	ego build
+}
+
+src_test() {
+	ego test
+}
+
+src_install() {
+	einstalldocs
+
+	dobin goawk
+}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 70ec34529bb5..a5f78ff49157 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -6,7 +6,7 @@ DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f
 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
-EBUILD grep-3.11.ebuild 2983 BLAKE2B daa65b9a2f21bca350b8ae83f182d72b47622bd8ad889a0a03e1393ede86a10636980658043e557ab03ec91d7ca0071e30a3d28804c0156c6691e34bfe266bab SHA512 258c38ed88fc62bebaf5e8b8c2e9e1c34646dc02da3ee03bff402bfed7b197a53f6b9f1e745d8dc64e0bcee7fd2d50e02fba7876eb535e1a7b347ae90e135e07
+EBUILD grep-3.11.ebuild 2976 BLAKE2B c5d5e3372c8ed2f1ed789cced4709fac512e1cb686a51fa031296caa846203a7fc688f2bf36954a7e3c9fe47f27dc69469f1761516ea8afb0b2237697949c905 SHA512 e9cb9619c584126a6cc30b1251b9e83ca62c71c9948cd756c078334325218c447feff6ae7bbc986090a197bb89b666cfa6cc25c47da0c26a31ea1f3ca61d5284
 EBUILD grep-3.7.ebuild 2230 BLAKE2B bba1d70da0946b001e79d1f6add2fa1ee919629f850192422182cc92b284d3c0b7caec73a06f93dbef7832092e2f96ad162a726490476818bce0d00cb5cba2da SHA512 f1370011d5655047fa1144a3ddde81653f9859658c3fb67cff542089d725ed461716a21509df1e0f56e1c4534e4bfa57546a782d34e2fc3302b3fdfc017b72d3
 EBUILD grep-3.8-r1.ebuild 2818 BLAKE2B ab01bd21228f3f90f5431067ab307cfa50af4b0ea7e0c610040662f0fe080792df0f0c319bc26ebecf9808aaef1c53dcb5437c9ab937b8e325bc9f796cdb1b67 SHA512 f56256ff6447f4772b565ba1b788ca74dd2a5a7ae2f2ef4ee64c85ea0bbc6b54751cabb869d4914f3eb5a5f62dadf0174f03628d66065ad02843db38cf32324f
 MISC metadata.xml 666 BLAKE2B 0c90e38d5363234474093ece5c9e0cbb99c01731a80c52869d700b7367fd74eec23f355653174b315f91ca7b41b4c5c9f5645ffaba043b3918c3c22c2c817ea4 SHA512 8e46c5c28b55063a7c74dfc637eb59785dc35651027e144acf4aea7f0ad7a4e43a3692946252acdf0d4a66ff8bdcfa89664fdf8bae71f1db688c06014c2a6a0f
diff --git a/sys-apps/grep/grep-3.11.ebuild b/sys-apps/grep/grep-3.11.ebuild
index f4c5c0cc1e00..a34eb16e03df 100644
--- a/sys-apps/grep/grep-3.11.ebuild
+++ b/sys-apps/grep/grep-3.11.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	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+"
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index 8d283b07b03b..63172c9fafde 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -4,6 +4,6 @@ DIST hwdata-0.370.tar.gz 2332791 BLAKE2B 92c68ce6ff05a9cae24e77794eb665672df9ad6
 DIST hwdata-0.371.tar.gz 2340297 BLAKE2B bb92b6d4f66879eacc1efae13ff1a5fe58014614c4af1906eca0489053f61d0ae2f4be777532cb6209cb2d133f8787774bc803a4d2cdf11a1014d7218bf25650 SHA512 62739cce61493f5d46a9cec5732bd4f9e0c86adec5b56cca31fa50c0d85e3a48d32f5abeaa5ca26f4ba42fc13affe4350b66a1838e958b037ddec7b30e726e86
 EBUILD hwdata-0.367.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.369.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
-EBUILD hwdata-0.370.ebuild 702 BLAKE2B 8734f2398aa66f05a6f68ace57d21a1cb515babef49888824257eb354da537d84f396c38a216ec071b6caa5b38a841c4049e3108d2ffd99cdfbc3bff8c64c045 SHA512 6dffe93d4582d6bd7c50d0a57bc6d067693c897dbd33c1ffc75b514065b64fad66d805d26f69d6af927813920b9ad5072f5a6eda118cb0942d66ec78c1a76088
+EBUILD hwdata-0.370.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.371.ebuild 702 BLAKE2B 8734f2398aa66f05a6f68ace57d21a1cb515babef49888824257eb354da537d84f396c38a216ec071b6caa5b38a841c4049e3108d2ffd99cdfbc3bff8c64c045 SHA512 6dffe93d4582d6bd7c50d0a57bc6d067693c897dbd33c1ffc75b514065b64fad66d805d26f69d6af927813920b9ad5072f5a6eda118cb0942d66ec78c1a76088
 MISC metadata.xml 328 BLAKE2B cf72c9663e944154e41475067b5e89dbfcd50f0c771e17dddfb6042a2ccb10693d7ef6eb7508e9ec7a50cbc59e8e47698030a5c1e18accd79040d4318416eb54 SHA512 f366d006f709fabe624840768aa780982884ba8a74f3ac121e323995e218a577dc5a4d34d9dcbec44571580d388967d78350d4540316444ddaf014b99db804e7
diff --git a/sys-apps/hwdata/hwdata-0.370.ebuild b/sys-apps/hwdata/hwdata-0.370.ebuild
index afddd20d2fd1..b5d599c17b39 100644
--- a/sys-apps/hwdata/hwdata-0.370.ebuild
+++ b/sys-apps/hwdata/hwdata-0.370.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index 707923e94571..43d3487d6acc 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -2,6 +2,9 @@ DIST moar-1.15.0-deps.tar.xz 4808044 BLAKE2B cd7808337af5acb2bd6cb4b9696c9d04803
 DIST moar-1.15.0.tar.gz 2780805 BLAKE2B 6a50018596f34de7d43fcedf0155141a6cd8d5896f34a05b44cfc5180d00e17caaf46377ecc3bb273fd5e2fd4536ada94e82cc7a8788cd14b030390f22ba40a4 SHA512 deedb8bf6f28f68a1633296a32a690df109c867023980125f7550111a3cf20463980c95fbddbafb16175aa03c46f3bf6150fbe066508cedffce49dd9bf18a90c
 DIST moar-1.15.1-deps.tar.xz 4808044 BLAKE2B cd7808337af5acb2bd6cb4b9696c9d04803df033b5a1d4904418602dc629cef7c16172b0eaa57644be76a02b6727d36f767bfafba1377ea95eb827fbb4a1d34b SHA512 e51ca15137f4b5dc5ea447c200341aaeb06cd77118cd8f2fb3efca0ffc2d4199e00687f980803c4ff09c535621b58206b22bff2c944ad8786c73c3a7c886d6c6
 DIST moar-1.15.1.tar.gz 2780649 BLAKE2B 79145ae426f5ae77d73dd556521135bfad21af3841818c4092eb476a52b408da86a4ce1f4c8e43712e74be233b7fc9469788e2134c866e8bb8ba83927c7f4f2d SHA512 c58fc57f583e8051c3e1f567e9d8ad0aca45dcbfb1998d0156cb07b90bc2359d70c8fe90849f753f969980af919d9faef82cde7dedcf2aa9aeab4c080edc7752
+DIST moar-1.15.2-deps.tar.xz 4760036 BLAKE2B 6fd72d710a620fdf104766be84f3fa68652c760818cdee66bb8475cc8949872c82be026c04b54cb61c0108c5977cb1f787f9a4fa0316bde0293cdedb1f6f94f8 SHA512 f40520a1b2e94f4a3e97d6a4e19191484b66e13a57c7b30416c813d84cad3d29295e862d5b75870313cc905112425c731d052619d49e78b33fb3d5d8750df3df
+DIST moar-1.15.2.tar.gz 2780812 BLAKE2B c104349cb94399f2c0c4a3219f2d59020cb7a9fa445edcde639c706070cae38ce54c7f181a0bf2de3ee831c146aaa19effbabf76509bfae948a22771951c0e34 SHA512 b4b7afa1b884a50e3939b59174e610357c6259667d3cac190aab24c5991bf59ff617200f04ec7292fd7eebf36a828748c54ce2eccbbe0cc413f3e0b5994d8cf4
 EBUILD moar-1.15.0.ebuild 820 BLAKE2B 2e027326f5d58653b7e84d695d675495329c22abe4a107fe3534d181ae43a45394cd80b1d1d2951004d61b9b473fd964e6f69c70539ebb83af45fcf7553ccba3 SHA512 60dbd1af440d29010acdabd0d0a77ed2f5b3d4240acd18d46e9a7acf5a062bb3eb57bc08e8fa3215707473af81f45520c3f94c829ac0859912be0a3215906ce7
 EBUILD moar-1.15.1.ebuild 820 BLAKE2B 2e027326f5d58653b7e84d695d675495329c22abe4a107fe3534d181ae43a45394cd80b1d1d2951004d61b9b473fd964e6f69c70539ebb83af45fcf7553ccba3 SHA512 60dbd1af440d29010acdabd0d0a77ed2f5b3d4240acd18d46e9a7acf5a062bb3eb57bc08e8fa3215707473af81f45520c3f94c829ac0859912be0a3215906ce7
+EBUILD moar-1.15.2.ebuild 820 BLAKE2B 2e027326f5d58653b7e84d695d675495329c22abe4a107fe3534d181ae43a45394cd80b1d1d2951004d61b9b473fd964e6f69c70539ebb83af45fcf7553ccba3 SHA512 60dbd1af440d29010acdabd0d0a77ed2f5b3d4240acd18d46e9a7acf5a062bb3eb57bc08e8fa3215707473af81f45520c3f94c829ac0859912be0a3215906ce7
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.15.2.ebuild b/sys-apps/moar/moar-1.15.2.ebuild
new file mode 100644
index 000000000000..177f577621ac
--- /dev/null
+++ b/sys-apps/moar/moar-1.15.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A pager designed to do the right thing without any configuration"
+HOMEPAGE="https://github.com/walles/moar"
+SRC_URI=" https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="!dev-lang/moarvm"
+
+src_compile() {
+	# https://github.com/walles/moar/blob/master/build.sh#L28
+	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
+}
+
+src_test() {
+	# From test.sh (we don't run that because it has some linting etc)
+	ego test -timeout 20s ./...
+}
+
+src_install() {
+	dobin moar
+	doman moar.1
+	einstalldocs
+}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index f40d8d264327..fc3c407597ad 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -5,7 +5,7 @@ AUX pciutils-3.8.0-pkg-config.patch 691 BLAKE2B c12a6a6f19a62d5d161479e401f5bd9e
 DIST pciutils-3.10.0.tar.gz 931711 BLAKE2B 2e1255eb5508c9d1339f5bc772c2592a03cae4d8d097e8939748c9bb5d5d949be53d705d1b7d903f7ea88b2abeea91e39de16e39d2f46f0a1f62f8a9e32c6faa SHA512 3da1af4af8b0fa3cf4d3f06095524e25dc292182beec10aa2c16c5c6ba751fe469d0e7f54e43413b6f3f5bcdbd1fba3c66df1d8e39d2e1962ae36a2d9c06238e
 DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
 DIST pciutils-3.9.0.tar.gz 908219 BLAKE2B 59d2a151b114691980b8f0a0bfdf8e48b9e1a0a9976df6dbc94962c251d8bfc61e7bd3b0f3c47a4295f52b5df67ad0e44ed6f2e6a87728e213e4ef0b8a55c028 SHA512 e17225c2adcc21c9ff4253998aec5805ae5e031888fa01841a1ff680796f7515f9dd6e5c2e0588edba854f66f1268ba8e28ae1a2f794574e715fec8a8c8def4f
-EBUILD pciutils-3.10.0.ebuild 4956 BLAKE2B 5d3f92794f32ce2ead29e8c4e8f2ed3a0acc4f930c8cd276ac50dcf89c33858abaf713710d717a00f607387fa6d9f940eba7f6111d0388f7ad978e825545f4f4 SHA512 9f53a474df39481c80e81001c920a75977a4f374ddf326f6dd26731f839ad9a1bfa6ce495cf331d8b0b35a9e73aec75ddfdf9c9db6b7f1699ac671feab49a956
+EBUILD pciutils-3.10.0.ebuild 4952 BLAKE2B 9c182aa7a5d33b42927beedcb313119558f8eb5498a96e10a68ba8e21445510be0bd94d73ce62f84d4c1cda4061b6f9809132ff070edfa4d33648c2a49b140ba SHA512 ccfbbc44a5358f51aef6b090a338b748b421e14b850a9f44ec2cbcb63400810ffbf78cda08f55b6d3117aaf3cf70cf0bab54a020ad0dc04f9d37c81e891d6929
 EBUILD pciutils-3.8.0-r1.ebuild 4915 BLAKE2B ddc1ba11cefb65a69392aad79260482827a62476200518f5d5aeac8209713b791f5fd389fcdd93c4acb3e40663180338584b17c04ea7148a5123a8bd274d0909 SHA512 ea895c2400ea0af258d0dc1151e81b3f972218f03054ddc20edf847fe053794d7286932fee44f008f53f641193bcdfd8cfac8b08800f4b0a620ae30e8591962a
 EBUILD pciutils-3.9.0.ebuild 4818 BLAKE2B cc031ea10caa35e700b2dff962f682d6cba393654b111b4ddcb61137f796e36c317527a7ff25a05f3b99902c8265cee496e11a52a8b430205fe8f3fe67aee520 SHA512 0d1c6d03f882c6fe593be6814005f44cd12f7d5a6750b85da55868af4066939a1b8551068378f45fe9d6b6e8e7c65aa1964a263c7184e6c6967c96acd30db9c5
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.10.0.ebuild b/sys-apps/pciutils/pciutils-3.10.0.ebuild
index 5e89fcabdfd5..273cc9669f25 100644
--- a/sys-apps/pciutils/pciutils-3.10.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 REQUIRED_USE="static-libs? ( !udev )"
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d451b81dd0a3..6fd25524b311 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -12,7 +12,7 @@ EBUILD portage-3.0.45.3-r2.ebuild 9028 BLAKE2B b12f08568132beaa953cf3634571c2eeb
 EBUILD portage-3.0.46.ebuild 9034 BLAKE2B 14f9d103cb065925f1487975448bc3bc2da871676a6216782f8fbda37823a063ffa74601630f316e66a3acf611381ae2e2610138faf6df977b648035d4234643 SHA512 de460773918dade93a80b3bf3253fbe02530024534a4a673c803d0440ebe24e7bc2af5322193864577180af831895096d8ea6cf12477c3b0dab6f0280833e65f
 EBUILD portage-3.0.47-r1.ebuild 9272 BLAKE2B 5cfd00aa50d078fe299c5cf244064ddf63e9b31a713d96a515c6dac9efd4b2e9964630de983a1707831ef06df49286ea123b9c4dd6503162bb107202f60e71c4 SHA512 3914720ad172677040d9016783145c325ae2504df00180811bcb0418ca983f3c843e57d08ef76d749cddaea4a491e4b95148a62ac85de625a33e083b5289f4c1
 EBUILD portage-3.0.47.ebuild 9200 BLAKE2B a3cd513f441aef9205bc0761ee782b82d6721181243d6bef4dab5bbafa47a54a4e470d8eb805a2c31f3ee40b0a8b426578a46cb7bf406bdeb1485b7d20a10f79 SHA512 6b2f57982d6bb6e6ccab936f9cf995817bb8ab93c67f81615ca74151bea13d832a29998ee70cff7a7ac3859c2c5648cfc75ed89af8f807665bc05bc09dd45407
-EBUILD portage-3.0.48.1.ebuild 9270 BLAKE2B 5573892ff05766bc8d288d0e8712ce9303585b177b5ff198ff97625bbbdf96078f0890d92fb1e69f37b3ea51007b4495c4f8566c8d7cd76f338836ebf7146670 SHA512 8c0bb5ddc900018bb36fbc15a00d0f5f588f6c6e01f12fb5641704961d976c71c17bf73405d5ff94d2669e0852d2db7622502ad566978ece4bbd20ed101f51cd
+EBUILD portage-3.0.48.1-r1.ebuild 9269 BLAKE2B d4dd70f72286c3ca9ed910daa052c7eaaa7e391aa7a19b7b92535fff570c0e973e4d46c363d076569aa4617019fc942844ab008368c21cf624df0b5ffa30d1f9 SHA512 2767d6091fe1aa7f8c9df1c724193ed66897310c06e9e836d2ef8dd6be54344022b3ebba60235885d9be534e0998e01a24a395a7604abed0273876b372c4ae3b
 EBUILD portage-3.0.48.ebuild 9270 BLAKE2B 5573892ff05766bc8d288d0e8712ce9303585b177b5ff198ff97625bbbdf96078f0890d92fb1e69f37b3ea51007b4495c4f8566c8d7cd76f338836ebf7146670 SHA512 8c0bb5ddc900018bb36fbc15a00d0f5f588f6c6e01f12fb5641704961d976c71c17bf73405d5ff94d2669e0852d2db7622502ad566978ece4bbd20ed101f51cd
-EBUILD portage-9999.ebuild 9270 BLAKE2B 5573892ff05766bc8d288d0e8712ce9303585b177b5ff198ff97625bbbdf96078f0890d92fb1e69f37b3ea51007b4495c4f8566c8d7cd76f338836ebf7146670 SHA512 8c0bb5ddc900018bb36fbc15a00d0f5f588f6c6e01f12fb5641704961d976c71c17bf73405d5ff94d2669e0852d2db7622502ad566978ece4bbd20ed101f51cd
+EBUILD portage-9999.ebuild 9269 BLAKE2B d4dd70f72286c3ca9ed910daa052c7eaaa7e391aa7a19b7b92535fff570c0e973e4d46c363d076569aa4617019fc942844ab008368c21cf624df0b5ffa30d1f9 SHA512 2767d6091fe1aa7f8c9df1c724193ed66897310c06e9e836d2ef8dd6be54344022b3ebba60235885d9be534e0998e01a24a395a7604abed0273876b372c4ae3b
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.48.1.ebuild b/sys-apps/portage/portage-3.0.48.1-r1.ebuild
index 07b36de0ea7e..9e5f7353bb48 100644
--- a/sys-apps/portage/portage-3.0.48.1.ebuild
+++ b/sys-apps/portage/portage-3.0.48.1-r1.ebuild
@@ -61,12 +61,12 @@ RDEPEND="
 	>=sys-apps/baselayout-2.9
 	>=sys-apps/findutils-4.4
 	!build? (
-		>=sys-apps/sed-4.0.5
-		>=app-shells/bash-5.0:0[readline]
 		>=app-admin/eselect-1.2
+		>=app-shells/bash-5.0:0[readline]
+		>=sys-apps/sed-4.0.5
+		>=sec-keys/openpgp-keys-gentoo-release-20230329
 		rsync-verify? (
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20220101
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 07b36de0ea7e..9e5f7353bb48 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -61,12 +61,12 @@ RDEPEND="
 	>=sys-apps/baselayout-2.9
 	>=sys-apps/findutils-4.4
 	!build? (
-		>=sys-apps/sed-4.0.5
-		>=app-shells/bash-5.0:0[readline]
 		>=app-admin/eselect-1.2
+		>=app-shells/bash-5.0:0[readline]
+		>=sys-apps/sed-4.0.5
+		>=sec-keys/openpgp-keys-gentoo-release-20230329
 		rsync-verify? (
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20220101
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)