17 files changed, 119 insertions, 274 deletions
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 1fa5fc692062..873ff5981fa7 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,2 +1 @@
-DIST byacc-20220114.tgz 897405 BLAKE2B 79d3cbb07022e3376fa5c2b772b55bfc509f23daf7cc4a58cffc8834db4340b4f59e0ba544a11039d2a4e2b2bbf18f279f9be37c34c85f06c9b755d572005521 SHA512 5734d7f21b356a620104fbac574d46fb31fd967766b4184bf2cae7de6a61686ce32d21a2920f2a0fe4b98e7826b50a3d44fadc057d7371de5e3ca38c3b685733
 DIST byacc-20220128.tgz 896513 BLAKE2B a5dd491702274ed84fdddc8b2d2d240d8ddcc9350db82eee067978297ceda012ab99d7c8f53102f8190ce6e6bb3feb8d9beb62969ddf222b4ba967041b746c00 SHA512 e8ae4c56f5be4cc0ef1d281c43f02c6296fdc40f630269f2a61af511f270ae059ad185b9718190b8133018f7b74b7ca6f84ced5d63a359960b52ea2a3ef562ea
diff --git a/dev-util/byacc/byacc-20220114.ebuild b/dev-util/byacc/byacc-20220114.ebuild
deleted file mode 100644
index f55c717ce08d..000000000000
--- a/dev-util/byacc/byacc-20220114.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="ftp://ftp.invisible-island.net/byacc/${P}.tgz"
-# Seems to be unreliable (unstable tarballs): bug #820167.
-#SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index a8c23cf47bbe..c6dc8f1b4bab 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,2 +1 @@
-DIST devscripts_2.21.4.tar.xz 981488 BLAKE2B 29339490586a66c6360f599a90e23452fd1e99fd01757e258e082b9550731b3e443b12fb9ce9b8fe6fb229f228a115f87a9b91b8769000afd741eb77e9e7a4a4 SHA512 99250737cabc24bbd21e20de7c787e182492e15cad4288226ed497349cbf3dd45927e1c501d73341e48dfd14ee2285c8cca8ac3b2145c2f02ce4d04ddb881e50
 DIST devscripts_2.22.1.tar.xz 989556 BLAKE2B 2a2e3ca9757c710e181e807f0369c137f21070d86b4c51d8b5132ca4add33677edbd26e04a2faae93e9e4586080286888880ce450119579aa40ad205c8e5d857 SHA512 260603e1a655035c5aca3c9734db1bc6aa7e9aa017ece7e9158c57e06a1ee548922ec2defdd9dcb4560743d78aef08d30695b1bc833bd4d77fe1c7497d157c45
diff --git a/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
deleted file mode 100644
index 0c7a74637d05..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/dialog/Manifest b/dev-util/dialog/Manifest
index 6d7ded1e1f03..b239210955cb 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,3 +1,2 @@
-DIST dialog-1.3-20211214.tgz 565608 BLAKE2B f069968abe258942f27e010f8d14eafd270c45ae467d5131b41b57c0cc5a145a410fdaeab5f7fa221aa7dbea440f8e268d130e0f1f7389a224374b0047228156 SHA512 b76e7e1fc333550a9cc351e37e7121e98f48b2a1f78e8c0c528e2126db16ae14c4c5da088bc611cb12020836e75dd2a1d875561fe5eec6589c104252d4aa7626
 DIST dialog-1.3-20220414.tgz 566701 BLAKE2B d3fba0e896d51048876cd1c393d1f2183e47c5307d218dea0bf8c9cbaaed198bfc39e40e1f52b12c978dda10fa61be75d2527c293da652d2f83b80a2237d9d2f SHA512 53b7bc64bb6406c5828f2d023e7db457eee970ade2077bc64860ef12f06c254b4a13706eee068ffe44055ec6b0576ecfe33153438660a5a54f78ea1be00091ee
 DIST dialog-1.3-20220526.tgz 567657 BLAKE2B 1b46c0310e54f26cf5efcd8c84d9b8ef3d7ba7b58292c0967559e4bf281a0312185d3f9dea090e01a95a096ee1781bcdcbab11552175c8d6154ac9268654b6d8 SHA512 619d52b8123264bf586f5325443c3b85863166119c6fbaa91571a57454d761f01a53ebeb2203ea725c83dc88f2abf886c64c6eac5b56c126e4f3939eb1d24d62
