diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
commit | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch) | |
tree | cee0a97398040001220ece3cd48c3d568bcddb4a /eclass/opam.eclass | |
parent | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff) |
gentoo resync : 10.02.2019
Diffstat (limited to 'eclass/opam.eclass')
-rw-r--r-- | eclass/opam.eclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/eclass/opam.eclass b/eclass/opam.eclass index 5c9c4950dd26..5cd6748929cf 100644 --- a/eclass/opam.eclass +++ b/eclass/opam.eclass @@ -13,8 +13,8 @@ # src_install for opam-based packages. case ${EAPI:-0} in - 0|1|2|3|4) die "You need at least EAPI-5 to use opam.eclass";; - *) ;; + 5|6|7) ;; + *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; esac RDEPEND=">=dev-lang/ocaml-4:=" @@ -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 } |