gentoo resync : 09.07.2022

4 files changed, 27 insertions, 27 deletions

diff --git a/app-admin/doctl/Manifest b/app-admin/doctl/Manifest
index dc06f8cb8e91..e1f9c9859ac0 100644
--- a/app-admin/doctl/Manifest
+++ b/app-admin/doctl/Manifest
@@ -1,8 +1,8 @@
-DIST doctl-1.57.0.tar.gz 5195498 BLAKE2B 17273e9f8f63464aa2ba6c6d48dfabd78b0bdeb7156dc315d1970fb0052710c7a4b37f1d5e2a7a60211f2ab166c0926de438959d853639a8c329ec39b3ee0577 SHA512 0c868c5732a48367a93bf2b884689dbd917ba6690c82516495862546bc31d58d44aab192bd3b3543f951e9fa9b7289e99fbdf828c017af68496b84f1585a5f6b
-DIST doctl-1.68.0.tar.gz 5514572 BLAKE2B e44be00e1b7451e84d3d6dc5a19dc04fcb5dab2c8a5c1923c0c0f99058a1938f9567d63681989e869341957586cdf549842cd45ca82503007039ae989664e8ff SHA512 d81799c227c071793af74f78e54d8348782caf158b28e0a12b92adf17b6c78c787a82abbdf3aa340a960f26c929b00f38015725e6e629aad7615096270d19c10
 DIST doctl-1.76.2.tar.gz 5648377 BLAKE2B 1ec89adb5ad187ccc6b66d077dda57ca4065bc1a5981a0f2549913532f6bcc6d1f48c3cc56c100c1b6c55f698ffcf3f2c639888ccaab30948384ce800181b332 SHA512 d7efc587843cd87f3ac17b974858ea688377ca6f0cd3d4b7430c47a1e8b825cc05f4d9107d7062f5e52fe3c267ec6bbd19a8b1d773a15f1d7ab653087ce13bba
-EBUILD doctl-1.57.0.ebuild 1293 BLAKE2B 518183156896035326550d0b8e0054bb83be446cad52cafad07f2bd9a602761e263e0782c5f7eccce9d75863521fc2e99d9f8da74ddf2c490d0f5532367da230 SHA512 bd8c37680fd859bb274f1b489c5953c4190eec0405da2c239c1e523217585d73920bd636a596b1c951a9f5edc916ab2945bb3ecf2c4999d04cacefc819b71d70
-EBUILD doctl-1.68.0.ebuild 1285 BLAKE2B a863062d3cb20ff46bbc1ffd58369ddb254cce65fdca008c1dea4c4821c9f937f5962fd4aa0bf67dad5d8f432a5fd0727963d07f32de9755aff10eccb749601c SHA512 2b30bae4fe2cc84f713304754b7951c214258a935cd1d0ea75b6fca88353c3c38164c9fa7fe29cd928d2c5231aa9d6453bfad5567e918f9c78e02560f36b398b
+DIST doctl-1.77.0.tar.gz 5654010 BLAKE2B 809189c9fdfa1e81e75847e57fe5967f0d3ca476fdb7a2e72ffba1b4bb81ecdc2ce07b4b05f4f1f898104cd9e919d6bdba664d4ae0cc97adea6863379789aa08 SHA512 a53e8e3179ec467cd0617a25ab985fe36e41135a824688a947b15c0565fb2d8364c59a295573043039b79b701bb4d5a9ec5461450fa0e7c5a24f10ece53c6f71
+DIST doctl-1.78.0.tar.gz 5658172 BLAKE2B 3213219b1cfbc395c742a59a6bee1c6232f222455ac126de9ce51470a56ebaa9680de4d332cd31580a7ddb9f748b19a8abadef17ff6ea4265dffc2c42b1bb16d SHA512 193fe775885c78312eb6ba14bd34d109ee31acf41cfe68dbacbf6ab19864509b774c658aecf7a61d470598ca89829a6737ea6796eb970b3075d8f37aef747dbe
 EBUILD doctl-1.76.2.ebuild 1192 BLAKE2B 2b2e5e62493c6f2469deeb48a1c799e8ba4b9ee9b756b0ba44c1b9cd5af8162d7c8c56e65ae65e3311055ce00e5fd8094132a012d3bf3fd624c9a123f796bd1f SHA512 333c3fe715ae2b0c289401ca22f233722a7e4d3da4c1ec5e137c0ebf5c78717d44aef07067ec8ec05864dd4f6edf5d586842a58cbde7be4b4e30d62a5403107c
