From 9145634cfc5b38aba295567cac5446a27862796f Mon Sep 17 00:00:00 2001
From: Alfredo Tupone <tupone@gentoo.org>
Date: Sat, 18 Mar 2023 18:52:13 +0100
Subject: dev-ml/stdune: fix the upgrade

Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
---
 dev-ml/stdune/stdune-3.0.3-r1.ebuild | 37 -----------------------------------
 dev-ml/stdune/stdune-3.0.3-r2.ebuild | 38 ++++++++++++++++++++++++++++++++++++
 dev-ml/stdune/stdune-3.2.0-r1.ebuild | 36 ++++++++++++++++++++++++++++++++++
 dev-ml/stdune/stdune-3.2.0.ebuild    | 35 ---------------------------------
 dev-ml/stdune/stdune-3.6.1-r1.ebuild | 36 ++++++++++++++++++++++++++++++++++
 dev-ml/stdune/stdune-3.6.1.ebuild    | 35 ---------------------------------
 dev-ml/stdune/stdune-3.6.2-r1.ebuild | 36 ++++++++++++++++++++++++++++++++++
 dev-ml/stdune/stdune-3.6.2.ebuild    | 35 ---------------------------------
 dev-ml/stdune/stdune-3.7.0-r1.ebuild | 36 ++++++++++++++++++++++++++++++++++
 dev-ml/stdune/stdune-3.7.0.ebuild    | 35 ---------------------------------
 10 files changed, 182 insertions(+), 177 deletions(-)
 delete mode 100644 dev-ml/stdune/stdune-3.0.3-r1.ebuild
 create mode 100644 dev-ml/stdune/stdune-3.0.3-r2.ebuild
 create mode 100644 dev-ml/stdune/stdune-3.2.0-r1.ebuild
 delete mode 100644 dev-ml/stdune/stdune-3.2.0.ebuild
 create mode 100644 dev-ml/stdune/stdune-3.6.1-r1.ebuild
 delete mode 100644 dev-ml/stdune/stdune-3.6.1.ebuild
 create mode 100644 dev-ml/stdune/stdune-3.6.2-r1.ebuild
 delete mode 100644 dev-ml/stdune/stdune-3.6.2.ebuild
 create mode 100644 dev-ml/stdune/stdune-3.7.0-r1.ebuild
 delete mode 100644 dev-ml/stdune/stdune-3.7.0.ebuild

(limited to 'dev-ml/stdune')

diff --git a/dev-ml/stdune/stdune-3.0.3-r1.ebuild b/dev-ml/stdune/stdune-3.0.3-r1.ebuild
deleted file mode 100644
index 57914cc6d34c..000000000000
--- a/dev-ml/stdune/stdune-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Dune's unstable standard library"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3"
-DEPEND="
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/ordering-${PV}:=[ocamlopt?]
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	./configure \
-		--libdir="$(ocamlc -where)" \
-		--mandir="/usr/share/man" \
-		|| die
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/stdune/stdune-3.0.3-r2.ebuild b/dev-ml/stdune/stdune-3.0.3-r2.ebuild
new file mode 100644
index 000000000000..6899e81ace5c
--- /dev/null
+++ b/dev-ml/stdune/stdune-3.0.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Dune's unstable standard library"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3"
+DEPEND="
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/ordering-${PV}:=[ocamlopt?]
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	./configure \
+		--libdir="$(ocamlc -where)" \
+		--mandir="/usr/share/man" \
+		|| die
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/stdune/stdune-3.2.0-r1.ebuild b/dev-ml/stdune/stdune-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..6eb7a8ea3f95
--- /dev/null
+++ b/dev-ml/stdune/stdune-3.2.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Dune's unstable standard library"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3"
+DEPEND="
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/ordering-${PV}:=[ocamlopt?]
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/stdune/stdune-3.2.0.ebuild b/dev-ml/stdune/stdune-3.2.0.ebuild
deleted file mode 100644
index 42c85b7e9d79..000000000000
--- a/dev-ml/stdune/stdune-3.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Dune's unstable standard library"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3"
-DEPEND="
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/ordering-${PV}:=[ocamlopt?]
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/stdune/stdune-3.6.1-r1.ebuild b/dev-ml/stdune/stdune-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..8d82be573c81
--- /dev/null
+++ b/dev-ml/stdune/stdune-3.6.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Dune's unstable standard library"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/ordering-${PV}:=[ocamlopt?]
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/stdune/stdune-3.6.1.ebuild b/dev-ml/stdune/stdune-3.6.1.ebuild
deleted file mode 100644
index 8a902b92cec8..000000000000
--- a/dev-ml/stdune/stdune-3.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Dune's unstable standard library"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/ordering-${PV}:=[ocamlopt?]
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/stdune/stdune-3.6.2-r1.ebuild b/dev-ml/stdune/stdune-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..c31152e785e8
--- /dev/null
+++ b/dev-ml/stdune/stdune-3.6.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Dune's unstable standard library"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/ordering-${PV}:=[ocamlopt?]
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/stdune/stdune-3.6.2.ebuild b/dev-ml/stdune/stdune-3.6.2.ebuild
deleted file mode 100644
index 9ab1a59d2ae2..000000000000
--- a/dev-ml/stdune/stdune-3.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Dune's unstable standard library"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/ordering-${PV}:=[ocamlopt?]
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/stdune/stdune-3.7.0-r1.ebuild b/dev-ml/stdune/stdune-3.7.0-r1.ebuild
new file mode 100644
index 000000000000..8d82be573c81
--- /dev/null
+++ b/dev-ml/stdune/stdune-3.7.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Dune's unstable standard library"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/ordering-${PV}:=[ocamlopt?]
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/stdune/stdune-3.7.0.ebuild b/dev-ml/stdune/stdune-3.7.0.ebuild
deleted file mode 100644
index 7ee771448037..000000000000
--- a/dev-ml/stdune/stdune-3.7.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Dune's unstable standard library"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/ordering-${PV}:=[ocamlopt?]
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
-- 
cgit v1.2.3-65-gdbad