7 files changed, 21 insertions, 238 deletions
diff --git a/sci-biology/ants/Manifest b/sci-biology/ants/Manifest
index 867a142eb..ef2d97caf 100644
--- a/sci-biology/ants/Manifest
+++ b/sci-biology/ants/Manifest
@@ -1,2 +1,2 @@
-DIST ants-2.3.4.tar.gz 2455843 BLAKE2B c00a2d3edebc0a121fa3b6618982c64fd986db9ea6aed1a1b2c7ced2f77ab154837a47e5bcb01f432b937160de2248b30a2bb7b526952852946e686858334e12 SHA512 084161505671a19530bec40c8209a67510d7de6e9d5afd151b806755ca703dadbea17c0a8d5c6472c7a81185821e17213ebf1488bc0325bfe858af783e8e6575
-DIST ants_testdata-2.3.4.tar.xz 25056552 BLAKE2B 6478ffe0c98fd3700a6de201f1271339276b45b461b02d4753acdcd1335c83196aa2ed89a89b5b4b0b3df33026f77b231ba1418c9eb7a2380356d4e224f9b310 SHA512 a266fbf2de0003ee689a9369c424c97c92cdf7e4d08ba713623948276d96c9f0f02ab14480c329f462db0059217138680bfe39654f9ec4ac99bf947f51da853d
+DIST ants-2.4.3.tar.gz 2474986 BLAKE2B 56a057673ff65e7ed3037ee34cea481e960122f32d2fd04b347644126793a2ba0a9249823b45e360abf2019136659b3ba4a24e49677458d69cc0b614266faca1 SHA512 50b42e30bec9077a00450253a39a8296ca841a3b3511f623a759071e6fbda9b6ab480b4f26566c621dc85107913f2782f2a1c4ecdeaa8361dc132209a432c544
+DIST ants_testdata-2.4.3.tar.xz 25058064 BLAKE2B ca3bb9998d7ded8fc9821a341a3a5b847a40fe93cccbc61458b5a6f9bab102a14fa297aad2425a5602b70c51e756edab2609213b01e06f7dc63eca2e67846351 SHA512 2689bdf1cb6bc4e608511efab574c8a0a5de839a376e9af91e277bae352744fa58463258ea604ea73041b7b596a3ab3a36e0f5a28c098ee5e7a1a9f8b8873779
diff --git a/sci-biology/ants/ants-2.3.4.ebuild b/sci-biology/ants/ants-2.4.3.ebuild
index a457397a9..2dfa2a56d 100644
--- a/sci-biology/ants/ants-2.3.4.ebuild
+++ b/sci-biology/ants/ants-2.4.3.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake multilib
+inherit cmake
 
 MY_PN="ANTs"
 
 DESCRIPTION="Advanced Normalitazion Tools for neuroimaging"
-HOMEPAGE="http://stnava.github.io/ANTs/"
+HOMEPAGE="https://stnava.github.io/ANTs/"
 SRC_URI="
 	https://github.com/ANTsX/ANTs/archive/v${PV}.tar.gz ->  ${P}.tar.gz
 	test? (
-		http://chymera.eu/distfiles/ants_testdata-${PV}.tar.xz
+		https://resources.chymera.eu/distfiles/ants_testdata-${PV}.tar.xz
 	)
 "
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 SLOT="0"
 LICENSE="BSD"
@@ -25,49 +25,40 @@ IUSE="test vtk"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	!vtk? ( =sci-libs/itk-5.3*[fftw,-vtkglue] )
 	vtk? (
-		~sci-libs/itk-5.1.0[vtkglue]
-		sci-libs/vtk
+		=sci-libs/itk-5.3*[fftw,vtkglue]
+		=sci-libs/vtk-9.2*
 	)
-	!vtk? (	~sci-libs/itk-5.1.0 )
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-version.patch"
-	"${FILESDIR}/${P}-libdir.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_unpack() {
 	default
 	if use test; then
