commit: b198f454d812345a524f13243e39e6f977d71790 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Mon Jan 9 11:07:30 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Mon Jan 9 11:08:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b198f454
dev-ml/uchar: stop using opam-installer as it is an indirect opam dep, bug #601906 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-ml/uchar/uchar-0.0.1.ebuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-ml/uchar/uchar-0.0.1.ebuild b/dev-ml/uchar/uchar-0.0.1.ebuild index 2cf183d..37b0fbd 100644 --- a/dev-ml/uchar/uchar-0.0.1.ebuild +++ b/dev-ml/uchar/uchar-0.0.1.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=6 +inherit findlib + DESCRIPTION="Uchar compatibility library" HOMEPAGE="https://github.com/ocaml/uchar"; SRC_URI="https://github.com/ocaml/uchar/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -13,9 +15,8 @@ SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="+ocamlopt" -RDEPEND="dev-lang/ocaml:=" -DEPEND="${RDEPEND} - dev-ml/opam" +RDEPEND=">=dev-lang/ocaml-4.03:=" +DEPEND="${RDEPEND}" src_compile() { ocaml pkg/build.ml \ @@ -28,10 +29,9 @@ src_test() { } src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die + # Can't use opam-installer here as it is an opam dep... + findlib_src_preinst + mv _build/pkg/META{.empty,} || die + ocamlfind install ${PN} _build/pkg/META || die dodoc README.md CHANGES.md }
