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

[Zac Medico]

commit:     8f1263c85e3c0b76de8a2656be6efc5f3df13a5c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 16:32:51 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 16:32:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1263c8

app-admin/vault: skip useless files /usr/lib/go-gentoo

Anything that needs to build against vault should simply download a
vault tarball, since that includes the vendored dependencies.

Package-Manager: portage-2.3.2

 app-admin/vault/vault-0.6.2.ebuild | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/app-admin/vault/vault-0.6.2.ebuild 
b/app-admin/vault/vault-0.6.2.ebuild
index f16d491..48720ff 100644
--- a/app-admin/vault/vault-0.6.2.ebuild
+++ b/app-admin/vault/vault-0.6.2.ebuild
@@ -23,8 +23,6 @@ RESTRICT="test"
 DEPEND=">=dev-lang/go-1.6:="
 RDEPEND=""
 
-STRIP_MASK="*.a"
-
 FILECAPS=(
        -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
 )
@@ -74,9 +72,6 @@ pkg_setup() {
 src_compile() {
        export GOPATH=${S}
        go install -v -work -x ${EGO_BUILD_FLAGS} 
"github.com/mitchellh/gox/..." || die
-       go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-       # the previous command returns 2 on success...
-       [[ -d ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*} ]] || die
        cd "${S}"/src/${EGO_PN%/*} || die
        PATH=${PATH}:${S}/bin \
        XC_ARCH=$(go env GOARCH) \
@@ -86,8 +81,6 @@ src_compile() {
 }
 
 src_install() {
-       local x
-
        dodoc "${S}"/src/${EGO_PN%/*}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
        newinitd "${FILESDIR}/${PN}.initd" "${PN}"
        newconfd "${FILESDIR}/${PN}.confd" "${PN}"
@@ -103,19 +96,4 @@ src_install() {
        fowners ${PN}:${PN} /var/log/${PN}
 
        dobin "${S}/bin/${PN}"
-
-       rm -rf "${S}"/{src,pkg/$(go env GOOS)_$(go env 
GOARCH)}/${EGO_PN%/*}/vendor
-       find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type f -delete || 
die
-
-       while read -r -d '' x; do
-               x=${x#${S}/src}
-               [[ -d ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
-                       -f ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] 
&& continue
-               rm -rf "${S}"/src/${x}
-       done < <(find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type d 
-print0)
-       insopts -m0644 -p # preserve timestamps for bug 551486
-       insinto $(dirname "$(get_golibdir)/pkg/$(go env GOOS)_$(go env 
GOARCH)/${EGO_PN%/*}")
-       doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}
-       insinto $(dirname "$(get_golibdir)/src/${EGO_PN%/*}")
-       doins -r "${S}"/src/${EGO_PN%/*}
 }