gentoo auto-resync : 18:06:2023 - 01:46:36

17 files changed, 364 insertions, 191 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 43907e94dd54..03df70de1246 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 4dce13778b95..b354d9258131 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -19,6 +19,7 @@ EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B 6f52424f7e9f065d56dacc6fbbee0ac27928
 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-r3.ebuild 7935 BLAKE2B b70917cdf13265e12c70d38b5f305ec5a824407802a4111c30a5107ff13c4f6a30fb13f3ce88a3bff886b9de15edfe3b03519593ca3219a32f889af965b6104f SHA512 366d6aa630fbbed5484aa6d2f517512a74c25cd9fde1f0a660cfcd852c1fc1de22e4f495baccc7a959d298bf987a9904c9d71efa381adedf33ac22d28efac432
 EBUILD coreutils-9.3.ebuild 7478 BLAKE2B 8e857aeeb4a557ade9a6a85eb88814a414ba9f1a5c99efafd859c87cf644d21eac3592c033b505564ac54c0b827184faa295a2a7632fa2270a9c6225b790ce1f SHA512 7ec70783e2c978f6591ac16d1b137677e2927b961053a3e3e66a40dc5f9e576d9fbfae27f07f79110d3a2c4d93017ce92e3b32358e94cf5fe0509258ca2e4112
-EBUILD coreutils-9999.ebuild 7550 BLAKE2B a169a42a5e795e8cfb568d05c9744a46e687627bcc905178f5d0f5ee977f4a5c661a6cfe6f46c7dbaa04ab941f49de950af4546d22daf8ccd66e83a0df667c88 SHA512 cfb15372aa67eff7c67fee803b9d53500205e9d2e093cc9495e09fc48b453894ff183536d984b3ffc0fef25244f5285ebbf598ebeb3c74fe8bf35de0a99c0a7e
+EBUILD coreutils-9999.ebuild 7686 BLAKE2B a03e0d4c230f28daa688b2ee60f5f740bdb1a2040634dc86d4355647b96ea9666be13c589d62d773bc65a3f57d183354389c0f2e09bd73cd6775bd7c11aa9d1f SHA512 79b3b4263909522367ddb022247266535a21f0c950c9c0d8df2d78c68242a2730371e37e7528f53a39e1f72f0ffdd629e89c57cd546c9167985146c2215039d7
 MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1
