From b0ee0213b072261f673fc410cdd8d7e2891e2554 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 6 Feb 2016 16:20:30 +0100 Subject: [PATCH] dev-ml/ppx_deriving: Use opam-installer to install it properly Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier --- ...riving-3.0.ebuild => ppx_deriving-3.0-r1.ebuild} | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) rename dev-ml/ppx_deriving/{ppx_deriving-3.0.ebuild => ppx_deriving-3.0-r1.ebuild} (80%) diff --git a/dev-ml/ppx_deriving/ppx_deriving-3.0.ebuild b/dev-ml/ppx_deriving/ppx_deriving-3.0-r1.ebuild similarity index 80% rename from dev-ml/ppx_deriving/ppx_deriving-3.0.ebuild rename to dev-ml/ppx_deriving/ppx_deriving-3.0-r1.ebuild index 933139f96558..0099ce56db76 100644 --- a/dev-ml/ppx_deriving/ppx_deriving-3.0.ebuild +++ b/dev-ml/ppx_deriving/ppx_deriving-3.0-r1.ebuild @@ -19,6 +19,7 @@ DEPEND="dev-ml/ppx_tools:= >=dev-lang/ocaml-4.02.3:=[ocamlopt?]" RDEPEND="${DEPEND}" DEPEND="${RDEPEND} + dev-ml/opam test? ( dev-ml/ounit )" src_compile() { @@ -40,12 +41,12 @@ src_test() { } src_install() { - findlib_src_preinst - # Copied from upstream makefile - grep -E '^[[:space:]]+' ppx_deriving.install | \ - awk '{ print $1 }' | \ - sed -e 's:"?*::g' | \ - xargs ocamlfind install ppx_deriving || die + opam-installer -i \ + --prefix="${ED}/usr" \ + --libdir="${D}/$(ocamlc -where)" \ + --docdir="${ED}/usr/share/doc/${PF}" \ + ${PN}.install || die + mv "${ED}/usr/lib/ppx_deriving/ppx_deriving" "${D}/$(ocamlc -where)/ppx_deriving/" || die use doc && dohtml api.docdir/* -- 2.26.2