commit: 40022cd56f21a7152d812b6435734aafa032c7f8 Author: Horea Christian <chr <AT> chymera <DOT> eu> AuthorDate: Fri Sep 25 19:40:28 2020 +0000 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> CommitDate: Fri Sep 25 19:40:28 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=40022cd5
sci-biology/ants: version bump 2.3.4 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Horea Christian <chr <AT> chymera.eu> sci-biology/ants/ants-2.3.4.ebuild | 77 ++++++++++++++++ sci-biology/ants/files/ants-2.3.4-libdir.patch | 117 ++++++++++++++++++++++++ sci-biology/ants/files/ants-2.3.4-version.patch | 17 ++++ 3 files changed, 211 insertions(+) diff --git a/sci-biology/ants/ants-2.3.4.ebuild b/sci-biology/ants/ants-2.3.4.ebuild new file mode 100644 index 000000000..e00865149 --- /dev/null +++ b/sci-biology/ants/ants-2.3.4.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake multilib + +MY_PN="ANTs" + +DESCRIPTION="Advanced Normalitazion Tools for neuroimaging" +HOMEPAGE="http://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 + ) +" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +IUSE="test vtk" + +DEPEND=" + vtk? ( + ~sci-libs/itk-5.1.0[vtkglue] + sci-libs/vtk + ) + !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." + fi +} + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_ITK=ON + -DITK_DIR="${EROOT}/usr/include/ITK-5.1/" + -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="${EROOT}/usr/include/vtk-8.1/" + ) + use test && mycmakeargs+=( + -DExternalData_OBJECT_STORES="${S}/.ExternalData/MD5" + ) + cmake_src_configure +} + +src_install() { + BUILD_DIR="${WORKDIR}/${P}_build/ANTS-build" + cmake_src_install + cd "${S}/Scripts" || die "scripts dir not found" + dobin *.sh + dodir /usr/$(get_libdir)/ants + insinto "/usr/$(get_libdir)/ants" + doins * + doenvd "${FILESDIR}"/99ants +} diff --git a/sci-biology/ants/files/ants-2.3.4-libdir.patch b/sci-biology/ants/files/ants-2.3.4-libdir.patch new file mode 100644 index 000000000..b593c2778 --- /dev/null +++ b/sci-biology/ants/files/ants-2.3.4-libdir.patch @@ -0,0 +1,117 @@ +From 329a7be631b33294d9cf3d58e8cdeb62e0aa993c Mon Sep 17 00:00:00 2001 +From: Philip A Cook <[email protected]> +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 new file mode 100644 index 000000000..487151d69 --- /dev/null +++ b/sci-biology/ants/files/ants-2.3.4-version.patch @@ -0,0 +1,17 @@ +--- 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()
