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 63BFE138334 for ; Sat, 7 Sep 2019 00:36:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56EA7E0AA3; Sat, 7 Sep 2019 00:36:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 38F33E0AA2 for ; Sat, 7 Sep 2019 00:36:52 +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 E146434ADB3 for ; Sat, 7 Sep 2019 00:36:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 678D76FE for ; Sat, 7 Sep 2019 00:36:49 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1567816590.f2d4333d8010e64dd17db7908e5f0dbdaa61c406.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild X-VCS-Directories: net-dns/dnscrypt-proxy/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: f2d4333d8010e64dd17db7908e5f0dbdaa61c406 X-VCS-Branch: master Date: Sat, 7 Sep 2019 00:36:49 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 30d2ed78-b248-4962-91f0-11bcfe851dfc X-Archives-Hash: 36f34a18fc5d3c089b60b46efb6434fc commit: f2d4333d8010e64dd17db7908e5f0dbdaa61c406 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Sep 7 00:23:59 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Sep 7 00:36:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d4333d net-dns/dnscrypt-proxy: fix build with new go // Vendor is present, and srcDir is outside parent's tree. Not allowed. perr := *p perr.Error = &PackageError{ ImportStack: stk.copy(), Err: "use of vendored package not allowed", } perr.Incomplete = true return &perr Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Georgy Yakovlev gentoo.org> net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild index 5539148f968..694bc5d7c02 100644 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild @@ -39,7 +39,7 @@ src_prepare() { # fixes $GOPATH/go.mod exists but should not rm go.mod || die mv "${PN}" "src/${EGO_PN}" || die - mv "vendor" "src/" || die + mv "vendor" "src/${EGO_PN}" || die } src_configure() {