-EBUILD doctl-9999.ebuild 1111 BLAKE2B 9c1012c33f62651e456678867c6397e865caed095274cb6011b16d2968bd61bf194aa03580203459de0d304d66fdd98a7a00b7e8bccb6049fb9d7cf6b08ec370 SHA512 4db64ac08a870f9a4dd75756d969b9ec80f988fd5d9fba3a5817702563187494e7b69d0c327acbd53f98632e08d2e5b20ebf49df44838686dbc75d64f646bbbd
+EBUILD doctl-1.77.0.ebuild 1195 BLAKE2B afb48a2d4e77a6a7e49463733a60df12f35fb6cab9e905c8f55544cf639d2a40de9ef80c24e9d5e30108e04b54e93908177907c94d2e03471b90cc08b9d8cd48 SHA512 655a4325dfb26e85f99b5e4ded5f8f1143d46d9df0757c7f12991ac6843c924ae2ca7650269dfc4c310bc87292d08497df8cf1d163a79e30af8415f8235763d3
+EBUILD doctl-1.78.0.ebuild 1195 BLAKE2B afb48a2d4e77a6a7e49463733a60df12f35fb6cab9e905c8f55544cf639d2a40de9ef80c24e9d5e30108e04b54e93908177907c94d2e03471b90cc08b9d8cd48 SHA512 655a4325dfb26e85f99b5e4ded5f8f1143d46d9df0757c7f12991ac6843c924ae2ca7650269dfc4c310bc87292d08497df8cf1d163a79e30af8415f8235763d3
+EBUILD doctl-9999.ebuild 1117 BLAKE2B db665b93fd6a9ff473a35f80b4d04e8474cea1c93d293f1731c87562fc65e03228569b2d0929b7fc6b1326ef4e2982d524a364276b4be537b87aee5cbcf8d3d0 SHA512 cd6a84398b1c031240b9faa0615388117215f42c740b520256a2e4b6748a59d2c7457e0389cf84fe945d483663b63ba335066cee57887783fde577e3bd196464
 MISC metadata.xml 670 BLAKE2B 5ee85d9c94a3bc5bf5a159089a11d22db8eb1923d0e713fd45ba4f76f154e17784fded0819aa2a359d2c582d96ca0db99ae80a01bb62843d136b45729b87407d SHA512 d48173ace378646dcad5eb5eb7025436432291ef03f89847e874c4cae7afebcd3c05549553543890581dccc8a7ab2808a6bab7fab6c1f315dcef7300897472d7
diff --git a/app-admin/doctl/doctl-1.68.0.ebuild b/app-admin/doctl/doctl-1.77.0.ebuild
index 30469673185f..3f5680240a83 100644
--- a/app-admin/doctl/doctl-1.68.0.ebuild
+++ b/app-admin/doctl/doctl-1.77.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit bash-completion-r1 go-module
+inherit bash-completion-r1 edo go-module
 
 DESCRIPTION="A command line tool for DigitalOcean services"
 HOMEPAGE="https://github.com/digitalocean/doctl"
@@ -18,17 +18,17 @@ src_compile() {
 		-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" \
-		go build -ldflags "$LDFLAGS" ./cmd/... || die "build failed"
+	GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/...
 
-	./doctl completion bash > doctl.bash || die "completion for bash failed"
-	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
-	./doctl completion fish > doctl.fish || die "completion for fish failed"
+	local completion
+	for completion in bash zsh fish ; do
+		edo ./doctl completion ${completion} > doctl.${completion} \
+			|| die "completion for ${completion} failed"
+	done
 }
 
 src_test() {
-	GOFLAGS="-v -x -mod=vendor" \
-		go test -work ./do/... ./pkg/... . || die "test failed"
+	GOFLAGS="-v -x -mod=vendor" ego test -work ./do/... ./pkg/... .
 }
 
 src_install() {
diff --git a/app-admin/doctl/doctl-1.57.0.ebuild b/app-admin/doctl/doctl-1.78.0.ebuild
index c1ed045f556d..3f5680240a83 100644
--- a/app-admin/doctl/doctl-1.57.0.ebuild
+++ b/app-admin/doctl/doctl-1.78.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit bash-completion-r1 go-module
+inherit bash-completion-r1 edo go-module
 
 DESCRIPTION="A command line tool for DigitalOcean services"
 HOMEPAGE="https://github.com/digitalocean/doctl"
@@ -12,24 +12,23 @@ SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 src_compile() {
 	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" \
-		go build -ldflags "$LDFLAGS" ./cmd/... || die "build failed"
+	GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/...
 
-	./doctl completion bash > doctl.bash || die "completion for bash failed"
-	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
-	./doctl completion fish > doctl.fish || die "completion for fish failed"
+	local completion
+	for completion in bash zsh fish ; do
+		edo ./doctl completion ${completion} > doctl.${completion} \
+			|| die "completion for ${completion} failed"
+	done
 }
 
 src_test() {
-	GOFLAGS="-v -x -mod=vendor" \
-		go test -work ./do/... ./pkg/... . || die "test failed"
+	GOFLAGS="-v -x -mod=vendor" ego test -work ./do/... ./pkg/... .
 }
 
 src_install() {
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
 }