[gentoo-commits] repo/proj/guru:master commit in: dev-util/shfmt/

2022-08-02 Thread Haelwenn Monnier
commit: e86df47ed839b988490678e24b472e666d6d400a
Author: Randall T. Vasquez  icloud  com>
AuthorDate: Sat Jul 30 16:27:57 2022 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sat Jul 30 16:29:37 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e86df47e

dev-util/shfmt: drop ebuilds

`dev-util/sh` is now available in ::gentoo

Signed-off-by: Randall T. Vasquez  icloud.com>

 dev-util/shfmt/Manifest   |  2 --
 dev-util/shfmt/metadata.xml   | 14 ---
 dev-util/shfmt/shfmt-3.5.1.ebuild | 50 ---
 dev-util/shfmt/shfmt-.ebuild  | 50 ---
 4 files changed, 116 deletions(-)

diff --git a/dev-util/shfmt/Manifest b/dev-util/shfmt/Manifest
deleted file mode 100644
index 5363e0a6e..0
--- a/dev-util/shfmt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST shfmt-3.5.1-deps.tar.xz 3117092 BLAKE2B 
13e85d2b737f80f1c90201e7d035fb01bb624e396ccf292d00e5c8c19da8209c69ecff88ce334ba0de8e7bbf4243be58cbcea21ee99166285f2738f0036862c9
 SHA512 
24791e7798fdfe69e76117785b5d469742f680c2ed7d186cb580e55776e5e011ab907be882f6394b9f84f82717611a28f9e72ec5280d6a9d7e89f629bb4a378a
-DIST shfmt-3.5.1.tar.gz 222608 BLAKE2B 
a81af092d0f8d0ee7c05240d816a99f044bce3e35d242a815a238a27893db5bfc320efc4a0237ca9ecfa0276e4687152c87f6e0170f5326e2d0a8604f94f6adb
 SHA512 
fd1084921254b70376b3ac47b97e2108308252fa6bd23aff1e59aaefb45a7e01c1738a46ae6f4eb255ecade77fb9659fbc8184d2473e8e4f70e520757bad506d

diff --git a/dev-util/shfmt/metadata.xml b/dev-util/shfmt/metadata.xml
deleted file mode 100644
index 898031468..0
--- a/dev-util/shfmt/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-  
-ran.d...@icloud.com
-Randall Vasquez
-  
-  
-A shell parser, formatter, and interpreter with bash support; includes 
shfmt. Supports POSIX Shell, Bash, and mksh.
-  
-  
-mvdan/sh
-  
-

diff --git a/dev-util/shfmt/shfmt-3.5.1.ebuild 
b/dev-util/shfmt/shfmt-3.5.1.ebuild
deleted file mode 100644
index 96a20587a..0
--- a/dev-util/shfmt/shfmt-3.5.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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} == * ]]; 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} == * ]]; 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-.ebuild b/dev-util/shfmt/shfmt-.ebuild
deleted file mode 100644
index 96a20587a..0
--- a/dev-util/shfmt/shfmt-.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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} == * ]]; 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} == * ]]; 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
-}



[gentoo-commits] repo/proj/guru:master commit in: dev-util/shfmt/

2022-05-24 Thread Florian Schmaus
commit: 721d2e323baab28be465845295610f2d9563da35
Author: Randall T. Vasquez  icloud  com>
AuthorDate: Tue May 24 13:03:48 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue May 24 13:03:48 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=721d2e32

dev-util/shfmt: fix BDEPEND statement

This commits fixes the BDEPEND statement.

Signed-off-by: Randall T. Vasquez  icloud.com>

 dev-util/shfmt/shfmt-3.5.0.ebuild | 5 +
 dev-util/shfmt/shfmt-.ebuild  | 5 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dev-util/shfmt/shfmt-3.5.0.ebuild 
b/dev-util/shfmt/shfmt-3.5.0.ebuild
index dbf998adf..eacbfc840 100644
--- a/dev-util/shfmt/shfmt-3.5.0.ebuild
+++ b/dev-util/shfmt/shfmt-3.5.0.ebuild
@@ -23,10 +23,7 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="+man"
 
