From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7AF14138334 for ; Thu, 23 Aug 2018 17:51:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 507C0E0980; Thu, 23 Aug 2018 17:51:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A6F8E0980 for ; Thu, 23 Aug 2018 17:51:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBED8335C8D for ; Thu, 23 Aug 2018 17:50:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A63C390 for ; Thu, 23 Aug 2018 17:50:57 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1535046648.29f16a0a010fc42e6722fb755c4abcb1044743e1.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-go/go-tour/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-go/go-tour/go-tour-0_p20180810.ebuild X-VCS-Directories: dev-go/go-tour/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 29f16a0a010fc42e6722fb755c4abcb1044743e1 X-VCS-Branch: master Date: Thu, 23 Aug 2018 17:50:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 031b65b7-6bbb-47c9-8bc6-60df55cfb7ec X-Archives-Hash: 91d2a64d26a7f3a9e2fa98b0456cc82d commit: 29f16a0a010fc42e6722fb755c4abcb1044743e1 Author: Zac Medico gentoo org> AuthorDate: Thu Aug 23 17:44:14 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Aug 23 17:50:48 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f16a0a dev-go/go-tour: DEPEND on go-net (bug 664376) Reported-by: Toralf Förster gentoo.org> Closes: https://bugs.gentoo.org/664376 Package-Manager: Portage-2.3.48, Repoman-2.3.10 dev-go/go-tour/go-tour-0_p20180810.ebuild | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dev-go/go-tour/go-tour-0_p20180810.ebuild b/dev-go/go-tour/go-tour-0_p20180810.ebuild index b97a2e598af..0266d4dd62b 100644 --- a/dev-go/go-tour/go-tour-0_p20180810.ebuild +++ b/dev-go/go-tour/go-tour-0_p20180810.ebuild @@ -15,17 +15,21 @@ SRC_URI="${ARCHIVE_URI}" LICENSE="BSD" SLOT="0" IUSE="" -DEPEND="dev-go/go-tools:=" +DEPEND="dev-go/go-net:= + dev-go/go-tools:=" src_compile() { - GOPATH="${S}:$(get_golibdir_gopath)" GOBIN="${S}/bin" \ - go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" - [[ -x $(find "${T}" -name a.out) ]] || die "a.out not found" + local x + mkdir -p "${T}/golibdir/src/golang.org/x" || die + for x in net tools; do + ln -s "$(get_golibdir_gopath)/src/golang.org/x/${x}" "${T}/golibdir/src/golang.org/x/${x}" || die + done + GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \ + go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" + [[ -x bin/gotour ]] || die "gotour not found" } src_install() { - GOPATH="${S}:$(get_golibdir_gopath)" GOBIN="${S}/bin" \ - go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" exeinto "$(go env GOTOOLDIR)" newexe bin/gotour tour insinto "$(go env GOROOT)" @@ -33,6 +37,6 @@ src_install() { } src_test() { - GOPATH="${S}:$(get_golibdir_gopath)" GOBIN="${S}/bin" \ + GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \ go test -v -work -x "${EGO_PN}" || die }