diff --git a/sci-biology/fsl/ChangeLog b/sci-biology/fsl/ChangeLog index bb4eba0..1d1d42a 100644 --- a/sci-biology/fsl/ChangeLog +++ b/sci-biology/fsl/ChangeLog @@ -1,3 +1,6 @@ + 08 Nov 2019; François Bissey fsl-6.0.2.ebuild: + sci-biology/fsl: final touches. Skip mist-clean. + 07 Nov 2019; François Bissey +files/fsl-6.0.2-fsldir_redux.patch, fsl-6.0.2.ebuild: sci-biology/fsl: Work on fsldir elimination diff --git a/sci-biology/fsl/fsl-6.0.2.ebuild b/sci-biology/fsl/fsl-6.0.2.ebuild index 0e9a1eb..6b5ff00 100644 --- a/sci-biology/fsl/fsl-6.0.2.ebuild +++ b/sci-biology/fsl/fsl-6.0.2.ebuild @@ -56,6 +56,9 @@ src_prepare(){ eprefixify $(grep -rl GENTOO_PORTAGE_EPREFIX src/*) \ etc/js/label-div.html + # Disable mist-clean the hard way for now. + rm -rf src/mist-clean + makefilelist=$(find src/ -name Makefile) sed -i \ @@ -75,6 +78,10 @@ src_prepare(){ $(grep -rl "\${FSLDIR}/bin" etc/matlab/*)\ $(grep -rl "\$FSLDIR/bin" etc/matlab/*) || die + # Not caught by the previous sed. Usually append + sed -e "s:\${FSLDIR}/bin::g" \ + -i $(grep -rl "\${FSLDIR}/bin" src/*) || die + sed -e "s:\$FSLDIR/data:${EPREFIX}/usr/share/fsl/data:g" \ -e "s:\${FSLDIR}/data:${EPREFIX}/usr/share/fsl/data:g" \ -i $(grep -rl "\$FSLDIR/data" src/*) \