Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/jbuilder/
Date: Wed, 02 Aug 2017 11:23:20
Message-Id: 1501672969.19d34c8b896c102862873640d393e45911fcbd64.aballier@gentoo
1 commit: 19d34c8b896c102862873640d393e45911fcbd64
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 2 10:38:53 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 2 11:22:49 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19d34c8b
7
8 dev-ml/jbuilder: convert to opam.eclass
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 dev-ml/jbuilder/jbuilder-1.0_beta11.ebuild | 14 +++-----------
13 1 file changed, 3 insertions(+), 11 deletions(-)
14
15 diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta11.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta11.ebuild
16 index f5fac788964..73b64735ff8 100644
17 --- a/dev-ml/jbuilder/jbuilder-1.0_beta11.ebuild
18 +++ b/dev-ml/jbuilder/jbuilder-1.0_beta11.ebuild
19 @@ -3,6 +3,8 @@
20
21 EAPI=5
22
23 +inherit opam
24 +
25 MY_PV="${PV/_/+}"
26 MY_P="${PN}-${PV/_/-}"
27
28 @@ -15,10 +17,9 @@ SLOT="0/${PV}"
29 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
30 IUSE="test"
31
32 -DEPEND="dev-lang/ocaml:="
33 +DEPEND=""
34 RDEPEND="${DEPEND}"
35 DEPEND="${DEPEND}
36 - dev-ml/opam
37 test? ( dev-ml/menhir )
38 "
39 OPAMSWITCH="system"
40 @@ -30,12 +31,3 @@ src_prepare() {
41 # Disable Werror like behavior, doesnt build with ocaml 4.05 otherwise
42 sed -i -e 's/--dev//' Makefile || die
43 }
44 -
45 -src_install() {
46 - opam-installer -i \
47 - --prefix="${ED}/usr" \
48 - --libdir="${D}/$(ocamlc -where)" \
49 - --docdir="${ED}/usr/share/doc/${PF}" \
50 - --mandir="${ED}/usr/share/man" \
51 - ${PN}.install || die
52 -}