diff --git a/dev-util/dialog/dialog-1.3.20211214.ebuild b/dev-util/dialog/dialog-1.3.20211214.ebuild
deleted file mode 100644
index 5e7375f8cdbc..000000000000
--- a/dev-util/dialog/dialog-1.3.20211214.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-$(ver_rs 2 -)
-
-DESCRIPTION="Tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-island.net/archives/dialog/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples minimal nls unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_prog_LIBTOOL=glibtool
-	fi
-
-	econf \
-		--disable-rpath-hack \
-		--with-pkg-config \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts='-shared' \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 2cab197aca60..613e6392058d 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -1,4 +1,4 @@
-DIST gitlab-runner-14.10.1-deps.tar.xz 142146176 BLAKE2B cfd9d5050f9dac745b6181f1ab70459ee0bb987745315748ba10c6e95d5d3394e218024a8f9e0fb81f0718c0c23d594112ccc86c1e5ab5ed4952d2d7bcba5ccb SHA512 710e22f06d002c677259dd594400ca4cd43614dc50099ab87902e124e55aa4c47b43e8286584c28d9e1c15055363143e9a5b37da5a5075562fb03a3a100be619
 DIST gitlab-runner-15.0.0-deps.tar.xz 142142928 BLAKE2B 6ad51f021418c68a4dc00f927da50084408f00095a6e6ed0ae4727f32ff6df8fa06a56a34bf410b6bfd01cfbe3797791e644ae163035c823c7dc82e5ee423094 SHA512 6c2e21da2ad6793aa1f2d40000b237c443597a311f49a13a63db795c4d773fb0ef7d29a1a278e250917fc51bf1f65079c63d3b2e6b112a46faf78f28f8efb8c0
-DIST gitlab-runner-v14.10.1.tar.gz 1265690 BLAKE2B c455c08f1530b4fa6d63d74736adeb7cfb76c5f4f56577e2c22ba64630c88a3b0933fd0e3fbcf173d7263f6150bd77491fa091c5c8a4821dabf4bfee24928a52 SHA512 5b3a6b1b13569a9f24206f078bd864689fc6cf9c7f249b3fc5adb36e9c59bc6b53f218a7e31aab8537f188500f072a8e73ad9422e03e2eb44c21521c903044a1
+DIST gitlab-runner-15.1.0-deps.tar.xz 139987784 BLAKE2B 46319f3d4b30e8479436995a9dcdd160e0ff5af770e4dbe468d8100c35b3c8444417b00dd1146d0b354b6a3429e31eb87893afea3a154f8b9e4c8c1d64aac30e SHA512 66f7ccfe32c1e0928a41474362886645097d9d7e5f6f0acfb7a10c0b66e1c73f1f13812d1a8879429ab08b5232fca34dc740fd68dbfa3bb53aebd83f35932bf4
 DIST gitlab-runner-v15.0.0.tar.gz 1273838 BLAKE2B ac80f8bdd4a750f86d34e98cefad9d3c4e345d9607669c1205e5fbba28f25a83be27c43850383fd81e8222426ed31c2738a59c22cd5b6b6e60765295e7437f17 SHA512 8ba54e690fc45c1e22d174b649fbe3cf78707fd5a146c738c73cba045e6ac00499ddedd7a5f905c0c7e4e804a533d3fc718f8f7ac3c9ec5581de4dd9b3599c80
+DIST gitlab-runner-v15.1.0.tar.gz 1287049 BLAKE2B 76b1c5b535e328941741e55e460de158bcf54d8fa76bc70eba1eed63e7e892f126cdec992cf34ad4c0227f0ee5ba33ec06cea8ba4efd47bf36a540869f71b706 SHA512 7892b4ccfa5973f20deda365e337b8f70e159a9387b6823eada4b39a0cabcd078af08c9bc45e629aa432f49c72f71df6b04fc1cecb72bc2e9c9cd018fc04299b
diff --git a/dev-util/gitlab-runner/gitlab-runner-14.10.1.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.1.0.ebuild
index b544f0d47fc2..b544f0d47fc2 100644
--- a/dev-util/gitlab-runner/gitlab-runner-14.10.1.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-15.1.0.ebuild
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
index 9a039a2c3d5d..4334bac38a85 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -11,9 +11,13 @@
  </maintainer>
  
  <use>
-  <flag name="idl">Install idl files.</flag>
-  <flag name="libraries">Build extra libraries: mangle, pseh, winpthreads.</flag>
-  <flag name="tools">Build extra tools: gendef, genidl.</flag>
+  <flag name="default-ucrt">
+      Use ucrt instead of msvcrt-os as the default crt (WARNING:
+      incompatible with each others and also for building Wine with
+      USE=mingw, pick one from the start and keep it)</flag>
+  <flag name="idl">Install idl files</flag>
+  <flag name="libraries">Build extra libraries: mangle, pseh, winpthreads</flag>
+  <flag name="tools">Build extra tools: gendef, genidl, widl</flag>
  </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
