From 394fdd4ebed7b5621e7555ccb1222119e58e85ea Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Sat, 16 May 2020 05:57:01 -0400 Subject: [PATCH] sci-biology/ants: building from tarball, failing Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Horea Christian --- profiles/package.mask | 5 +++++ sci-biology/ants/ChangeLog | 3 +++ sci-biology/ants/Manifest | 1 + sci-biology/ants/ants-2.3.1_p20191013.ebuild | 14 +++++++++----- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 135c5b6..a025b4d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -34,3 +34,8 @@ # Issues with new dependencies: # https://github.com/nipy/nipype/issues/3196 =sci-libs/nipype-1.4.2 + +# Horea Christian (16 Mai 2020) +# Fails when building from tarball: +# https://github.com/ANTsX/ANTs/issues/1002 +=sci-biology/ants-2.3.1_p20191013 diff --git a/sci-biology/ants/ChangeLog b/sci-biology/ants/ChangeLog index 7a89409..664210a 100644 --- a/sci-biology/ants/ChangeLog +++ b/sci-biology/ants/ChangeLog @@ -1,3 +1,6 @@ + 16 May 2020; ants-2.3.1_p20191013.ebuild: + sci-biology/ants: building from tarball, failing + *ants-2.3.1_p20191013 (14 Dec 2019) 14 Dec 2019; +ants-2.3.1_p20191013.ebuild, diff --git a/sci-biology/ants/Manifest b/sci-biology/ants/Manifest index 1982afc..22cf812 100644 --- a/sci-biology/ants/Manifest +++ b/sci-biology/ants/Manifest @@ -1 +1,2 @@ +DIST 2.3.1_p20191013.tar.gz 2445357 SHA256 819e60c215e61abff2990eac20520b85083fba78598a49a5a6ff915d7206a0c4 SHA512 3de360f58de63662be7db7704a1e4b74ccba03c656ee68dde7e82f4231cbeb6e9d6c7f20a01dab57d0e54740f1f33acd40d07fbe67673993230c08d8aecd9359 WHIRLPOOL 0338d27a73f0b01a079f80129727d413833771fce306d7e839c5a2d23a6c9da71c8ee751e67928d07791cb927b746039d8c5ae6396d7baa06e6ee3217347198b DIST ants_testdata-2.3.1_p20191013.tar.xz 25056428 SHA256 df2396d453a37674945612b2248d4ca818fce6a0b2d97beb88ab3bc59d040657 SHA512 0f86b967cd5e6c7481804c5b1dfb8d638a0560fbb08f86f04d9a3dc508a64e3181d056c2c9cdc26cbcf8eae9e45ecb29fa58580a1377ed8733b87b1b04b15ab2 WHIRLPOOL 08a5adb931b4606a0b03e32effc218d4940395472f7c2b62098472fe999cc0f0a452454619eba2bb2da775a0d5e5eb7baa966bdccf087da1d57d781061006422 diff --git a/sci-biology/ants/ants-2.3.1_p20191013.ebuild b/sci-biology/ants/ants-2.3.1_p20191013.ebuild index c1aae9a..e286a3d 100644 --- a/sci-biology/ants/ants-2.3.1_p20191013.ebuild +++ b/sci-biology/ants/ants-2.3.1_p20191013.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake-utils git-r3 multilib +inherit cmake-utils multilib + +MY_COMMIT="f78b2d4a382d3090230641b5ade5da28962dad04" +MY_PN="ANTs" DESCRIPTION="Advanced Normalitazion Tools for neuroimaging" HOMEPAGE="http://stnava.github.io/ANTs/" SRC_URI=" + https://github.com/ANTsX/ANTs/archive/${MY_COMMIT}.tar.gz -> ${PV}.tar.gz test? ( http://chymera.eu/distfiles/ants_testdata-${PV}.tar.xz ) " -EGIT_REPO_URI="https://github.com/stnava/ANTs.git" -EGIT_COMMIT="f78b2d4a382d3090230641b5ade5da28962dad04" SLOT="0" LICENSE="BSD" @@ -36,8 +38,10 @@ PATCHES=( "${FILESDIR}/${P}-paths.patch" ) +S="${WORKDIR}/${MY_PN}-${MY_COMMIT}" + src_unpack() { - git-r3_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."