8 files changed, 157 insertions, 50 deletions
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index 786f45045c3c..c8afbf5f5510 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1 +1,2 @@
 DIST ccls-0.20210330.tar.gz 160487 BLAKE2B f87539a5e726a8742552d811d741c379d62c146bed835c7fa8d32ab5eb1f609513f80051faf07bbb8e346f176c02ab3e54b3446d5e28dae744468f2209a9d037 SHA512 dd78c040c2a51d6b47f8dd2d8bdc0661111f26b9233ffeb41216254b1b0ad0f634190784e6b8c2d7b36475c13020356342d83a9f80047d7da75ce21ca8885b16
+DIST ccls-0.20220729.tar.gz 160861 BLAKE2B db096f0f1e1d56967086e2711af63f4882e77128236b3d1af3cc107a3b320aa29bcacd4b21769904727261b5608bb2c8409dbb0f3b0d9b0907a94f3bb7c966c8 SHA512 63cb4eace1700118f9c8c4d2f4be40aac948f9c658485c8e3f49dcc863ce7bdd8b6de810b95ec8f46c943b65c8aa5fa643b110a6b981a2e43f57569d897d36c1
diff --git a/dev-util/ccls/ccls-0.20220729.ebuild b/dev-util/ccls/ccls-0.20220729.ebuild
new file mode 100644
index 000000000000..d99dd418d177
--- /dev/null
+++ b/dev-util/ccls/ccls-0.20220729.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	LLVM_MAX_SLOT=15
+else
+	LLVM_MAX_SLOT=14
+fi
+
+inherit cmake llvm ${GIT_ECLASS}
+
+DESCRIPTION="C/C++/ObjC language server"
+HOMEPAGE="https://github.com/MaskRay/ccls"
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+# We only depend on Clang because of a quirk in how dependencies work
+# See comment in llvm.eclass docs
+DEPEND="
+	dev-libs/rapidjson
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCLS_VERSION=${PV}
+		-DUSE_SYSTEM_RAPIDJSON=ON
+		-DCLANG_LINK_CLANG_DYLIB=1
+	)
+	cmake_src_configure
+}
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/trace-cmd/trace-cmd-3.0.2.ebuild b/dev-util/trace-cmd/trace-cmd-3.0.2.ebuild
index 8212dad83e0e..815274329fcf 100644
--- a/dev-util/trace-cmd/trace-cmd-3.0.2.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-3.0.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=8
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi