commit:     ab5da3a3c54661d152e77015e99cb1584b3584df
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 21:31:21 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 21:32:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab5da3a3

dev-ml/base: add ocamlopt USE depends

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/base/Manifest                               |  4 ----
 ...base-0.14.0-r1.ebuild => base-0.14.0-r2.ebuild} |  6 +++---
 dev-ml/base/base-0.14.1-r1.ebuild                  | 21 ---------------------
 dev-ml/base/base-0.14.3-r1.ebuild                  | 21 ---------------------
 ...base-0.15.0-r3.ebuild => base-0.14.3-r2.ebuild} |  7 +++----
 ...base-0.15.1-r1.ebuild => base-0.15.1-r2.ebuild} |  4 ++--
 dev-ml/base/base-0.16.1-r1.ebuild                  | 22 ----------------------
 dev-ml/base/base-0.16.2.ebuild                     | 22 ----------------------
 .../{base-0.16.3.ebuild => base-0.16.3-r1.ebuild}  |  4 ++--
 9 files changed, 10 insertions(+), 101 deletions(-)

diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index c27c9e3d2313..f15c6de0fb50 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -1,8 +1,4 @@
 DIST base-0.14.0.tar.gz 385265 BLAKE2B 
f3a49b22bb63919bcdc522fbce14a24fd6eaddf39b921ba956cb82eb664ccc6919c9a9feb799dea318f1d8bdf1bd1983180b7ce38d9a43e118794057a9fec6a3
 SHA512 
c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16
-DIST base-0.14.1.tar.gz 385381 BLAKE2B 
619c5c437237bb3ea9f428b450085eff2cb4639bf11803bcb2ae9f147b3ae39af72cfcfa10aaa5e74446bff4ba5f553815ff790190845f12e5e5b5080b197237
 SHA512 
5675a8b6b1ee5b7bd992ac9fbb036239f11b8a8c7cac9059ca38581d91f42e35d7bfa5839a90ed227344dd4c7b1bbacf0e7871d958c81f6ccf7e072b64ceff2e
 DIST base-0.14.3.tar.gz 385390 BLAKE2B 
e951fcf90f1181720346be0dc048bdb3d3f0b6417c954106aa035d807bff4a8bb85e97b11efbb296be92b24c257e8c83284c5419842b2d2f587a7ceee214e31f
 SHA512 
56499ffd630bc8d09a18f49851d950ad54c376d4441b50ce60141f58aadece16f175a5b57492e8ddd997a6289d8671368dc0a58b01b6bbd2374acf45e7882e66
-DIST base-0.15.0.tar.gz 414117 BLAKE2B 
7df1e74fc74f7d58d8e3b524a95a8ea8750dfa39bd31271b84d47ab4a4c5c74f17b9ae9fbc5a352431b0b222ff9437d11f22eb6b846c74d9baac96cc770dc53b
 SHA512 
1e9a507f66a44b53eb80c866a544263ae5811992866043cb626826de8a4b4c6086601554fbe93ec874773edd229fab052be9cdfa5b75ef3bc7eaff468b53bca6
 DIST base-0.15.1.tar.gz 414911 BLAKE2B 
4f0955374213bed241214451cb930c939bfed7208668b2b6676786a37c60f14b671b50e9a8893555693068dc2272e21f63e4def938dbe064b4ecb143925a8aab
 SHA512 
4ac43829229765c19d8af98d45783c098abffd026328b03f5dc4390911b26cf6b65879d4084d30dd4b0b4f5a1d23079270e9bb10b1aeccf575ee70c7e16021ec
-DIST base-0.16.1.tar.gz 442796 BLAKE2B 
8ad6426bd32700e0d8bfdf0315d2113cbfcf69459b6b3a5997adc6e320885e2706f72cdecaeeafde2a77c089752f446c9d865c152cc3cc2ecb4f98b1ee19548e
 SHA512 
347ccc68be09ef207f0ac793f1c472688855ba53c317a35c95f7124be4105985b54f866b604a66a9d2e54bc320f7b29ffa3eb224622b1cce6ca504e1ee4888ff
-DIST base-0.16.2.tar.gz 442593 BLAKE2B 
bf0de878e412719a370b17c741b3191bacb34416c7dce022a56944803db30699b40bd750d8290e40a817dbd4e0dc8d3298e816c8ce31ea2197fbaf1eefb368a3
 SHA512 
d5f00c411dbdffe6cabc7ec309550c4f947e79c9ff6c95cbb2d148fd0bbff060db8019c9544c1db56172a6d143f810e700d7092d404ba6cbcd756cbaa896813f
 DIST base-0.16.3.tar.gz 442632 BLAKE2B 
533a04b197bb1065a8b8772aa227bbe3be2c47d536722dfa7d1df366ad05e40fdd47f3a842654ee9bde1e3527ff34adaf155057af68596d4c02c8108505c9108
 SHA512 
69380ed392faf4495459f97f70a10a6959fce71d2e6ba093472fc272141646307fd7872407de855dfa48ef0435f6587eae5aa50f4a67eac40a9e1946d0c3c070

