app-admin/consul-template: inherit go-build for GOPATH setting with get_golibdir_gopath

Package-Manager: portage-2.2.20

diff --git a/app-admin/consul-template/consul-template-0.9.0-r1.ebuild b/app-admin/consul-template/consul-template-0.9.0-r1.ebuild
index fd646ee7809da5aad37f3b42245008cd4be09e6e..cbc1059efff734cda1158279ce4980ad0300d3df 100644 (file)
--- a/app-admin/consul-template/consul-template-0.9.0-r1.ebuild
+++ b/app-admin/consul-template/consul-template-0.9.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit systemd user
+inherit golang-base systemd user
 
 KEYWORDS="~amd64"
 DESCRIPTION="Generic template rendering and notifications with Consul"
@@ -68,7 +68,7 @@ unpack_go_packages() {
 
 src_unpack() {
        unpack_go_packages
-       export GOPATH=${WORKDIR}
+       export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
 }
 
 src_prepare() {

diff --git a/app-admin/consul-template/consul-template-0.9.0.ebuild b/app-admin/consul-template/consul-template-0.9.0.ebuild
index 0abadf7d7d2b02de7c67d45b6a54ac9525f380ad..80a3de8adbf5f042b59719eeb322eed553af2937 100644 (file)
--- a/app-admin/consul-template/consul-template-0.9.0.ebuild
+++ b/app-admin/consul-template/consul-template-0.9.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit systemd user
+inherit golang-base systemd user
 
 KEYWORDS="~amd64"
 DESCRIPTION="Generic template rendering and notifications with Consul"
@@ -68,7 +68,7 @@ unpack_go_packages() {
 
 src_unpack() {
        unpack_go_packages
-       export GOPATH=${WORKDIR}
+       export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
 }
 
 src_prepare() {

diff --git a/app-admin/consul-template/consul-template-9999.ebuild b/app-admin/consul-template/consul-template-9999.ebuild
index 40307ab7352039823e3880c9118da7a6088c95f5..0dcf7f1b954150657df32ffedfe371a8d6dec6c9 100644 (file)
--- a/app-admin/consul-template/consul-template-9999.ebuild
+++ b/app-admin/consul-template/consul-template-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit git-r3 systemd user
+inherit git-r3 golang-base systemd user
 
 KEYWORDS=""
 DESCRIPTION="Generic template rendering and notifications with Consul"
@@ -32,7 +32,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-       export GOPATH=${WORKDIR}
+       export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
        git-r3_src_unpack
        go get -d -v ./... $(go list -f '{{range .TestImports}}{{.}} {{end}}' ./...) || die
 }