commit:     2f3ebb81c0c041fa4ffa598cd1040d5973bb48f4
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 05:26:35 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 05:35:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f3ebb81

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

Package-Manager: portage-2.2.20

 app-admin/consul-template/consul-template-0.9.0-r1.ebuild | 4 ++--
 app-admin/consul-template/consul-template-0.9.0.ebuild    | 4 ++--
 app-admin/consul-template/consul-template-9999.ebuild     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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 fd646ee..cbc1059 100644
--- 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 0abadf7..80a3de8 100644
--- 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 40307ab..0dcf7f1 100644
--- 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
 }

Reply via email to