commit: 5751886ea4425766efee98c3e98e41c07b152444 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Thu Mar 4 20:55:56 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Thu Mar 4 20:55:56 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5751886e
sci-libs/itk: try to fix doc building where do they go? currently fails to install with USE="doc" Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> sci-libs/itk/itk-5.0.1.ebuild | 14 +++++++------- sci-libs/itk/itk-5.1.0.ebuild | 19 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild index 707684d8a..d23816f2e 100644 --- a/sci-libs/itk/itk-5.0.1.ebuild +++ b/sci-libs/itk/itk-5.0.1.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="NLM Insight Segmentation and Registration Toolkit" HOMEPAGE="http://www.itk.org"; SRC_URI=" https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/${MY_P}.tar.gz - https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.zip -> ITKGenericLabelInterpolator-${PV}.zip + https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.tar.gz -> ITKGenericLabelInterpolator-${PV}.tar.gz test? ( https://data.kitware.com/api/v1/folder/${GLI_TEST_HASH}/download -> ITKGenericLabelInterpolator_test-${PV}.zip https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/InsightData-${PV}.tar.gz @@ -118,6 +118,7 @@ src_configure() { -DBUILD_TESTING="$(usex test ON OFF)" -DBUILD_EXAMPLES="$(usex examples ON OFF)" -DITK_USE_REVIEW="$(usex review ON OFF)" + -DITK_BUILD_DOCUMENTATION="$(usex doc ON OFF)" -DITK_INSTALL_LIBRARY_DIR=$(get_libdir) ) if use fftw; then @@ -153,9 +154,9 @@ src_install() { cmake_src_install if use examples; then - insinto /usr/share/doc/${PF}/examples + docinto examples docompress -x /usr/share/doc/${PF}/examples - doins -r "${S}"/Examples/* + dodoc -r "${S}"/Examples/* fi echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN} @@ -168,11 +169,10 @@ src_install() { doenvd "${T}"/40${PN} if use doc; then - insinto /usr/share/doc/${PF}/api-docs - cd "${WORKDIR}"/html + cd "${WORKDIR}"/html || die rm *.md5 || die "Failed to remove superfluous hashes" einfo "Installing API docs. This may take some time." - insinto /usr/share/doc/${PF}/api-docs - doins -r * + docinto /usr/share/doc/${PF}/api-docs + dodoc -r * fi } diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild index c7d19607a..f5c9cd50d 100644 --- a/sci-libs/itk/itk-5.1.0.ebuild +++ b/sci-libs/itk/itk-5.1.0.ebuild @@ -18,17 +18,17 @@ declare -a GLI_TEST_HASHES=( GLI_TEST_SRC="" for i in "${GLI_TEST_HASHES[@]}"; do - GLI_TEST_SRC+="https://data.kitware.com/api/v1/file/hashsum/sha512/${i} -> ${i} " + GLI_TEST_SRC+="https://data.kitware.com/api/v1/file/hashsum/sha512/${i} -> ${P}-test-${i} " done DESCRIPTION="NLM Insight Segmentation and Registration Toolkit" HOMEPAGE="http://www.itk.org"; SRC_URI=" https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/${MY_P}.tar.gz - https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.zip -> ITKGenericLabelInterpolator-${PV}.zip + https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator/archive/${GLI_HASH}.tar.gz -> ITKGenericLabelInterpolator-${PV}.tar.gz 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://github.com/InsightSoftwareConsortium/ITKTestingData/archive/${TEST_HASH}.tar.gz -> ${P}-testingdata.tar.gz ${GLI_TEST_SRC} ) " @@ -64,7 +64,6 @@ DEPEND="${RDEPEND} ) doc? ( app-doc/doxygen ) " -BDEPEND="app-arch/unzip" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -106,6 +105,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DITK_BUILD_DOCUMENTATION="$(usex doc ON OFF)" -DBUILD_EXAMPLES="$(usex examples ON OFF)" -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING="$(usex test ON OFF)" @@ -165,9 +165,9 @@ src_install() { cmake_src_install if use examples; then - insinto /usr/share/doc/${PF}/examples + docinto examples docompress -x /usr/share/doc/${PF}/examples - doins -r "${S}"/Examples/* + dodoc -r "${S}"/Examples/* fi echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN} @@ -180,11 +180,10 @@ src_install() { doenvd "${T}"/40${PN} if use doc; then - insinto /usr/share/doc/${PF}/api-docs - cd "${WORKDIR}"/html + cd "${WORKDIR}"/html || die rm *.md5 || die "Failed to remove superfluous hashes" einfo "Installing API docs. This may take some time." - insinto /usr/share/doc/${PF}/api-docs - doins -r * + docinto api-docs + dodoc -r * fi }