-BDEPENDS="
-   dev-lang/go
-   man? ( app-text/scdoc )
-"
+BDEPEND="man? ( app-text/scdoc )"
 
 src_unpack() {
if [[ ${PV} == * ]]; then

diff --git a/dev-util/shfmt/shfmt-.ebuild b/dev-util/shfmt/shfmt-.ebuild
index dbf998adf..eacbfc840 100644
--- a/dev-util/shfmt/shfmt-.ebuild
+++ b/dev-util/shfmt/shfmt-.ebuild
@@ -23,10 +23,7 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="+man"
 
-BDEPENDS="
-   dev-lang/go
-   man? ( app-text/scdoc )
-"
+BDEPEND="man? ( app-text/scdoc )"
 
 src_unpack() {
if [[ ${PV} == * ]]; then



[gentoo-commits] repo/proj/guru:master commit in: dev-util/shfmt/

2022-05-23 Thread Haelwenn Monnier
commit: 708223445a7a9fdcfffb40f0bc7d7d1b78d7e4c8
Author: Randall T. Vasquez  icloud  com>
AuthorDate: Sat May 21 18:00:32 2022 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sat May 21 18:00:32 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=70822344

dev-util/shfmt: fix metadata.xml

This commits fixes some minor compliance issues with dev-util/shfmt/metadata.xml

Signed-off-by: Randall T. Vasquez  icloud.com>

 dev-util/shfmt/metadata.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-util/shfmt/metadata.xml b/dev-util/shfmt/metadata.xml
index 66342d17d..898031468 100644
--- a/dev-util/shfmt/metadata.xml
+++ b/dev-util/shfmt/metadata.xml
@@ -5,10 +5,10 @@
 ran.d...@icloud.com
 Randall Vasquez
   
-   
-   A shell parser, formatter, and interpreter with bash support; 
includes shfmt. Supports POSIX Shell, Bash, and mksh.
-   
-   
-   mvdan/sh
-   
+  
+A shell parser, formatter, and interpreter with bash support; includes 
shfmt. Supports POSIX Shell, Bash, and mksh.
+  
+  
+mvdan/sh
+  
 



[gentoo-commits] repo/proj/guru:master commit in: dev-util/shfmt/

2022-05-23 Thread Haelwenn Monnier
commit: 4a38bce6483cddb086321a61561a65cfaa4401a1
Author: Randall T. Vasquez  icloud  com>
AuthorDate: Sat May 21 16:51:49 2022 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sat May 21 16:51:49 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4a38bce6

dev-util/shfmt: add shfmt v3.5.0 and v

This commits adds ebuilds for shfmt v3.5.0 and v

Signed-off-by: Randall T. Vasquez  icloud.com>

 dev-util/shfmt/Manifest   |  2 ++
 dev-util/shfmt/metadata.xml   | 14 ++
 dev-util/shfmt/shfmt-3.5.0.ebuild | 56 ++
 dev-util/shfmt/shfmt-.ebuild  | 57 +++
 4 files changed, 129 insertions(+)

diff --git a/dev-util/shfmt/Manifest b/dev-util/shfmt/Manifest
new file mode 100644
index 0..15f0d5e01
--- /dev/null
+++ b/dev-util/shfmt/Manifest
@@ -0,0 +1,2 @@
+DIST shfmt-3.5.0-deps.tar.xz 3121980 BLAKE2B 
411e7df230864d1692899b89c4b5e25f54582752a10bde30a8a5e1ae03da3b325353d9bab71b46795f3d285747fbbcc63dd367ecddc8055d5df45013c5f491ae
 SHA512 
562fc2a58c0c115d132c9107c569f5139d7e1f817c91077b80151d0043601c328b083ce8261301689ce72deecabe3957bc11e4dc4388024234a2791c9f118743
+DIST shfmt-3.5.0.tar.gz 222314 BLAKE2B 
733785dbeb4af946f316aae1c9bf917c0d70598e3b19b993f592d35bbce53ef8ab613935ebc5ecbfb11677b722e4ca12175b85e30be2467abed381d30b6c3159
 SHA512 
8a3225a39a415d4926e44f214e8de6d25fedf5a0fe6b09743cc43e1c849094a3d8a34f327d00bffaaf93e4552f7ea03b681d3bb97f59727ab36ac66bafb6d4e7

diff --git a/dev-util/shfmt/metadata.xml b/dev-util/shfmt/metadata.xml
new file mode 100644
index 0..66342d17d
--- /dev/null
+++ b/dev-util/shfmt/metadata.xml
@@ -0,0 +1,14 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+ran.d...@icloud.com
+Randall Vasquez
+  
+   
+   A shell parser, formatter, and interpreter with bash support; 
includes shfmt. Supports POSIX Shell, Bash, and mksh.
+   
+   
+   mvdan/sh
+   
+

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 0..069e7e3d8
--- /dev/null
+++ b/dev-util/shfmt/shfmt-3.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Shell script formatter"
+HOMEPAGE="https://github.com/mvdan/sh;
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mvdan/sh.git;
+   RESTRICT="fetch mirror test"
+else
+   inherit go-module
+   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"
+
+BDEPENDS="
+   dev-lang/go
+   man? ( app-text/scdoc )
+"
+
+src_unpack() {
+   if [[ ${PV} == * ]]; then
+   git-r3_fetch
+   git-r3_checkout
+   pushd ${P}/cmd/shfmt || die "location change for module 
building failed"
+   ego get
+   popd || die "location reset from module building failed"
+   else
+   mv mvdan-sh-* || die "correct placement of directory failed"
+   go-module_src_unpack
+   fi
+   default
+}
+
+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-.ebuild b/dev-util/shfmt/shfmt-.ebuild
new file mode 100644
index 0..65a9730a9
--- /dev/null
+++ b/dev-util/shfmt/shfmt-.ebuild
@@ -0,0 +1,57 @@
+# 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} == * ]]; 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+=" ${P}-deps.tar.xz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   RESTRICT="mirror test"
+   S="${WORKDIR}/${PN/fmt}-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+man"
+
+BDEPENDS="
+   dev-lang/go
+   man? ( app-text/scdoc )
+"
+
+src_unpack() {
+   default
+   if [[ ${PV} == * ]]; then
+   git-r3_fetch
+   git-r3_checkout
+   pushd ${P}/cmd/shfmt || die "location change for module 
building failed"
+   ego get
+   popd || die "location 

[gentoo-commits] repo/proj/guru:master commit in: dev-util/shfmt/

2022-05-23 Thread Haelwenn Monnier
commit: 78a3d626d46d831df759e6a084408795a0bf676b
Author: Randall T. Vasquez  icloud  com>
AuthorDate: Sun May 22 14:40:03 2022 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sun May 22 14:40:03 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=78a3d626

dev-util/shfmt: tidy shfmt ebuilds

This commits fixes the manifest of the shfmt 3.5.0 ebuild; along with some 
other general tidying of all the shfmt ebuilds.

Signed-off-by: Randall T. Vasquez  icloud.com>

 dev-util/shfmt/Manifest   | 2 +-
 dev-util/shfmt/shfmt-3.5.0.ebuild | 6 +++---
 dev-util/shfmt/shfmt-.ebuild  | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev-util/shfmt/Manifest b/dev-util/shfmt/Manifest
index 15f0d5e01..2a1bf631e 100644
--- a/dev-util/shfmt/Manifest
+++ b/dev-util/shfmt/Manifest
@@ -1,2 +1,2 @@
 DIST shfmt-3.5.0-deps.tar.xz 3121980 BLAKE2B 
411e7df230864d1692899b89c4b5e25f54582752a10bde30a8a5e1ae03da3b325353d9bab71b46795f3d285747fbbcc63dd367ecddc8055d5df45013c5f491ae
 SHA512 
562fc2a58c0c115d132c9107c569f5139d7e1f817c91077b80151d0043601c328b083ce8261301689ce72deecabe3957bc11e4dc4388024234a2791c9f118743
-DIST shfmt-3.5.0.tar.gz 222314 BLAKE2B 
733785dbeb4af946f316aae1c9bf917c0d70598e3b19b993f592d35bbce53ef8ab613935ebc5ecbfb11677b722e4ca12175b85e30be2467abed381d30b6c3159
 SHA512 
8a3225a39a415d4926e44f214e8de6d25fedf5a0fe6b09743cc43e1c849094a3d8a34f327d00bffaaf93e4552f7ea03b681d3bb97f59727ab36ac66bafb6d4e7
+DIST shfmt-3.5.0.tar.gz 62 BLAKE2B 
a54c91afd1da39084637aba43dc9e3af82c2c57dabdd3e24cd80bbfc5fed9632da0e98b5a65169dc439216218a4664afcc8dc77cd409f15a35cd0b505d39dd39
 SHA512 
9071a015369088dbba8eb7221305893095ebeaa72124e1ca964b7b1e6f34dedc9d11f2daa2f679d24637b04925cbf58427a24cc4885d8e918cb81844e71d3c6b

diff --git a/dev-util/shfmt/shfmt-3.5.0.ebuild 
b/dev-util/shfmt/shfmt-3.5.0.ebuild
index 069e7e3d8..dbf998adf 100644
--- a/dev-util/shfmt/shfmt-3.5.0.ebuild
+++ b/dev-util/shfmt/shfmt-3.5.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit go-module
+
 DESCRIPTION="Shell script formatter"
 HOMEPAGE="https://github.com/mvdan/sh;
 if [[ ${PV} == * ]]; then
@@ -10,12 +12,11 @@ if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://github.com/mvdan/sh.git;
RESTRICT="fetch mirror test"
 else
-   inherit go-module
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}"
+   S="${WORKDIR}/${PN//fmt}-${PV}"
 fi
 
 LICENSE="MIT"
@@ -35,7 +36,6 @@ src_unpack() {
ego get
popd || die "location reset from module building failed"
else
-   mv mvdan-sh-* || die "correct placement of directory failed"
go-module_src_unpack
fi
default

diff --git a/dev-util/shfmt/shfmt-.ebuild b/dev-util/shfmt/shfmt-.ebuild
index d9c9cc2c4..dbf998adf 100644
--- a/dev-util/shfmt/shfmt-.ebuild
+++ b/dev-util/shfmt/shfmt-.ebuild
@@ -16,7 +16,7 @@ else
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}"
+   S="${WORKDIR}/${PN//fmt}-${PV}"
 fi
 
 LICENSE="MIT"
@@ -29,7 +29,6 @@ BDEPENDS="
 "
 
 src_unpack() {
-   default
if [[ ${PV} == * ]]; then
git-r3_fetch
git-r3_checkout
@@ -37,9 +36,9 @@ src_unpack() {
ego get
popd || die "location reset from module building failed"
else
-   mv mvdan-sh-* || die "correct placement of directory failed"
go-module_src_unpack
fi
+   default
 }
 
 src_compile() {



[gentoo-commits] repo/proj/guru:master commit in: dev-util/shfmt/

2022-05-23 Thread Haelwenn Monnier
commit: 335cbeae8c0479c7f08298364aaca1cac3de9fe9
Author: Randall T. Vasquez  icloud  com>
AuthorDate: Sun May 22 02:26:10 2022 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sun May 22 02:26:10 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=335cbeae

dev-util/shfmt-: fix dependency SRC_URI

Signed-off-by: Randall T. Vasquez  icloud.com>

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

diff --git a/dev-util/shfmt/shfmt-.ebuild b/dev-util/shfmt/shfmt-.ebuild
index 65a9730a9..d9c9cc2c4 100644
--- a/dev-util/shfmt/shfmt-.ebuild
+++ b/dev-util/shfmt/shfmt-.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == * ]]; then
RESTRICT="fetch mirror test"
 else
SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
-   SRC_URI+=" ${P}-deps.tar.xz"
+   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}"