opam.eclass: unbreak on EAPI=7

Since D, ED, ROOT, EROOT no longer have a trailing slash in EAPI=7
This eclass is terribly broken, installing things into
imageusr/...

Reported by AnAverageHuman on #gentoo-dev-help

Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

diff --git a/eclass/opam.eclass b/eclass/opam.eclass
index 5c9c4950dd2619d85a56eae4e22ba3ff18bdae51..03ffc0276412830af6b67ceea49742612f43f08d 100644 (file)
--- a/eclass/opam.eclass
+++ b/eclass/opam.eclass
@@ -30,10 +30,10 @@ opam-install() {
        local pkg
        for pkg ; do
                opam-installer -i \
-                       --prefix="${ED}usr" \
-                       --libdir="${D}$(ocamlc -where)" \
-                       --docdir="${ED}usr/share/doc/${PF}" \
-                       --mandir="${ED}usr/share/man" \
+                       --prefix="${ED%/}/usr" \
+                       --libdir="${D%/}/$(ocamlc -where)" \
+                       --docdir="${ED%/}/usr/share/doc/${PF}" \
+                       --mandir="${ED%/}/usr/share/man" \
                        "${pkg}.install" || die
        done
 }
@@ -42,9 +42,9 @@ opam_src_install() {
        local pkg="${1:-${PN}}"
        opam-install "${pkg}"
        # Handle opam putting doc in a subdir
-       if [ -d "${ED}usr/share/doc/${PF}/${pkg}" ] ; then
-               mv "${ED}usr/share/doc/${PF}/${pkg}/"* "${ED}usr/share/doc/${PF}/" || die
-               rmdir "${ED}usr/share/doc/${PF}/${pkg}" || die
+       if [ -d "${ED%/}/usr/share/doc/${PF}/${pkg}" ] ; then
+               mv "${ED%/}/usr/share/doc/${PF}/${pkg}/"* "${ED%/}/usr/share/doc/${PF}/" || die
+               rmdir "${ED%/}/usr/share/doc/${PF}/${pkg}" || die
        fi
 }