| 1 |
commit: f2d4333d8010e64dd17db7908e5f0dbdaa61c406 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 7 00:23:59 2019 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 7 00:36:30 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d4333d |
| 7 |
|
| 8 |
net-dns/dnscrypt-proxy: fix build with new go |
| 9 |
|
| 10 |
// Vendor is present, and srcDir is outside parent's tree. Not allowed. |
| 11 |
perr := *p |
| 12 |
perr.Error = &PackageError{ |
| 13 |
ImportStack: stk.copy(), |
| 14 |
Err: "use of vendored package not allowed", |
| 15 |
} |
| 16 |
perr.Incomplete = true |
| 17 |
return &perr |
| 18 |
|
| 19 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 20 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 21 |
|
| 22 |
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild | 2 +- |
| 23 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 24 |
|
| 25 |
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 |
| 26 |
index 5539148f968..694bc5d7c02 100644 |
| 27 |
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild |
| 28 |
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild |
| 29 |
@@ -39,7 +39,7 @@ src_prepare() { |
| 30 |
# fixes $GOPATH/go.mod exists but should not |
| 31 |
rm go.mod || die |
| 32 |
mv "${PN}" "src/${EGO_PN}" || die |
| 33 |
- mv "vendor" "src/" || die |
| 34 |
+ mv "vendor" "src/${EGO_PN}" || die |
| 35 |
} |
| 36 |
|
| 37 |
src_configure() { |
Archives