commit:     e490424559add8b0cb39cebcd7f7cb28b17ac15e
Author:     Vladimir Pavljuchenkov (SpiderX) <spiderx <AT> spiderx <DOT> dp 
<DOT> ua>
AuthorDate: Thu Jun 16 18:49:51 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 17:35:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4904245

app-admin/doctl: version bump to 1.77.0

fix typo in live ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Vladimir Pavljuchenkov <spiderx <AT> spiderx.dp.ua>
Closes: https://github.com/gentoo/gentoo/pull/25927
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-admin/doctl/Manifest                           |  1 +
 .../{doctl-9999.ebuild => doctl-1.77.0.ebuild}     | 23 ++++++++++------------
 app-admin/doctl/doctl-9999.ebuild                  |  7 ++++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app-admin/doctl/Manifest b/app-admin/doctl/Manifest
index dafbbd57b95a..3d24a516bf39 100644
--- a/app-admin/doctl/Manifest
+++ b/app-admin/doctl/Manifest
@@ -1 +1,2 @@
 DIST doctl-1.76.2.tar.gz 5648377 BLAKE2B 
1ec89adb5ad187ccc6b66d077dda57ca4065bc1a5981a0f2549913532f6bcc6d1f48c3cc56c100c1b6c55f698ffcf3f2c639888ccaab30948384ce800181b332
 SHA512 
d7efc587843cd87f3ac17b974858ea688377ca6f0cd3d4b7430c47a1e8b825cc05f4d9107d7062f5e52fe3c267ec6bbd19a8b1d773a15f1d7ab653087ce13bba
+DIST doctl-1.77.0.tar.gz 5654010 BLAKE2B 
809189c9fdfa1e81e75847e57fe5967f0d3ca476fdb7a2e72ffba1b4bb81ecdc2ce07b4b05f4f1f898104cd9e919d6bdba664d4ae0cc97adea6863379789aa08
 SHA512 
a53e8e3179ec467cd0617a25ab985fe36e41135a824688a947b15c0565fb2d8364c59a295573043039b79b701bb4d5a9ec5461450fa0e7c5a24f10ece53c6f71

diff --git a/app-admin/doctl/doctl-9999.ebuild 
b/app-admin/doctl/doctl-1.77.0.ebuild
similarity index 53%
copy from app-admin/doctl/doctl-9999.ebuild
copy to app-admin/doctl/doctl-1.77.0.ebuild
index 03b7027f041b..3f5680240a83 100644
--- a/app-admin/doctl/doctl-9999.ebuild
+++ b/app-admin/doctl/doctl-1.77.0.ebuild
@@ -3,30 +3,27 @@
 
 EAPI=8
 
-EGIT_REPO_URI="https://github.com/digitalocean/${PN}.git";
-
-inherit edo bash-completion-r1 git-r3 go-module
+inherit bash-completion-r1 edo go-module
 
 DESCRIPTION="A command line tool for DigitalOcean services"
 HOMEPAGE="https://github.com/digitalocean/doctl";
-SRC_URI=""
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
 SLOT="0"
-KEYWORDS=""
-
-src_unpack() {
-       git-r3_src_unpack
-}
+KEYWORDS="~amd64 ~x86"
 
 src_compile() {
-       LDFLAGS="-X github.com/digitalocean/doctl.Build=$(git rev-parse --short 
HEAD)
-               -X github.com/digitalocean/doctl.Label=dev"
-       GOFLAGS="-v -x -mod=vendor" go build -ldflags "$LDFLAGS" ./cmd/...
+       LDFLAGS="-X github.com/digitalocean/doctl.Major=$(ver_cut 1)
+               -X github.com/digitalocean/doctl.Minor=$(ver_cut 2)
+               -X github.com/digitalocean/doctl.Patch=$(ver_cut 3-)
+               -X github.com/digitalocean/doctl.Label=release"
+       GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/...
 
        local completion
        for completion in bash zsh fish ; do
-               edo ./doctl completion ${completion} > doctl.${completion} || 
die "completion for ${completion} failed"
+               edo ./doctl completion ${completion} > doctl.${completion} \
+                       || die "completion for ${completion} failed"
        done
 }
 

diff --git a/app-admin/doctl/doctl-9999.ebuild 
b/app-admin/doctl/doctl-9999.ebuild
index 03b7027f041b..9837f24928f9 100644
--- a/app-admin/doctl/doctl-9999.ebuild
+++ b/app-admin/doctl/doctl-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 EGIT_REPO_URI="https://github.com/digitalocean/${PN}.git";
 
-inherit edo bash-completion-r1 git-r3 go-module
+inherit bash-completion-r1 edo git-r3 go-module
 
 DESCRIPTION="A command line tool for DigitalOcean services"
 HOMEPAGE="https://github.com/digitalocean/doctl";
@@ -22,11 +22,12 @@ src_unpack() {
 src_compile() {
        LDFLAGS="-X github.com/digitalocean/doctl.Build=$(git rev-parse --short 
HEAD)
                -X github.com/digitalocean/doctl.Label=dev"
-       GOFLAGS="-v -x -mod=vendor" go build -ldflags "$LDFLAGS" ./cmd/...
+       GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/...
 
        local completion
        for completion in bash zsh fish ; do
-               edo ./doctl completion ${completion} > doctl.${completion} || 
die "completion for ${completion} failed"
+               edo ./doctl completion ${completion} > doctl.${completion} \
+                       || die "completion for ${completion} failed"
        done
 }
 

Reply via email to