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 CDB121382C5 for ; Mon, 8 Feb 2021 17:21:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F25FE0949; Mon, 8 Feb 2021 17:21:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 5ACD2E0949 for ; Mon, 8 Feb 2021 17:21:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8EB29340D5D for ; Mon, 8 Feb 2021 17:21:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 008204D1 for ; Mon, 8 Feb 2021 17:21:02 +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: <1612804856.38aa6762c466b947e2dc72e4f37fd30eeafb0c41.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/opam-installer/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild dev-ml/opam-installer/opam-installer-2.0.7.ebuild dev-ml/opam-installer/opam-installer-2.0.8.ebuild X-VCS-Directories: dev-ml/opam-installer/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 38aa6762c466b947e2dc72e4f37fd30eeafb0c41 X-VCS-Branch: master Date: Mon, 8 Feb 2021 17:21:02 +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: bbbeca71-1131-49c7-ba96-f0fa5918f6c9 X-Archives-Hash: 7d68c7e34f61f017044da2c5ad3691a4 commit: 38aa6762c466b947e2dc72e4f37fd30eeafb0c41 Author: Sam James gentoo org> AuthorDate: Mon Feb 8 17:16:59 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Feb 8 17:20:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38aa6762 dev-ml/opam-installer: fix deps Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> ...opam-installer-2.0.7.ebuild => opam-installer-2.0.7-r1.ebuild} | 8 ++++++-- dev-ml/opam-installer/opam-installer-2.0.8.ebuild | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild similarity index 92% rename from dev-ml/opam-installer/opam-installer-2.0.7.ebuild rename to dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild index 59f744994a0..eb52254c396 100644 --- a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild +++ b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild @@ -12,17 +12,21 @@ inherit opam DESCRIPTION="Core installer for opam packages" HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam" SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz" +S="${WORKDIR}/opam-full-${PV/_/-}" LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="" -RDEPEND=">=dev-lang/ocaml-4.02.3" +RDEPEND=" + >=dev-lang/ocaml-4.02.3 + dev-ml/cmdliner:= + ~dev-ml/opam-format-${PV} +" DEPEND="${RDEPEND} dev-ml/findlib" -S="${WORKDIR}/opam-full-${PV/_/-}" OPAM_INSTALLER="${S}/opam-installer" src_configure() { diff --git a/dev-ml/opam-installer/opam-installer-2.0.8.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8.ebuild index fad39a7a570..a6722cf81e7 100644 --- a/dev-ml/opam-installer/opam-installer-2.0.8.ebuild +++ b/dev-ml/opam-installer/opam-installer-2.0.8.ebuild @@ -17,7 +17,11 @@ LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -RDEPEND=">=dev-lang/ocaml-4.02.3" +RDEPEND=" + >=dev-lang/ocaml-4.02.3 + dev-ml/cmdliner:= + ~dev-ml/opam-format-${PV} +" DEPEND="${RDEPEND} dev-ml/findlib"