From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1650449-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9B7C81581C1
for <garchives@archives.gentoo.org>; Sat, 6 Jul 2024 14:28:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D63BB2BC041;
Sat, 6 Jul 2024 14:28:53 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AF8122BC041
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Jul 2024 14:28:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C1669342F94
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Jul 2024 14:28:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 63AE71DC6
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Jul 2024 14:28:51 +0000 (UTC)
From: "Alfredo Tupone" <tupone@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" <tupone@gentoo.org>
Message-ID: <1720276100.abf23c51ac7d10eb80ef8c6c43493066a7918fdb.tupone@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/cudf/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ml/cudf/cudf-0.10-r1.ebuild dev-ml/cudf/cudf-0.10.ebuild
X-VCS-Directories: dev-ml/cudf/
X-VCS-Committer: tupone
X-VCS-Committer-Name: Alfredo Tupone
X-VCS-Revision: abf23c51ac7d10eb80ef8c6c43493066a7918fdb
X-VCS-Branch: master
Date: Sat, 6 Jul 2024 14:28:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6a789ded-97af-45b4-91c1-afa37d401dd4
X-Archives-Hash: 49debfc8661887eaf40968957d69895c
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