[gentoo-commits] repo/gentoo:master commit in: dev-ml/dune-configurator/, dev-ml/dune-private-libs/

[gentoo-commits] repo/gentoo:master commit in: dev-ml/dune-configurator/, dev-ml/dune-private-libs/

[Alfredo Tupone]

commit:     2bdf5a887a2a4bac72846b7d2bdedcd506f39dfe
Author:     Hiroki Tokunaga <tokusan441 <AT> gmail <DOT> com>
AuthorDate: Sat Sep 28 07:53:21 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 14:27:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bdf5a88

dev-ml/*: remove vendored `csexp` and `pp` before the build process

Closes: https://bugs.gentoo.org/940360
Signed-off-by: Hiroki Tokunaga <tokusan441 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38801
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 ...nfigurator-3.16.0.ebuild => dune-configurator-3.16.0-r1.ebuild} | 4 +---
 ...te-libs-3.16.0-r3.ebuild => dune-private-libs-3.16.0-r4.ebuild} | 7 +++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-ml/dune-configurator/dune-configurator-3.16.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.16.0-r1.ebuild
similarity index 81%
rename from dev-ml/dune-configurator/dune-configurator-3.16.0.ebuild
rename to dev-ml/dune-configurator/dune-configurator-3.16.0-r1.ebuild
index 64655885dfcc..e843054dad74 100644
--- a/dev-ml/dune-configurator/dune-configurator-3.16.0.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-3.16.0-r1.ebuild
@@ -25,9 +25,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 
-	# This enables dune-configurator to use the vendored csexp module
-	sed -i 's/stdune.csexp/dune-configurator.csexp/' \
-		vendor/csexp/src/dune || die
+	rm -r vendor/{csexp,pp} || die
 }
 
 src_configure() {

diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r4.ebuild
similarity index 88%
rename from dev-ml/dune-private-libs/dune-private-libs-3.16.0-r3.ebuild
rename to dev-ml/dune-private-libs/dune-private-libs-3.16.0-r4.ebuild
index 5f18338cf9ee..86b86d785695 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r3.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-3.16.0-r4.ebuild
@@ -20,6 +20,7 @@ RESTRICT="test"
 BDEPEND=">=dev-ml/dune-3.12"
 DEPEND="
 	dev-ml/csexp:=[ocamlopt?]
+	>=dev-ml/pp-1.2.0:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}
 	!dev-ml/stdune
@@ -27,6 +28,12 @@ RDEPEND="${DEPEND}
 	!dev-ml/ordering
 "
 
+src_prepare() {
+	default
+
+	rm -r vendor/{csexp,pp} || die
+}
+
 src_configure() {
 	:
 }