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

Package-Manager: portage-2.2.27

diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild b/app-admin/consul/consul-0.5.2-r1.ebuild
index f48f76037edaa59acce6506c6755272c8003b7d5..e8d1102174106794da1990764566d252681d659a 100644 (file)
--- a/app-admin/consul/consul-0.5.2-r1.ebuild
+++ b/app-admin/consul/consul-0.5.2-r1.ebuild
@@ -100,7 +100,7 @@ src_unpack() {
        cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
        while read -r path; do
                rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
-               "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
+               "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
        done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
 }
 
@@ -157,13 +157,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/consul/consul-0.6.3.ebuild b/app-admin/consul/consul-0.6.3.ebuild
index 99b94506fbbe0c46109bbb0ffb368666b0be6d53..aa758bba1e3bad71bfbe8b6cb9e13918fbaa7361 100644 (file)
--- a/app-admin/consul/consul-0.6.3.ebuild
+++ b/app-admin/consul/consul-0.6.3.ebuild
@@ -108,7 +108,7 @@ src_unpack() {
        cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
        while read -r path; do
                rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
-               "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
+               "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
        done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
 }
 
@@ -129,7 +129,7 @@ src_prepare() {
 }
 
 src_compile() {
-       PATH=${PATH}:${WORKDIR}/bin XC_ARCH=${ARCH} XC_OS=${KERNEL} emake
+       PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) emake
 }
 
 src_install() {
@@ -158,13 +158,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/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild
index bce86d8de781debf854c917a1268dd28eac21d55..deebbb42ff82cb48a78e44185b03b12f71eee31a 100644 (file)
--- a/app-admin/consul/consul-9999.ebuild
+++ b/app-admin/consul/consul-9999.ebuild
@@ -53,7 +53,7 @@ src_unpack() {
        # Use latest versions of some packages, in case of incompatible
        # API changes
        rm -rf "${GOROOT}/src/${GO_PN%/*}" \
-               "${GOROOT}/pkg/linux_${ARCH}/${GO_PN%/*}" || die
+               "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" || die
 
        # Fetch dependencies
        emake deps
@@ -61,7 +61,7 @@ src_unpack() {
        # Avoid interference from installed instances
        while read -r path; do
                rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
-               "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
+               "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
        done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
 }
 
@@ -112,13 +112,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}
 }