commit: abf23c51ac7d10eb80ef8c6c43493066a7918fdb
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 6 14:27:30 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 14:28:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf23c51
dev-ml/cudf: make it work with ocaml-5
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../cudf/{cudf-0.10.ebuild => cudf-0.10-r1.ebuild} | 48 +++++++++++++++-------
dev-ml/cudf/cudf-0.10.ebuild | 6 +--
2 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/dev-ml/cudf/cudf-0.10.ebuild b/dev-ml/cudf/cudf-0.10-r1.ebuild
similarity index 59%
copy from dev-ml/cudf/cudf-0.10.ebuild
copy to dev-ml/cudf/cudf-0.10-r1.ebuild
index 00c999757bff..c77436962e30 100644
--- a/dev-ml/cudf/cudf-0.10.ebuild
+++ b/dev-ml/cudf/cudf-0.10-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit dune toolchain-funcs
@@ -10,20 +10,22 @@ DESCRIPTION="Library to parse, pretty print, and evaluate
CUDF documents"
HOMEPAGE="http://www.mancoosi.org/cudf/";
SRC_URI="https://gitlab.com/irill/${PN}/-/archive/v${PV}/${MYP}.tar.bz2";
-LICENSE="LGPL-3"
+S="${WORKDIR}"/${MYP}
+
+LICENSE="LGPL-3+"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt llvm-libunwind test"
RESTRICT="!test? ( test )"
RDEPEND="
- >=dev-lang/ocaml-3.12:=[ocamlopt?]
dev-ml/extlib:=
dev-ml/findlib:=
dev-libs/glib:2
llvm-libunwind? ( sys-libs/llvm-libunwind:= )
!llvm-libunwind? ( sys-libs/libunwind:= )
sys-libs/ncurses:=
+ app-arch/zstd
"
DEPEND="${RDEPEND}
test? ( dev-ml/ounit2 )
@@ -34,21 +36,39 @@ BDEPEND="virtual/pkgconfig"
QA_FLAGS_IGNORED='.*'
-S="${WORKDIR}"/${MYP}
-
src_prepare() {
default
sed -i \
-e 's|make|$(MAKE)|g' \
Makefile || die
- sed -i \
- -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)
-lunwind|g' \
- -e "s|ar r|$(tc-getAR) r|g" \
- c-lib/Makefile || die
- sed -i \
- -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)
-lunwind|g' \
- c-lib/Makefile.variants || die
+
+ if has_version ">=dev-lang/ocaml-5" ; then
+ sed -i \
+ -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses
glib-2.0) -lunwind -lzstd|g' \
+ -e "s|ar r|$(tc-getAR) r|g" \
+ c-lib/Makefile || die
+ sed -i \
+ -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses
glib-2.0) -lunwind -lzstd|g' \
+ c-lib/Makefile.variants || die
+ if use ocamlopt ; then
+ sed -i \
+ -e 's|-lunix|-lunixnat|g' \
+ c-lib/Makefile || die
+ else
+ sed -i \
+ -e 's|-lunix|-lunixbyt|g' \
+ c-lib/Makefile || die
+ fi
+ else
+ sed -i \
+ -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses
glib-2.0) -lunwind|g' \
+ -e "s|ar r|$(tc-getAR) r|g" \
+ c-lib/Makefile || die
+ sed -i \
+ -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses
glib-2.0) -lunwind|g' \
+ c-lib/Makefile.variants || die
+ fi
tc-export CC PKG_CONFIG
diff --git a/dev-ml/cudf/cudf-0.10.ebuild b/dev-ml/cudf/cudf-0.10.ebuild
index 00c999757bff..d4e45e0e014f 100644
--- a/dev-ml/cudf/cudf-0.10.ebuild
+++ b/dev-ml/cudf/cudf-0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,6 +10,8 @@ DESCRIPTION="Library to parse, pretty print, and evaluate
CUDF documents"
HOMEPAGE="http://www.mancoosi.org/cudf/";
SRC_URI="https://gitlab.com/irill/${PN}/-/archive/v${PV}/${MYP}.tar.bz2";
+S="${WORKDIR}"/${MYP}
+
LICENSE="LGPL-3"
SLOT="0/${PV}"
KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
@@ -34,8 +36,6 @@ BDEPEND="virtual/pkgconfig"
QA_FLAGS_IGNORED='.*'
-S="${WORKDIR}"/${MYP}
-
src_prepare() {
default