index fbd35d0570b7..3b3854308f65 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain tools? ( GPL-3+ )
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE=libraries needs working stage2 compiler: bug #665512
-IUSE="headers-only idl libraries tools"
+IUSE="default-ucrt headers-only idl libraries tools"
 RESTRICT="strip"
 
 PATCHES=(
@@ -77,6 +77,7 @@ src_configure() {
 		--prefix="${prefix}"
 		--libdir="${prefix}"/lib
 		$(use_with !headers-only crt)
+		$(usev default-ucrt --with-default-msvcrt=ucrt)
 
 		# By default configure tries to set --sysroot=${prefix}. We disable
 		# this behaviour with --with-sysroot=no to use gcc's sysroot default.
diff --git a/dev-util/shfmt/Manifest b/dev-util/shfmt/Manifest
index 418b8f58afae..2a1bf631ebc5 100644
--- a/dev-util/shfmt/Manifest
+++ b/dev-util/shfmt/Manifest
@@ -1,6 +1,2 @@
-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
+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
diff --git a/dev-util/shfmt/metadata.xml b/dev-util/shfmt/metadata.xml
index 7cf1ac1fff23..c20d3da1c785 100644
--- a/dev-util/shfmt/metadata.xml
+++ b/dev-util/shfmt/metadata.xml
@@ -2,10 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>toffanin.mauro@gmail.com</email>
-  <name>Mauro Toffanin</name>
-  <description>Maintainer. Assign bugs to him</description>
+  <email>ran.dall@icloud.com</email>
+  <name>Randall Vasquez</name>
  </maintainer>
+ <longdescription lang="en">
+    A shell parser, formatter, and interpreter with bash support; includes shfmt. Supports POSIX Shell, Bash, and mksh.
+  </longdescription>
  
- <origin>go-overlay</origin>
+ <origin>gentoo-guru-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
deleted file mode 100644
index dba936db29bc..000000000000
--- a/dev-util/shfmt/shfmt-3.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
new file mode 100644
index 000000000000..96a20587ac5e
--- /dev/null
+++ b/dev-util/shfmt/shfmt-3.5.0.ebuild
@@ -0,0 +1,50 @@
+# 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
new file mode 100644
index 000000000000..96a20587ac5e
--- /dev/null
+++ b/dev-util/shfmt/shfmt-9999.ebuild
@@ -0,0 +1,50 @@
+# 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/strace/Manifest b/dev-util/strace/Manifest
index 4de429503f8f..e711c7091129 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,3 +1,2 @@
-DIST strace-5.15.tar.xz 2248664 BLAKE2B fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94 SHA512 67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384
 DIST strace-5.17.tar.xz 2281220 BLAKE2B 27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec SHA512 1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44
 DIST strace-5.18.tar.xz 2307412 BLAKE2B 658d17d2137344550ea3c2ece54708387c3b78020dbade45a7ef04905dc9d4703fa8d44802cca5a9448d096a7210d0178d8d78caab7e504fa998d1f9a0b59c65 SHA512 99418b84a5e2049cb6fe32eed19ddcb61bbefb25220550c67d92cd7bc3d44ae5d87ac228b3e1c207166b9bfdae55c624a0f4e603004599fb7ea3143bbccc749e
diff --git a/dev-util/strace/strace-5.15.ebuild b/dev-util/strace/strace-5.15.ebuild
deleted file mode 100644
index 9c248f5d99ea..000000000000
--- a/dev-util/strace/strace-5.15.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl selinux static unwind elfutils"
-REQUIRED_USE="?? ( unwind elfutils )"
-
-BDEPEND="virtual/pkgconfig"
-LIB_DEPEND="
-	unwind? ( sys-libs/libunwind[static-libs(+)] )
-	elfutils? ( dev-libs/elfutils[static-libs(+)] )
-	selinux? ( sys-libs/libselinux[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.11-static.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	# Stub out the -k test since it's known to be flaky. bug #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	filter-lfs-flags # configure handles this sanely
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	local myeconfargs=(
-		--disable-gcc-Werror
-
-		# Don't require mpers support on non-multilib systems. #649560
-		--enable-mpers=check
-
-		$(use_enable static)
-		$(use_with unwind libunwind)
-		$(use_with elfutils libdw)
-		$(use_with selinux libselinux)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		# bug #643044
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use perl ; then
-		exeinto /usr/bin
-		doexe src/strace-graph
-	fi
-	dodoc CREDITS
-}