public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2023-11-25  6:36 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2023-11-25  6:36 UTC (permalink / raw
  To: gentoo-commits

commit:     b7cdf199cc92df2bb376669cab0419575b04d9d2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 06:34:39 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 06:34:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7cdf199

dev-util/sh: drop 3.5.1, 3.6.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/Manifest        |  4 ----
 dev-util/sh/sh-3.5.1.ebuild | 54 ---------------------------------------------
 dev-util/sh/sh-3.6.0.ebuild | 54 ---------------------------------------------
 3 files changed, 112 deletions(-)

diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest
index d0d043aba5ac..5f386fada8a5 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -1,6 +1,2 @@
-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
-DIST sh-3.6.0-deps.tar.xz 3291776 BLAKE2B 63a04877eb69aca3b82cf08cd5b171de7fb9aa46910d5d59e7584f2eac424e52bcefdefffb4216b47ea6760535f298fca5ae5e4db29eef9c66a72ffb880b6ec8 SHA512 01271d1e311ab5d6e89dec4287b18229dcd892b05ee0bbf9917fdc9a9318d3f44e1322ca50722e5771091615dfa12f8041a23d533c7107ed03010d399667a24f
-DIST sh-3.6.0.tar.gz 216645 BLAKE2B a4b9e711eb1d8889e317775fcbab95a273c0bef9ff46ce043c1db39b4b21ca944272b595f60d190bf169ce4924f6c37c9aa1945155e62f9f27c7af2ff9008e3f SHA512 c7812496c66df2fd32b674fc260d0f100b3b6297540bc9e4890d603ca8f41589950493d6d62924bded6d17d4dd9347ee5bc47464608cdcde9c1f73e198c454cd
 DIST sh-3.7.0-deps.tar.xz 9776560 BLAKE2B 2376bba34d0b57897f748ce277b8c40da2ac98ad518e516868c442a521b24e4e19016b26dd0e889157781fa75cc7f945dea72a0451937a3bef24d65149d8de7b SHA512 3baf5276b1916e726a99b47dcf1319fb9a015e6096d8dbd430df478f9dbc1ecbcffcb82de72efbb455aa4a6dc17437e00287df27abd2e7e126253171d7024a9e
 DIST sh-3.7.0.tar.gz 219380 BLAKE2B 5de1f5576f3e92f5cc892da730b62640b0922f879005e844b3e0b0d84a4e8f1a5f76e89c53152dd3de11c67da20411c5bddd44627ab31b66a72f950b1bf03393 SHA512 5869b68d4bb59907ff7543019e02e8e1efee5963475763b2b2daf0b1ef8621d919d54978a50e52d865b5b76b188c821fecb673e6a9ce42b30cd9907a020e6387

diff --git a/dev-util/sh/sh-3.5.1.ebuild b/dev-util/sh/sh-3.5.1.ebuild
deleted file mode 100644
index ea48ab9e9b7d..000000000000
--- a/dev-util/sh/sh-3.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-}

