17 files changed, 135 insertions, 286 deletions
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 51497c97b450..139223bde397 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.4.xz 547280 BLAKE2B 453f8ff38a9c6bc69ebb18fe2ea413844e6987b6ff5e0c735f0d047b730349e35731d5a813c3732b330ae9e06e606987952f4d649b3b9b43144710dd296b769f SHA512 9242ce094611d1ee672e782d3eea5910af6c8172fd237afc0a58414106bfc2e7a771d3db91fbf19bcb3cc123ad103c6950951e0c5c5582410a43caec4eb79465
 DIST patch-5.17.7.xz 668120 BLAKE2B ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb SHA512 b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
 DIST patch-5.18.1.xz 24248 BLAKE2B 099b4185f9c7606c0b1d5aa1081651e3856ae9eee297e91c3e02c96e02d2f0b99f645fd998c02f4fd12c2fc2bda1c566c37f3525fcd6663de1607fa3b021097e SHA512 d8f105b34b4a0f933cddc631f8f54ca2e50f055365c864f33c389972df03cb2cdf415eb47a2b2fbc0d43af6679fe21e3bb459d79d02103a2db8782146473910e
diff --git a/dev-util/bpftool/bpftool-5.17.4.ebuild b/dev-util/bpftool/bpftool-5.17.4.ebuild
deleted file mode 100644
index aae105df8422..000000000000
--- a/dev-util/bpftool/bpftool-5.17.4.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 ~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/bpftool/bpftool-5.17.7.ebuild b/dev-util/bpftool/bpftool-5.17.7.ebuild
index d45ef9cdcf42..aae105df8422 100644
--- a/dev-util/bpftool/bpftool-5.17.7.ebuild
+++ b/dev-util/bpftool/bpftool-5.17.7.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="
diff --git a/dev-util/bpftool/bpftool-5.18.1.ebuild b/dev-util/bpftool/bpftool-5.18.1.ebuild
index d45ef9cdcf42..1c33cf70eb99 100644
--- a/dev-util/bpftool/bpftool-5.18.1.ebuild
+++ b/dev-util/bpftool/bpftool-5.18.1.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index c6dc8f1b4bab..78ff5a9b368d 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1 +1,2 @@
 DIST devscripts_2.22.1.tar.xz 989556 BLAKE2B 2a2e3ca9757c710e181e807f0369c137f21070d86b4c51d8b5132ca4add33677edbd26e04a2faae93e9e4586080286888880ce450119579aa40ad205c8e5d857 SHA512 260603e1a655035c5aca3c9734db1bc6aa7e9aa017ece7e9158c57e06a1ee548922ec2defdd9dcb4560743d78aef08d30695b1bc833bd4d77fe1c7497d157c45
