diff --git a/sci-libs/itk/ChangeLog b/sci-libs/itk/ChangeLog index 3421c83..d03eaca 100644 --- a/sci-libs/itk/ChangeLog +++ b/sci-libs/itk/ChangeLog @@ -1,3 +1,6 @@ + 19 Sep 2020; itk-5.1.0.ebuild: + sci-libs/itk: fetching test files + 08 Aug 2020; files/itk-5.1.0-downloads.patch: sci-libs/itk: better syntax for warning diff --git a/sci-libs/itk/Manifest b/sci-libs/itk/Manifest index 30580bd..a7614d8 100644 --- a/sci-libs/itk/Manifest +++ b/sci-libs/itk/Manifest @@ -1,3 +1,6 @@ +DIST 0eb202e23ae81be123b1b26cf31a9ba743824700.tar.gz 2409232372 SHA256 bac8365cb56a6c5f68e565445e00012f31453b06e8f7879bc7c3238796a67948 SHA512 8b451608cb3f75d3ba6a78fd23e79495948c2792a98d831e0f0c93745595df84d3c2a8d76389976f67ac7e7e1f5a44a18d201e51d2ee659cdb708ae28536df8f WHIRLPOOL 4c9f65bb51a0714a24db6c1e739fff32b454e0289135cd190146df0fd6dece736ff348d9aeae388dff8ce9ccc9010c979f1a6051065f92bbb0bc98c8628aab4e DIST ITKGenericLabelInterpolator-5.1.0.zip 161970 SHA256 8c6cda6d4d8bac95347576b35355cc7a0fe127396b2c96fb8688b413045ff704 SHA512 26304168d2dc6f825ba085912c50a179e101da281b3d646109250c5ac9d12f2ad2216f967a81fb12d54ebd55ff7b17a355658282d7c65efb16dafb311fb3fc2c WHIRLPOOL d183ea141b212fa2247f595155836710cee5c05049caa0c67326a9ebb9eaf16f192464580ac616ab5970242704a797afb5fda9ecd79a19f3e41b2556c42bdd8d DIST InsightData-5.1.0.tar.gz 292322103 SHA256 777f587c587b47d76157a0ee87a5942b944742f334b801abe0e6dc1ad1d8424f SHA512 458c2959ba5e0745eee23e16ff7178230a7bae94d7dff065b3b38136e238becff96554693e3b2149d2307949c23a6c695c92676f8d44e6f7305dbb8bed48c9fa WHIRLPOOL d5785f862c627cabc97c469ac9fb84d1493e1827fd993c68ed5019e7062adc7fe68efe6ab2471c7c6b2a9d542cbfdb1a00c6633fa7be498cbc9e09fa12d3710a DIST InsightToolkit-5.1.0.tar.gz 20694338 SHA256 121020a1611508cec8123eb5226215598cec07be627d843a2e6b6da891e61d13 SHA512 413b6ef549b59d8f507038130446ccb704794c6d0980d8ab631d1b1051cb91f399e77c26b69fab6a1e9b9bb4cc233d49996c3ee735cd4de065993d4379b4ed4c WHIRLPOOL bbe7368cc46dc1a0869d8ab47218d0777e689be17114048653a537fbe792dfc0eb0e687b06fa894218cc35ef95143df75a46c17ffd6b072233e9f72a3c811825 +DIST a5e11ea71164ff78c65fcf259db01ea5db981a9d868e60045ff2bffca92984df1174bf984a1076e450f0d5d69b4f0191ed1a61465c220e2c91a893b5df150c0a 214819 SHA256 6b62bd25168bebf9a3bc14403952c2bf326f787a055a757bced6d2d76b459706 SHA512 a5e11ea71164ff78c65fcf259db01ea5db981a9d868e60045ff2bffca92984df1174bf984a1076e450f0d5d69b4f0191ed1a61465c220e2c91a893b5df150c0a WHIRLPOOL 0e97d37fff5e205d5784be8f44209f22218c31723a6461eed6dd2497cc6345c98cf41e20a9c650b8c990735ef45e533cc979d0054a37a201191cab8bdaabcb05 +DIST bcdbb347f3704262d1f00be7179d6a0a6e68aed56c0653e8072ee5a94985c713bd229c935b1226a658af84fb7f1fffc2458c98364fc35303a2303b12f9f7ce2f 215417 SHA256 aa1e713ed84c9a45337df1e2754c6f5a073e1b74ee33b38d59d3f8e449928378 SHA512 bcdbb347f3704262d1f00be7179d6a0a6e68aed56c0653e8072ee5a94985c713bd229c935b1226a658af84fb7f1fffc2458c98364fc35303a2303b12f9f7ce2f WHIRLPOOL 6ec2cf4178fa52242fb323100e0ec69046bf6bc304cf4b6f8899ccfc8267b790a4133565e7677a73ce7dc1852cdeee7e0b42f7e99c20ec1615bd9089b2613582 diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild index e91046b..e137326 100644 --- a/sci-libs/itk/itk-5.1.0.ebuild +++ b/sci-libs/itk/itk-5.1.0.ebuild @@ -10,7 +10,13 @@ inherit toolchain-funcs cmake python-single-r1 MY_PN="InsightToolkit" MY_P="${MY_PN}-${PV}" GLI_HASH="a02cbeaf28cb3d28ac66b9ac651073530eb6ab78" -GLI_TEST_HASH="57b5d5de8d777f10f269445a" +TEST_HASH="0eb202e23ae81be123b1b26cf31a9ba743824700" +#declare -a GIT_TEST_HASHES=( +# "a5e11ea71164ff78c65fcf259db01ea5db981a9d868e60045ff2bffca92984df1174bf984a1076e450f0d5d69b4f0191ed1a61465c220e2c91a893b5df150c0a" +# "bcdbb347f3704262d1f00be7179d6a0a6e68aed56c0653e8072ee5a94985c713bd229c935b1226a658af84fb7f1fffc2458c98364fc35303a2303b12f9f7ce2f" +#) +GLI_TEST_HASH1="a5e11ea71164ff78c65fcf259db01ea5db981a9d868e60045ff2bffca92984df1174bf984a1076e450f0d5d69b4f0191ed1a61465c220e2c91a893b5df150c0a" +GLI_TEST_HASH2="bcdbb347f3704262d1f00be7179d6a0a6e68aed56c0653e8072ee5a94985c713bd229c935b1226a658af84fb7f1fffc2458c98364fc35303a2303b12f9f7ce2f" DESCRIPTION="NLM Insight Segmentation and Registration Toolkit" HOMEPAGE="http://www.itk.org" @@ -19,6 +25,9 @@ SRC_URI=" https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.zip -> ITKGenericLabelInterpolator-${PV}.zip test? ( https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/InsightData-${PV}.tar.gz + https://github.com/InsightSoftwareConsortium/ITKTestingData/archive/${TEST_HASH}.tar.gz + https://data.kitware.com/api/v1/file/hashsum/sha512/${GLI_TEST_HASH1}/download -> ${GLI_TEST_HASH1} + https://data.kitware.com/api/v1/file/hashsum/sha512/${GLI_TEST_HASH2}/download -> ${GLI_TEST_HASH2} ) " #https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.zip -> ITKGenericLabelInterpolator-${PV}.zip @@ -81,14 +90,24 @@ src_prepare() { sed -i -e "s/find_package(OpenJPEG 2.0.0/find_package(OpenJPEG/g"\ Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt ln -sr ../ITKGenericLabelInterpolator-* Modules/External/ITKGenericLabelInterpolator || die - #if use test; then - # for filename in ../GenericLabelInterpolator/test/*/*mha; do - # MD5=$(md5sum $filename) || die - # MD5=${MD5% *} || die - # cp "$filename" ".ExternalData/MD5/${MD5}" || die - # done - #fi + #pwd + #echo ${S} + #echo ${WORKDIR} + #die cmake_src_prepare + if use test; then + cp -rf "../ITKTestingData-${TEST_HASH}/"* ".ExternalData/" || die + mv "../ITKTestingData-${TEST_HASH}" "${BUILD_DIR}/.ExternalData" || die + cp "${DISTDIR}/${GLI_TEST_HASH1}" ".ExternalData/SHA512/" || die + cp "${DISTDIR}/${GLI_TEST_HASH1}" "${BUILD_DIR}/.ExternalData/SHA512/" || die + cp "${DISTDIR}/${GLI_TEST_HASH2}" ".ExternalData/SHA512/" || die + cp "${DISTDIR}/${GLI_TEST_HASH2}" "${BUILD_DIR}/.ExternalData/SHA512/" || die + fi + #pwd + #echo ${S} + #echo ${WORKDIR} + #echo ${BUILD_DIR} + #die } src_configure() {