dev-ml/ocsigen-toolkit: convert to opam.eclass

Package-Manager: Portage-2.3.10, Repoman-2.3.3

diff --git a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild
index 5099256e8dc4fb2c65277a31925f2a08e086efe7..9a99adeda85b580a5b849486f55901ada4d656c4 100644 (file)
--- a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild
+++ b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit findlib
+inherit findlib opam
 
 DESCRIPTION="User interface widgets for Ocsigen applications"
 HOMEPAGE="https://github.com/ocsigen/ocsigen-toolkit"
@@ -29,8 +29,7 @@ RDEPEND="dev-lang/ocaml:=[ocamlopt?]
        dev-ml/ppx_deriving:=
        dev-ml/calendar:=
        dev-ml/lwt:="
-DEPEND="${RDEPEND}
-       dev-ml/opam"
+DEPEND="${RDEPEND}"
 
 src_compile() {
        emake \
@@ -42,10 +41,6 @@ src_compile() {
 src_install() {
        findlib_src_preinst
        OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
-       opam-installer -i \
-               --prefix="${ED}/usr" \
-               --libdir="${D}/$(ocamlc -where)" \
-               --docdir="${ED}/usr/share/doc/${PF}" \
-               ${PN}.install || die
+       opam_src_install
        dodoc README.md
 }

diff --git a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild
index 5099256e8dc4fb2c65277a31925f2a08e086efe7..9a99adeda85b580a5b849486f55901ada4d656c4 100644 (file)
--- a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild
+++ b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit findlib
+inherit findlib opam
 
 DESCRIPTION="User interface widgets for Ocsigen applications"
 HOMEPAGE="https://github.com/ocsigen/ocsigen-toolkit"
@@ -29,8 +29,7 @@ RDEPEND="dev-lang/ocaml:=[ocamlopt?]
        dev-ml/ppx_deriving:=
        dev-ml/calendar:=
        dev-ml/lwt:="
-DEPEND="${RDEPEND}
-       dev-ml/opam"
+DEPEND="${RDEPEND}"
 
 src_compile() {
        emake \
@@ -42,10 +41,6 @@ src_compile() {
 src_install() {
        findlib_src_preinst
        OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
-       opam-installer -i \
-               --prefix="${ED}/usr" \
-               --libdir="${D}/$(ocamlc -where)" \
-               --docdir="${ED}/usr/share/doc/${PF}" \
-               ${PN}.install || die
+       opam_src_install
        dodoc README.md
 }