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

[Zac Medico]

commit:     21f91f320fdc4f27e223ceaa986978e5195e2054
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 16:12:11 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 16:12:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f91f32

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

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

Package-Manager: portage-2.3.2

 app-admin/consul/consul-0.7.0.ebuild | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/app-admin/consul/consul-0.7.0.ebuild 
b/app-admin/consul/consul-0.7.0.ebuild
index 4e65738..55bb9ef 100644
--- a/app-admin/consul/consul-0.7.0.ebuild
+++ b/app-admin/consul/consul-0.7.0.ebuild
@@ -28,8 +28,6 @@ DEPEND="
        >=dev-go/go-tools-0_pre20160121"
 RDEPEND=""
 
-STRIP_MASK="*.a"
-
 S="${WORKDIR}/src/${GO_PN}"
 
 pkg_setup() {
@@ -82,7 +80,6 @@ src_prepare() {
 src_compile() {
        export GOPATH="${WORKDIR}"
        go install -v -work -x ${EGO_BUILD_FLAGS} 
"github.com/mitchellh/gox/..." || die
-       go install -v -work -x ${EGO_BUILD_FLAGS} "${GO_PN}/..." || die
        PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env 
GOOS) emake
 }
 
@@ -90,7 +87,6 @@ src_install() {
        local x
 
        dobin "${WORKDIR}/bin/${PN}"
-       rm -rf bin || die
 
        keepdir /etc/consul.d
        insinto /etc/consul.d
@@ -107,19 +103,4 @@ src_install() {
        insinto /etc/logrotate.d
        newins "${FILESDIR}/${PN}.logrotated" "${PN}"
        systemd_dounit "${FILESDIR}/consul.service"
-
-       find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete 
|| die
-       rm -rf "${WORKDIR}"/{src,pkg/$(go env GOOS)_$(go env 
GOARCH)}/${GO_PN}/vendor
-
-       while read -r -d '' x; do
-               x=${x#${WORKDIR}/src}
-               [[ -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 "$(get_golibdir)/pkg/$(go env GOOS)_$(go env 
GOARCH)/${GO_PN%/*}"
-       doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-       insinto "$(get_golibdir)/src/${GO_PN%/*}"
-       doins -r "${WORKDIR}"/src/${GO_PN}
 }