[gentoo-commits] repo/gentoo:master commit in: dev-ml/opam/, dev-ml/opam/files/

[Alexis Ballier]

commit:     ac1add2566a0bf7947d69228347043369517d516
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 12:52:28 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 13:01:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1add25

dev-ml/opam: Fix build with cmdliner 1.0.0

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-ml/opam/files/cmdl.patch  | 43 +++++++++++++++++++++++++++++++++++++++++++
 dev-ml/opam/opam-1.3.0.ebuild |  4 ++++
 2 files changed, 47 insertions(+)

diff --git a/dev-ml/opam/files/cmdl.patch b/dev-ml/opam/files/cmdl.patch
new file mode 100644
index 00000000000..5a05808ea9d
--- /dev/null
+++ b/dev-ml/opam/files/cmdl.patch
@@ -0,0 +1,43 @@
+Backport of:
+
+commit b8c8b94e9f642e52ca0cd1f8b125606b9ef13b78
+Author: Daniel Bünzli <daniel.buenzli@×××××××××.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 =

diff --git a/dev-ml/opam/opam-1.3.0.ebuild b/dev-ml/opam/opam-1.3.0.ebuild
index 10441e2b2ac..d82287aa9bb 100644
--- a/dev-ml/opam/opam-1.3.0.ebuild
+++ b/dev-ml/opam/opam-1.3.0.ebuild
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}
 	dev-ml/findlib
 "
 
+src_prepare() {
+	epatch "${FILESDIR}/cmdl.patch"
+}
+
 src_compile() {
 	emake -j1
 	cd doc