From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 30E62158090 for ; Sun, 22 May 2022 16:30:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D12FE0937; Sun, 22 May 2022 16:30:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F338BE0937 for ; Sun, 22 May 2022 16:30:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 13164341C90 for ; Sun, 22 May 2022 16:30:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4380134E for ; Sun, 22 May 2022 16:30:53 +0000 (UTC) From: "Randall Vasquez" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Randall Vasquez" Message-ID: <1653230403.78a3d626d46d831df759e6a084408795a0bf676b.ran.dall@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/shfmt/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-util/shfmt/Manifest dev-util/shfmt/shfmt-3.5.0.ebuild dev-util/shfmt/shfmt-9999.ebuild X-VCS-Directories: dev-util/shfmt/ X-VCS-Committer: ran.dall X-VCS-Committer-Name: Randall Vasquez X-VCS-Revision: 78a3d626d46d831df759e6a084408795a0bf676b X-VCS-Branch: dev Date: Sun, 22 May 2022 16:30:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f468662e-551e-496c-885f-b56cc2a06257 X-Archives-Hash: 0506a030509d66eacd628aace7a664ae commit: 78a3d626d46d831df759e6a084408795a0bf676b Author: Randall T. Vasquez icloud com> AuthorDate: Sun May 22 14:40:03 2022 +0000 Commit: Randall Vasquez icloud com> CommitDate: Sun May 22 14:40:03 2022 +0000 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-9999.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 222262 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} == *9999 ]]; then @@ -10,12 +12,11 @@ if [[ ${PV} == *9999 ]]; 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-9999.ebuild b/dev-util/shfmt/shfmt-9999.ebuild index d9c9cc2c4..dbf998adf 100644 --- a/dev-util/shfmt/shfmt-9999.ebuild +++ b/dev-util/shfmt/shfmt-9999.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} == *9999 ]]; 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() {