diff --git a/sys-apps/coreutils/coreutils-9.3-r3.ebuild b/sys-apps/coreutils/coreutils-9.3-r3.ebuild
new file mode 100644
index 000000000000..ab1c0e9a1cbd
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-9.3-r3.ebuild
@@ -0,0 +1,277 @@
+# 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() {
+	# On alpha at least, gnulib (as of 9.3) can't seem to figure out we need
+	# _F_O_B=64: https://debbugs.gnu.org/64123
+	append-lfs-flags
+
+	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/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild
index 6e3d435cba1d..3e4dc9a20eb0 100644
--- a/sys-apps/coreutils/coreutils-9999.ebuild
+++ b/sys-apps/coreutils/coreutils-9999.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 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).198-e68b1"
+	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}
@@ -135,6 +135,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# On alpha at least, gnulib (as of 9.3) can't seem to figure out we need
+	# _F_O_B=64: https://debbugs.gnu.org/64123
+	append-lfs-flags
+
 	local myconf=(
 		--with-packager="Gentoo"
 		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 261f85bea158..210669e90d91 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -3,5 +3,5 @@ DIST dmidecode-3.4.tar.xz 61420 BLAKE2B f9f0429c5128692c2d1d560580552285ea900c1c
 DIST dmidecode-3.5.tar.xz 65068 BLAKE2B 07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802 SHA512 690c9bea391f6bbfc8cd48e8db408a61d5b551a07a2823c29d03a09607fc2043cc1bea44ee9fd27fd0e7bc0b287bf9de9f22a1a66053f5b1e63d77c03d93e1ae
 EBUILD dmidecode-3.4-r1.ebuild 1254 BLAKE2B 61d66053e0b1ce8067c8a9ea9f2f4bf73adabbd48de1b3681a0e9f5f87688ec91bd968f373a512df710c94c99992a3577804b106d3a730797b5b026c519de4cc SHA512 db523a6849344cd14fd6df62e29ea2f6d5efd57a4b919848da555c88e65d9ddccb2844f036998c1652a2796c978adc24b51397213432ccfa9620c6003268334e
 EBUILD dmidecode-3.5-r1.ebuild 1254 BLAKE2B 61d66053e0b1ce8067c8a9ea9f2f4bf73adabbd48de1b3681a0e9f5f87688ec91bd968f373a512df710c94c99992a3577804b106d3a730797b5b026c519de4cc SHA512 db523a6849344cd14fd6df62e29ea2f6d5efd57a4b919848da555c88e65d9ddccb2844f036998c1652a2796c978adc24b51397213432ccfa9620c6003268334e
-EBUILD dmidecode-3.5-r2.ebuild 1326 BLAKE2B 068296d6e9adb5eec007a404a950a33f449da612c3ed616e40dd775d6d03331d3bfb287ade7d1a4530d98b18db1e0906eb713143879b5c80fa5f420495fbe6f5 SHA512 1c33edf417cc99c89a70357aec829c6bd1d779ccad3da560c2c9999b98141396cf24f1c425893c297ec9996d085ab244bf1827a293db2459eaeb086f7cf12fb6
+EBUILD dmidecode-3.5-r2.ebuild 1325 BLAKE2B 1ba8f7f528efc76c33af5b85d5420c778f76d9debe28c988e8469a2f7055cd330062404b6d29047fce008bd2c2b2509ed82210f638827e4487e08f83cfa562a1 SHA512 1b197bbea13a6ad097b48a4d0c873c449b83f10c36028cb08db92bfdccff74c57825cdf958efe59de247c5cf0a11ffc681054b092d366acb899648e7ab87641b
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild b/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild
index 3e2a2fff690d..f171497c09df 100644
--- a/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86"
+KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 5f061a1a3750..c3b746450d47 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -3,5 +3,5 @@ DIST gawk-5.2.1.tar.xz.sig 488 BLAKE2B 5dcdc9ae90d4744a968cc750526a9c1c38915f85c
 DIST gawk-5.2.2.tar.xz 3402872 BLAKE2B 49dd69d3e2414867d60fe42b74b39bc6858114aeeb9305ade7bfd64f1933b3c93d59d127362b614cb4b73e29279ed3b4ea9fa0da94fce98ca9925980d17b5d0c SHA512 90611e4daba7226d5ce8230843bf479dc71c0101740c005d851ef7c5b935b6cd4c42089b858abc1619adc05ed25fc7234f993690a76d2ea0b8e61bcbb7dc5a58
 DIST gawk-5.2.2.tar.xz.sig 488 BLAKE2B ad737580d7eeb556187a3eeb269decb484398ca91b0fbf08da7f78bba92328ca2fb566b00f8e880fb7c5f0f956e49f8ab9fddc73209902c420666d5413e8a467 SHA512 563911c3771feddf64810ef2480705fd470c90380c0e258940cedeef3f15d594ef657ddab267a6d958321333d466b77c9b83be2392549c959245324950fb32ed
 EBUILD gawk-5.2.1.ebuild 3506 BLAKE2B 1363dfbda07f8249a123c3892dd844ca7427d8f506f7b43a22897b5eebc7202535fc28b7bf75db0ae60296c06f36f3b6ae44dd3b672670628f0d7bff2e5a6d6f SHA512 404bc69c26e5b621b0e069eab6639a901d064947ed447eb77f1a720afc1fe3c6fc5401c985ce102b7b39a15d22613adc41af87d3511ced29d72893474b35a3eb
-EBUILD gawk-5.2.2.ebuild 3510 BLAKE2B 67e7a457d943e6c633d8bb7683fbf04d485846dd6521e44c0f94a263b8d47c03de7723c05a39758cf5aec15da0bd88653e7c0b29c68fce8ba88b6c7d092d7710 SHA512 07ebba00abd145f11b0221d7001a643fde7bb07137609c0c33eef3229bc4d55dcb4886f881e90d94c92b5c0060dd28f2207a14be0809f132b892c42331ab3f05
+EBUILD gawk-5.2.2.ebuild 3509 BLAKE2B fe1b96751d73d988d32a68b8243a27ee68b8250b41f6bb1939067adca18949c4b74abc4a891108a195aaf7011bcdc5eaa6ee20794086b224990d2298965cc570 SHA512 49f7835ae625c8fbb7d5a5a71c332d0208bb71219cbca0eed82430223fa38086f757441a6bc4d2fba479de5b1d189d91ecf54b0f22e457a75370089a50267404
 MISC metadata.xml 654 BLAKE2B e04183a376da2006e727296257a18431f2e4f29fdabcee48edebb1c9dbf099c846af6bfe90d9e551ec4536c2dd034a80b47e6a1b8e442a89c1228929bef7d956 SHA512 9bb5a19c4b9a8ff7669c7ae7320a88d64eb68b4897f06d2046f71efe562a4846cb8c611bcc03b0111dfde19b40275f3357a5cd6285d4d5f0b4464a9c8b3eacb2
diff --git a/sys-apps/gawk/gawk-5.2.2.ebuild b/sys-apps/gawk/gawk-5.2.2.ebuild
index 9d8a4b0480a1..7521209aa553 100644
--- a/sys-apps/gawk/gawk-5.2.2.ebuild
+++ b/sys-apps/gawk/gawk-5.2.2.ebuild
@@ -29,7 +29,7 @@ else
 	SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${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/less/Manifest b/sys-apps/less/Manifest
index cd1f0fb17d8f..2020c3c74458 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -8,6 +8,6 @@ DIST less-633.tar.gz 375733 BLAKE2B e9df180794af365f86734c6b8fde766c1bba42b11171
 EBUILD less-608-r1.ebuild 1587 BLAKE2B 68675bd30388ab95aa57d8fc90bcd98fc6b27f26e9bd77d193880726fbcb9b141b8d916164bca303b12f330fa88dd62afb93d9eaff23f8b626bbbfb73d5c2bc5 SHA512 f05b649f662a46232fd2ba93335ff906ed7457b4f3581a48d0d273f1744ca39d1cdd90502a1a6e6770cba17091663107a5071b974217485fd1bc3218dfe55537
 EBUILD less-608-r2.ebuild 1634 BLAKE2B 87c9824276ec63f523bef354cdc92a91f6771e43adcf141c8a8e0b6ae20eb2391a15bdd8c37d18527d04135c873fe4330207bcbd331fabf20f7c3e0cbfc03343 SHA512 5f97824ddd3760ddc995d2eff9d915f023e9162a803e1fcc098abc2cd56745b250df1b37646e7cb533c74bbd3436bc4784e70f3cd7cd76716dfe7a32acdc6279
 EBUILD less-632.ebuild 2188 BLAKE2B 3157e4c5b111b0f1b8e1ef9a9a437474f5380af2b6bbc7e1011d102b6d6cefd788fe2c60bb7d272f0fcdf69db0fd1692c66a42bb47b648f94dfe3281ecdebdc6 SHA512 299d40de3ac0c4d3a9321dca6efbc44aad50066fabe324c0e0cea407469adf374b26887cd4ca1347cec99eb6c2037d3fff2e8cbc764d44ee509759b27f588b1e
-EBUILD less-633.ebuild 2189 BLAKE2B ddc740b9815c2b5ac6b094e291797ed0b4f67aa80e26101e71117eed064d0c3185fc49f76a91cbe52b7ccdc0009be23649edceec65b0db8f1a853a21ec473885 SHA512 b2610a69dad428b7d08160ee1862271237d351d93927b7eca12d0c90177e3483f50cc173917dfbdd492203212171c44c858bb4c52b9c0f4fad7f3959666adbe5
+EBUILD less-633.ebuild 2188 BLAKE2B 3157e4c5b111b0f1b8e1ef9a9a437474f5380af2b6bbc7e1011d102b6d6cefd788fe2c60bb7d272f0fcdf69db0fd1692c66a42bb47b648f94dfe3281ecdebdc6 SHA512 299d40de3ac0c4d3a9321dca6efbc44aad50066fabe324c0e0cea407469adf374b26887cd4ca1347cec99eb6c2037d3fff2e8cbc764d44ee509759b27f588b1e
 EBUILD less-9999.ebuild 2196 BLAKE2B 5029b2a8d8dbaa4b10272dd8327ce8c3447729ebbfdf06ac7783a036e03719fe6707039100054c1a9cd4014317b2a1e0f5d6c1baf9c545e9c62963a6115ee9a6 SHA512 7a41769096ec6a680541f67101781672037f688078e02adefcb36a93db2610298ae456482f63d23dfee4ae696fcb090bf127e75783d038d63cf18f95ba10dcb4
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/less-633.ebuild b/sys-apps/less/less-633.ebuild
index 4a273c315ca2..84b0670e4fc7 100644
--- a/sys-apps/less/less-633.ebuild
+++ b/sys-apps/less/less-633.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}"/${MY_P/?beta}
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
-	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
 IUSE="pcre"
 # As of 623_beta, lesstest is not included in dist tarballs
diff --git a/sys-apps/openrazer/Manifest b/sys-apps/openrazer/Manifest
index 78781de1a9b3..714ac17a34a2 100644
--- a/sys-apps/openrazer/Manifest
+++ b/sys-apps/openrazer/Manifest
@@ -1,7 +1,4 @@
-DIST openrazer-3.5.1.tar.gz 240254 BLAKE2B 7f6b887c22c81c8cd3d7908f94748879aa4c89f6446e073aeaed0d33f8d58bd7b618768a9915a451d6659c0cdf428b52e055641420553a00f2cf41b0a9737487 SHA512 dc32f040f4b9ecbefbd2b4afc34edcc97fbda16f6dd9a64ed61d637233ea5d0e6f046685837635a177d3cab8506224c973ea26972a6ea7cc20d7bcce60065e39
-DIST openrazer-3.6.0.tar.gz 243924 BLAKE2B 7b782990cf5afedb88adafe310bcba6512ff8009cee6bbf8e005f4780c711ccc724cacc3056f471002268c61e6d3bfce0ba6b5c72e502ad83b954c45f70b521a SHA512 fb08a8a38ce582099e6c1a98df73aacf9dd437beb4be9cc0e7e3e14f4da6e53de90058a8cc22daeda0bbcfe111b2bc5a38c0503e0020239d44dae2f199219695
 DIST openrazer-3.6.1.tar.gz 244061 BLAKE2B f5fa8bf4ec383cf92d3c9c66db6b2f6cc9e4cf1969558d187ff62e687316b861d3c0f0ba37f5addc0911a49794acc648ae2d6be6f519ea1d33afa3cc9ab7bd1b SHA512 1e1db191e4daa028fe177e9c50ddf2dfffdf7c8ba68d108a2e74232b9accb344dbc5c3352aba223434cf16d79c113e7ba19dc9f2e6672758153c25ba9391cbff
-EBUILD openrazer-3.5.1.ebuild 3703 BLAKE2B fda67f9e5979847b7607bc93bfacfd54018917ce856445054e54cd1476b41959d45d28e21ea6dff5d7631446011cb3897509880c3fcd404eaacf243a1b510f3d SHA512 111f3f3a8d604be9a5ae2cbee75758e5035efb9fe54139a9070e6be85919ec61430ea605c2a3259e3aae1f188993e3541322b3f9980a2d7d4e6cc596256debc0
-EBUILD openrazer-3.6.0.ebuild 3703 BLAKE2B fda67f9e5979847b7607bc93bfacfd54018917ce856445054e54cd1476b41959d45d28e21ea6dff5d7631446011cb3897509880c3fcd404eaacf243a1b510f3d SHA512 111f3f3a8d604be9a5ae2cbee75758e5035efb9fe54139a9070e6be85919ec61430ea605c2a3259e3aae1f188993e3541322b3f9980a2d7d4e6cc596256debc0
+EBUILD openrazer-3.6.1-r1.ebuild 3765 BLAKE2B 609159b3060ed6330f68521654c1fc53ea7985e82ba836f6db814c391a272678fc29b260b45e52b619eda6172e4c3424894af8f88260019f6b046d91b673e20e SHA512 cae3fc3bab7e24d602280e1de5030dffd041b147dc596acf8c7e1c9f837bf4b7163d414af624e630a377494bd08df4f176b4163cdb1fd35475ba93038137d342
 EBUILD openrazer-3.6.1.ebuild 3703 BLAKE2B fda67f9e5979847b7607bc93bfacfd54018917ce856445054e54cd1476b41959d45d28e21ea6dff5d7631446011cb3897509880c3fcd404eaacf243a1b510f3d SHA512 111f3f3a8d604be9a5ae2cbee75758e5035efb9fe54139a9070e6be85919ec61430ea605c2a3259e3aae1f188993e3541322b3f9980a2d7d4e6cc596256debc0
 MISC metadata.xml 557 BLAKE2B c7d8fe83eb9f1d3d5361d816e6bad6abd2eea172e743a3482b1e67bb77019251b26b2ecb7d9d8e7efd4ada69990ea07735446771a836a64bd110cac6b72a626a SHA512 87490d202ae606a8f4d1fe63e5631c7eae1ae13f0705dc6553f79b351d6181183cc81c69b5740647298a48e35db407821835c8309db725b609f4bcfd8d0bdd56
diff --git a/sys-apps/openrazer/openrazer-3.6.0.ebuild b/sys-apps/openrazer/openrazer-3.6.0.ebuild
deleted file mode 100644
index 1c4a836bb8ba..000000000000
--- a/sys-apps/openrazer/openrazer-3.6.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit readme.gentoo-r1 systemd udev xdg-utils distutils-r1 linux-mod
-
-DESCRIPTION="Drivers and user-space daemon to control Razer devices on GNU/Linux"
-HOMEPAGE="https://openrazer.github.io/
-	https://github.com/openrazer/openrazer/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-IUSE="+client +daemon"
-REQUIRED_USE="
-	client? ( daemon )
-	daemon? ( ${PYTHON_REQUIRED_USE} )
-	test? ( daemon )
-"
-
-RDEPEND="
-	client? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	daemon? (
-		acct-group/plugdev
-		dev-python/daemonize[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyudev[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-		x11-misc/xautomation
-		x11-misc/xdotool
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	virtual/linux-sources
-"
-
-DOCS=( README.md )
-
-DOC_CONTENTS="To successfully use OpenRazer: load desired kernel module
-(razeraccessory, razerkbd, razerkraken and/or razermouse),
-add your user to the \"plugdev\" group and start the OpenRazer daemon.
-To automatically start up the OpenRazer daemon on session login copy
-/usr/share/openrazer/openrazer-daemon.desktop file into Your user's
-~/.config/autostart/ directory."
-
-BUILD_TARGETS="clean driver"
-BUILD_PARAMS="-C ${S} SUBDIRS=${S}/driver KERNELDIR=${KERNEL_DIR}"
-MODULE_NAMES="
-	razeraccessory(hid:${S}/driver)
-	razerkbd(hid:${S}/driver)
-	razerkraken(hid:${S}/driver)
-	razermouse(hid:${S}/driver)
-"
-
-distutils_enable_tests unittest
-
-python_compile() {
-	if use daemon ; then
-		( cd "${S}"/daemon || die ; distutils-r1_python_compile )
-	fi
-	if use client ; then
-		( cd "${S}"/pylib || die ; distutils-r1_python_compile )
-	fi
-}
-
-python_install() {
-	if use daemon ; then
-		( cd "${S}"/daemon || die ; distutils-r1_python_install )
-		python_scriptinto /usr/bin
-		python_newscript "${S}"/daemon/run_openrazer_daemon.py ${PN}-daemon
-	fi
-	if use client ; then
-		( cd "${S}"/pylib || die ; distutils-r1_python_install )
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-	distutils-r1_src_prepare
-
-	# Remove bad tests.
-	rm "${S}"/daemon/tests/test_effect_sync.py || die
-}
-
-src_compile() {
-	linux-mod_src_compile
-	distutils-r1_src_compile
-
-	if use daemon ; then
-		emake -C "${S}"/daemon PREFIX=/usr service
-	fi
-
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	( cd "${S}"/daemon/tests || die ; distutils-r1_src_test )
-}
-
-src_install() {
-	linux-mod_src_install
-	distutils-r1_src_install
-
-	udev_dorules "${S}"/install_files/udev/99-razer.rules
-	exeinto "$(get_udevdir)"
-	doexe "${S}"/install_files/udev/razer_mount
-
-	# Install configuration example so that the daemon does not complain.
-	insinto /usr/share/${PN}
-	newins "${S}"/daemon/resources/razer.conf razer.conf.example
-
-	if use daemon ; then
-		# dbus service
-		insinto /usr/share/dbus-1/services
-		doins "${S}"/daemon/org.razer.service
-
-		# systemd unit
-		systemd_douserunit "${S}"/daemon/${PN}-daemon.service
-
-		# xdg autostart example file
-		insinto /usr/share/${PN}
-		doins "${S}"/install_files/desktop/openrazer-daemon.desktop
-
-		# Manpages
-		doman "${S}"/daemon/resources/man/${PN}-daemon.8
-		doman "${S}"/daemon/resources/man/razer.conf.5
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	udev_reload
-
-	if use daemon ; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	udev_reload
-
-	if use daemon ; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/sys-apps/openrazer/openrazer-3.5.1.ebuild b/sys-apps/openrazer/openrazer-3.6.1-r1.ebuild
index 1c4a836bb8ba..f0e886f47110 100644
--- a/sys-apps/openrazer/openrazer-3.5.1.ebuild
+++ b/sys-apps/openrazer/openrazer-3.6.1-r1.ebuild
@@ -5,17 +5,23 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit readme.gentoo-r1 systemd udev xdg-utils distutils-r1 linux-mod
+inherit readme.gentoo-r1 systemd udev xdg-utils distutils-r1 linux-mod-r1
 
 DESCRIPTION="Drivers and user-space daemon to control Razer devices on GNU/Linux"
 HOMEPAGE="https://openrazer.github.io/
 	https://github.com/openrazer/openrazer/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
 
 IUSE="+client +daemon"
 REQUIRED_USE="
@@ -53,15 +59,6 @@ To automatically start up the OpenRazer daemon on session login copy
 /usr/share/openrazer/openrazer-daemon.desktop file into Your user's
 ~/.config/autostart/ directory."
 
-BUILD_TARGETS="clean driver"
-BUILD_PARAMS="-C ${S} SUBDIRS=${S}/driver KERNELDIR=${KERNEL_DIR}"
-MODULE_NAMES="
-	razeraccessory(hid:${S}/driver)
-	razerkbd(hid:${S}/driver)
-	razerkraken(hid:${S}/driver)
-	razermouse(hid:${S}/driver)
-"
-
 distutils_enable_tests unittest
 
 python_compile() {
@@ -93,7 +90,15 @@ src_prepare() {
 }
 
 src_compile() {
-	linux-mod_src_compile
+	local -a modargs=(
+		SUBDIRS="${S}"/driver
+		KERNELDIR="${KERNEL_DIR}"
+	)
+	local -a modlist=(
+		{razeraccessory,razerkbd,razerkraken,razermouse}="hid:${S}:driver"
+	)
+	linux-mod-r1_src_compile
+
 	distutils-r1_src_compile
 
 	if use daemon ; then
@@ -108,7 +113,7 @@ src_test() {
 }
 
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 	distutils-r1_src_install
 
 	udev_dorules "${S}"/install_files/udev/99-razer.rules
@@ -138,7 +143,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	linux-mod_pkg_postinst
+	linux-mod-r1_pkg_postinst
 	udev_reload
 
 	if use daemon ; then
@@ -150,7 +155,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	linux-mod_pkg_postrm
+	linux-mod-r1_pkg_postrm
 	udev_reload
 
 	if use daemon ; then
diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index fff7d5670d7a..993ed570cf49 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1,6 +1,8 @@
 DIST pkgcraft-tools-0.0.7.tar.xz 18854348 BLAKE2B 1a7c22df87b994c3c58ae00d964e422ff1d9d5eb479b183178e33e517e5c0c1ff802c4c43ef4e49437c699eeeb81c1db8aa4825736fdef2d0548f92ea15c3f13 SHA512 a97da4a477f399238f0257c1dc1e93cdcaa14bf1c39014e42d39220566fc582a4c24a6cbaf23b8635cf1bc74d24ff1cdc6aa04619437788f2d2ef73e5f833cc8
 DIST pkgcraft-tools-0.0.8.tar.xz 19137448 BLAKE2B 81e8315115f2baa0ade249125b096bc22ef8a06d69fd0ea6a5773f547c3969ec8096066cc6bccfed3ed71e8d5268881d9d7b81daffc95c9ae9892de24acf5b34 SHA512 0b834da7df84b677c3a2e6195bd5e2f9295ecf04f5f5d6d076b1d117762f928e4497d83c13bdcba9365343296ac5be294d5d303fe79708bfa65bb21a671c96ad
+DIST pkgcraft-tools-0.0.9.tar.xz 18168280 BLAKE2B 3608c2dbe2443cca8335f0d119cf02904680c9795179ec9cecf82be350b232faab50fdc01ded9b6270659c3b097c6cd1b9256baec9a8c313e1f592b9a82f9d26 SHA512 32bf93adafcdf02f736282af0398c0cc12619589e41e9488b8dd38947cfb0f7b0e1916629c5f51bb5b2d2c00f165e3f2c4f15b34333e739789b1896f60599b64
 EBUILD pkgcraft-tools-0.0.7.ebuild 928 BLAKE2B c311f2252f0115157228d19f875a12455aa8a2f98f7f2a8a2bc2c5fb2b1781d276fa95b53871eb16f1cf5cc2958ec99702ffa84bafb12a29a917f97ee2e96a9a SHA512 6da2ed74401627b471499eb936aa2e374430cb809edab5c33a8eda911d8820296c3c6c6b1338991a1f061ee8341f1fa4420f4a7a3fb940cc623d558b29a04770
 EBUILD pkgcraft-tools-0.0.8.ebuild 928 BLAKE2B c311f2252f0115157228d19f875a12455aa8a2f98f7f2a8a2bc2c5fb2b1781d276fa95b53871eb16f1cf5cc2958ec99702ffa84bafb12a29a917f97ee2e96a9a SHA512 6da2ed74401627b471499eb936aa2e374430cb809edab5c33a8eda911d8820296c3c6c6b1338991a1f061ee8341f1fa4420f4a7a3fb940cc623d558b29a04770
+EBUILD pkgcraft-tools-0.0.9.ebuild 928 BLAKE2B c311f2252f0115157228d19f875a12455aa8a2f98f7f2a8a2bc2c5fb2b1781d276fa95b53871eb16f1cf5cc2958ec99702ffa84bafb12a29a917f97ee2e96a9a SHA512 6da2ed74401627b471499eb936aa2e374430cb809edab5c33a8eda911d8820296c3c6c6b1338991a1f061ee8341f1fa4420f4a7a3fb940cc623d558b29a04770
 EBUILD pkgcraft-tools-9999.ebuild 928 BLAKE2B c311f2252f0115157228d19f875a12455aa8a2f98f7f2a8a2bc2c5fb2b1781d276fa95b53871eb16f1cf5cc2958ec99702ffa84bafb12a29a917f97ee2e96a9a SHA512 6da2ed74401627b471499eb936aa2e374430cb809edab5c33a8eda911d8820296c3c6c6b1338991a1f061ee8341f1fa4420f4a7a3fb940cc623d558b29a04770
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.9.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.9.ebuild
new file mode 100644
index 000000000000..249efde287e3
--- /dev/null
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+LLVM_MAX_SLOT=16
+inherit cargo llvm
+
+DESCRIPTION="pkgcraft-based tools for Gentoo"
+HOMEPAGE="https://pkgcraft.github.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
+	inherit git-r3
+
+	S="${WORKDIR}"/${P}/crates/pkgcraft-tools
+else
+	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT Unicode-DFS-2016"
+SLOT="0"
+
+QA_FLAGS_IGNORED="usr/bin/pk"
+
+# Clang needed for bindgen
+BDEPEND="
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+"
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 07977b2ce9de..012cdd75a23f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,7 +8,7 @@ DIST portage-3.0.47.tar.bz2 1148789 BLAKE2B 268589c37a6bdc36377f3e407b16bebfb987
 DIST portage-3.0.48.1.tar.bz2 1150967 BLAKE2B ed8822306ef55a776163df3464f67cfe0942a0a2aa55c324921da106019f9f8f19db772d4bee75f49ef6f9b1823b95b2239ef4fe1457fc5c22956fc83419f9c5 SHA512 c20cd0557d885329910fade4d5a0b701bb411f179779d96b22c5dc4e1b504d4ed3dbfbd8c28157782a297d794ce3a0021f3c6aaedc7299f3df858294c14f7945
 EBUILD portage-3.0.44-r1.ebuild 9185 BLAKE2B d1477b9433d5d369f10b4332293c0686be65cf0a3c343612749e437b8db10e9609167e430dd051fbb8fdbf0c74ca2e8b67fd84868d0e7aeebcd678aaf9c4e70d SHA512 58f4dd151193fd9fb626855a1e05804f4ffe8ddc88f3431db59dde337fb7e07fd319d4583f15108aaa853d1b8ae13d4586af5ab203c2703dc6ff15d5837a7086
 EBUILD portage-3.0.45.3-r2.ebuild 9026 BLAKE2B aaba365eaafaffb9dd2d8a66c41fa51c9f5cd7c462fb52f6c77ebc5401361e0875e5696ccea13a647189c53765842f019e255ce14bbb8290f4f8e2ca45a2b051 SHA512 07c1d7ebe215da5031e1f7d6a926e31387d31d3e8ee59fb0a4e86bde8c06b0f6b698ac885c7acc18db1461859c84055b2e8b9a21af36ddbe4692db920e62b377
-EBUILD portage-3.0.46.ebuild 9030 BLAKE2B bf2e7dc52cdef0d6a11b1194e3e3cfcc83cfd545f678d222edf3fda51413515a4b15f6572fef524a6c5d9d0e4f5e6e8eda722377b4a3781b776d8f11d1153ef2 SHA512 06e0ee5d6dcd9aa1058f1fa4b08e584785ebad7ace6feda4fb67ab7e568f472deea5cfe3877c00df4f64c8a45273a4e0254546f94d41a6be45cd25bc33f02159
+EBUILD portage-3.0.46.ebuild 9029 BLAKE2B be02d0cb6a6455e39605b96d57915ef9ec8f919781c4a433a800961710707be1ab301f11b25bcdb891e34133d3e9bbb9c26da2498b80e2374d3e9310fec5b794 SHA512 f1b682f1e830b23b58b869a12e459d7645fb99adc062f4a5dc7fd6e78b44d3a625d2be08e567d12b7526bf759d3286b24c7d7494e5493ccd3c7d4dddeedadb53
 EBUILD portage-3.0.47-r1.ebuild 9272 BLAKE2B 5cfd00aa50d078fe299c5cf244064ddf63e9b31a713d96a515c6dac9efd4b2e9964630de983a1707831ef06df49286ea123b9c4dd6503162bb107202f60e71c4 SHA512 3914720ad172677040d9016783145c325ae2504df00180811bcb0418ca983f3c843e57d08ef76d749cddaea4a491e4b95148a62ac85de625a33e083b5289f4c1
 EBUILD portage-3.0.48.1-r1.ebuild 9269 BLAKE2B d4dd70f72286c3ca9ed910daa052c7eaaa7e391aa7a19b7b92535fff570c0e973e4d46c363d076569aa4617019fc942844ab008368c21cf624df0b5ffa30d1f9 SHA512 2767d6091fe1aa7f8c9df1c724193ed66897310c06e9e836d2ef8dd6be54344022b3ebba60235885d9be534e0998e01a24a395a7604abed0273876b372c4ae3b
 EBUILD portage-9999.ebuild 9269 BLAKE2B d4dd70f72286c3ca9ed910daa052c7eaaa7e391aa7a19b7b92535fff570c0e973e4d46c363d076569aa4617019fc942844ab008368c21cf624df0b5ffa30d1f9 SHA512 2767d6091fe1aa7f8c9df1c724193ed66897310c06e9e836d2ef8dd6be54344022b3ebba60235885d9be534e0998e01a24a395a7604abed0273876b372c4ae3b
diff --git a/sys-apps/portage/portage-3.0.46.ebuild b/sys-apps/portage/portage-3.0.46.ebuild
index e8b8b7a7c6b4..1cdd5dae77a1 100644
--- a/sys-apps/portage/portage-3.0.46.ebuild
+++ b/sys-apps/portage/portage-3.0.46.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"