gentoo auto-resync : 05:08:2022 - 08:07:19

4 files changed, 91 insertions, 5 deletions

diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest
index d9058b436fa3..4f8acfec5626 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -1,4 +1,5 @@
 DIST sh-3.5.1-deps.tar.xz 3113476 BLAKE2B 0998ebeacdd7c882542eea25ad5ab3131211c686ac2ba8040b89897a60ab41ecea7fc0c45f6498eda56a4539550622e2693fed0a6a1ed5ca6af060c40a9aaf97 SHA512 b572f7334e04365d3d685ba8b87fff834fb9823e815152646659d66e92410cab03940b5a32f6eb0634c4a0cce34808d03849d8b97b17fdbec939b305b13878e9
 DIST sh-3.5.1.tar.gz 222608 BLAKE2B a81af092d0f8d0ee7c05240d816a99f044bce3e35d242a815a238a27893db5bfc320efc4a0237ca9ecfa0276e4687152c87f6e0170f5326e2d0a8604f94f6adb SHA512 fd1084921254b70376b3ac47b97e2108308252fa6bd23aff1e59aaefb45a7e01c1738a46ae6f4eb255ecade77fb9659fbc8184d2473e8e4f70e520757bad506d
-EBUILD sh-3.5.1.ebuild 667 BLAKE2B bff7677fb283dd6f6290f700194b363abeeae3d037853d1c36d98d98ffed8b1ceff21c08cc020d33dc8d0ef4e20a249b2979e0316a3fdcab95a555510c89bc01 SHA512 c77a8e89f402680445c1d3aabde7aee6cdd697eb536cc08bdc41d1710246b1193b742d2cd32b05dd0a7a3ea1cab6d54b31b1e426330b9de5a7f401d169064bce
-MISC metadata.xml 313 BLAKE2B 17509142cbc5019a0566e03d41377d64c539a4dfd1d0458c5ea97d9d5962dde815fe9101b4d8aa4e0943589222278a255febb283af62441137c5752111b7ef4f SHA512 1d7462856c874a7dec084a7bb3d0f58e5aec0fbee61fc0f6bead7c559aba7a88b867779018f78d7ce42a657b2fc5dd192e0985325cdf9312abce4913216c9397
+EBUILD sh-3.5.1.ebuild 1124 BLAKE2B 0bde749e4856c27ab0125fb3afef356dfcd34afc588d4dc74d45389fadf1b6999245a1455fc15b5ce3424570be96c056ec5e2e06a632659d0d9a2e5dd9f03275 SHA512 94b0e355218e6cdacdd775301e6b779a74111655fbe010e0828b4f9985e753db0611eb9fb723b1f175d8651bec827e345c166a8511401bff944de460a7c283a1
+EBUILD sh-9999.ebuild 1124 BLAKE2B 0bde749e4856c27ab0125fb3afef356dfcd34afc588d4dc74d45389fadf1b6999245a1455fc15b5ce3424570be96c056ec5e2e06a632659d0d9a2e5dd9f03275 SHA512 94b0e355218e6cdacdd775301e6b779a74111655fbe010e0828b4f9985e753db0611eb9fb723b1f175d8651bec827e345c166a8511401bff944de460a7c283a1
+MISC metadata.xml 608 BLAKE2B b5a596e7ef469d9868a472e2529206776ae934de853800c0e0a520532e428fb085556282d21867dd9dd4a5c5a184feba43e119944480836da998f0ffa3c477ca SHA512 32a59e3e7d7c060fe742fd0705d7e9cf371c92df4a34c1f295b93a004e6ddebc46552a5fd54b8ca19770b194bfb79114cfffcbc4c686748a9e1d5ede317d79e9
diff --git a/dev-util/sh/metadata.xml b/dev-util/sh/metadata.xml
index 1e811dcb7fc9..02bd9ab81cf5 100644
--- a/dev-util/sh/metadata.xml
+++ b/dev-util/sh/metadata.xml
@@ -5,6 +5,13 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>ran.dall@icloud.com</email>
+		<name>Randall T. Vasquez</name>
+	</maintainer>
+	<longdescription lang="en">
+		A shell parser, formatter, and interpreter with bash support; includes shfmt. Supports POSIX Shell, Bash, and mksh.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">mvdan/sh</remote-id>
 	</upstream>
diff --git a/dev-util/sh/sh-3.5.1.ebuild b/dev-util/sh/sh-3.5.1.ebuild
index f5098aea771b..ea48ab9e9b7d 100644
--- a/dev-util/sh/sh-3.5.1.ebuild
+++ b/dev-util/sh/sh-3.5.1.ebuild
@@ -7,17 +7,38 @@ inherit go-module
 
 DESCRIPTION="A shell parser, formatter, and interpreter with bash support"
 HOMEPAGE="https://github.com/mvdan/sh"
-SRC_URI="https://github.com/mvdan/sh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/mvdan/sh.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${PN//fmt/}-${PV}"
+fi
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+IUSE="+man"
+
+BDEPEND="man? ( app-text/scdoc )"
+
+src_unpack() {
+	default
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	fi
+}
 
 src_compile() {
 	# Not bothering with gosh for now as it's very new
 	# https://github.com/mvdan/sh#gosh
 	ego build ./cmd/shfmt
+	if use man; then
+		scdoc <cmd/shfmt/shfmt.1.scd >shfmt.1 || die "conversation of man page failed"
+	fi
 }
 
 src_test() {
@@ -27,4 +48,7 @@ src_test() {
 
 src_install() {
 	dobin shfmt
+	if use man; then
+		doman shfmt.1
+	fi
 }
diff --git a/dev-util/sh/sh-9999.ebuild b/dev-util/sh/sh-9999.ebuild
new file mode 100644
index 000000000000..ea48ab9e9b7d
--- /dev/null
+++ b/dev-util/sh/sh-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A shell parser, formatter, and interpreter with bash support"
+HOMEPAGE="https://github.com/mvdan/sh"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/mvdan/sh.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${PN//fmt/}-${PV}"
+fi
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+IUSE="+man"
+
+BDEPEND="man? ( app-text/scdoc )"
+
+src_unpack() {
+	default
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	fi
+}
+
+src_compile() {
+	# Not bothering with gosh for now as it's very new
+	# https://github.com/mvdan/sh#gosh
+	ego build ./cmd/shfmt
+	if use man; then
+		scdoc <cmd/shfmt/shfmt.1.scd >shfmt.1 || die "conversation of man page failed"
+	fi
+}
+
+src_test() {
+	cd syntax || die
+	ego test -run=-
+}
+
+src_install() {
+	dobin shfmt
+	if use man; then
+		doman shfmt.1
+	fi
+}