Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam/
Date: Mon, 08 Feb 2021 17:21:06
Message-Id: 1612804855.961fcc9f31f9b63b59beb135324479b22504b6b2.sam@gentoo
1 commit: 961fcc9f31f9b63b59beb135324479b22504b6b2
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 8 17:12:36 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 8 17:20:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=961fcc9f
7
8 dev-ml/opam: fix deps
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-ml/opam/{opam-2.0.8.ebuild => opam-2.0.7-r1.ebuild} | 8 ++++----
14 dev-ml/opam/{opam-2.0.7.ebuild => opam-2.0.8-r1.ebuild} | 10 +++++-----
15 2 files changed, 9 insertions(+), 9 deletions(-)
16
17 diff --git a/dev-ml/opam/opam-2.0.8.ebuild b/dev-ml/opam/opam-2.0.7-r1.ebuild
18 similarity index 96%
19 rename from dev-ml/opam/opam-2.0.8.ebuild
20 rename to dev-ml/opam/opam-2.0.7-r1.ebuild
21 index 32c8aa658a3..765c723d6f1 100644
22 --- a/dev-ml/opam/opam-2.0.8.ebuild
23 +++ b/dev-ml/opam/opam-2.0.7-r1.ebuild
24 @@ -8,8 +8,6 @@ inherit dune
25 DESCRIPTION="A source-based package manager for OCaml"
26 HOMEPAGE="http://opam.ocaml.org/"
27 SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
28 -S="${WORKDIR}/opam-${PV/_/-}"
29 -
30 LICENSE="LGPL-2.1-with-linking-exception"
31 SLOT="0/${PV}"
32 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
33 @@ -20,14 +18,16 @@ RDEPEND="
34 dev-ml/cudf:=
35 dev-ml/dose3:=
36 dev-ml/extlib:=
37 - dev-ml/opam-client:=
38 + ~dev-ml/opam-client-${PV}:=
39 dev-ml/opam-file-format:=
40 dev-ml/re:="
41 +
42 DEPEND="${RDEPEND}"
43
44 +S="${WORKDIR}/opam-${PV/_/-}"
45 +
46 src_prepare() {
47 default
48 -
49 cat <<- EOF >> "${S}/dune"
50 (env
51 (dev
52
53 diff --git a/dev-ml/opam/opam-2.0.7.ebuild b/dev-ml/opam/opam-2.0.8-r1.ebuild
54 similarity index 91%
55 rename from dev-ml/opam/opam-2.0.7.ebuild
56 rename to dev-ml/opam/opam-2.0.8-r1.ebuild
57 index 61db05b45f5..acd71e6b4ec 100644
58 --- a/dev-ml/opam/opam-2.0.7.ebuild
59 +++ b/dev-ml/opam/opam-2.0.8-r1.ebuild
60 @@ -1,4 +1,4 @@
61 -# Copyright 1999-2020 Gentoo Authors
62 +# Copyright 1999-2021 Gentoo Authors
63 # Distributed under the terms of the GNU General Public License v2
64
65 EAPI=7
66 @@ -8,6 +8,8 @@ inherit dune
67 DESCRIPTION="A source-based package manager for OCaml"
68 HOMEPAGE="http://opam.ocaml.org/"
69 SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
70 +S="${WORKDIR}/opam-${PV/_/-}"
71 +
72 LICENSE="LGPL-2.1-with-linking-exception"
73 SLOT="0/${PV}"
74 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
75 @@ -18,16 +20,14 @@ RDEPEND="
76 dev-ml/cudf:=
77 dev-ml/dose3:=
78 dev-ml/extlib:=
79 - dev-ml/opam-client:=
80 + ~dev-ml/opam-client-${PV}:=
81 dev-ml/opam-file-format:=
82 dev-ml/re:="
83 -
84 DEPEND="${RDEPEND}"
85
86 -S="${WORKDIR}/opam-${PV/_/-}"
87 -
88 src_prepare() {
89 default
90 +
91 cat <<- EOF >> "${S}/dune"
92 (env
93 (dev