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 EFD6C1382C5 for ; Wed, 9 Jun 2021 21:45:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 215EFE07A7; Wed, 9 Jun 2021 21:45:31 +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 D54F3E07A7 for ; Wed, 9 Jun 2021 21:45:30 +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 EEBB233BEB9 for ; Wed, 9 Jun 2021 21:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 717A87A5 for ; Wed, 9 Jun 2021 21:45:27 +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: <1623274892.660e8b9da0de345fde4d04c17e13b82d05f42dcf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp4/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild dev-ml/camlp4/camlp4-4.05_p1.ebuild dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild dev-ml/camlp4/camlp4-4.08_p1.ebuild dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild dev-ml/camlp4/camlp4-4.10_p1.ebuild dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild dev-ml/camlp4/camlp4-4.11_p1.ebuild X-VCS-Directories: dev-ml/camlp4/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 660e8b9da0de345fde4d04c17e13b82d05f42dcf X-VCS-Branch: master Date: Wed, 9 Jun 2021 21:45:27 +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: e3aea014-d580-4c15-8a90-69145fcb4416 X-Archives-Hash: 4b79e9492f43432c42242c4609a18e8d commit: 660e8b9da0de345fde4d04c17e13b82d05f42dcf Author: Sam James gentoo org> AuthorDate: Wed Jun 9 21:41:32 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 9 21:41:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=660e8b9d dev-ml/camlp4: add subslot dep on OCaml major version Needs to be exactly aligned with OCaml major version. Closes: https://bugs.gentoo.org/794898 Signed-off-by: Sam James gentoo.org> dev-ml/camlp4/{camlp4-4.05_p1.ebuild => camlp4-4.05_p1-r1.ebuild} | 4 ++-- dev-ml/camlp4/{camlp4-4.08_p1.ebuild => camlp4-4.08_p1-r1.ebuild} | 2 +- dev-ml/camlp4/{camlp4-4.10_p1.ebuild => camlp4-4.10_p1-r1.ebuild} | 4 ++-- dev-ml/camlp4/{camlp4-4.11_p1.ebuild => camlp4-4.11_p1-r1.ebuild} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild similarity index 92% rename from dev-ml/camlp4/camlp4-4.05_p1.ebuild rename to dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild index e3f1c78d6c1..c7f37c50a7d 100644 --- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.05_p1-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 @@ -15,7 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]" +DEPEND="dev-lang/ocaml:0/4.05[ocamlopt?]" RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/ocamlbuild" diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild similarity index 95% rename from dev-ml/camlp4/camlp4-4.08_p1.ebuild rename to dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild index 06769da466c..ab9c9e3c267 100644 --- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild @@ -16,7 +16,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND="~dev-lang/ocaml-4.09.0:=[ocamlopt?]" +DEPEND="dev-lang/ocaml:0/4.08[ocamlopt?]" RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/ocamlbuild" diff --git a/dev-ml/camlp4/camlp4-4.10_p1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild similarity index 92% rename from dev-ml/camlp4/camlp4-4.10_p1.ebuild rename to dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild index b80025c98ba..53a6a66d6b4 100644 --- a/dev-ml/camlp4/camlp4-4.10_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.10_p1-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 @@ -15,7 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-4.10.0:=[ocamlopt?]" +DEPEND="dev-lang/ocaml:0/4.10[ocamlopt?]" RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/ocamlbuild" diff --git a/dev-ml/camlp4/camlp4-4.11_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild similarity index 95% rename from dev-ml/camlp4/camlp4-4.11_p1.ebuild rename to dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild index f50ced55ac7..7def8b41a1d 100644 --- a/dev-ml/camlp4/camlp4-4.11_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild @@ -15,7 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-4.11.0:=[ocamlopt?]" +DEPEND="dev-lang/ocaml:0/4.11[ocamlopt?]" RDEPEND="${DEPEND}" DEPEND="${DEPEND} dev-ml/ocamlbuild"