app-admin/vault: use go env GOOS and GOARCH

Package-Manager: portage-2.2.27

diff --git a/app-admin/vault/vault-0.1.2-r1.ebuild b/app-admin/vault/vault-0.1.2-r1.ebuild
index c30bcd2fda198f84fb5c6cd7a60c35af4d57798a..558bf59e87e89939f82a39a2112115873508d403 100644 (file)
--- a/app-admin/vault/vault-0.1.2-r1.ebuild
+++ b/app-admin/vault/vault-0.1.2-r1.ebuild
@@ -53,7 +53,7 @@ src_unpack() {
        export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
 
        while read -r -d '' x; do
-               rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die
+               rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
        done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
 
        mkdir -p "${GOROOT}/src/github.com/mitchellh" || die
@@ -97,13 +97,13 @@ src_install() {
 
        while read -r -d '' x; do
                x=${x#${WORKDIR}/src}
-               [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
-                       -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+               [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+                       -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
                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/${KERNEL}_${ARCH}/${GO_PN%/*}
-       doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+       insinto /usr/lib/go/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%/*}
        doins -r "${WORKDIR}"/src/${GO_PN}
 }

diff --git a/app-admin/vault/vault-9999.ebuild b/app-admin/vault/vault-9999.ebuild
index ef7e7b59b029e647c3462b8d5cb9c76dff0ccf84..4c8a514f461e6b2fe09675d97ca587a23a9f1cc9 100644 (file)
--- a/app-admin/vault/vault-9999.ebuild
+++ b/app-admin/vault/vault-9999.ebuild
@@ -51,7 +51,7 @@ src_unpack() {
        export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
 
        while read -r -d '' x; do
-               rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die
+               rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
        done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
 
        rm -rf "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src/github.com/awslabs"
@@ -93,13 +93,13 @@ src_install() {
 
        while read -r -d '' x; do
                x=${x#${WORKDIR}/src}
-               [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
-                       -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+               [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+                       -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
                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/${KERNEL}_${ARCH}/${GO_PN%/*}
-       doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+       insinto /usr/lib/go/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%/*}
        doins -r "${WORKDIR}"/src/${GO_PN}
 }