[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/

[Zac Medico]

commit:     aacd7d945d3eb71802517990caddb596cfcf204f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 21:30:35 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 21:37:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aacd7d94

app-admin/consul: use get_golibdir for library installation

Package-Manager: portage-2.2.27

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

diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild 
b/app-admin/consul/consul-0.5.2-r1.ebuild
index 57487ed..16987cf 100644
--- a/app-admin/consul/consul-0.5.2-r1.ebuild
+++ b/app-admin/consul/consul-0.5.2-r1.ebuild
@@ -163,8 +163,8 @@ src_install() {
                rm -rf "${WORKDIR}"/src/${x}
        done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d 
-print0)
        insopts -m0644 -p # preserve timestamps for bug 551486
-       insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+       insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env 
GOARCH)/${GO_PN%/*}"
        doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-       insinto /usr/lib/go/src/${GO_PN%/*}
+       insinto "$(get_golibdir)/src/${GO_PN%/*}"
        doins -r "${WORKDIR}"/src/${GO_PN}
 }

diff --git a/app-admin/consul/consul-0.6.3.ebuild 
b/app-admin/consul/consul-0.6.3.ebuild
index 9b35adb..ea2a455 100644
--- a/app-admin/consul/consul-0.6.3.ebuild
+++ b/app-admin/consul/consul-0.6.3.ebuild
@@ -165,8 +165,8 @@ src_install() {
                rm -rf "${WORKDIR}"/src/${x}
        done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d 
-print0)
        insopts -m0644 -p # preserve timestamps for bug 551486
-       insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+       insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env 
GOARCH)/${GO_PN%/*}"
        doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-       insinto /usr/lib/go/src/${GO_PN%/*}
+       insinto "$(get_golibdir)/src/${GO_PN%/*}"
        doins -r "${WORKDIR}"/src/${GO_PN}
 }

diff --git a/app-admin/consul/consul-9999.ebuild 
b/app-admin/consul/consul-9999.ebuild
index f6d1b09..0e865fe 100644
--- a/app-admin/consul/consul-9999.ebuild
+++ b/app-admin/consul/consul-9999.ebuild
@@ -118,8 +118,8 @@ src_install() {
                rm -rf "${WORKDIR}"/src/${x}
        done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d 
-print0)
        insopts -m0644 -p # preserve timestamps for bug 551486
-       insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+       insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env 
GOARCH)/${GO_PN%/*}"
        doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-       insinto /usr/lib/go/src/${GO_PN%/*}
+       insinto "$(get_golibdir)/src/${GO_PN%/*}"
        doins -r "${WORKDIR}"/src/${GO_PN}
 }