commit: 7c2d62f11603cc64279a72f03d2b7b18d61b9de0
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 15:34:00 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 15:34:00 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c2d62f1
sci-biology/afni: bump to version 22.0.03
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-biology/afni/afni-19.3.12.ebuild | 72 --------------------
sci-biology/afni/afni-20.3.03.ebuild | 77 ----------------------
.../{afni-20.1.16.ebuild => afni-22.0.03.ebuild} | 24 +++----
sci-biology/afni/afni-9999.ebuild | 70 --------------------
sci-biology/afni/files/afni-20.1.16-python.patch | 11 ----
sci-biology/afni/files/afni-20.3.03-python.patch | 11 ----
6 files changed, 10 insertions(+), 255 deletions(-)
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.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-20.1.16.ebuild
b/sci-biology/afni/afni-22.0.03.ebuild
similarity index 72%
rename from sci-biology/afni/afni-20.1.16.ebuild
rename to sci-biology/afni/afni-22.0.03.ebuild
index e2ed432c8..920bf7189 100644
--- a/sci-biology/afni/afni-20.1.16.ebuild
+++ b/sci-biology/afni/afni-22.0.03.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
@@ -26,22 +26,18 @@ RDEPEND="dev-libs/expat
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
+ x11-libs/motif
+"
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)
+BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count)
src_prepare() {
- eapply "${FILESDIR}/${P}-python.patch" || die
- find -type f -exec sed -i -e "s/-lXp //g" {} +
+ find -type f -exec sed -i -e "s/-lXp //g" {} + || die
cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy
Makefile"
# Unbundle imcat
sed -e "s/ imcat / /g" \
@@ -53,10 +49,10 @@ src_prepare() {
-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)~"\
+ 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
+ find "${S}" -iname "*Makefile*" | xargs sed -e
"s~/usr/~${EPREFIX}/usr/~g;" -i || die
default
}
@@ -65,9 +61,9 @@ src_compile() {
}
src_install() {
- emake INSTALLDIR="${ED}/usr/bin" -j1 install install_plugins
+ emake INSTALLDIR="${ED}/usr/bin" install install_plugins
emake INSTALLDIR="${ED}/usr/$(get_libdir)" install_lib
for CONFLICT in ${BIN_CONFLICTS[@]}; do
- rm "${ED}/usr/bin/${CONFLICT}"
+ rm "${ED}/usr/bin/${CONFLICT}" || die
done
}
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
