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

[Andreas Sturmlechner]

commit: e8309a63597a10bf9ccdc097a77cb0ffbc0a5bcd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 18 09:03:03 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 15 21:45:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8309a63

dev-ml/opam: Drop 1.3.1-r2, EAPI5--

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-ml/opam/Manifest |  1 -
 dev-ml/opam/files/stublibs.patch | 11 
 dev-ml/opam/opam-1.3.1-r2.ebuild | 59 
 3 files changed, 71 deletions(-)

diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 4ce56fe2e51..6022b2986d9 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,2 +1 @@
-DIST opam-1.3.1.tar.gz 669485 BLAKE2B 
e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a
 SHA512 
d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 
66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2
 SHA512 
14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9

diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch
deleted file mode 100644
index 69fb02913b5..000
--- a/dev-ml/opam/files/stublibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/src/tools/opam_installer.ml
-+++ b/src/tools/opam_installer.ml
-@@ -312,7 +312,7 @@ let options =
- let mandir = mk_dir mandir in
- let libdir = mk_dir libdir in
- let stubsdir = match mk_dir stubsdir, libdir with
--  | None, Some d -> Some OpamFilename.Op.(d / "stubslibs")
-+  | None, Some d -> Some OpamFilename.Op.(d / "stublibs")
-   | d, None | (Some _ as d), _ -> d
- in
- let topdir = match mk_dir topdir, libdir with

diff --git a/dev-ml/opam/opam-1.3.1-r2.ebuild b/dev-ml/opam/opam-1.3.1-r2.ebuild
deleted file mode 100644
index e1d225ca5e6..000
--- a/dev-ml/opam/opam-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A source-based package manager for OCaml"
-HOMEPAGE="http://opam.ocaml.org/;
-if [[ ${PV} !=  ]] ; 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
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/ocaml:=
-   || ( net-misc/wget net-misc/curl )
-   dev-ml/extlib:=
-   dev-ml/re:=
-   dev-ml/ocamlgraph:=
-   dev-ml/cmdliner:=
-   dev-ml/cudf:=
-   >=dev-ml/dose3-5:=
-   dev-ml/uutf:=
-   dev-ml/jsonm:=
-"
-DEPEND="${RDEPEND}
-   dev-ml/findlib
-   test? ( dev-vcs/git )
-"
-
-PATCHES=(
-   "${FILESDIR}"/stublibs.patch
-)
-
-src_compile() {
-   emake -j1
-
-   cd doc || die
-   emake man
-}
-
-src_test() {
-   EMAIL=f...@bar.com emake -j1 tests
-}
-
-src_install() {
-   default
-
-   emake \
-   DESTDIR="${D}" \
-   OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" 
--libdir=\"${D}/$(ocamlc -where)\"" \
-   libinstall
-}

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

[Alexis Ballier]

commit: c5c302ab1aa05d71033e5a557114d0501d98372e
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Apr 12 16:56:59 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Apr 12 19:20:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c302ab

dev-ml/opam: Patch default stublibs to match manpage.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-ml/opam/files/stublibs.patch| 13 +
 dev-ml/opam/{opam-1.3.1.ebuild => opam-1.3.1-r1.ebuild} |  4 
 2 files changed, 17 insertions(+)

diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch
new file mode 100644
index 000..3cb61883233
--- /dev/null
+++ b/dev-ml/opam/files/stublibs.patch
@@ -0,0 +1,13 @@
+Index: opam-1.3.1/src/tools/opam_installer.ml
+===
+--- opam-1.3.1.orig/src/tools/opam_installer.ml
 opam-1.3.1/src/tools/opam_installer.ml
+@@ -312,7 +312,7 @@ let options =
+ let mandir = mk_dir mandir in
+ let libdir = mk_dir libdir in
+ let stubsdir = match mk_dir stubsdir, libdir with
+-  | None, Some d -> Some OpamFilename.Op.(d / "stubslibs")
++  | None, Some d -> Some OpamFilename.Op.(d / "stublibs")
+   | d, None | (Some _ as d), _ -> d
+ in
+ let topdir = match mk_dir topdir, libdir with