+DIST devscripts_2.22.2.tar.xz 995524 BLAKE2B a7649ea5b790a64b5470a66425e487959b058e9af34be173210277765c8610f7d6da1b9105f97e1da2f84a578ca7514b1dabaa7c38a88c9b1eef29c2f34f97a1 SHA512 d6c47f604a252f58e1cf8ea9fe7387a390683757144bb76cce6915fca1ff7ccb71ce6c87d829f874097d869172774a806b506dc7fb4187876d14e50eaaf92593
diff --git a/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild
new file mode 100644
index 000000000000..b5bf37296fc9
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.22.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+S="${WORKDIR}/${MY_P}/scripts"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long"
+
+src_prepare() {
+	default
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/clippy/clippy-8.2.2-r1.ebuild b/dev-util/clippy/clippy-8.2.2-r1.ebuild
index ccbb08f2a59a..63e3d28ede3b 100644
--- a/dev-util/clippy/clippy-8.2.2-r1.ebuild
+++ b/dev-util/clippy/clippy-8.2.2-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # standalone clippy does not have any tests
diff --git a/dev-util/clippy/clippy-8.2.2.ebuild b/dev-util/clippy/clippy-8.2.2.ebuild
deleted file mode 100644
index 8f9a82997fb2..000000000000
--- a/dev-util/clippy/clippy-8.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="frr-${PV}"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone clippy tool built from FRR sources"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/frr-${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# standalone clippy does not have any tests
-# restrict to prevent bug 811753
-RESTRICT="test"
-
-DEPEND="
-	${PYTHON_DEPS}
-	virtual/libelf:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-clippy-only
-}
-
-src_install() {
-	dobin lib/clippy
-}
diff --git a/dev-util/ebuildtester/Manifest b/dev-util/ebuildtester/Manifest
index 25d52aa7c1e4..30159babba3f 100644
--- a/dev-util/ebuildtester/Manifest
+++ b/dev-util/ebuildtester/Manifest
@@ -1,2 +1,3 @@
 DIST ebuildtester-0.1.35.tar.gz 19842 BLAKE2B 3d562718680914a47bb078f38f4351e5b4575ef6d11fa39247d7f06b81868cca0a30ec29ba0e7b14330ef45a117330ad2351f5eea2b75f23cbaba9e37d0441d4 SHA512 c268c621c3b22aefb6945da7169a4049c7bd3f9cc198d43eb733bc144bf1ac46e251235af669d2af5231f5517ef997ffcd28f4bcbb1c945237f6dd2dca502c46
 DIST ebuildtester-0.1.37.tar.gz 20919 BLAKE2B a97ea0de557601aae3faee8c959453179d402450f722872a7de6f544abdc2facaa71558d8b2088fbadf37b829a2991ca717ff5e1790c1e7c48ccfcd619e1737e SHA512 dfa157bb5745854cfd2a7580e5c8650712b796e01831137b90dbea7097f926e7b1eb6718bef8ab70a8e703a65049274cfe52eda9c3635df6b5697ff3403f5ee0
+DIST ebuildtester-41.tar.gz 22320 BLAKE2B dcaa1e35e4ee9dd43e6d9c1d6332d56c711117e98eb59e9bc0e852b6676a5e05bca69d7949f8a2edbd2cef7f6b100cefc866bd8394281ce9aa25b9287c235c8c SHA512 abee45178782f6ec648ebf7f3c2885065866a8f518e396bb1b0fd0b2815141b175c172114fb319ccdfa83f3043ecd44e83871a1a9d9dbea72f6091b3732717c5
diff --git a/dev-util/ebuildtester/ebuildtester-41.ebuild b/dev-util/ebuildtester/ebuildtester-41.ebuild
new file mode 100644
index 000000000000..4222ddc016f2
--- /dev/null
+++ b/dev-util/ebuildtester/ebuildtester-41.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+# SRC_URI="https://github.com/nicolasbock/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-containers/docker
+	sys-fs/fuse
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r3.ebuild
index 0849b83b7c58..ee4a1f12a047 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Internationalization Tool Collection"
 HOMEPAGE="https://launchpad.net/intltool/"
@@ -10,16 +10,12 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-DEPEND="
+BDEPEND="
 	dev-lang/perl
-	dev-perl/XML-Parser
-"
-RDEPEND="${DEPEND}
-	sys-devel/gettext
-"
-DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
+	dev-perl/XML-Parser"
+RDEPEND="${BDEPEND}
+	sys-devel/gettext"
 
 PATCHES=(
 	# Fix handling absolute paths in single file key output, bug #470040
@@ -28,3 +24,5 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.51.0-perl-5.22.patch
 	"${FILESDIR}"/${PN}-0.51.0-perl-5.26.patch
 )
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
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/stressapptest/stressapptest-1.0.9.ebuild b/dev-util/stressapptest/stressapptest-1.0.9-r1.ebuild
index 054b68fe3b0e..7a237d62e478 100644
--- a/dev-util/stressapptest/stressapptest-1.0.9.ebuild
+++ b/dev-util/stressapptest/stressapptest-1.0.9-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit flag-o-matic
 
@@ -18,10 +18,7 @@ RDEPEND="dev-libs/libaio"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	# Uses uintptr_t, which is C++11, #651842
-	append-cxxflags -std=c++11
-
-	# Matches the configure & sat.cc logic.
+	# Matches the configure & sat.cc logic
 	use debug || append-cppflags -DNDEBUG -DCHECKOPTS
 	econf --disable-default-optimizations
 }