-		mkdir -p "${S}/.ExternalData/MD5" || die "Could not create test data directory."
-		tar xvf "${DISTDIR}/ants_testdata-${PV}.tar.xz" -C "${S}/.ExternalData/MD5/" > /dev/null || die "Could not unpack test data."
+	    mkdir -p "${S}/.ExternalData/SHA512" || die "Could not create test data directory."
+	    tar xvf "${DISTDIR}/ants_testdata-${PV}.tar.xz" -C "${S}/.ExternalData/SHA512/" > /dev/null || die "Could not unpack test data."
 	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
 		-DUSE_SYSTEM_ITK=ON
-		-DITK_DIR="${EPREFIX}/usr/include/ITK-5.1/"
+		-DITK_USE_SYSTEM_FFTW=ON
+		-DITK_DIR="${EPREFIX}/usr/include/ITK-5.3/"
 		-DBUILD_TESTING="$(usex test ON OFF)"
 		-DUSE_VTK=$(usex vtk ON OFF)
 		-DUSE_SYSTEM_VTK=$(usex vtk ON OFF)
-		-DANTS_SNAPSHOT_VERSION:STRING=${PV}
 	)
 	use vtk && mycmakeargs+=(
-		-DVTK_DIR="${EPREFIX}/usr/include/vtk-8.1/"
-	)
-	use test && mycmakeargs+=(
-		-DExternalData_OBJECT_STORES="${S}/.ExternalData/MD5"
+		-DVTK_DIR="${EPREFIX}/usr/include/vtk-9.2/"
 	)
 	cmake_src_configure
 }
 
 src_install() {
-	BUILD_DIR="${WORKDIR}/${P}_build/ANTS-build"
+	BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build/ANTS-build"
 	cmake_src_install
 	cd "${S}/Scripts" || die "scripts dir not found"
 	dobin *.sh
diff --git a/sci-biology/ants/files/ants-2.3.1_p20191013-logic.patch b/sci-biology/ants/files/ants-2.3.1_p20191013-logic.patch
deleted file mode 100644
index 932da9954..000000000
--- a/sci-biology/ants/files/ants-2.3.1_p20191013-logic.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b2c828ff8e5ce537d7096af04b086e965fede9e8 Mon Sep 17 00:00:00 2001
-From: "Gabriel A. Devenyi" <gdevenyi@gmail.com>
-Date: Mon, 7 Oct 2019 22:01:51 -0400
-Subject: [PATCH] Fix install logic
-
----
- ANTS.cmake       | 3 ++-
- SuperBuild.cmake | 2 ++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/ANTS.cmake b/ANTS.cmake
-index a1baf845..95ffdc74 100644
---- a/ANTS.cmake
-+++ b/ANTS.cmake
-@@ -172,7 +172,8 @@ install(PROGRAMS Scripts/ANTSpexec.sh
-                 COMPONENT SCRIPTS
-         )
- 
--if(BUILD_SHARED_LIBS AND NOT (USE_SYSTEM_ITK AND USE_SYSTEM_VTK))
-+#Only install ITK/VTK libraries if shared build and superbuild is used
-+if(BUILD_SHARED_LIBS AND ((NOT USE_SYSTEM_ITK) OR ((NOT USE_SYSTEM_VTK) AND USE_VTK)))
-   install(DIRECTORY ${CMAKE_BINARY_DIR}/../staging/lib/
-           DESTINATION lib)
- endif()
-diff --git a/SuperBuild.cmake b/SuperBuild.cmake
-index f4630e64..32b930c2 100644
---- a/SuperBuild.cmake
-+++ b/SuperBuild.cmake
-@@ -207,6 +207,8 @@ list(APPEND ${CMAKE_PROJECT_NAME}_SUPERBUILD_EP_VARS
-   CMAKE_C_COMPILER_LAUNCHER:STRING
-   CMAKE_CXX_COMPILER_LAUNCHER:STRING
-   CMAKE_CUDA_COMPILER_LAUNCHER:STRING
-+  USE_SYSTEM_ITK:BOOL
-+  USE_SYSTEM_VTK:BOOL
-   )
- 
- _expand_external_project_vars()
diff --git a/sci-biology/ants/files/ants-2.3.1_p20191013-paths.patch b/sci-biology/ants/files/ants-2.3.1_p20191013-paths.patch
deleted file mode 100644
index aaea92808..000000000
--- a/sci-biology/ants/files/ants-2.3.1_p20191013-paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
---- a/Examples/CMakeLists.txt
-+++ b/Examples/CMakeLists.txt
-@@ -16,8 +16,9 @@
-+include(GNUInstallDirs)
- install(TARGETS antsUtilities
--    RUNTIME DESTINATION bin
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     COMPONENT RUNTIME_antsUtilities
--    LIBRARY DESTINATION lib
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT RUNTIME_antsUtilities
--    ARCHIVE DESTINATION lib
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT DEVELOPMENT_antsUtilities
-   )
-@@ -38,8 +38,8 @@
-   install(TARGETS l_${ANTS_FUNCTION_NAME} ${ANTS_FUNCTION_NAME}
--    RUNTIME DESTINATION bin
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--    LIBRARY DESTINATION lib
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--    ARCHIVE DESTINATION lib
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME}
-   )
-@@ -61,8 +61,8 @@
-   install(TARGETS l_${ANTS_FUNCTION_NAME} ${ANTS_FUNCTION_NAME}
--    RUNTIME DESTINATION bin
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--    LIBRARY DESTINATION lib
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--    ARCHIVE DESTINATION lib
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME}
-   )
diff --git a/sci-biology/ants/files/ants-2.3.4-libdir.patch b/sci-biology/ants/files/ants-2.3.4-libdir.patch
deleted file mode 100644
index b593c2778..000000000
--- a/sci-biology/ants/files/ants-2.3.4-libdir.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 329a7be631b33294d9cf3d58e8cdeb62e0aa993c Mon Sep 17 00:00:00 2001
-From: Philip A Cook <cookpa@pennmedicine.upenn.edu>
-Date: Fri, 26 Jun 2020 18:23:08 +0000
-Subject: [PATCH] ENH: Use GNUInstallDirs CMake module
-
-Trying to enable installation to the correct lib dir for each platform
----
- Common.cmake            |  7 +++++--
- Examples/CMakeLists.txt | 32 ++++++++++++++++----------------
- 2 files changed, 21 insertions(+), 18 deletions(-)
-
-diff --git a/Common.cmake b/Common.cmake
-index 5e52d7f1..1e604113 100644
---- a/Common.cmake
-+++ b/Common.cmake
-@@ -103,8 +103,6 @@ if(PLATFORM_CHECK)
-   endif()
- endif()
- 
--
--
- #-------------------------------------------------------------------------
- # Augment compiler flags
- #-------------------------------------------------------------------------
-@@ -124,3 +122,8 @@ if(NOT CMAKE_POSITION_INDEPENDENT_CODE)
-   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- endif()
- endif()
-+
-+#-------------------------------------------------------------------------
-+# Define install dirs for different platforms
-+#-------------------------------------------------------------------------
-+include(GNUInstallDirs)
-diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
-index 61781f56..cb352748 100644
---- a/Examples/CMakeLists.txt
-+++ b/Examples/CMakeLists.txt
-@@ -1,4 +1,4 @@
--SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- ## Note that the antsUtilities can always be built static.  It will then be linked
- ## Directly into the other libraries.
- add_library(antsUtilities antsUtilities.cxx
-@@ -14,11 +14,11 @@ add_library(antsUtilities antsUtilities.cxx
-             )
- target_link_libraries(antsUtilities ${ITK_LIBRARIES} )
- install(TARGETS antsUtilities
--    RUNTIME DESTINATION bin
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     COMPONENT RUNTIME_antsUtilities
--    LIBRARY DESTINATION lib
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT RUNTIME_antsUtilities
--    ARCHIVE DESTINATION lib
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT DEVELOPMENT_antsUtilities
-   )
- 
-@@ -34,22 +34,22 @@ macro(STATIC_ANTS_BUILD ANTS_FUNCTION_NAME EXTRA_LIBS)
- 
-   if (ANTS_INSTALL_LIBS_ONLY)
-     install(TARGETS l_${ANTS_FUNCTION_NAME}
-- #    RUNTIME DESTINATION bin
-+ #    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  #    COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--      LIBRARY DESTINATION lib
-+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--      ARCHIVE DESTINATION lib
-+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME}
-     )
-   else()
-     add_executable( ${ANTS_FUNCTION_NAME} cli_${ANTS_FUNCTION_NAME}.cxx )
-     target_link_libraries( ${ANTS_FUNCTION_NAME} l_${ANTS_FUNCTION_NAME} )
-     install(TARGETS l_${ANTS_FUNCTION_NAME} ${ANTS_FUNCTION_NAME}
--      RUNTIME DESTINATION bin
-+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-       COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--      LIBRARY DESTINATION lib
-+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--      ARCHIVE DESTINATION lib
-+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME}
-     )
-   endif()
-@@ -68,11 +68,11 @@ macro(DYNAMIC_ANTS_BUILD ANTS_FUNCTION_NAME EXTRA_LIBS)
- 
-   if (ANTS_INSTALL_LIBS_ONLY)
-     install(TARGETS l_${ANTS_FUNCTION_NAME}
--  #   RUNTIME DESTINATION bin
-+  #   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-   #   COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--      LIBRARY DESTINATION lib
-+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--      ARCHIVE DESTINATION lib
-+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME}
-   )
-   else()
-@@ -80,11 +80,11 @@ macro(DYNAMIC_ANTS_BUILD ANTS_FUNCTION_NAME EXTRA_LIBS)
-     target_link_libraries( ${ANTS_FUNCTION_NAME} l_${ANTS_FUNCTION_NAME} )
- 
-     install(TARGETS l_${ANTS_FUNCTION_NAME} ${ANTS_FUNCTION_NAME}
--      RUNTIME DESTINATION bin
-+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-       COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--      LIBRARY DESTINATION lib
-+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       COMPONENT RUNTIME_${ANTS_FUNCTION_NAME}
--      ARCHIVE DESTINATION lib
-+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       COMPONENT DEVELOPMENT_${ANTS_FUNCTION_NAME}
-     )
-   endif()
diff --git a/sci-biology/ants/files/ants-2.3.4-version.patch b/sci-biology/ants/files/ants-2.3.4-version.patch
deleted file mode 100644
index 487151d69..000000000
--- a/sci-biology/ants/files/ants-2.3.4-version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/ANTS.cmake	2020-06-08 12:11:14.000000000 -0400
-+++ b/ANTS.cmake	2020-08-03 16:44:00.826633506 -0400
-@@ -37,7 +37,6 @@
-   set(${PROJECT_NAME}_VERSION_MAJOR 0)
-   set(${PROJECT_NAME}_VERSION_MINOR 0)
-   set(${PROJECT_NAME}_VERSION_PATCH 0)
--  set(${PROJECT_NAME}_VERSION_TWEAK 0)
-   set(${PROJECT_NAME}_VERSION "snapshot-${ANTS_SNAPSHOT_VERSION}")
- endif()
-
-@@ -46,7 +45,6 @@
-   set(${PROJECT_NAME}_VERSION_MAJOR 0)
-   set(${PROJECT_NAME}_VERSION_MINOR 0)
-   set(${PROJECT_NAME}_VERSION_PATCH 0)
--  set(${PROJECT_NAME}_VERSION_TWEAK 0)
-   set(${PROJECT_NAME}_VERSION "0.0.0.0")
- endif()
diff --git a/sci-biology/ants/metadata.xml b/sci-biology/ants/metadata.xml
index 9f969ddf9..e8372d21b 100644
--- a/sci-biology/ants/metadata.xml
+++ b/sci-biology/ants/metadata.xml
@@ -21,4 +21,7 @@
 	<use>
 		<flag name="vtk">Optional support for a number of surface enabled tools (via sci-libs/vtk).</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ANTsX/ANTs</remote-id>
+	</upstream>
 </pkgmetadata>