diff --git a/dev-ml/base/base-0.14.0-r1.ebuild 
b/dev-ml/base/base-0.14.0-r2.ebuild
similarity index 74%
rename from dev-ml/base/base-0.14.0-r1.ebuild
rename to dev-ml/base/base-0.14.0-r2.ebuild
index 22177725208b..b297736ade18 100644
--- a/dev-ml/base/base-0.14.0-r1.ebuild
+++ b/dev-ml/base/base-0.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
        <dev-lang/ocaml-4.12
-       >=dev-ml/sexplib0-0.14.0:= <dev-ml/sexplib0-0.15.0:=
-       dev-ml/dune-configurator:=
+       >=dev-ml/sexplib0-0.14.0:=[ocamlopt?] <dev-ml/sexplib0-0.15.0:=
+       dev-ml/dune-configurator:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"

diff --git a/dev-ml/base/base-0.14.1-r1.ebuild 
b/dev-ml/base/base-0.14.1-r1.ebuild
deleted file mode 100644
index ec1b96faf89e..000000000000
--- a/dev-ml/base/base-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Standard library for OCaml"
-HOMEPAGE="https://github.com/janestreet/base";
-SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-       >=dev-ml/sexplib0-0.14.0:= <dev-ml/sexplib0-0.15.0:=
-       dev-ml/dune-configurator:=
-"
-DEPEND="${RDEPEND}"

diff --git a/dev-ml/base/base-0.14.3-r1.ebuild 
b/dev-ml/base/base-0.14.3-r1.ebuild
deleted file mode 100644
index 1aead12b4736..000000000000
--- a/dev-ml/base/base-0.14.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Standard library for OCaml"
-HOMEPAGE="https://github.com/janestreet/base";
-SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-       >=dev-ml/sexplib0-0.14.0:= <dev-ml/sexplib0-0.15.0:=
-       dev-ml/dune-configurator:=
-"
-DEPEND="${RDEPEND}"

diff --git a/dev-ml/base/base-0.15.0-r3.ebuild 
b/dev-ml/base/base-0.14.3-r2.ebuild
similarity index 78%
rename from dev-ml/base/base-0.15.0-r3.ebuild
rename to dev-ml/base/base-0.14.3-r2.ebuild
index ef8935da48a2..7977bf74941e 100644
--- a/dev-ml/base/base-0.15.0-r3.ebuild
+++ b/dev-ml/base/base-0.14.3-r2.ebuild
@@ -10,13 +10,12 @@ HOMEPAGE="https://github.com/janestreet/base";
 SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-       >=dev-lang/ocaml-4.10.0
-       =dev-ml/sexplib0-0.15*:=
-       dev-ml/dune-configurator:=
+       >=dev-ml/sexplib0-0.14.0:=[ocamlopt?] <dev-ml/sexplib0-0.15.0:=
+       dev-ml/dune-configurator:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"

diff --git a/dev-ml/base/base-0.15.1-r1.ebuild 
b/dev-ml/base/base-0.15.1-r2.ebuild
similarity index 85%
rename from dev-ml/base/base-0.15.1-r1.ebuild
rename to dev-ml/base/base-0.15.1-r2.ebuild
index 372006684a85..536909da83bd 100644
--- a/dev-ml/base/base-0.15.1-r1.ebuild
+++ b/dev-ml/base/base-0.15.1-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
        >=dev-lang/ocaml-4.10.0
-       =dev-ml/sexplib0-0.15*:=
-       dev-ml/dune-configurator:=
+       =dev-ml/sexplib0-0.15*:=[ocamlopt?]
+       dev-ml/dune-configurator:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"

diff --git a/dev-ml/base/base-0.16.1-r1.ebuild 
b/dev-ml/base/base-0.16.1-r1.ebuild
deleted file mode 100644
index 500f481d48ff..000000000000
--- a/dev-ml/base/base-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Standard library for OCaml"
-HOMEPAGE="https://github.com/janestreet/base";
-SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-       >=dev-lang/ocaml-4.14.0
-       =dev-ml/sexplib0-0.16*:=
-       dev-ml/dune-configurator:=
-"
-DEPEND="${RDEPEND}"

diff --git a/dev-ml/base/base-0.16.2.ebuild b/dev-ml/base/base-0.16.2.ebuild
deleted file mode 100644
index 500f481d48ff..000000000000
--- a/dev-ml/base/base-0.16.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Standard library for OCaml"
-HOMEPAGE="https://github.com/janestreet/base";
-SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-       >=dev-lang/ocaml-4.14.0
-       =dev-ml/sexplib0-0.16*:=
-       dev-ml/dune-configurator:=
-"
-DEPEND="${RDEPEND}"

diff --git a/dev-ml/base/base-0.16.3.ebuild b/dev-ml/base/base-0.16.3-r1.ebuild
similarity index 86%
rename from dev-ml/base/base-0.16.3.ebuild
rename to dev-ml/base/base-0.16.3-r1.ebuild
index 500f481d48ff..0842c57f20db 100644
--- a/dev-ml/base/base-0.16.3.ebuild
+++ b/dev-ml/base/base-0.16.3-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
        >=dev-lang/ocaml-4.14.0
-       =dev-ml/sexplib0-0.16*:=
-       dev-ml/dune-configurator:=
+       =dev-ml/sexplib0-0.16*:=[ocamlopt?]
+       dev-ml/dune-configurator:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"

Reply via email to