1 |
commit: e490424559add8b0cb39cebcd7f7cb28b17ac15e |
2 |
Author: Vladimir Pavljuchenkov (SpiderX) <spiderx <AT> spiderx <DOT> dp <DOT> ua> |
3 |
AuthorDate: Thu Jun 16 18:49:51 2022 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 2 17:35:15 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4904245 |
7 |
|
8 |
app-admin/doctl: version bump to 1.77.0 |
9 |
|
10 |
fix typo in live ebuild |
11 |
|
12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
13 |
Signed-off-by: Vladimir Pavljuchenkov <spiderx <AT> spiderx.dp.ua> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/25927 |
15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
16 |
|
17 |
app-admin/doctl/Manifest | 1 + |
18 |
.../{doctl-9999.ebuild => doctl-1.77.0.ebuild} | 23 ++++++++++------------ |
19 |
app-admin/doctl/doctl-9999.ebuild | 7 ++++--- |
20 |
3 files changed, 15 insertions(+), 16 deletions(-) |
21 |
|
22 |
diff --git a/app-admin/doctl/Manifest b/app-admin/doctl/Manifest |
23 |
index dafbbd57b95a..3d24a516bf39 100644 |
24 |
--- a/app-admin/doctl/Manifest |
25 |
+++ b/app-admin/doctl/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST doctl-1.76.2.tar.gz 5648377 BLAKE2B 1ec89adb5ad187ccc6b66d077dda57ca4065bc1a5981a0f2549913532f6bcc6d1f48c3cc56c100c1b6c55f698ffcf3f2c639888ccaab30948384ce800181b332 SHA512 d7efc587843cd87f3ac17b974858ea688377ca6f0cd3d4b7430c47a1e8b825cc05f4d9107d7062f5e52fe3c267ec6bbd19a8b1d773a15f1d7ab653087ce13bba |
28 |
+DIST doctl-1.77.0.tar.gz 5654010 BLAKE2B 809189c9fdfa1e81e75847e57fe5967f0d3ca476fdb7a2e72ffba1b4bb81ecdc2ce07b4b05f4f1f898104cd9e919d6bdba664d4ae0cc97adea6863379789aa08 SHA512 a53e8e3179ec467cd0617a25ab985fe36e41135a824688a947b15c0565fb2d8364c59a295573043039b79b701bb4d5a9ec5461450fa0e7c5a24f10ece53c6f71 |
29 |
|
30 |
diff --git a/app-admin/doctl/doctl-9999.ebuild b/app-admin/doctl/doctl-1.77.0.ebuild |
31 |
similarity index 53% |
32 |
copy from app-admin/doctl/doctl-9999.ebuild |
33 |
copy to app-admin/doctl/doctl-1.77.0.ebuild |
34 |
index 03b7027f041b..3f5680240a83 100644 |
35 |
--- a/app-admin/doctl/doctl-9999.ebuild |
36 |
+++ b/app-admin/doctl/doctl-1.77.0.ebuild |
37 |
@@ -3,30 +3,27 @@ |
38 |
|
39 |
EAPI=8 |
40 |
|
41 |
-EGIT_REPO_URI="https://github.com/digitalocean/${PN}.git" |
42 |
- |
43 |
-inherit edo bash-completion-r1 git-r3 go-module |
44 |
+inherit bash-completion-r1 edo go-module |
45 |
|
46 |
DESCRIPTION="A command line tool for DigitalOcean services" |
47 |
HOMEPAGE="https://github.com/digitalocean/doctl" |
48 |
-SRC_URI="" |
49 |
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
50 |
|
51 |
LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0" |
52 |
SLOT="0" |
53 |
-KEYWORDS="" |
54 |
- |
55 |
-src_unpack() { |
56 |
- git-r3_src_unpack |
57 |
-} |
58 |
+KEYWORDS="~amd64 ~x86" |
59 |
|
60 |
src_compile() { |
61 |
- LDFLAGS="-X github.com/digitalocean/doctl.Build=$(git rev-parse --short HEAD) |
62 |
- -X github.com/digitalocean/doctl.Label=dev" |
63 |
- GOFLAGS="-v -x -mod=vendor" go build -ldflags "$LDFLAGS" ./cmd/... |
64 |
+ LDFLAGS="-X github.com/digitalocean/doctl.Major=$(ver_cut 1) |
65 |
+ -X github.com/digitalocean/doctl.Minor=$(ver_cut 2) |
66 |
+ -X github.com/digitalocean/doctl.Patch=$(ver_cut 3-) |
67 |
+ -X github.com/digitalocean/doctl.Label=release" |
68 |
+ GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/... |
69 |
|
70 |
local completion |
71 |
for completion in bash zsh fish ; do |
72 |
- edo ./doctl completion ${completion} > doctl.${completion} || die "completion for ${completion} failed" |
73 |
+ edo ./doctl completion ${completion} > doctl.${completion} \ |
74 |
+ || die "completion for ${completion} failed" |
75 |
done |
76 |
} |
77 |
|
78 |
|
79 |
diff --git a/app-admin/doctl/doctl-9999.ebuild b/app-admin/doctl/doctl-9999.ebuild |
80 |
index 03b7027f041b..9837f24928f9 100644 |
81 |
--- a/app-admin/doctl/doctl-9999.ebuild |
82 |
+++ b/app-admin/doctl/doctl-9999.ebuild |
83 |
@@ -5,7 +5,7 @@ EAPI=8 |
84 |
|
85 |
EGIT_REPO_URI="https://github.com/digitalocean/${PN}.git" |
86 |
|
87 |
-inherit edo bash-completion-r1 git-r3 go-module |
88 |
+inherit bash-completion-r1 edo git-r3 go-module |
89 |
|
90 |
DESCRIPTION="A command line tool for DigitalOcean services" |
91 |
HOMEPAGE="https://github.com/digitalocean/doctl" |
92 |
@@ -22,11 +22,12 @@ src_unpack() { |
93 |
src_compile() { |
94 |
LDFLAGS="-X github.com/digitalocean/doctl.Build=$(git rev-parse --short HEAD) |
95 |
-X github.com/digitalocean/doctl.Label=dev" |
96 |
- GOFLAGS="-v -x -mod=vendor" go build -ldflags "$LDFLAGS" ./cmd/... |
97 |
+ GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/... |
98 |
|
99 |
local completion |
100 |
for completion in bash zsh fish ; do |
101 |
- edo ./doctl completion ${completion} > doctl.${completion} || die "completion for ${completion} failed" |
102 |
+ edo ./doctl completion ${completion} > doctl.${completion} \ |
103 |
+ || die "completion for ${completion} failed" |
104 |
done |
105 |
} |