1 |
commit: aacd7d945d3eb71802517990caddb596cfcf204f |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 21 21:30:35 2016 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 21 21:37:30 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aacd7d94 |
7 |
|
8 |
app-admin/consul: use get_golibdir for library installation |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
app-admin/consul/consul-0.5.2-r1.ebuild | 4 ++-- |
13 |
app-admin/consul/consul-0.6.3.ebuild | 4 ++-- |
14 |
app-admin/consul/consul-9999.ebuild | 4 ++-- |
15 |
3 files changed, 6 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild b/app-admin/consul/consul-0.5.2-r1.ebuild |
18 |
index 57487ed..16987cf 100644 |
19 |
--- a/app-admin/consul/consul-0.5.2-r1.ebuild |
20 |
+++ b/app-admin/consul/consul-0.5.2-r1.ebuild |
21 |
@@ -163,8 +163,8 @@ src_install() { |
22 |
rm -rf "${WORKDIR}"/src/${x} |
23 |
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) |
24 |
insopts -m0644 -p # preserve timestamps for bug 551486 |
25 |
- insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} |
26 |
+ insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" |
27 |
doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} |
28 |
- insinto /usr/lib/go/src/${GO_PN%/*} |
29 |
+ insinto "$(get_golibdir)/src/${GO_PN%/*}" |
30 |
doins -r "${WORKDIR}"/src/${GO_PN} |
31 |
} |
32 |
|
33 |
diff --git a/app-admin/consul/consul-0.6.3.ebuild b/app-admin/consul/consul-0.6.3.ebuild |
34 |
index 9b35adb..ea2a455 100644 |
35 |
--- a/app-admin/consul/consul-0.6.3.ebuild |
36 |
+++ b/app-admin/consul/consul-0.6.3.ebuild |
37 |
@@ -165,8 +165,8 @@ src_install() { |
38 |
rm -rf "${WORKDIR}"/src/${x} |
39 |
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) |
40 |
insopts -m0644 -p # preserve timestamps for bug 551486 |
41 |
- insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} |
42 |
+ insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" |
43 |
doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} |
44 |
- insinto /usr/lib/go/src/${GO_PN%/*} |
45 |
+ insinto "$(get_golibdir)/src/${GO_PN%/*}" |
46 |
doins -r "${WORKDIR}"/src/${GO_PN} |
47 |
} |
48 |
|
49 |
diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild |
50 |
index f6d1b09..0e865fe 100644 |
51 |
--- a/app-admin/consul/consul-9999.ebuild |
52 |
+++ b/app-admin/consul/consul-9999.ebuild |
53 |
@@ -118,8 +118,8 @@ src_install() { |
54 |
rm -rf "${WORKDIR}"/src/${x} |
55 |
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) |
56 |
insopts -m0644 -p # preserve timestamps for bug 551486 |
57 |
- insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} |
58 |
+ insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" |
59 |
doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} |
60 |
- insinto /usr/lib/go/src/${GO_PN%/*} |
61 |
+ insinto "$(get_golibdir)/src/${GO_PN%/*}" |
62 |
doins -r "${WORKDIR}"/src/${GO_PN} |
63 |
} |