commit: 0d2c9adbc44295a290232b4fa509beda05ca9101 Author: AbstractMethod <paul.polak <AT> med-image <DOT> info> AuthorDate: Tue Mar 9 05:45:41 2021 +0000 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> CommitDate: Mon Mar 15 07:53:24 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0d2c9adb
dev-python/fslpy: Changes to resolve file collisions Signed-off-by: Horea Christian <chr <AT> chymera.eu> dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch | 8 ++++++++ dev-python/fslpy/fslpy-3.4.0.ebuild | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch b/dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch new file mode 100644 index 000000000..eb2a0480d --- /dev/null +++ b/dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch @@ -0,0 +1,8 @@ +diff -Naur fslpy-3.4.0.orig/requirements.txt fslpy-3.4.0/requirements.txt +--- fslpy-3.4.0.orig/requirements.txt 2021-02-18 21:38:49.826829560 -0500 ++++ fslpy-3.4.0/requirements.txt 2021-02-18 21:38:55.475829863 -0500 +@@ -3,4 +3,3 @@ + numpy>=1 + scipy>=0.18 + six>=1 +-dataclasses diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild b/dev-python/fslpy/fslpy-3.4.0.ebuild index ee8dcf336..fc4a2a629 100644 --- a/dev-python/fslpy/fslpy-3.4.0.ebuild +++ b/dev-python/fslpy/fslpy-3.4.0.ebuild @@ -14,8 +14,7 @@ SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar LICENSE="BSD" SLOT="0" -# Fails with file collisions with =sci-biology/fsl-6.0.2-r1 -KEYWORDS="" +KEYWORDS="~amd64 ~x86" RDEPEND=" dev-python/h5py[${PYTHON_USEDEP}] @@ -30,7 +29,10 @@ RDEPEND=" dev-python/scipy[${PYTHON_USEDEP}] " -PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" ) +PATCHES=( + "${FILESDIR}/fslpy-2.7.0-coverage.patch" + "${FILESDIR}/fslpy-3-remove_dataclasses_req.patch" +) distutils_enable_tests pytest
