From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53B9013835A for ; Mon, 8 Feb 2021 17:21:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5374CE093D; Mon, 8 Feb 2021 17:21:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30BA7E093D for ; Mon, 8 Feb 2021 17:21:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F85E340D68 for ; Mon, 8 Feb 2021 17:21:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AAD584CD for ; Mon, 8 Feb 2021 17:21:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1612804855.961fcc9f31f9b63b59beb135324479b22504b6b2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/opam/opam-2.0.7-r1.ebuild dev-ml/opam/opam-2.0.7.ebuild dev-ml/opam/opam-2.0.8-r1.ebuild dev-ml/opam/opam-2.0.8.ebuild X-VCS-Directories: dev-ml/opam/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 961fcc9f31f9b63b59beb135324479b22504b6b2 X-VCS-Branch: master Date: Mon, 8 Feb 2021 17:21:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 81d92eab-7094-4d53-80e0-09ff0f444f5f X-Archives-Hash: 96e3403981a22cad9dd84b38f811b0a9 commit: 961fcc9f31f9b63b59beb135324479b22504b6b2 Author: Sam James gentoo org> AuthorDate: Mon Feb 8 17:12:36 2021 +0000 Commit: Sam James gentoo 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 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