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

[Sam James]

commit:     961fcc9f31f9b63b59beb135324479b22504b6b2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 17:12:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 17:20:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=961fcc9f

dev-ml/opam: fix deps

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-ml/opam/{opam-2.0.8.ebuild => opam-2.0.7-r1.ebuild} |  8 ++++----
 dev-ml/opam/{opam-2.0.7.ebuild => opam-2.0.8-r1.ebuild} | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-ml/opam/opam-2.0.8.ebuild b/dev-ml/opam/opam-2.0.7-r1.ebuild
similarity index 96%
rename from dev-ml/opam/opam-2.0.8.ebuild
rename to dev-ml/opam/opam-2.0.7-r1.ebuild
index 32c8aa658a3..765c723d6f1 100644
--- a/dev-ml/opam/opam-2.0.8.ebuild
+++ b/dev-ml/opam/opam-2.0.7-r1.ebuild
@@ -8,8 +8,6 @@ inherit dune
 DESCRIPTION="A source-based package manager for OCaml"
 HOMEPAGE="http://opam.ocaml.org/";
 SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> 
opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
@@ -20,14 +18,16 @@ RDEPEND="
        dev-ml/cudf:=
        dev-ml/dose3:=
        dev-ml/extlib:=
-       dev-ml/opam-client:=
+       ~dev-ml/opam-client-${PV}:=
        dev-ml/opam-file-format:=
        dev-ml/re:="
+
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/opam-${PV/_/-}"
+
 src_prepare() {
        default
-
        cat <<- EOF >> "${S}/dune"
                (env
                 (dev

diff --git a/dev-ml/opam/opam-2.0.7.ebuild b/dev-ml/opam/opam-2.0.8-r1.ebuild
similarity index 91%
rename from dev-ml/opam/opam-2.0.7.ebuild
rename to dev-ml/opam/opam-2.0.8-r1.ebuild
index 61db05b45f5..acd71e6b4ec 100644
--- a/dev-ml/opam/opam-2.0.7.ebuild
+++ b/dev-ml/opam/opam-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,6 +8,8 @@ inherit dune
 DESCRIPTION="A source-based package manager for OCaml"
 HOMEPAGE="http://opam.ocaml.org/";
 SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> 
opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
@@ -18,16 +20,14 @@ RDEPEND="
        dev-ml/cudf:=
        dev-ml/dose3:=
        dev-ml/extlib:=
-       dev-ml/opam-client:=
+       ~dev-ml/opam-client-${PV}:=
        dev-ml/opam-file-format:=
        dev-ml/re:="
-
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/opam-${PV/_/-}"
-
 src_prepare() {
        default
+
        cat <<- EOF >> "${S}/dune"
                (env
                 (dev