diff --git a/dev-ml/opam/opam-1.3.1.ebuild b/dev-ml/opam/opam-1.3.1-r1.ebuild
similarity index 94%
rename from dev-ml/opam/opam-1.3.1.ebuild
rename to dev-ml/opam/opam-1.3.1-r1.ebuild
index 7a59ae2c792..8dcc9ac786d 100644
--- a/dev-ml/opam/opam-1.3.1.ebuild
+++ b/dev-ml/opam/opam-1.3.1-r1.ebuild
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}
dev-ml/findlib
 "
 
+src_prepare() {
+   epatch "${FILESDIR}/stublibs.patch"
+}
+
 src_compile() {
emake -j1
cd doc

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

[Alexis Ballier]

commit: ac1add2566a0bf7947d69228347043369517d516
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Mar  2 12:52:28 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Mar  2 13:01:13 2017 +
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 000..5a05808ea9d
--- /dev/null
+++ b/dev-ml/opam/files/cmdl.patch
@@ -0,0 +1,43 @@
+Backport of:
+
+commit b8c8b94e9f642e52ca0cd1f8b125606b9ef13b78
+Author: Daniel Bünzli 
+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

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

[Alexis Ballier]

commit: d485add3c0c9fb5884649242968418d59c9e8bcb
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jan 24 11:26:28 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jan 24 11:26:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d485add3

dev-ml/opam: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/opam/Manifest |  1 -
 dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch | 77 
 dev-ml/opam/files/no-insecure.patch  | 25 
 dev-ml/opam/opam-1.2.2-r1.ebuild | 57 --
 4 files changed, 160 deletions(-)

diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index e8ec3ff..9e786d9 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,2 +1 @@
-DIST opam-1.2.2.tar.gz 648951 SHA256 
3e4a05df6ff8deecba019d885ebe902eb933acb6e2fc7784ffee1ee14871e36a SHA512 
12105b5219a14d4c4cb29c387dd5af858d2b4a2a1bad7dcd70e4c284fc52848df82933396571b85251d904b3c14cdf02db55060c1ba29dc34b8bab3721d05f54
 WHIRLPOOL 
97d6ab75620a4ed18b45d80e88e77564af457606cbb8dd4591030574bfdbff5c16d508e81438b78198b87511151b1b030e6a51c2370e3110ae21216846f37836
 DIST opam-1.3.0.tar.gz 669389 SHA256 
9d50122940f44401c2dcee39b12a4e4afea851b2f2ab47d90b522f7395f10f7a SHA512 
290535a1bb2e7eff6ab44126c5070d2bed94e68cee3bd5e47054f91ad81ed92e9a21f7888bd1dafcb397e3ac61589d4eaf7267305ac63d1aee08761701bdf647
 WHIRLPOOL 
64b8fc334b8dd193af1d4ae0d0bb445554f6afeb3007fefd4048816d1bd90363c7b18c4d44521da8162bc3ae49668d26b75ef811a4de4d5287597024d0b74ddd

diff --git a/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch 
b/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch
deleted file mode 100644
index a06733c..
--- a/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Mehdi Dogguy 
-Date: Mon, 14 Sep 2015 23:11:00 +0200
-Subject: Port to Dose3 4.0.1
-

- src/core/opamCompiler.ml   | 2 +-
- src/core/opamFilter.ml | 2 +-
- src/core/opamPackage.ml| 2 +-
- src/core/opamVersion.ml.in | 2 +-
- src/solver/opamCudf.ml | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/core/opamCompiler.ml b/src/core/opamCompiler.ml
-index 4178311..c7beb93 100644
 a/src/core/opamCompiler.ml
-+++ b/src/core/opamCompiler.ml
-@@ -30,7 +30,7 @@ module Version = struct
- 
-   type constr = (OpamFormula.relop * t) OpamFormula.formula
- 
--  let compare v1 v2 = Debian.Version.compare (to_string v1) (to_string v2)
-+  let compare v1 v2 = Versioning.Debian.compare (to_string v1) (to_string v2)
- 
-   let eval_relop relop v1 v2 = OpamFormula.check_relop relop (compare v1 v2)
- 
-diff --git a/src/core/opamFilter.ml b/src/core/opamFilter.ml
-index 0e919e7..ebce090 100644
 a/src/core/opamFilter.ml
-+++ b/src/core/opamFilter.ml
-@@ -203,7 +203,7 @@ let rec reduce_aux env = function
-  | FUndef, _ | _, FUndef -> FUndef
-  | e,f ->
-FBool (OpamFormula.check_relop relop
--(Debian.Version.compare (value_string e) (value_string f
-+(Versioning.Debian.compare (value_string e) (value_string 
f
-   | FAnd (e,f) -> logop2 (&&) false (reduce env e) (reduce env f)
-   | FOr (e,f) -> logop2 (||) true (reduce env e) (reduce env f)
-   | FNot e -> logop1 not (reduce env e)
-diff --git a/src/core/opamPackage.ml b/src/core/opamPackage.ml
-index 56605bb..8390896 100644
 a/src/core/opamPackage.ml
-+++ b/src/core/opamPackage.ml
-@@ -29,7 +29,7 @@ module Version = struct
- 
-   let of_string x = x
- 
--  let compare = Debian.Version.compare
-+  let compare = Versioning.Debian.compare
- 
-   let to_json x =
- `String (to_string x)
-diff --git a/src/core/opamVersion.ml.in b/src/core/opamVersion.ml.in
-index 3c9fc92..ead47b8 100644
 a/src/core/opamVersion.ml.in
-+++ b/src/core/opamVersion.ml.in
-@@ -27,7 +27,7 @@ let compare v w =
-   let cut s = match OpamMisc.cut_at s '-' with
- | Some (s,_) -> s
- | None -> s in
--  Debian.Version.compare (cut v) (cut w)
-+  Versioning.Debian.compare (cut v) (cut w)
- 
- module O = struct
-   type t = string
-diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
-index 62ea551..f790352 100644
 a/src/solver/opamCudf.ml
-+++ b/src/solver/opamCudf.ml
-@@ -611,7 +611,7 @@ let check_cudf_version =
-   `Compat
- | s::_ ->
-   match OpamMisc.split s ' ' with
--  | "aspcud"::_::v::_ when Debian.Version.compare v "1.9" >= 0 ->
-+  | "aspcud"::_::v::_ when Versioning.Debian.compare v "1.9" >= 0 ->
- log "Solver is aspcud > 1.9: using latest version criteria";
- `Latest
-   | _ ->

diff --git a/dev-ml/opam/files/no-insecure.patch 
b/dev-ml/opam/files/no-insecure.patch
deleted file mode 100644
index aebd5b2..
--- a/dev-ml/opam/files/no-insecure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: remove insecure / no-check-certificate flags (see mail on 

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

[Alexis Ballier]

commit: dbc6f713d8a7ca97ed9c319e96c22e3135ac095a
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jan 19 11:35:12 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jan 19 11:35:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc6f713

dev-ml/opam: import debian patch to fix build with dose3 >= 4. Bug #566810.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch | 77 
 dev-ml/opam/opam-1.2.2.ebuild|  6 +-
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch 
b/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch
new file mode 100644
index 000..a06733c
--- /dev/null
+++ b/dev-ml/opam/files/0001-Port-to-Dose3-4.0.1.patch
@@ -0,0 +1,77 @@
+From: Mehdi Dogguy 
+Date: Mon, 14 Sep 2015 23:11:00 +0200
+Subject: Port to Dose3 4.0.1
+
+---
+ src/core/opamCompiler.ml   | 2 +-
+ src/core/opamFilter.ml | 2 +-
+ src/core/opamPackage.ml| 2 +-
+ src/core/opamVersion.ml.in | 2 +-
+ src/solver/opamCudf.ml | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/core/opamCompiler.ml b/src/core/opamCompiler.ml
+index 4178311..c7beb93 100644
+--- a/src/core/opamCompiler.ml
 b/src/core/opamCompiler.ml
+@@ -30,7 +30,7 @@ module Version = struct
+ 
+   type constr = (OpamFormula.relop * t) OpamFormula.formula
+ 
+-  let compare v1 v2 = Debian.Version.compare (to_string v1) (to_string v2)
++  let compare v1 v2 = Versioning.Debian.compare (to_string v1) (to_string v2)
+ 
+   let eval_relop relop v1 v2 = OpamFormula.check_relop relop (compare v1 v2)
+ 
+diff --git a/src/core/opamFilter.ml b/src/core/opamFilter.ml
+index 0e919e7..ebce090 100644
+--- a/src/core/opamFilter.ml
 b/src/core/opamFilter.ml
+@@ -203,7 +203,7 @@ let rec reduce_aux env = function
+  | FUndef, _ | _, FUndef -> FUndef
+  | e,f ->
+FBool (OpamFormula.check_relop relop
+-(Debian.Version.compare (value_string e) (value_string f
++(Versioning.Debian.compare (value_string e) (value_string 
f
+   | FAnd (e,f) -> logop2 (&&) false (reduce env e) (reduce env f)
+   | FOr (e,f) -> logop2 (||) true (reduce env e) (reduce env f)
+   | FNot e -> logop1 not (reduce env e)
+diff --git a/src/core/opamPackage.ml b/src/core/opamPackage.ml
+index 56605bb..8390896 100644
+--- a/src/core/opamPackage.ml
 b/src/core/opamPackage.ml
+@@ -29,7 +29,7 @@ module Version = struct
+ 
+   let of_string x = x
+ 
+-  let compare = Debian.Version.compare
++  let compare = Versioning.Debian.compare
+ 
+   let to_json x =
+ `String (to_string x)
+diff --git a/src/core/opamVersion.ml.in b/src/core/opamVersion.ml.in
+index 3c9fc92..ead47b8 100644
+--- a/src/core/opamVersion.ml.in
 b/src/core/opamVersion.ml.in
+@@ -27,7 +27,7 @@ let compare v w =
+   let cut s = match OpamMisc.cut_at s '-' with
+ | Some (s,_) -> s
+ | None -> s in
+-  Debian.Version.compare (cut v) (cut w)
++  Versioning.Debian.compare (cut v) (cut w)
+ 
+ module O = struct
+   type t = string
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index 62ea551..f790352 100644
+--- a/src/solver/opamCudf.ml
 b/src/solver/opamCudf.ml
+@@ -611,7 +611,7 @@ let check_cudf_version =
+   `Compat
+ | s::_ ->
+   match OpamMisc.split s ' ' with
+-  | "aspcud"::_::v::_ when Debian.Version.compare v "1.9" >= 0 ->
++  | "aspcud"::_::v::_ when Versioning.Debian.compare v "1.9" >= 0 ->
+ log "Solver is aspcud > 1.9: using latest version criteria";
+ `Latest
+   | _ ->

diff --git a/dev-ml/opam/opam-1.2.2.ebuild b/dev-ml/opam/opam-1.2.2.ebuild
index 416dff6..d0e1cc3 100644
--- a/dev-ml/opam/opam-1.2.2.ebuild
+++ b/dev-ml/opam/opam-1.2.2.ebuild
@@ -27,7 +27,7 @@ DEPEND="dev-lang/ocaml:=
dev-ml/ocamlgraph:=
dev-ml/cmdliner:=
dev-ml/cudf:=
-   dev-ml/dose3:=
+   >=dev-ml/dose3-4:=
dev-ml/uutf:=
dev-ml/jsonm:=
 "
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}
dev-ml/findlib
 "
 
+src_prepare() {
+   epatch "${FILESDIR}/0001-Port-to-Dose3-4.0.1.patch"
+}
+
 src_compile() {
emake -j1
cd doc