16 files changed, 52 insertions, 552 deletions
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 5571324f1eb7..021b7eeff65b 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,2 +1 @@
-DIST bcc-0.23.0.tar.gz 5254103 BLAKE2B 011559f081dd8f95b45b64e347ed191f585f6f5e395aadc3ef9726785aa41735b263c0d6e7743c969e390792f0f4f286930fee585c1a59878f301c4b4026dce8 SHA512 531626c920f5ef7d05617b3b418d55fdeef2dc8014f942a6e68ca457433d63445cc98303bbe331ee982e4aefe5d2df84764d373a6166638bd457992b371f037c
 DIST bcc-0.24.0.tar.gz 4640711 BLAKE2B 91d333c21c55de6a0ae78f9bb0b003803578525746e63ca5047896c0b2ed03ee880e03a84511470576e888e46559c67a8ebfdfe49d8785d094e2361bb20c5c2e SHA512 951672e3a8e5ad56eedf513477317ec3d3b4cf2d594bbfce20f3d19ddf7ce255e9dcfc69d9b05bb765a16e769c8e42d7c57071ddb86fb32437f527d3d25d19b6
diff --git a/dev-util/bcc/bcc-0.23.0-r5.ebuild b/dev-util/bcc/bcc-0.23.0-r5.ebuild
deleted file mode 100644
index 8d92e23c768b..000000000000
--- a/dev-util/bcc/bcc-0.23.0-r5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-LLVM_MAX_SLOT=13
-
-inherit cmake eapi8-dosym linux-info llvm lua-single python-r1 toolchain-funcs
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-# tests need root access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/elfutils-0.166:=
-	>=dev-libs/libbpf-0.5.0:=[static-libs(-)]
-	sys-kernel/linux-headers
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}
-	lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	# bug 811288
-	local script scriptname
-	for script in $(find tools/old -type f -name "*.py" || die); do
-		scriptname=$(basename ${script} || die)
-		mv ${script} tools/old/old-${scriptname} || die
-	done
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		-Wno-dev
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-	local -A rename_tools=(
-		[trace]=1
-	)
-
-	local tool name
-	for tool in "${ED}"/usr/share/bcc/tools/*; do
-		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
-		name=${tool##*/}
-		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
-		dosym8 -r "${tool#${ED}}" /usr/sbin/${name}
-	done
-
-	docompress /usr/share/${PN}/man
-
-	newenvd - "70${P}" <<-_EOF_
-		MANPATH="${EPREFIX}/usr/share/${PN}/man"
-	_EOF_
-}
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 40855f0fe2dd..386929cb6746 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,4 @@
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST patch-5.17.7.xz 668120 BLAKE2B ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb SHA512 b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
-DIST patch-5.18.1.xz 24248 BLAKE2B 099b4185f9c7606c0b1d5aa1081651e3856ae9eee297e91c3e02c96e02d2f0b99f645fd998c02f4fd12c2fc2bda1c566c37f3525fcd6663de1607fa3b021097e SHA512 d8f105b34b4a0f933cddc631f8f54ca2e50f055365c864f33c389972df03cb2cdf415eb47a2b2fbc0d43af6679fe21e3bb459d79d02103a2db8782146473910e
 DIST patch-5.18.4.xz 424880 BLAKE2B 6ab25a0b36539608f8d0cfb42a6d41afa4d1810dfa4bdd85fe478465044e481a734ed31baf2de3c41741d07ac41bc943ea2f8a1da76c5d285f971f53edca1756 SHA512 4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949
diff --git a/dev-util/bpftool/bpftool-5.18.1.ebuild b/dev-util/bpftool/bpftool-5.18.1.ebuild
deleted file mode 100644
index 1c33cf70eb99..000000000000
--- a/dev-util/bpftool/bpftool-5.18.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
-HOMEPAGE="https://kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	sys-libs/zlib:=
-	virtual/libelf:=
-	caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-	local paths=(
-		tools/bpf kernel/bpf
-		tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
-	local arch=$(tc-arch-kernel)
-	tc-export AR CC LD
-
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
-		prefix="${EPREFIX}"/usr \
-		feature-libcap="$(usex caps 1 0)" \
-		"$@"
-}
-
-src_compile() {
-	bpftool_make
-	bpftool_make -C Documentation
-}
-
-src_install() {
-	bpftool_make DESTDIR="${D}" install
-	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
-}
-
-pkg_postinst() {
-	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
-}
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 96ee56633f51..f594b9b845c0 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,3 +1,2 @@
 DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396 SHA512 3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
-DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B 832f213760eb86804d63df782ff1923f6355b63770b8c4d486dd2547ae3dc474f9e4923f3107bbefbf2066dc013c930d4765ef86ef4d10bda6757513e30c2de1 SHA512 0be06c209ba12f70a0d1140b168dac94945c1b034dbd0c7dae5460fca43eec10bb436e28c122ec37b259256bf6b9bb23a3c5e7f8435feb67eae1b9277debaf73
 DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
diff --git a/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild b/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
deleted file mode 100644
index f8e1dddbd01e..000000000000
--- a/dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=14
-
-inherit llvm linux-info cmake toolchain-funcs
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
-MY_PV="${PV//_/}"
-SRC_URI="
-	https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~chutzpah/dist/bpftrace/bpftrace-0.14.1-llvm14.patch.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libbpf:=
-	>=dev-util/bcc-0.13.0:=
-	dev-util/systemtap
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
-	sys-libs/binutils-libs:=
-	virtual/libelf:=
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/cereal:=
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	sys-apps/sed
-	app-arch/xz-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
-	"${FILESDIR}/bpftrace-0.14.0-fuzzing.patch"
-	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
-	"${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
-	"${FILESDIR}/bpftrace-0.14-libbpf-0.6.patch"
-	"${WORKDIR}/bpftrace-0.14.1-llvm14.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DSTATIC_LINKING:BOOL=OFF
-		# bug 809362, 754648
-		-DBUILD_SHARED_LIBS:=OFF
-		-DBUILD_TESTING:BOOL=OFF
-		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
-		-DENABLE_MAN:BOOL=OFF
-		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# bug 809362
-	dostrip -x /usr/bin/bpftrace
-	doman man/man8/*.?
-}
diff --git a/dev-util/bpftrace/bpftrace-0.14.1.ebuild b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
deleted file mode 100644
index 91157b21ad7e..000000000000
--- a/dev-util/bpftrace/bpftrace-0.14.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=13
-
-inherit llvm linux-info cmake toolchain-funcs
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libbpf:=
-	>=dev-util/bcc-0.13.0:=
-	dev-util/systemtap
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
-	sys-libs/binutils-libs:=
-	virtual/libelf:=
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/cereal:=
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	sys-apps/sed
-	app-arch/xz-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
-	"${FILESDIR}/bpftrace-0.14.0-fuzzing.patch"
-	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
-	"${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
-	"${FILESDIR}/bpftrace-0.14-libbpf-0.6.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DSTATIC_LINKING:BOOL=OFF
-		# bug 809362, 754648
-		-DBUILD_SHARED_LIBS:=OFF
-		-DBUILD_TESTING:BOOL=OFF
-		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
-		-DENABLE_MAN:BOOL=OFF
-		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# bug 809362
-	dostrip -x /usr/bin/bpftrace
-	doman man/man8/*.?
-}
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
index 2e96794b4eed..9d16ad338950 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.2.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="emacs test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index e58fcee1912e..0c22c22504d7 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,4 +2,4 @@ DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e
 DIST meson-0.61.4.tar.gz 2014265 BLAKE2B 09e6630f8a1786143832007c929e652e743bbf11d1b55ffcf366dd127779f61e8fd4a8be5cb23fa6bc949938a3bd0222f19ad1fec883f0ca6ed8cd6d4bbd6aef SHA512 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195
 DIST meson-0.62.1.tar.gz 2034805 BLAKE2B 6370b6bf07e6e875f6a0cabbf6284f97c89a4653b62c4765f365fbf083e607853094aa37d5dc97042f086ca1db569b2f8dabd14b37f674615d3b9d267d3d0d0f SHA512 52d2d06c27275b824046164403908be8555faed33aef862940623cef3e4f84b4c9b8d461c291642e6ea2c0db30b2ec4a99f46bde5d54945a26c1dbeca219cc32
 DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2 SHA512 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195
-DIST meson-0.63.0rc1.tar.gz 2063605 BLAKE2B 01e8416a8c4f23d8d7044458e7efef76cc4fe632271ff2124e8d4d2f5aa3a94bbad6a765b9aa12b2d74e54fdde73f6d507148d973f762b4af47de45453ae834d SHA512 269f97f5c06714fde9e30e8286ee88fc21aac4181f034b5344d8c115ec04e411b4037197a94ba7ca6000088d0a5e367475df14080a6a60fd8181aa7881e8cbb9
+DIST meson-0.63.0rc2.tar.gz 2059282 BLAKE2B 4b90ccc87fddcd9d1e6edc71d508990e68da8eeb6349de76f170a4951d64b106d098fc23ef46424b6af2210ccc5be1d79a5c12f18c2ac70c3f8162ceaa4e2b6b SHA512 898e2dbb8b1dc4145c70c9042054cd2bc9568ce363cfb9b9ac697f2d8f406f7d4e312f7c7233b1cfd8d74946b253d597231d2dbc4f7803f98a33cdd03237a1a5
diff --git a/dev-util/meson/meson-0.63.0_rc1.ebuild b/dev-util/meson/meson-0.63.0_rc2.ebuild
index 4e1dd7be1554..4e1dd7be1554 100644
--- a/dev-util/meson/meson-0.63.0_rc1.ebuild
+++ b/dev-util/meson/meson-0.63.0_rc2.ebuild
diff --git a/dev-util/shfmt/Manifest b/dev-util/shfmt/Manifest
index 2a1bf631ebc5..418b8f58afae 100644
--- a/dev-util/shfmt/Manifest
+++ b/dev-util/shfmt/Manifest
@@ -1,2 +1,6 @@
-DIST shfmt-3.5.0-deps.tar.xz 3121980 BLAKE2B 411e7df230864d1692899b89c4b5e25f54582752a10bde30a8a5e1ae03da3b325353d9bab71b46795f3d285747fbbcc63dd367ecddc8055d5df45013c5f491ae SHA512 562fc2a58c0c115d132c9107c569f5139d7e1f817c91077b80151d0043601c328b083ce8261301689ce72deecabe3957bc11e4dc4388024234a2791c9f118743
-DIST shfmt-3.5.0.tar.gz 222262 BLAKE2B a54c91afd1da39084637aba43dc9e3af82c2c57dabdd3e24cd80bbfc5fed9632da0e98b5a65169dc439216218a4664afcc8dc77cd409f15a35cd0b505d39dd39 SHA512 9071a015369088dbba8eb7221305893095ebeaa72124e1ca964b7b1e6f34dedc9d11f2daa2f679d24637b04925cbf58427a24cc4885d8e918cb81844e71d3c6b
+DIST github.com-golang-sys-9197077.tar.gz 1540407 BLAKE2B d1ae2fbbbb1aba2db1b3bbab07ce6ca7a8eb43ea1e4fbf690348c9ba3e5bcbc48add0619430a08a273e70b5c0e4380c237108198ccf74a8ac6aa538fc6b6b20a SHA512 9bff781a71306cfe2f8791a309f39e7ad5a904b1b82cca0caab77cea19e517ecc9da97949e44ee24e74dfee9acae20e9f14b069ef7fabd3a1baf4db27b512985
+DIST github.com-golang-term-ad39bd3.tar.gz 3891 BLAKE2B 16c707e5b25296e3f0f700d644ebfc84bb602aaf9f8490110197f1a6e0d7a8ea1eadef497f7e09a7aa751162aefae4ca9343d9a3cf95addd4c1af54bb19b2afe SHA512 c23cd5da67a6734cc8fb8c9bbda7286581cdd7d0182a0a8ddcc999e256c2c41ee3c4aa10cd000e7bc6734c8be61e48c709acee005e4fae02df903f56ba1bb22c
+DIST github.com-google-renameio-f0e3298.tar.gz 9724 BLAKE2B 82e818a97eceb2d6917e5c1f21afe6284cc88d223b1af5992219d03dd6bc1f59a072413b913c3f6ffd2a919a40bf6c6db480bb36d7f15aafca513e156ab1f7fc SHA512 556d6df5328dde7aa46619fbe8cf2f1f00289544d1e96b23c97521d9f8b2773276c628a424f45f8d5720d17a3aec0080a3bbfcd3bcc8203ad30bac6a41a31b39
+DIST github.com-mvdan-editorconfig-e40951b.tar.gz 9303 BLAKE2B 46cefb76c0537c1dba29ed6ece9a8b29f9404c0adac03a08aa254de34a443a21c2302b5c8af6e71784a656cce04305e2085d06b9ac3ec9808cf00185ee84f458 SHA512 48c836caf69d8b751415ccc00b00451cc2aeed132b6f7662c3525bd059d6f231e78db789677e63b5f25637429f6eff4bd63ec7ace1b036293f22648d44038592
+DIST github.com-pkg-diff-5319263.tar.gz 11597 BLAKE2B 5be0365f1a3456710e4ad2e94da6b05b33fae6c8c611c7016568c6d2d3a8257994cc658320e25a8fd5e0ef9b02f9063dc73716ce68f9aba8425f92a0aefcca54 SHA512 63f5b5c1e0df55ceaecdd1988585639c3e5bfc4624e3ae85b419d3e3015a2de6944319636b387298b89ff406878ac26894aff66dd2837a670b1f6f999bafcdc6
+DIST shfmt-3.1.2.tar.gz 193379 BLAKE2B e970ccb34989e3272c9c937917370a1d60d3f19891d8cae1f390e69789755bec46ec6de17d5af77084150dc6c6ab4d6d2f9acb431d5da5dd3adbe5f5cd2b56ff SHA512 6e367a7a05c5e18d6de7f822ef181443b22d05f94a5fe5a0cf4759bc1e4a07dfac0e2704eb3025868e0f44c0e04a9cbd28dfe5a977381b2ba6fe274ac97ef29a
diff --git a/dev-util/shfmt/metadata.xml b/dev-util/shfmt/metadata.xml
index c20d3da1c785..7cf1ac1fff23 100644
--- a/dev-util/shfmt/metadata.xml
+++ b/dev-util/shfmt/metadata.xml
@@ -2,12 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>ran.dall@icloud.com</email>
-  <name>Randall Vasquez</name>
+  <email>toffanin.mauro@gmail.com</email>
+  <name>Mauro Toffanin</name>
+  <description>Maintainer. Assign bugs to him</description>
  </maintainer>
- <longdescription lang="en">
-    A shell parser, formatter, and interpreter with bash support; includes shfmt. Supports POSIX Shell, Bash, and mksh.
-  </longdescription>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>go-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-util/shfmt/shfmt-3.1.2.ebuild b/dev-util/shfmt/shfmt-3.1.2.ebuild
new file mode 100644
index 000000000000..dba936db29bc
--- /dev/null
+++ b/dev-util/shfmt/shfmt-3.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Go Overlay Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GOLANG_PKG_IMPORTPATH="github.com/mvdan"
+GOLANG_PKG_IMPORTPATH_ALIAS="mvdan.cc"
+GOLANG_PKG_NAME="sh"
+GOLANG_PKG_ARCHIVEPREFIX="v"
+GOLANG_PKG_BUILDPATH="/cmd/${PN}"
+GOLANG_PKG_LDFLAGS="-X main.version=v${PV} -extldflags=-static"
+GOLANG_PKG_HAVE_TEST=1
+
+GOLANG_PKG_DEPENDENCIES=(
+	"github.com/google/renameio:f0e3298"  #v0.1.0
+	"github.com/pkg/diff:5319263"
+	"github.com/mvdan/editorconfig:e40951b" #v0.1.1
+
+	"github.com/golang/sys:9197077 -> golang.org/x"
+	"github.com/golang/term:ad39bd3 -> golang.org/x"
+)
+
+inherit golang-single
+
+HOMEPAGE="https://github.com/mvdan/sh"
+DESCRIPTION="A shell parser and formatter for POSIX shell and bash"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+
+src_prepare() {
+	golang-single_src_prepare
+
+	golang_fix_importpath_alias \
+		"github.com/mvdan/editorconfig" \
+		"mvdan.cc/editorconfig"
+}
diff --git a/dev-util/shfmt/shfmt-3.5.0.ebuild b/dev-util/shfmt/shfmt-3.5.0.ebuild
deleted file mode 100644
index 96a20587ac5e..000000000000
--- a/dev-util/shfmt/shfmt-3.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Shell script formatter"
-HOMEPAGE="https://github.com/mvdan/sh"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mvdan/sh.git"
-	RESTRICT="fetch mirror test"
-else
-	SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	RESTRICT="mirror test"
-	S="${WORKDIR}/${PN//fmt}-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+man"
-
-BDEPEND="man? ( app-text/scdoc )"
-
-src_unpack() {
-	default
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	ego build -v -ldflags "-s -w" -o "${PN}" "./cmd/shfmt"
-	if use man; then
-		scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 || die "conversation of man page failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-	if use man; then
-		doman shfmt.1
-	fi
-}
diff --git a/dev-util/shfmt/shfmt-9999.ebuild b/dev-util/shfmt/shfmt-9999.ebuild
deleted file mode 100644
index 96a20587ac5e..000000000000
--- a/dev-util/shfmt/shfmt-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Shell script formatter"
-HOMEPAGE="https://github.com/mvdan/sh"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mvdan/sh.git"
-	RESTRICT="fetch mirror test"
-else
-	SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	RESTRICT="mirror test"
-	S="${WORKDIR}/${PN//fmt}-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+man"
-
-BDEPEND="man? ( app-text/scdoc )"
-
-src_unpack() {
-	default
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	ego build -v -ldflags "-s -w" -o "${PN}" "./cmd/shfmt"
-	if use man; then
-		scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 || die "conversation of man page failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-	if use man; then
-		doman shfmt.1
-	fi
-}
diff --git a/dev-util/umockdev/umockdev-0.17.13.ebuild b/dev-util/umockdev/umockdev-0.17.13.ebuild
index c4bf2f1470cf..da72b243a9f7 100644
--- a/dev-util/umockdev/umockdev-0.17.13.ebuild
+++ b/dev-util/umockdev/umockdev-0.17.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"