11 files changed, 273 insertions, 317 deletions
diff --git a/sci-biology/afni/Manifest b/sci-biology/afni/Manifest
index 2f909b5c4..d1e783ff1 100644
--- a/sci-biology/afni/Manifest
+++ b/sci-biology/afni/Manifest
@@ -1,3 +1,4 @@
-DIST afni-19.3.12.tar.gz 42337320 BLAKE2B f8f3347e38b7c4b3d720c3c49d5bc50f1057b1d3945e6a33b8415e84e7e539577e5eb351cfc61c53269b6a465619f900b9edcb25830ea056a53f54beb683b0ad SHA512 c4f9303312a89a6e87285646f58223df40b07329cf155bf251a48e8e63302988f103a97363d0666ddd8e9f62f762cf0c219bfc995265b4fe1f1ff5f782025371
-DIST afni-20.1.16.tar.gz 43355499 BLAKE2B ad7750e64dd9f4c2ca7e5c67bd99faeb8595a41d8a16192e77202f3d307e912083affc11dcbb5da3530079b9e3cf3c2b6b470050f57d5d7af2bb35cc2322772f SHA512 e6fdb8baea6165865bae5bb186375bd65e862564c48470523a8fe026a12f00715fd21bd852bd77c4077ea444a97642c4c3d2ca8060640ba5ddd57bd7883901a6
-DIST afni-20.3.03.tar.gz 43263734 BLAKE2B 7fdaf3de874edff9b32950a2724ba8b4cbcdda538b09effb12658a042326d5c8badf48f1a4dfb4555eb069347099cf3cdb08c4fe1a12999e6eca3ca6f8dca639 SHA512 3c5007f59d6c46093d38f9419c72aa36fb5701314690811f757d9568561b386cf3cd602ddf910ae08fd071ea7ae1e51f5762081217f7a29b23e32f1490f5db65
+DIST afni-24.0.04.gh.tar.gz 52888143 BLAKE2B db414b9ac9489aaab824e6f99cae54a1982e600d3b6d93a01cf3f175220ab76923a53ce6da647e4d8be87d3b50699c1b9603f8f0de43d812d34ceb1a65bde19d SHA512 aff673b63453a18c1f687775a6316614ee7495ff583e86c341aa0eed40d5f99b15cb599dea79baf05f8f8b77fea292436e3adc51b906dc13589968a8bdffa3d8
+DIST afni-24.0.08.gh.tar.gz 52917832 BLAKE2B 4cf61f3474c2c69d8373fbf9413c2236fbda77408535b142e6860effbf49ebcc6007ef9fb18943c07299b4815be6692477cc79423d7ac5a09bfe3d125565058c SHA512 90a9c8a48e1084dcc19d90e62b313057f0e71e87740f6ac63a305d19a4ded8ee01722b55546d2aaa2d4dfbfd0a206d4a9d25969592646c101cabe4743b8962c6
+DIST gifti-d3e873d8539d9b469daf7db04093da1d7e73d4f7.tar.gz 107745 BLAKE2B b8162fe08446d5c934762e8dce051e93c8c90fd574dca55757988ccc45be20bfdd07b7a401ef6c536afbe097e6bc05fd3b7f09c4404af4fad4e21fbada7109de SHA512 c458074c6976245cffc48c1e1e57811ec3c0cc5959345bdbc8d674eed6c8a8f93e9f9762bf3acce7142e004dc37930d14bed8cfb97c5b7e92b3f39598da924e2
+DIST nifti-da476fd27f46098f37f5c9c4c1baee01e559572c.tar.gz 451578 BLAKE2B 6bb92ae3ab48dba435b067f7ec0b6d417658ee1a46efe05070bf18fd6d46b8339eaffd09c2fea4971d2685f211496a700b36c255ffb164994636e535b64fe4f5 SHA512 df92345ed580e8bf0579f2ea3ed55a4c4c678a0fe3bfad1e62379e5bf16961272bb2d3e7fda89b96b503cda51c1bf2fb8eb74adba6aad9c73b6830d7d884d1f5
diff --git a/sci-biology/afni/afni-19.3.12.ebuild b/sci-biology/afni/afni-19.3.12.ebuild
deleted file mode 100644
index db19930fd..000000000
--- a/sci-biology/afni/afni-19.3.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/expat
-	media-libs/glu
-	media-libs/netpbm
-	media-libs/qhull
-	media-video/mpeg-tools
-	sci-libs/gsl
-	sys-devel/llvm:*
-	virtual/jpeg:0
-	x11-libs/libGLw
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXpm
-	x11-libs/motif[-static-libs]"
-
-# x11-libs/motif[static-libs] breaks the build.
-# See upstream discussion
-# http://afni.nimh.nih.gov/afni/community/board/read.php?1,85348,85348#msg-85348
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-S="${WORKDIR}/${PN}-AFNI_${PV}/src"
-BUILD="linux_fedora_19_64"
-BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count mpeg_encode)
-
-src_prepare() {
-	find -type f -exec sed -i -e "s/-lXp //g" {} +
-	cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy Makefile"
-	# Unbundle imcat
-	sed -e "s/ imcat / /g" \
-		-i Makefile.INCLUDE || die "Could not edit includes files."
-	sed -e "s~CC     = /usr/bin/gcc -O2 -m64~CC     = $(tc-getCC) \$(CFLAGS)~" \
-		-e "s~CCMIN  = /usr/bin/gcc -m64~CCMIN  = $(tc-getCC) \$(CFLAGS)~" \
-		-e "s~LD     = /usr/bin/gcc~LD     = $(tc-getCC)~" \
-		-e "s~AR     = /usr/bin/ar~AR     = $(tc-getAR)~" \
-		-e "s~RANLIB = /usr/bin/ranlib~RANLIB = $(tc-getRANLIB)~" \
-		-i Makefile || die "Could not edit Makefile"
-		# they provide somewhat problematic makefiles :(
-	sed -e "s~ifeq ($(CC),gcc)~ifeq (1,1)~"\
-		-i SUMA/SUMA_Makefile || die "Could not edit SUMA/SUMA_Makefile"
-		# upstream checks if $CC is EXACTLY gcc, else sets variables for Mac
-	find "${S}" -iname "*Makefile*" | xargs sed -e "s~/usr/~${EROOT}/usr/~g;" -i
-	eapply_user
-}
-
-src_compile() {
-	emake -j1 all plugins suma_exec
-}
-
-src_install() {
-	emake INSTALLDIR="${ED}/usr/bin" -j1 install install_plugins
-	emake INSTALLDIR="${ED}/usr/$(get_libdir)" -j1 install_lib
-	for CONFLICT in ${BIN_CONFLICTS[@]}; do
-		rm "${ED}/usr/bin/${CONFLICT}"
-	done
-}
diff --git a/sci-biology/afni/afni-20.1.16.ebuild b/sci-biology/afni/afni-20.1.16.ebuild
deleted file mode 100644
index e2ed432c8..000000000
--- a/sci-biology/afni/afni-20.1.16.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/expat
-	media-libs/glu
-	media-libs/netpbm
-	media-libs/qhull
-	media-video/mpeg-tools
-	sci-libs/gsl
-	sys-devel/llvm:*
-	virtual/jpeg:0
-	x11-libs/libGLw
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXpm
-	x11-libs/motif[-static-libs]"
-
-# x11-libs/motif[static-libs] breaks the build.
-# See upstream discussion
-# http://afni.nimh.nih.gov/afni/community/board/read.php?1,85348,85348#msg-85348
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-S="${WORKDIR}/${PN}-AFNI_${PV}/src"
-BUILD="linux_fedora_19_64"
-BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count mpeg_encode)
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-python.patch" || die
-	find -type f -exec sed -i -e "s/-lXp //g" {} +
-	cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy Makefile"
-	# Unbundle imcat
-	sed -e "s/ imcat / /g" \
-		-i Makefile.INCLUDE || die "Could not edit includes files."
-	sed -e "s~CC     = /usr/bin/gcc -O2 -m64~CC     = $(tc-getCC) \$(CFLAGS)~" \
-		-e "s~CCMIN  = /usr/bin/gcc -m64~CCMIN  = $(tc-getCC) \$(CFLAGS)~" \
-		-e "s~LD     = /usr/bin/gcc~LD     = $(tc-getCC)~" \
-		-e "s~AR     = /usr/bin/ar~AR     = $(tc-getAR)~" \
-		-e "s~RANLIB = /usr/bin/ranlib~RANLIB = $(tc-getRANLIB)~" \
-		-i Makefile || die "Could not edit Makefile"
-		# they provide somewhat problematic makefiles :(
-	sed -e "s~ifeq ($(CC),gcc)~ifeq (1,1)~"\
-		-i SUMA/SUMA_Makefile || die "Could not edit SUMA/SUMA_Makefile"
-		# upstream checks if $CC is EXACTLY gcc, else sets variables for Mac
-	find "${S}" -iname "*Makefile*" | xargs sed -e "s~/usr/~${EROOT}/usr/~g;" -i
-	default
-}
-
-src_compile() {
-	emake -j1 all plugins suma_exec
-}
-
-src_install() {
-	emake INSTALLDIR="${ED}/usr/bin" -j1 install install_plugins
-	emake INSTALLDIR="${ED}/usr/$(get_libdir)" install_lib
-	for CONFLICT in ${BIN_CONFLICTS[@]}; do
-		rm "${ED}/usr/bin/${CONFLICT}"
-	done
-}
diff --git a/sci-biology/afni/afni-20.3.03.ebuild b/sci-biology/afni/afni-20.3.03.ebuild
deleted file mode 100644
index 3185a297a..000000000
--- a/sci-biology/afni/afni-20.3.03.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/expat
-	media-libs/glu
-	media-libs/netpbm
-	media-libs/qhull
-	media-video/mpeg-tools
-	sci-libs/gsl
-	sys-devel/llvm:*
-	virtual/jpeg:0
-	x11-libs/libGLw
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXpm
-	x11-libs/motif[-static-libs]"
-
-# x11-libs/motif[static-libs] breaks the build.
-# See upstream discussion
-# http://afni.nimh.nih.gov/afni/community/board/read.php?1,85348,85348#msg-85348
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-S="${WORKDIR}/${PN}-AFNI_${PV}/src"
-BUILD="linux_fedora_19_64"
-BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count mpeg_encode)
-
-#PATCHES=(
-#	"${FILESDIR}/${P}-python.patch"
-#)
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-python.patch" || die
-	find -type f -exec sed -i -e "s/-lXp //g" {} +
-	cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy Makefile"
-	# Unbundle imcat
-	sed -e "s/ imcat / /g" \
-		-i Makefile.INCLUDE || die "Could not edit includes files."
-	sed -e "s~CC     = /usr/bin/gcc -O2 -m64~CC     = $(tc-getCC) \$(CFLAGS)~" \
-		-e "s~CCMIN  = /usr/bin/gcc -m64~CCMIN  = $(tc-getCC) \$(CFLAGS)~" \
-		-e "s~LD     = /usr/bin/gcc~LD     = $(tc-getCC)~" \
-		-e "s~AR     = /usr/bin/ar~AR     = $(tc-getAR)~" \
-		-e "s~RANLIB = /usr/bin/ranlib~RANLIB = $(tc-getRANLIB)~" \
-		-i Makefile || die "Could not edit Makefile"
-		# they provide somewhat problematic makefiles :(
-	sed -e "s~ifeq ($(CC),gcc)~ifeq (1,1)~"\
-		-i SUMA/SUMA_Makefile || die "Could not edit SUMA/SUMA_Makefile"
-		# upstream checks if $CC is EXACTLY gcc, else sets variables for Mac
-	find "${S}" -iname "*Makefile*" | xargs sed -e "s~/usr/~${EROOT}/usr/~g;" -i
-	default
-}
-
-src_compile() {
-	emake -j1 all plugins suma_exec
-}
-
-src_install() {
-	emake INSTALLDIR="${ED}/usr/bin" -j1 install install_plugins
-	emake INSTALLDIR="${ED}/usr/$(get_libdir)" install_lib
-	for CONFLICT in ${BIN_CONFLICTS[@]}; do
-		rm "${ED}/usr/bin/${CONFLICT}"
-	done
-}
diff --git a/sci-biology/afni/afni-24.0.04-r1.ebuild b/sci-biology/afni/afni-24.0.04-r1.ebuild
new file mode 100644
index 000000000..557fbd579
--- /dev/null
+++ b/sci-biology/afni/afni-24.0.04-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit cmake distutils-r1 toolchain-funcs
+
+GTS_HASH="962155a01f5a1b87bd64e3e3d880b4dbc2347ac7"
+NIFTI_HASH="da476fd27f46098f37f5c9c4c1baee01e559572c"
+GIFTI_HASH="d3e873d8539d9b469daf7db04093da1d7e73d4f7"
+
+DESCRIPTION="Advanced Normalitazion Tools for neuroimaging"
+HOMEPAGE="http://stnava.github.io/ANTs/"
+SRC_URI="
+	https://github.com/afni/afni/archive/refs/tags/AFNI_${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/NIFTI-Imaging/nifti_clib/archive/${NIFTI_HASH}.tar.gz -> nifti-${NIFTI_HASH}.tar.gz
+	https://github.com/NIFTI-Imaging/gifti_clib/archive/${GIFTI_HASH}.tar.gz -> gifti-${GIFTI_HASH}.tar.gz
+	"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="test whirlgif"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libf2c
+	dev-libs/expat
+	dev-build/ninja
+	media-libs/freeglut
+	media-libs/glu
+	media-libs/netpbm
+	media-libs/qhull
+	media-video/mpeg-tools
+	sci-libs/gsl
+	sci-libs/gts
+	sys-devel/llvm:*
+	sys-libs/libomp
+	virtual/jpeg-compat:62
+	x11-libs/libGLw
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/motif[-static-libs]
+	"
+DEPEND="
+	${RDEPEND}
+	app-shells/tcsh
+	"
+
+S="${WORKDIR}/afni-AFNI_${PV}"
+
+src_prepare() {
+	tar xf "${DISTDIR}/nifti-${NIFTI_HASH}.tar.gz" || die
+	tar xf "${DISTDIR}/gifti-${GIFTI_HASH}.tar.gz" || die
+	cmake_src_prepare
+	default
+	}
+
+src_configure() {
+	if use !whirlgif; then
+		eapply "${FILESDIR}/${P}-whirlgif.patch"
+	fi
+	export CFLAGS="-pthread ${CFLAGS}"
+	export GIT_REPO_VERSION=3.0.1.1
+	local mycmakeargs=(
+		-DLIBDIR=/usr/$(get_libdir)
+		-DNIFTI_INSTALL_LIBRARY_DIR=/usr/$(get_libdir)
+		-DGIFTI_INSTALL_LIBRARY_DIR=/usr/$(get_libdir)
+		-DGIFTI_INSTALL_LIB_DIR=/usr/$(get_libdir)
+		-DAFNI_INSTALL_LIBRARY_DIR=/usr/$(get_libdir)
+		-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+		-DCOMP_COREBINARIES=ON
+		-DUSE_SYSTEM_NIFTI=OFF
+		-DUSE_SYSTEM_GIFTI=OFF
+		-DUSE_SYSTEM_XMHTML=OFF
+		-DUSE_SYSTEM_GTS=ON
+		-DFETCHCONTENT_SOURCE_DIR_NIFTI_CLIB="${WORKDIR}/nifti_clib-${NIFTI_HASH}"
+		-DFETCHCONTENT_SOURCE_DIR_GIFTI_CLIB="${WORKDIR}/gifti_clib-${GIFTI_HASH}"
+		-DCOMP_GUI=ON
+		-DCOMP_PLUGINS=ON
+		-DUSE_OMP=ON
+		-DCOMP_PYTHON=OFF
+		-DUSE_SYSTEM_F2C=ON
+	)
+	tc-export CC
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	pushd src/python_scripts
+		distutils-r1_src_compile
+	popd
+}
+
+src_install() {
+	cmake_src_install
+	pushd src/python_scripts
+		distutils-r1_src_install
+	popd
+	cd "${D}"
+	rm usr/bin/mpeg_encode
+}
diff --git a/sci-biology/afni/afni-24.0.08-r1.ebuild b/sci-biology/afni/afni-24.0.08-r1.ebuild
new file mode 100644
index 000000000..20293877f
--- /dev/null
+++ b/sci-biology/afni/afni-24.0.08-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit cmake distutils-r1 toolchain-funcs
+
+GTS_HASH="962155a01f5a1b87bd64e3e3d880b4dbc2347ac7"
+NIFTI_HASH="da476fd27f46098f37f5c9c4c1baee01e559572c"
+GIFTI_HASH="d3e873d8539d9b469daf7db04093da1d7e73d4f7"
+
+DESCRIPTION="Advanced Normalitazion Tools for neuroimaging"
+HOMEPAGE="http://stnava.github.io/ANTs/"
+SRC_URI="
+	https://github.com/afni/afni/archive/refs/tags/AFNI_${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/NIFTI-Imaging/nifti_clib/archive/${NIFTI_HASH}.tar.gz -> nifti-${NIFTI_HASH}.tar.gz
+	https://github.com/NIFTI-Imaging/gifti_clib/archive/${GIFTI_HASH}.tar.gz -> gifti-${GIFTI_HASH}.tar.gz
+	"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="test whirlgif"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libf2c
+	dev-libs/expat
+	dev-build/ninja
+	media-libs/freeglut
+	media-libs/glu
+	media-libs/netpbm
+	media-libs/qhull
+	media-video/mpeg-tools
+	sci-libs/gsl
+	sci-libs/gts
+	sys-devel/llvm:*
+	sys-libs/libomp
+	virtual/jpeg-compat:62
+	x11-libs/libGLw
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/motif[-static-libs]
+	"
+DEPEND="
+	${RDEPEND}
+	app-shells/tcsh
+	"
+# Prospectively:
+#Update jpeg-compat to virtual/jpeg:0
+# look for xmhtlm
+
+S="${WORKDIR}/afni-AFNI_${PV}"
+
+	#tar xf "${DISTDIR}/${GTS_HASH}.tar.gz" || die
+src_prepare() {
+	tar xf "${DISTDIR}/nifti-${NIFTI_HASH}.tar.gz" || die
+	tar xf "${DISTDIR}/gifti-${GIFTI_HASH}.tar.gz" || die
+	cmake_src_prepare
+	default
+	}
+
+src_configure() {
+	if use !whirlgif; then
+		eapply "${FILESDIR}/${PN}-24.0.04-whirlgif.patch"
+	fi
+	export CFLAGS="-pthread ${CFLAGS}"
+	export GIT_REPO_VERSION=3.0.1.1
+	local mycmakeargs=(
+		-DLIBDIR=/usr/$(get_libdir)
+		-DNIFTI_INSTALL_LIBRARY_DIR=/usr/$(get_libdir)
+		-DGIFTI_INSTALL_LIBRARY_DIR=/usr/$(get_libdir)
+		-DGIFTI_INSTALL_LIB_DIR=/usr/$(get_libdir)
+		-DAFNI_INSTALL_LIBRARY_DIR=/usr/$(get_libdir)
+		-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+		-DCOMP_COREBINARIES=ON
+		-DUSE_SYSTEM_NIFTI=OFF
+		-DUSE_SYSTEM_GIFTI=OFF
+		-DUSE_SYSTEM_XMHTML=OFF
+		-DUSE_SYSTEM_GTS=ON
+		-DFETCHCONTENT_SOURCE_DIR_NIFTI_CLIB="${WORKDIR}/nifti_clib-${NIFTI_HASH}"
+		-DFETCHCONTENT_SOURCE_DIR_GIFTI_CLIB="${WORKDIR}/gifti_clib-${GIFTI_HASH}"
+		-DCOMP_GUI=ON
+		-DCOMP_PLUGINS=ON
+		-DUSE_OMP=ON
+		-DCOMP_PYTHON=OFF
+		-DUSE_SYSTEM_F2C=ON
+	)
+	tc-export CC
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	pushd src/python_scripts
+		distutils-r1_src_compile
+	popd
+}
+
+src_install() {
+	cmake_src_install
+	pushd src/python_scripts
+		distutils-r1_src_install
+	popd
+	cd "${D}"
+	rm usr/bin/mpeg_encode
+}
diff --git a/sci-biology/afni/afni-9999.ebuild b/sci-biology/afni/afni-9999.ebuild
deleted file mode 100644
index c6e4c669b..000000000
--- a/sci-biology/afni/afni-9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 toolchain-funcs
-
-DESCRIPTION="An open-source environment for processing and displaying functional MRI data"
-HOMEPAGE="http://afni.nimh.nih.gov/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/AFNI/AFNI"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-libs/expat
-	media-libs/glu
-	media-libs/netpbm
-	media-libs/qhull
-	media-video/mpeg-tools
-	sci-libs/gsl
-	sys-devel/llvm:*
-	virtual/jpeg:0
-	x11-libs/libGLw
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXpm
-	x11-libs/motif[-static-libs]"
-
-# x11-libs/motif[static-libs] breaks the build.
-# See upstream discussion
-# http://afni.nimh.nih.gov/afni/community/board/read.php?1,85348,85348#msg-85348
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-S="${WORKDIR}/${P}/src"
-BUILD="linux_fedora_19_64"
-BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count mpeg_encode)
-
-src_prepare() {
-	find -type f -exec sed -i -e "s/-lXp //g" {} +
-	cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy Makefile"
-	sed -e "s~CC     = /usr/bin/gcc -O2 -m64~CC     = $(tc-getCC) \$(CFLAGS)~" \
-		-e "s~CCMIN  = /usr/bin/gcc -m64~CCMIN  = $(tc-getCC) \$(CFLAGS)~" \
-		-e "s~LD     = /usr/bin/gcc~LD     = $(tc-getCC)~" \
-		-e "s~AR     = /usr/bin/ar~AR     = $(tc-getAR)~" \
-		-e "s~RANLIB = /usr/bin/ranlib~RANLIB = $(tc-getRANLIB)~" \
-		-i Makefile || die "Could not edit Makefile"
-		# they provide somewhat problematic makefiles :(
-	sed -e "s~ifeq ($(CC),gcc)~ifeq (1,1)~"\
-		-i SUMA/SUMA_Makefile || die "Could not edit SUMA/SUMA_Makefile"
-		# upstream checks if $CC is EXACTLY gcc, else sets variables for Mac
-	find "${S}" -iname "*Makefile*" | xargs sed -e "s~/usr/~${EROOT}/usr/~g;" -i
-	eapply_user
-}
-
-src_compile() {
-	emake -j1 all plugins suma_exec
-}
-
-src_install() {
-	emake INSTALLDIR="${ED}/usr/bin" -j1 install install_plugins
-	emake INSTALLDIR="${ED}/usr/$(get_libdir)" -j1 install_lib
-	for CONFLICT in ${BIN_CONFLICTS[@]}; do
-		rm "${ED}/usr/bin/${CONFLICT}"
-	done
-}
diff --git a/sci-biology/afni/files/afni-20.1.16-python.patch b/sci-biology/afni/files/afni-20.1.16-python.patch
deleted file mode 100644
index 24ed98405..000000000
--- a/sci-biology/afni/files/afni-20.1.16-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/other_builds/Makefile.linux_fedora_19_64      2020-10-09 07:07:58.348874414 -0400
-+++ b/other_builds/Makefile.linux_fedora_19_64	2020-10-10 01:15:22.337755934 -0400
-@@ -11,8 +11,6 @@
-
- # ------------------------------
- # python from C
--IPYTHON  = -DSELENIUM_READY -I/usr/include/python2.7
--LDPYTHON = -lpython2.7
-
- # ----------------------------------------------------------------------
- # X configuration
diff --git a/sci-biology/afni/files/afni-20.3.03-python.patch b/sci-biology/afni/files/afni-20.3.03-python.patch
deleted file mode 100644
index 24ed98405..000000000
--- a/sci-biology/afni/files/afni-20.3.03-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/other_builds/Makefile.linux_fedora_19_64      2020-10-09 07:07:58.348874414 -0400
-+++ b/other_builds/Makefile.linux_fedora_19_64	2020-10-10 01:15:22.337755934 -0400
-@@ -11,8 +11,6 @@
-
- # ------------------------------
- # python from C
--IPYTHON  = -DSELENIUM_READY -I/usr/include/python2.7
--LDPYTHON = -lpython2.7
-
- # ----------------------------------------------------------------------
- # X configuration
diff --git a/sci-biology/afni/files/afni-24.0.04-whirlgif.patch b/sci-biology/afni/files/afni-24.0.04-whirlgif.patch
new file mode 100644
index 000000000..a357799e6
--- /dev/null
+++ b/sci-biology/afni/files/afni-24.0.04-whirlgif.patch
@@ -0,0 +1,39 @@
+diff --git a/packaging/installation_components.txt b/packaging/installation_components.txt
+index 127193338..ba8825a7b 100644
+--- a/packaging/installation_components.txt
++++ b/packaging/installation_components.txt
+@@ -347,7 +347,6 @@ uniq_images, corebinaries
+ unu, corebinaries
+ waver, corebinaries
+ whereami, corebinaries
+-whirlgif, corebinaries
+ 3dMax, tcsh
+ 3dPAR2AFNI.pl, tcsh
+ @1dDiffMag, tcsh
+diff --git a/src/CMakeLists_binaries.txt b/src/CMakeLists_binaries.txt
+index d53368390..8c8e9e1fb 100644
+--- a/src/CMakeLists_binaries.txt
++++ b/src/CMakeLists_binaries.txt
+@@ -209,7 +209,6 @@ foreach(
+   uniq_images
+   unu
+   whereami
+-  whirlgif
+ )
+
+   add_afni_executable(${target} ${target}.c)
+diff --git a/src/Makefile.INCLUDE b/src/Makefile.INCLUDE
+index f44103def..7ac08a87d 100644
+--- a/src/Makefile.INCLUDE
++++ b/src/Makefile.INCLUDE
+@@ -3495,11 +3495,6 @@ help_format:help_format.o
+ ibinom:ibinom.o
+ 	$(CC) -o ibinom ibinom.o $(LFLAGS) $(LLIBS)
+
+-## GIF animation
+-
+-whirlgif:whirlgif.h whirlgif.c
+-	$(CC) -o whirlgif whirlgif.c $(INFLAGS) $(LFLAGS) $(LLIBS)
+-
+ extor.o:extor.c
+ 	$(CCFAST) -c extor.c $(INFLAGS)
diff --git a/sci-biology/afni/metadata.xml b/sci-biology/afni/metadata.xml
index acf637dca..39ec69d08 100644
--- a/sci-biology/afni/metadata.xml
+++ b/sci-biology/afni/metadata.xml
@@ -13,4 +13,10 @@
 		Analysis of Functional NeuroImages (AFNI) is an open-source environment for processing and displaying 
 		functional MRI data—a technique for mapping human brain activity.
 	</longdescription>
+	<use>
+		<flag name="whirlgif">Build optional whirlgif binary</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">afni/afni</remote-id>
+	</upstream>
 </pkgmetadata>