diff --git a/dev-util/sh/sh-3.6.0.ebuild b/dev-util/sh/sh-3.6.0.ebuild
deleted file mode 100644
index 5fbc2cb45333..000000000000
--- a/dev-util/sh/sh-3.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 ~riscv ~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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2024-08-21  5:45 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-08-21  5:45 UTC (permalink / raw
  To: gentoo-commits

commit:     b075dce8596ea3dce23758125de7e291f8de7d4a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 05:44:58 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 05:44:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b075dce8

dev-util/sh: add 3.9.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/Manifest        |  2 ++
 dev-util/sh/sh-3.9.0.ebuild | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest
index d83812ede7c3..e724fc45efef 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -2,3 +2,5 @@ DIST sh-3.7.0-deps.tar.xz 9776560 BLAKE2B 2376bba34d0b57897f748ce277b8c40da2ac98
 DIST sh-3.7.0.tar.gz 219380 BLAKE2B 5de1f5576f3e92f5cc892da730b62640b0922f879005e844b3e0b0d84a4e8f1a5f76e89c53152dd3de11c67da20411c5bddd44627ab31b66a72f950b1bf03393 SHA512 5869b68d4bb59907ff7543019e02e8e1efee5963475763b2b2daf0b1ef8621d919d54978a50e52d865b5b76b188c821fecb673e6a9ce42b30cd9907a020e6387
 DIST sh-3.8.0-deps.tar.xz 3129756 BLAKE2B e8a7a6f4a699b55d2b2533065ff0030777fddcb444606889cbf0b811715e89af8f97fb28d1ed71e8bb9ee07517cf71930c03151c2f102c316902e6b55141ee85 SHA512 1bb8776d308aea471051002ba2c426d6a59b354e3615561e33f42938c55472e402b037651db8307d593be0489df30a0d99be3a4e0d75972a85266facebdab32e
 DIST sh-3.8.0.tar.gz 221631 BLAKE2B b2235c88d2601c0c223b8bc55682ee7490da7bf97696fdf3fa32787e5ef123bf4072e281daf29851695b590fe93f7bf180b03558974ad726fab10f799881ec92 SHA512 fbeba1883f9458c480663c31d51beaffb780205f5251cae956f6582d494109e21e062e444f7436db220fb647e833ec48498fa1f75daa7fa7ec88ba1f564d4213
+DIST sh-3.9.0-deps.tar.xz 3099656 BLAKE2B 8ec6608ba97825e9d4589978c76464777c276d02a56d5a27e08469aaa88791e42e633618c6b01025c981e3ef4f819e27cd155765b7dce9547561ceb33dbd57f7 SHA512 78412277e7882b8d68adbc71011646e0b189371bd6e033ed783c4ee7bf48fce5249c5e6fc25b6c700634a000053b92b2e8fb2ebebeb7e8285183e59880fba74e
+DIST sh-3.9.0.tar.gz 224822 BLAKE2B b20e46fdc6db39efe54434a455dbd407af63e9b48dd616a895215047990ffcc42e0fabfd93607a0c4f5f50c64cc789616dfb5c8e685443451091cf2b99c7e64e SHA512 8e1ca255223d34fc5cdf8141b99029f1da5e3cdfdaea0c9838d68ed0eb9418b5bf7d363332919a632592c3d433fc40f1ae0b4df6bbfb20ff62d857325c4f10bf

diff --git a/dev-util/sh/sh-3.9.0.ebuild b/dev-util/sh/sh-3.9.0.ebuild
new file mode 100644
index 000000000000..6aa0a0969770
--- /dev/null
+++ b/dev-util/sh/sh-3.9.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2024 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"
+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"
+S="${WORKDIR}/${PN//fmt/}-${PV}"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+BDEPEND="app-text/scdoc"
+
+src_compile() {
+	# Not bothering with gosh for now as it's very new
+	# https://github.com/mvdan/sh#gosh
+	ego build ./cmd/shfmt
+	scdoc <cmd/shfmt/shfmt.1.scd >shfmt.1 || die "conversation of man page failed"
+}
+
+src_test() {
+	cd syntax || die
+	ego test -run=-
+}
+
+src_install() {
+	dobin shfmt
+	doman shfmt.1
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2024-02-27 22:06 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-02-27 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     f44ccd6080ad1c0e7892f70581d1ba3004333b78
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 22:01:37 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 22:01:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44ccd60

dev-util/sh: add 3.8.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/Manifest        |  2 ++
 dev-util/sh/sh-3.8.0.ebuild | 54 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest
index 5f386fada8a5..d83812ede7c3 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -1,2 +1,4 @@
 DIST sh-3.7.0-deps.tar.xz 9776560 BLAKE2B 2376bba34d0b57897f748ce277b8c40da2ac98ad518e516868c442a521b24e4e19016b26dd0e889157781fa75cc7f945dea72a0451937a3bef24d65149d8de7b SHA512 3baf5276b1916e726a99b47dcf1319fb9a015e6096d8dbd430df478f9dbc1ecbcffcb82de72efbb455aa4a6dc17437e00287df27abd2e7e126253171d7024a9e
 DIST sh-3.7.0.tar.gz 219380 BLAKE2B 5de1f5576f3e92f5cc892da730b62640b0922f879005e844b3e0b0d84a4e8f1a5f76e89c53152dd3de11c67da20411c5bddd44627ab31b66a72f950b1bf03393 SHA512 5869b68d4bb59907ff7543019e02e8e1efee5963475763b2b2daf0b1ef8621d919d54978a50e52d865b5b76b188c821fecb673e6a9ce42b30cd9907a020e6387
+DIST sh-3.8.0-deps.tar.xz 3129756 BLAKE2B e8a7a6f4a699b55d2b2533065ff0030777fddcb444606889cbf0b811715e89af8f97fb28d1ed71e8bb9ee07517cf71930c03151c2f102c316902e6b55141ee85 SHA512 1bb8776d308aea471051002ba2c426d6a59b354e3615561e33f42938c55472e402b037651db8307d593be0489df30a0d99be3a4e0d75972a85266facebdab32e
+DIST sh-3.8.0.tar.gz 221631 BLAKE2B b2235c88d2601c0c223b8bc55682ee7490da7bf97696fdf3fa32787e5ef123bf4072e281daf29851695b590fe93f7bf180b03558974ad726fab10f799881ec92 SHA512 fbeba1883f9458c480663c31d51beaffb780205f5251cae956f6582d494109e21e062e444f7436db220fb647e833ec48498fa1f75daa7fa7ec88ba1f564d4213

diff --git a/dev-util/sh/sh-3.8.0.ebuild b/dev-util/sh/sh-3.8.0.ebuild
new file mode 100644
index 000000000000..9aa4c37a568f
--- /dev/null
+++ b/dev-util/sh/sh-3.8.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2022-2024 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 ~riscv ~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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2024-02-27 22:06 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-02-27 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     83e9046c59342b7d5c02846b2cafff562b23174d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 22:02:43 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 22:03:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e9046c

dev-util/sh: always install man pages, drop 9999

I don't see much value in the live ebuild here and it also breaks
my go bump script. I could (and should) fix that but I didn't realise we even
had a live ebuild for this.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/sh-3.8.0.ebuild | 34 ++++++----------------------
 dev-util/sh/sh-9999.ebuild  | 54 ---------------------------------------------
 2 files changed, 7 insertions(+), 81 deletions(-)

diff --git a/dev-util/sh/sh-3.8.0.ebuild b/dev-util/sh/sh-3.8.0.ebuild
index 9aa4c37a568f..6aa0a0969770 100644
--- a/dev-util/sh/sh-3.8.0.ebuild
+++ b/dev-util/sh/sh-3.8.0.ebuild
@@ -7,38 +7,20 @@ 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 ~riscv ~x86"
-	S="${WORKDIR}/${PN//fmt/}-${PV}"
-fi
+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"
+S="${WORKDIR}/${PN//fmt/}-${PV}"
 
 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
-}
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+BDEPEND="app-text/scdoc"
 
 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
+	scdoc <cmd/shfmt/shfmt.1.scd >shfmt.1 || die "conversation of man page failed"
 }
 
 src_test() {
@@ -48,7 +30,5 @@ src_test() {
 
 src_install() {
 	dobin shfmt
-	if use man; then
-		doman shfmt.1
-	fi
+	doman shfmt.1
 }

diff --git a/dev-util/sh/sh-9999.ebuild b/dev-util/sh/sh-9999.ebuild
deleted file mode 100644
index c85de409caf7..000000000000
--- a/dev-util/sh/sh-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2022-2023 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 ~riscv ~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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2023-06-19 21:28 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2023-06-19 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     893439e3c3a46a2d8eacdc46fe1361f5913e84aa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 20:29:00 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 21:26:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893439e3

dev-util/sh: add 3.7.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/Manifest        |  2 ++
 dev-util/sh/sh-3.7.0.ebuild | 54 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest
index 80cd0d01d0d1..d0d043aba5ac 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -2,3 +2,5 @@ DIST sh-3.5.1-deps.tar.xz 3113476 BLAKE2B 0998ebeacdd7c882542eea25ad5ab3131211c6
 DIST sh-3.5.1.tar.gz 222608 BLAKE2B a81af092d0f8d0ee7c05240d816a99f044bce3e35d242a815a238a27893db5bfc320efc4a0237ca9ecfa0276e4687152c87f6e0170f5326e2d0a8604f94f6adb SHA512 fd1084921254b70376b3ac47b97e2108308252fa6bd23aff1e59aaefb45a7e01c1738a46ae6f4eb255ecade77fb9659fbc8184d2473e8e4f70e520757bad506d
 DIST sh-3.6.0-deps.tar.xz 3291776 BLAKE2B 63a04877eb69aca3b82cf08cd5b171de7fb9aa46910d5d59e7584f2eac424e52bcefdefffb4216b47ea6760535f298fca5ae5e4db29eef9c66a72ffb880b6ec8 SHA512 01271d1e311ab5d6e89dec4287b18229dcd892b05ee0bbf9917fdc9a9318d3f44e1322ca50722e5771091615dfa12f8041a23d533c7107ed03010d399667a24f
 DIST sh-3.6.0.tar.gz 216645 BLAKE2B a4b9e711eb1d8889e317775fcbab95a273c0bef9ff46ce043c1db39b4b21ca944272b595f60d190bf169ce4924f6c37c9aa1945155e62f9f27c7af2ff9008e3f SHA512 c7812496c66df2fd32b674fc260d0f100b3b6297540bc9e4890d603ca8f41589950493d6d62924bded6d17d4dd9347ee5bc47464608cdcde9c1f73e198c454cd
+DIST sh-3.7.0-deps.tar.xz 9776560 BLAKE2B 2376bba34d0b57897f748ce277b8c40da2ac98ad518e516868c442a521b24e4e19016b26dd0e889157781fa75cc7f945dea72a0451937a3bef24d65149d8de7b SHA512 3baf5276b1916e726a99b47dcf1319fb9a015e6096d8dbd430df478f9dbc1ecbcffcb82de72efbb455aa4a6dc17437e00287df27abd2e7e126253171d7024a9e
+DIST sh-3.7.0.tar.gz 219380 BLAKE2B 5de1f5576f3e92f5cc892da730b62640b0922f879005e844b3e0b0d84a4e8f1a5f76e89c53152dd3de11c67da20411c5bddd44627ab31b66a72f950b1bf03393 SHA512 5869b68d4bb59907ff7543019e02e8e1efee5963475763b2b2daf0b1ef8621d919d54978a50e52d865b5b76b188c821fecb673e6a9ce42b30cd9907a020e6387

diff --git a/dev-util/sh/sh-3.7.0.ebuild b/dev-util/sh/sh-3.7.0.ebuild
new file mode 100644
index 000000000000..c85de409caf7
--- /dev/null
+++ b/dev-util/sh/sh-3.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2022-2023 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 ~riscv ~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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2023-02-17 13:26 Yixun Lan
  0 siblings, 0 replies; 13+ messages in thread
From: Yixun Lan @ 2023-02-17 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     7ba2901ae5697718ab3b9635ab5c3a7139d4c584
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 13:25:58 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 13:25:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba2901a

dev-util/sh: forward keywords to live ebuild

keep it sync with release version

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-util/sh/sh-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/sh/sh-9999.ebuild b/dev-util/sh/sh-9999.ebuild
index ea48ab9e9b7d..c85de409caf7 100644
--- a/dev-util/sh/sh-9999.ebuild
+++ b/dev-util/sh/sh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 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"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	S="${WORKDIR}/${PN//fmt/}-${PV}"
 fi
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2023-02-17 13:24 Yixun Lan
  0 siblings, 0 replies; 13+ messages in thread
From: Yixun Lan @ 2023-02-17 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     d89e083326d7237fde65a28f7016799fbc8e4c98
Author:     jinqiang zhang <peeweep <AT> 0x0 <DOT> ee>
AuthorDate: Fri Feb 17 12:26:22 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 13:21:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d89e0833

dev-util/sh: Keyword 3.6.0 riscv, #895114

Closes: https://github.com/gentoo/gentoo/pull/29630
Signed-off-by: jinqiang zhang <peeweep <AT> 0x0.ee>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-util/sh/sh-3.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/sh/sh-3.6.0.ebuild b/dev-util/sh/sh-3.6.0.ebuild
index ea48ab9e9b7d..5fbc2cb45333 100644
--- a/dev-util/sh/sh-3.6.0.ebuild
+++ b/dev-util/sh/sh-3.6.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 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"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	S="${WORKDIR}/${PN//fmt/}-${PV}"
 fi
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2022-12-18  6:30 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-12-18  6:30 UTC (permalink / raw
  To: gentoo-commits

commit:     77f09a08a747707a675fb68dbc11c590816de744
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 06:09:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 06:09:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f09a08

dev-util/sh: add 3.6.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/Manifest        |  2 ++
 dev-util/sh/sh-3.6.0.ebuild | 54 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest
index d74589817b91..80cd0d01d0d1 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -1,2 +1,4 @@
 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
+DIST sh-3.6.0-deps.tar.xz 3291776 BLAKE2B 63a04877eb69aca3b82cf08cd5b171de7fb9aa46910d5d59e7584f2eac424e52bcefdefffb4216b47ea6760535f298fca5ae5e4db29eef9c66a72ffb880b6ec8 SHA512 01271d1e311ab5d6e89dec4287b18229dcd892b05ee0bbf9917fdc9a9318d3f44e1322ca50722e5771091615dfa12f8041a23d533c7107ed03010d399667a24f
+DIST sh-3.6.0.tar.gz 216645 BLAKE2B a4b9e711eb1d8889e317775fcbab95a273c0bef9ff46ce043c1db39b4b21ca944272b595f60d190bf169ce4924f6c37c9aa1945155e62f9f27c7af2ff9008e3f SHA512 c7812496c66df2fd32b674fc260d0f100b3b6297540bc9e4890d603ca8f41589950493d6d62924bded6d17d4dd9347ee5bc47464608cdcde9c1f73e198c454cd

diff --git a/dev-util/sh/sh-3.6.0.ebuild b/dev-util/sh/sh-3.6.0.ebuild
new file mode 100644
index 000000000000..ea48ab9e9b7d
--- /dev/null
+++ b/dev-util/sh/sh-3.6.0.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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2022-09-01 18:12 William Hubbs
  0 siblings, 0 replies; 13+ messages in thread
From: William Hubbs @ 2022-09-01 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     a8afbb307e9e7cb612e9ee0867cb12c4a22a4e38
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 18:12:15 2022 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 18:12:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8afbb30

dev-util/sh: add myself as a maintainer

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 dev-util/sh/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-util/sh/metadata.xml b/dev-util/sh/metadata.xml
index 02bd9ab81cf5..23226f483250 100644
--- a/dev-util/sh/metadata.xml
+++ b/dev-util/sh/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>ran.dall@icloud.com</email>
 		<name>Randall T. Vasquez</name>


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2022-08-05  3:19 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-08-05  3:19 UTC (permalink / raw
  To: gentoo-commits

commit:     b64a70f1930b2e79a9c727bff489faa7882df485
Author:     Randall T. Vasquez <ran.dall <AT> icloud <DOT> com>
AuthorDate: Wed Aug  3 22:30:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 01:52:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64a70f1

dev-util/sh: generate man page

Signed-off-by: Randall T. Vasquez <ran.dall <AT> icloud.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/sh-3.5.1.ebuild | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dev-util/sh/sh-3.5.1.ebuild b/dev-util/sh/sh-3.5.1.ebuild
index f5098aea771b..7da56df5263e 100644
--- a/dev-util/sh/sh-3.5.1.ebuild
+++ b/dev-util/sh/sh-3.5.1.ebuild
@@ -13,11 +13,25 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar
 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 +41,8 @@ src_test() {
 
 src_install() {
 	dobin shfmt
+	if use man; then
+		doman shfmt.1
+	fi
+
 }


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2022-08-05  3:19 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-08-05  3:19 UTC (permalink / raw
  To: gentoo-commits

commit:     007a9e70cd10ec1e3e4c7e6f5c5acf5d3c444022
Author:     Randall T. Vasquez <ran.dall <AT> icloud <DOT> com>
AuthorDate: Wed Aug  3 23:00:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 01:52:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007a9e70

dev-util/sh: add co-maintainer

Signed-off-by: Randall T. Vasquez <ran.dall <AT> icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/26733
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/metadata.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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>


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2022-08-05  3:19 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-08-05  3:19 UTC (permalink / raw
  To: gentoo-commits

commit:     0b896cd6c8f7e38f3c7e4c18f4a133cf6f591bed
Author:     Randall T. Vasquez <ran.dall <AT> icloud <DOT> com>
AuthorDate: Thu Aug  4 18:33:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 01:52:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b896cd6

dev-util/sh: add live build

Signed-off-by: Randall T. Vasquez <ran.dall <AT> icloud.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/sh-3.5.1.ebuild                     | 14 ++++++++++----
 dev-util/sh/{sh-3.5.1.ebuild => sh-9999.ebuild} | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/dev-util/sh/sh-3.5.1.ebuild b/dev-util/sh/sh-3.5.1.ebuild
index 7da56df5263e..ea48ab9e9b7d 100644
--- a/dev-util/sh/sh-3.5.1.ebuild
+++ b/dev-util/sh/sh-3.5.1.ebuild
@@ -7,12 +7,19 @@ 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 )"
@@ -44,5 +51,4 @@ src_install() {
 	if use man; then
 		doman shfmt.1
 	fi
-
 }

diff --git a/dev-util/sh/sh-3.5.1.ebuild b/dev-util/sh/sh-9999.ebuild
similarity index 69%
copy from dev-util/sh/sh-3.5.1.ebuild
copy to dev-util/sh/sh-9999.ebuild
index 7da56df5263e..ea48ab9e9b7d 100644
--- a/dev-util/sh/sh-3.5.1.ebuild
+++ b/dev-util/sh/sh-9999.ebuild
@@ -7,12 +7,19 @@ 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 )"
@@ -44,5 +51,4 @@ src_install() {
 	if use man; then
 		doman shfmt.1
 	fi
-
 }


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
@ 2022-07-26  8:41 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-07-26  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     80b27ad743723ca12f1e92be6267a2496bfc25ea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 08:22:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 08:40:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b27ad7

dev-util/sh: new package, add 3.5.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/sh/Manifest        |  2 ++
 dev-util/sh/metadata.xml    | 11 +++++++++++
 dev-util/sh/sh-3.5.1.ebuild | 30 ++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest
new file mode 100644
index 000000000000..d74589817b91
--- /dev/null
+++ b/dev-util/sh/Manifest
@@ -0,0 +1,2 @@
+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

diff --git a/dev-util/sh/metadata.xml b/dev-util/sh/metadata.xml
new file mode 100644
index 000000000000..1e811dcb7fc9
--- /dev/null
+++ b/dev-util/sh/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mvdan/sh</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/dev-util/sh/sh-3.5.1.ebuild b/dev-util/sh/sh-3.5.1.ebuild
new file mode 100644
index 000000000000..f5098aea771b
--- /dev/null
+++ b/dev-util/sh/sh-3.5.1.ebuild
@@ -0,0 +1,30 @@
+# 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"
+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"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	# Not bothering with gosh for now as it's very new
+	# https://github.com/mvdan/sh#gosh
+	ego build ./cmd/shfmt
+}
+
+src_test() {
+	cd syntax || die
+	ego test -run=-
+}
+
+src_install() {
+	dobin shfmt
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-08-21  5:45 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-25  6:36 [gentoo-commits] repo/gentoo:master commit in: dev-util/sh/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-08-21  5:45 Sam James
2024-02-27 22:06 Sam James
2024-02-27 22:06 Sam James
2023-06-19 21:28 Sam James
2023-02-17 13:26 Yixun Lan
2023-02-17 13:24 Yixun Lan
2022-12-18  6:30 Sam James
2022-09-01 18:12 William Hubbs
2022-08-05  3:19 Sam James
2022-08-05  3:19 Sam James
2022-08-05  3:19 Sam James
2022-07-26  8:41 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox