Gentoo Archives: gentoo-commits

From: Horea Christian <horea.christ@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/afni/
Date: Sun, 03 Apr 2022 08:11:26
Message-Id: 1648973472.65c6f547d13f0bf646544e6aef04a70e0d8976c3.chymera@gentoo
1 commit: 65c6f547d13f0bf646544e6aef04a70e0d8976c3
2 Author: Horea Christian <chr <AT> chymera <DOT> eu>
3 AuthorDate: Sun Apr 3 08:11:12 2022 +0000
4 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
5 CommitDate: Sun Apr 3 08:11:12 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=65c6f547
7
8 sci-biology/afni: corrected patch application
9
10 ebuild still fails, though, log included in comment and reposited here:
11 https://ppb.chymera.eu/4223de.log
12
13 Package-Manager: Portage-3.0.30, Repoman-3.0.3
14 Signed-off-by: Horea Christian <chr <AT> chymera.eu>
15
16 sci-biology/afni/afni-22.0.21.ebuild | 10 +++-------
17 1 file changed, 3 insertions(+), 7 deletions(-)
18
19 diff --git a/sci-biology/afni/afni-22.0.21.ebuild b/sci-biology/afni/afni-22.0.21.ebuild
20 index d8ad693bf..6694c9525 100644
21 --- a/sci-biology/afni/afni-22.0.21.ebuild
22 +++ b/sci-biology/afni/afni-22.0.21.ebuild
23 @@ -12,8 +12,7 @@ S="${WORKDIR}/${PN}-AFNI_${PV}/src"
24
25 LICENSE="GPL-3+"
26 SLOT="0"
27 -# Depends on some python version withoug pulling it in
28 -# `thd_selenium.c:18:10: fatal error: Python.h: No such file or directory`
29 +# SUMA error: https://ppb.chymera.eu/4223de.log
30 KEYWORDS=""
31
32 RDEPEND="
33 @@ -38,15 +37,12 @@ DEPEND="${RDEPEND}
34 app-shells/tcsh
35 "
36
37 -PATCHES=(
38 - # Drop python2.7 dependency
39 - "${FILESDIR}/${P}-python.patch"
40 -)
41 -
42 BUILD="linux_fedora_19_64"
43 BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count)
44
45 src_prepare() {
46 + # more easily applied here than via PATCHES at phase end.
47 + eapply "${FILESDIR}/${P}-python.patch" || die
48 find -type f -exec sed -i -e "s/-lXp //g" {} + || die
49 cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy Makefile"
50 # Unbundle imcat