1 |
commit: 8101ca1cbc0ff4bb763fa524864d9864b30db910 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 3 05:40:13 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 5 19:22:00 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8101ca1c |
7 |
|
8 |
opam.eclass: unbreak on EAPI=7 |
9 |
|
10 |
Since D, ED, ROOT, EROOT no longer have a trailing slash in EAPI=7 |
11 |
This eclass is terribly broken, installing things into |
12 |
imageusr/... |
13 |
|
14 |
Reported by AnAverageHuman on #gentoo-dev-help |
15 |
|
16 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
17 |
|
18 |
eclass/opam.eclass | 14 +++++++------- |
19 |
1 file changed, 7 insertions(+), 7 deletions(-) |
20 |
|
21 |
diff --git a/eclass/opam.eclass b/eclass/opam.eclass |
22 |
index 5c9c4950dd2..03ffc027641 100644 |
23 |
--- a/eclass/opam.eclass |
24 |
+++ b/eclass/opam.eclass |
25 |
@@ -30,10 +30,10 @@ opam-install() { |
26 |
local pkg |
27 |
for pkg ; do |
28 |
opam-installer -i \ |
29 |
- --prefix="${ED}usr" \ |
30 |
- --libdir="${D}$(ocamlc -where)" \ |
31 |
- --docdir="${ED}usr/share/doc/${PF}" \ |
32 |
- --mandir="${ED}usr/share/man" \ |
33 |
+ --prefix="${ED%/}/usr" \ |
34 |
+ --libdir="${D%/}/$(ocamlc -where)" \ |
35 |
+ --docdir="${ED%/}/usr/share/doc/${PF}" \ |
36 |
+ --mandir="${ED%/}/usr/share/man" \ |
37 |
"${pkg}.install" || die |
38 |
done |
39 |
} |
40 |
@@ -42,9 +42,9 @@ opam_src_install() { |
41 |
local pkg="${1:-${PN}}" |
42 |
opam-install "${pkg}" |
43 |
# Handle opam putting doc in a subdir |
44 |
- if [ -d "${ED}usr/share/doc/${PF}/${pkg}" ] ; then |
45 |
- mv "${ED}usr/share/doc/${PF}/${pkg}/"* "${ED}usr/share/doc/${PF}/" || die |
46 |
- rmdir "${ED}usr/share/doc/${PF}/${pkg}" || die |
47 |
+ if [ -d "${ED%/}/usr/share/doc/${PF}/${pkg}" ] ; then |
48 |
+ mv "${ED%/}/usr/share/doc/${PF}/${pkg}/"* "${ED%/}/usr/share/doc/${PF}/" || die |
49 |
+ rmdir "${ED%/}/usr/share/doc/${PF}/${pkg}" || die |
50 |
fi |
51 |
} |