From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1302629-garchives=archives.gentoo.org@lists.gentoo.org> 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 D22DA13933E for <garchives@archives.gentoo.org>; Thu, 15 Jul 2021 07:13:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 941EBE0CFD; Thu, 15 Jul 2021 07:13:24 +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 75862E0CFD for <gentoo-commits@lists.gentoo.org>; Thu, 15 Jul 2021 07:13:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9177D342B71 for <gentoo-commits@lists.gentoo.org>; Thu, 15 Jul 2021 07:13:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 043FA7D3 for <gentoo-commits@lists.gentoo.org>; Thu, 15 Jul 2021 07:13:21 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> 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" <zmedico@gentoo.org> Message-ID: <1626333132.cf829d50a6868b44de782d1e56b22a70ea8a4243.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-go/go-tools/go-tools-0.1.4.ebuild X-VCS-Directories: dev-go/go-tools/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: cf829d50a6868b44de782d1e56b22a70ea8a4243 X-VCS-Branch: master Date: Thu, 15 Jul 2021 07:13:21 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3f0db79e-0781-45b3-94c3-c3318e66ce4c X-Archives-Hash: 88e6123b91da88a9ba523c2277920623 commit: cf829d50a6868b44de782d1e56b22a70ea8a4243 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu Jul 15 07:12:12 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Jul 15 07:12:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf829d50 dev-go/go-tools: Fix double EPREFIX Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> dev-go/go-tools/go-tools-0.1.4.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-go/go-tools/go-tools-0.1.4.ebuild b/dev-go/go-tools/go-tools-0.1.4.ebuild index 2807b22e10a..36df26227c4 100644 --- a/dev-go/go-tools/go-tools-0.1.4.ebuild +++ b/dev-go/go-tools/go-tools-0.1.4.ebuild @@ -180,8 +180,10 @@ src_test() { src_install() { # bug 558818: install binaries in $GOROOT/bin to avoid file collisions - exeinto "$(go env GOROOT)/bin" + local goroot=$(go env GOROOT) + goroot=${goroot#${EPREFIX}} + exeinto "${goroot}/bin" doexe bin/* dodir /usr/bin - ln "${ED}/$(go env GOROOT)/bin/godoc" "${ED}/usr/bin/godoc" || die + ln "${ED}/${goroot}/bin/godoc" "${ED}/usr/bin/godoc" || die }