From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Jan 2017 17:21:18 +0000 (-0800)
Subject: app-admin/consul: avoid zip dependency
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7986fe91c1531b78b50d4448e72248b6075fe81;p=gentoo.git

app-admin/consul: avoid zip dependency

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/app-admin/consul/consul-0.7.2.ebuild b/app-admin/consul/consul-0.7.2.ebuild
index be5a8fce062b..7bbd099fe74b 100644
--- a/app-admin/consul/consul-0.7.2.ebuild
+++ b/app-admin/consul/consul-0.7.2.ebuild
@@ -22,7 +22,6 @@ IUSE=""
 RESTRICT="test"
 
 DEPEND="
-	app-arch/zip
 	>=dev-lang/go-1.6:=
 	>=dev-go/go-tools-0_pre20160121"
 RDEPEND=""
@@ -79,8 +78,11 @@ src_prepare() {
 src_compile() {
 	export GOPATH="${S}"
 	go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
-	PATH=${PATH}:${S}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) \
-		emake -C "${S}/src/${EGO_PN}"
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	PATH=${PATH}:${S}/bin \
+		emake -C "${S}/src/${EGO_PN}" dev
 }
 
 src_install() {