sci-libs/itk: revbump fixing module build and deps

Signed-off-by: Horea Christian <chr@chymera.eu>

2 files changed, 33 insertions, 17 deletions

diff --git a/sci-libs/itk/Manifest b/sci-libs/itk/Manifest
index f4547e7a7..87328da27 100644
--- a/sci-libs/itk/Manifest
+++ b/sci-libs/itk/Manifest
@@ -1,6 +1,6 @@
 DIST ITKAdaptiveDenoising-5.2.1.tar.gz 757851 BLAKE2B 3d94e1db6d2524adf7491e6e24308618b7b69e54184cbfe29a7084b55b8a337228a308233e0f0ab2cef04df9c8f42010a758e0071efdfd4905c28ca6399bfdfd SHA512 7e9c5a6681cd9777b33f11d1a1a5f6d8b1b6f7d2ec2d4d829398c78045b53b247bddea99e4a5450ba8d6666a31b5216ef6e07a2c874c5723af072e0d3c8cf9f4
 DIST ITKAdaptiveDenoising-5.3.0.tar.gz 757851 BLAKE2B 3d94e1db6d2524adf7491e6e24308618b7b69e54184cbfe29a7084b55b8a337228a308233e0f0ab2cef04df9c8f42010a758e0071efdfd4905c28ca6399bfdfd SHA512 7e9c5a6681cd9777b33f11d1a1a5f6d8b1b6f7d2ec2d4d829398c78045b53b247bddea99e4a5450ba8d6666a31b5216ef6e07a2c874c5723af072e0d3c8cf9f4
-DIST ITKGenericLabelInterpolator-1.2.0 137697 BLAKE2B f7bb877654e852f56f8eb1086f988ec3b71106b6528d5cf03734a3c3eb4ce5ac875b52081e0a1339ac237e1616b0516b8cc8efb4429ec0e5ef64ac5461a40836 SHA512 bc1fcd3c13cb182420bb4a5d2c9c789553f8b7b581fd7d0b7d687331e22c90d30efdd338bfbc22dfb8c97d3ab7209f761425c4d12755655d86d81ffb231d881c
+DIST ITKGenericLabelInterpolator-1.2.0.tar.gz 137697 BLAKE2B f7bb877654e852f56f8eb1086f988ec3b71106b6528d5cf03734a3c3eb4ce5ac875b52081e0a1339ac237e1616b0516b8cc8efb4429ec0e5ef64ac5461a40836 SHA512 bc1fcd3c13cb182420bb4a5d2c9c789553f8b7b581fd7d0b7d687331e22c90d30efdd338bfbc22dfb8c97d3ab7209f761425c4d12755655d86d81ffb231d881c
 DIST ITKGenericLabelInterpolator-5.2.1.tar.gz 140427 BLAKE2B b19703872926516d9d07acd4078d343e02f00a162d2cb8b6787d6210223be375a059e767cf9c32dd234e77ff51d1af5e08d9a9844c34e23a531938c7d3ded4a9 SHA512 69e53b281cd3f7c136ad9e7ded2c362e0d9e22dc2bd595f42abcefe2cf9ec4fa0f44192efc3d328290be4adaee1ebd74be3035b18147081cc8b8479a333cdea6
 DIST InsightData-5.2.1.tar.gz 293448802 BLAKE2B fd2bb012c0d96243d3543993a87e73c43be0626b0478959e36633f22c7e8d48a46d0f4d18fa3a8d952d4a705ca20594d92c07044000b8e1bc65390ce981af3e7 SHA512 93eae6bdf62ce29ea6dfb1dddedffe4046400a86074dd4d47e3ddcd7ff9ab10031363275cb7f9741add7c02343f1f3e6a41b0ec6533531f4a3a42607c51aa704
 DIST InsightData-5.3.0.tar.gz 366826437 BLAKE2B ae3cbb3f7a51d6b86717a073c0eb55c528baeff240f44413c25ce11319a7e0ef9ff073d1cb94d2d15d104687fe5b8e95d0d4286832dbb02993da8fe706fecb28 SHA512 3caf7d1d64543312d668ef1a6b8c879161a37deee5c980fbfeb14e299a296a2825ae48463bff915f50c98ec0ccdbef3e1aff7c4f52604a93c6028951f90a4757
diff --git a/sci-libs/itk/itk-5.3.0.ebuild b/sci-libs/itk/itk-5.3.0-r1.ebuild
index 54b7c89b3..23f3341a2 100644
--- a/sci-libs/itk/itk-5.3.0.ebuild
+++ b/sci-libs/itk/itk-5.3.0-r1.ebuild
@@ -8,8 +8,6 @@ VIRTUALX_REQUIRED="manual"
 
 inherit cmake python-single-r1 virtualx
 
-# rsync: [sender] link_stat "/distfiles/1c/itk-test-bcdbb347f3704262d1f00be7179d6a0a6e68aed56c0653e8072ee5a94985c713bd229c935b1226a658af84fb7f1fffc2458c98364fc35303a2303b12f9f7ce2f" (in gentoo) failed: No such file or directory (2)
-
 MY_PN="InsightToolkit"
 MY_P="${MY_PN}-${PV}"
 GLI_V="1.2.0"
@@ -29,7 +27,7 @@ DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
 HOMEPAGE="https://itk.org"
 SRC_URI="
 	https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/${MY_P}.tar.gz
