[gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
commit: 83e9046c59342b7d5c02846b2cafff562b23174d Author: Sam James gentoo org> AuthorDate: Tue Feb 27 22:02:43 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 27 22:03:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e9046c dev-util/sh: always install man pages, drop 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 gentoo.org> dev-util/sh/sh-3.8.0.ebuild | 34 ++-- dev-util/sh/sh-.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} == * ]]; 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} == * ]]; 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 shfmt.1 || die "conversation of man page failed" - fi + scdoc 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-.ebuild b/dev-util/sh/sh-.ebuild deleted file mode 100644 index c85de409caf7.. --- a/dev-util/sh/sh-.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} == * ]]; 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} == * ]]; 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 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 -}
[gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
commit: 7ba2901ae5697718ab3b9635ab5c3a7139d4c584 Author: Yixun Lan gentoo org> AuthorDate: Fri Feb 17 13:25:58 2023 + Commit: Yixun Lan gentoo org> CommitDate: Fri Feb 17 13:25:58 2023 + 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 gentoo.org> dev-util/sh/sh-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/sh/sh-.ebuild b/dev-util/sh/sh-.ebuild index ea48ab9e9b7d..c85de409caf7 100644 --- a/dev-util/sh/sh-.ebuild +++ b/dev-util/sh/sh-.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} == * ]]; 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
[gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
commit: d89e083326d7237fde65a28f7016799fbc8e4c98 Author: jinqiang zhang 0x0 ee> AuthorDate: Fri Feb 17 12:26:22 2023 + Commit: Yixun Lan gentoo org> CommitDate: Fri Feb 17 13:21:50 2023 + 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 0x0.ee> Signed-off-by: Yixun Lan 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} == * ]]; 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
[gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
commit: 77f09a08a747707a675fb68dbc11c590816de744 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 06:09:09 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 06:09:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f09a08 dev-util/sh: add 3.6.0 Signed-off-by: Sam James 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 ..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} == * ]]; 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} == * ]]; 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 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
commit: a8afbb307e9e7cb612e9ee0867cb12c4a22a4e38 Author: William Hubbs gentoo org> AuthorDate: Thu Sep 1 18:12:15 2022 + Commit: William Hubbs gentoo org> CommitDate: Thu Sep 1 18:12:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8afbb30 dev-util/sh: add myself as a maintainer Signed-off-by: William Hubbs 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 @@ s...@gentoo.org Sam James + + willi...@gentoo.org + William Hubbs + ran.d...@icloud.com Randall T. Vasquez
[gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
commit: 0b896cd6c8f7e38f3c7e4c18f4a133cf6f591bed Author: Randall T. Vasquez icloud com> AuthorDate: Thu Aug 4 18:33:48 2022 + Commit: Sam James gentoo org> CommitDate: Fri Aug 5 01:52:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b896cd6 dev-util/sh: add live build Signed-off-by: Randall T. Vasquez icloud.com> Signed-off-by: Sam James gentoo.org> dev-util/sh/sh-3.5.1.ebuild | 14 ++ dev-util/sh/{sh-3.5.1.ebuild => sh-.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} == * ]]; 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-.ebuild similarity index 69% copy from dev-util/sh/sh-3.5.1.ebuild copy to dev-util/sh/sh-.ebuild index 7da56df5263e..ea48ab9e9b7d 100644 --- a/dev-util/sh/sh-3.5.1.ebuild +++ b/dev-util/sh/sh-.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} == * ]]; 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 - }
[gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
commit: 007a9e70cd10ec1e3e4c7e6f5c5acf5d3c444022 Author: Randall T. Vasquez icloud com> AuthorDate: Wed Aug 3 23:00:43 2022 + Commit: Sam James gentoo org> CommitDate: Fri Aug 5 01:52:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007a9e70 dev-util/sh: add co-maintainer Signed-off-by: Randall T. Vasquez icloud.com> Closes: https://github.com/gentoo/gentoo/pull/26733 Signed-off-by: Sam James 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 @@ s...@gentoo.org Sam James + + ran.d...@icloud.com + Randall T. Vasquez + + + A shell parser, formatter, and interpreter with bash support; includes shfmt. Supports POSIX Shell, Bash, and mksh. + mvdan/sh
[gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
commit: b64a70f1930b2e79a9c727bff489faa7882df485 Author: Randall T. Vasquez icloud com> AuthorDate: Wed Aug 3 22:30:20 2022 + Commit: Sam James gentoo org> CommitDate: Fri Aug 5 01:52:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64a70f1 dev-util/sh: generate man page Signed-off-by: Randall T. Vasquez icloud.com> Signed-off-by: Sam James 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} == * ]]; 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 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 + }
[gentoo-commits] repo/gentoo:master commit in: dev-util/sh/
commit: 80b27ad743723ca12f1e92be6267a2496bfc25ea Author: Sam James gentoo org> AuthorDate: Tue Jul 26 08:22:13 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jul 26 08:40:54 2022 + 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 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 ..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 ..1e811dcb7fc9 --- /dev/null +++ b/dev-util/sh/metadata.xml @@ -0,0 +1,11 @@ + +https://www.gentoo.org/dtd/metadata.dtd;> + + + s...@gentoo.org + Sam James + + + mvdan/sh + + 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 ..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 +}