[gentoo-commits] proj/sci:master commit in: sci-biology/afni/, sci-biology/afni/files/

[Andrew Ammerlaan]

commit:     34f54dc027e97c6df729cede84253f6555e6c45e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 09:05:26 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 09:05:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=34f54dc0

sci-biology/afni: add 22.0.21, drop 22.0.03

Restore patch dropping py2.7 dep

TODO: make build system respect *FLAGS
TODO: Switch to cmake? This is non-trivial because the
cmake build system wants to fetch deps from the internet

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../afni/{afni-22.0.03.ebuild => afni-22.0.21.ebuild} | 19 +++++++++++++------
 sci-biology/afni/files/afni-22.0.21-python.patch      | 13 +++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/sci-biology/afni/afni-22.0.03.ebuild b/sci-biology/afni/afni-22.0.21.ebuild
similarity index 91%
rename from sci-biology/afni/afni-22.0.03.ebuild
rename to sci-biology/afni/afni-22.0.21.ebuild
index 9e831b018..5a015dafc 100644
--- a/sci-biology/afni/afni-22.0.03.ebuild
+++ b/sci-biology/afni/afni-22.0.21.ebuild
@@ -8,14 +8,16 @@ inherit toolchain-funcs
 DESCRIPTION="An open-source environment for processing and displaying functional MRI data"
 HOMEPAGE="http://afni.nimh.nih.gov/"
 SRC_URI="https://github.com/afni/afni/archive/AFNI_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-AFNI_${PV}/src"
 
 LICENSE="GPL-3+"
 SLOT="0"
-# fully broken due to upstream cmake migration
-KEYWORDS=""
-IUSE=""
+KEYWORDS="~amd64"
 
-RDEPEND="dev-libs/expat
+RDEPEND="
+	dev-libs/libf2c
+	dev-libs/expat
+	media-libs/freeglut
 	media-libs/glu
 	media-libs/netpbm
 	media-libs/qhull
@@ -31,9 +33,14 @@ RDEPEND="dev-libs/expat
 "
 
 DEPEND="${RDEPEND}
-	app-shells/tcsh"
+	app-shells/tcsh
+"
+
+PATCHES=(
+	# Drop python2.7 dependency
+	"${FILESDIR}/${P}-python.patch"
+)
 
-S="${WORKDIR}/${PN}-AFNI_${PV}/src"
 BUILD="linux_fedora_19_64"
 BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count)
 

diff --git a/sci-biology/afni/files/afni-22.0.21-python.patch b/sci-biology/afni/files/afni-22.0.21-python.patch
new file mode 100644
index 000000000..f31cc051b
--- /dev/null
+++ b/sci-biology/afni/files/afni-22.0.21-python.patch
@@ -0,0 +1,13 @@
+diff --git a/other_builds/Makefile.linux_fedora_19_64 b/other_builds/Makefile.linux_fedora_19_64
+index ebaa9d5..1471081 100644
+--- a/other_builds/Makefile.linux_fedora_19_64
++++ b/other_builds/Makefile.linux_fedora_19_64
+@@ -11,8 +11,6 @@ LGIFTI    = -lexpat
+ 
+ # ------------------------------
+ # python from C
+-IPYTHON  = -DSELENIUM_READY -I/usr/include/python2.7
+-LDPYTHON = -lpython2.7
+ 
+ # ----------------------------------------------------------------------
+ # X configuration