-	https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/refs/tags/v${GLI_V}.tar.gz -> ITKGenericLabelInterpolator-${GLI_V}
+	https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/refs/tags/v${GLI_V}.tar.gz -> ITKGenericLabelInterpolator-${GLI_V}.tar.gz
 	https://github.com/ntustison/ITKAdaptiveDenoising/archive/${IAD_HASH}.tar.gz -> ITKAdaptiveDenoising-${PV}.tar.gz
 	test? (
 		https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/InsightData-${PV}.tar.gz
@@ -50,15 +48,16 @@ RDEPEND="
 	dev-cpp/eigen:3
 	dev-libs/double-conversion:0=
 	dev-libs/expat:0=
-	media-libs/openjpeg:2
+	dev-libs/icu:0=
+	media-libs/libjpeg-turbo:0=
 	media-libs/libpng:0=
+	media-libs/openjpeg:2
 	media-libs/tiff:0=[jpeg]
 	sci-libs/dcmtk:0=
-	sci-libs/hdf5:0=[cxx]
 	sci-libs/gdcm:0=
-	sys-libs/zlib:0=
-	media-libs/libjpeg-turbo:0=
-	fftw? ( sci-libs/fftw:3.0= )
+	sci-libs/hdf5:0=[cxx]
+	sys-libs/zlib-ng
+	fftw? ( sci-libs/fftw:3.0=[threads] )
 	vtkglue? (
 		sci-libs/vtk:0=[rendering]
 		python? (
@@ -67,6 +66,13 @@ RDEPEND="
 	)
 	python? ( ${PYTHON_DEPS} )
 "
+# Might also need:
+# dev-libs/kwsys::guru
+# kwiml
+# minc
+# metaio
+# niftilib
+# sci-lib/vxl::science
 DEPEND="${RDEPEND}
 	sys-apps/coreutils
 	python? (
@@ -117,6 +123,7 @@ src_prepare() {
 		OpenJPEG/src/openjpeg
 		PNG/src/itkpng
 		TIFF/src/itktiff
+		ZLIB/src/itkzlib-ng
 	)
 	local x
 	for x in "${DROPS[@]}"; do
@@ -130,7 +137,7 @@ src_prepare() {
 	} | sort | uniq -u | xargs -n 1 ewarn "Using bundled" || die
 
 	# Remote modules
-	ln -sr "../ITKGenericLabelInterpolator-${GLI_HASH}" Modules/External/ITKGenericLabelInterpolator || die
+	ln -sr "../ITKGenericLabelInterpolator-${GLI_V}" Modules/External/ITKGenericLabelInterpolator || die
 	ln -sr "../ITKAdaptiveDenoising-${IAD_HASH}" Modules/External/ITKAdaptiveDenoising || die
 
 	cmake_src_prepare
@@ -158,6 +165,7 @@ src_configure() {
 		-DITK_FORBID_DOWNLOADS:BOOL=ON
 		-DITK_INSTALL_LIBRARY_DIR=$(get_libdir)
 		-DITK_USE_REVIEW="$(usex review ON OFF)"
+		-DITK_USE_SYSTEM_ICU=ON
 		-DITK_USE_SYSTEM_DCMTK=ON
 		-DITK_USE_SYSTEM_DOUBLECONVERSION=ON
 		-DITK_USE_SYSTEM_CASTXML=ON
@@ -183,14 +191,24 @@ src_configure() {
 	)
 	if use fftw; then
 		mycmakeargs+=(
-			-DUSE_FFTWD=ON
-			-DUSE_FFTWF=ON
-			-DUSE_SYSTEM_FFTW=ON
+			-DITK_USE_FFTWD:BOOL=ON
+			-DITK_USE_FFTWF:BOOL=ON
+			-DITK_USE_SYSTEM_FFTW:BOOL=ON
 			-DITK_WRAP_double=ON
 			-DITK_WRAP_vector_double=ON
 			-DITK_WRAP_covariant_vector_double=ON
 			-DITK_WRAP_complex_double=ON
 		)
+	else
+		mycmakeargs+=(
+			-DITK_USE_FFTWD:BOOL=OFF
+			-DITK_USE_FFTWF:BOOL=OFF
+			-DITK_USE_SYSTEM_FFTW:BOOL=OFF
+			-DITK_WRAP_double=OFF
+			-DITK_WRAP_vector_double=OFF
+			-DITK_WRAP_covariant_vector_double=OFF
+			-DITK_WRAP_complex_double=OFF
+		)
 	fi
 	if use vtkglue; then
 		mycmakeargs+=(
@@ -241,11 +259,9 @@ src_install() {
 }
 
 src_test() {
-	# Failing tests reported upstream:
-	# https://github.com/ntustison/ITKAdaptiveDenoising/issues/13
 	if use vtkglue; then
-		virtx cmake_src_test -E "(AdaptiveNonLocalMeansDenoisingImageFilterTest1|AdaptiveNonLocalMeansDenoisingImageFilterTest2)"
+		virtx cmake_src_test
 	else
-		cmake_src_test -E "(AdaptiveNonLocalMeansDenoisingImageFilterTest1|AdaptiveNonLocalMeansDenoisingImageFilterTest2)"
+		cmake_src_test
 	fi
 }