+++ /dev/null
-Backport of:
-
-commit b8c8b94e9f642e52ca0cd1f8b125606b9ef13b78
-Author: Daniel Bünzli <daniel.buenzli@erratique.ch>
-Date: Wed Feb 8 15:07:13 2017 +0100
-
- Avoid name clash with next version of cmdliner.
-
-
-Index: opam-1.3.0/src/client/opamArg.ml
-===================================================================
---- opam-1.3.0.orig/src/client/opamArg.ml
-+++ opam-1.3.0/src/client/opamArg.ml
-@@ -436,9 +436,9 @@ let mk_flag ?section flags doc =
- let doc = Arg.info ?docs:section ~doc flags in
- Arg.(value & flag & doc)
-
--let mk_opt ?section ?vopt flags value doc conv default =
-+let mk_opt ?section ?vopt flags value doc kind default =
- let doc = Arg.info ?docs:section ~docv:value ~doc flags in
-- Arg.(value & opt ?vopt conv default & doc)
-+ Arg.(value & opt ?vopt kind default & doc)
-
- let mk_tristate_opt ?section flags value doc =
- let doc = Arg.info ?docs:section ~docv:value ~doc flags in
-@@ -510,13 +510,13 @@ let term_info title ~doc ~man =
- let man = man @ help_sections in
- Term.info ~sdocs:global_option_section ~docs:"COMMANDS" ~doc ~man title
-
--let arg_list name doc conv =
-+let arg_list name doc kind =
- let doc = Arg.info ~docv:name ~doc [] in
-- Arg.(value & pos_all conv [] & doc)
-+ Arg.(value & pos_all kind [] & doc)
-
--let nonempty_arg_list name doc conv =
-+let nonempty_arg_list name doc kind =
- let doc = Arg.info ~docv:name ~doc [] in
-- Arg.(non_empty & pos_all conv [] & doc)
-+ Arg.(non_empty & pos_all kind [] & doc)
-
- (* Common flags *)
- let print_short_flag =
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A source-based package manager for OCaml"
-HOMEPAGE="http://opam.ocaml.org/"
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE=""
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ocaml/opam.git"
-fi
-
-DEPEND="dev-lang/ocaml:=
- || ( net-misc/wget net-misc/curl )
- dev-ml/extlib:=
- dev-ml/ocaml-re:=
- dev-ml/ocamlgraph:=
- dev-ml/cmdliner:=
- dev-ml/cudf:=
- >=dev-ml/dose3-5:=
- dev-ml/uutf:=
- dev-ml/jsonm:=
-"
-RDEPEND="${DEPEND}
- dev-ml/findlib
-"
-
-src_prepare() {
- epatch "${FILESDIR}/cmdl.patch"
-}
-
-src_compile() {
- emake -j1
- cd doc
- emake man
-}
-
-src_test() {
- EMAIL=foo@bar.com emake -j1 tests
-}
-
-src_install() {
- default
- emake DESTDIR="${D}" OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" libinstall
-}