[gentoo-commits] proj/sci:master commit in: sci-biology/fsl/

[Justin Lecher]

commit:     65da06ae6c6b80c958e4179df93c350c279968cc
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 17:21:47 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 17:21:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=65da06ae

sci-biology/fsl: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-biology/fsl/fsl-5.0.6.ebuild | 130 ---------------------------------------
 sci-biology/fsl/fsl-5.0.8.ebuild |  32 +++++-----
 2 files changed, 17 insertions(+), 145 deletions(-)

diff --git a/sci-biology/fsl/fsl-5.0.6.ebuild b/sci-biology/fsl/fsl-5.0.6.ebuild
deleted file mode 100644
index ed0ae88..0000000
--- a/sci-biology/fsl/fsl-5.0.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs prefix
-
-DESCRIPTION="Analysis of functional, structural, and diffusion MRI brain imaging data"
-HOMEPAGE="http://www.fmrib.ox.ac.uk/fsl"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-sources.tar.gz"
-
-LICENSE="FSL BSD-2 newmat"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="media-libs/glu
-	media-libs/libpng
-	media-libs/gd
-	sys-libs/zlib
-	dev-libs/boost
-	media-gfx/graphviz
-	"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/tcl
-	dev-lang/tk
-	"
-
-S=${WORKDIR}/${PN}
-
-src_prepare(){
-	epatch "${FILESDIR}/${PN}"-5.0.4-setup.patch
-	epatch "${FILESDIR}/${PN}"-5.0.4-headers.patch
-	epatch "${FILESDIR}/${PN}"-5.0.6-fsldir_redux.patch
-
-	sed -i \
-		-e "s:@@GENTOO_RANLIB@@:$(tc-getRANLIB):" \
-		-e "s:@@GENTOO_CC@@:$(tc-getCC):" \
-		-e "s:@@GENTOO_CXX@@:$(tc-getCXX):" \
-		config/generic/systemvars.mk || die
-
-	eprefixify $(grep -rl GENTOO_PORTAGE_EPREFIX src/*) \
-		etc/js/label-div.html
-
-	makefilelist=$(find src/ -name Makefile)
-
-	sed -i \
-		-e "s:-I\${INC_BOOST}::" \
-		-e "s:-I\${INC_ZLIB}::" \
-		-e "s:-I\${INC_GD}::" \
-		-e "s:-I\${INC_PNG}::" \
-		-e "s:-L\${LIB_GD}::" \
-		-e "s:-L\${LIB_PNG}::" \
-		-e "s:-L\${LIB_ZLIB}::" \
-		${makefilelist} || die
-
-	sed -i "s:\${FSLDIR}/bin/::g" \
-		$(grep -rl "\${FSLDIR}/bin" src/*) \
-		$(grep -rl "\${FSLDIR}/bin" etc/matlab/*)
-	sed -i "s:\$FSLDIR/bin/::g" \
-		$(grep -rl "\$FSLDIR/bin" src/*) \
-		$(grep -rl "\$FSLDIR/bin" etc/matlab/*)
-
-	sed -i "s:\$FSLDIR/data:${EPREFIX}/usr/share/fsl/data:g" \
-		$(grep -rl "\$FSLDIR/data" src/*)
-
-	sed -i "s:\${FSLDIR}/data:${EPREFIX}/usr/share/fsl/data:g" \
-		$(grep -rl "\${FSLDIR}/data" src/*)
-
-	sed -i "s:\$FSLDIR/etc:${EPREFIX}/etc:g" \
-		$(grep -rl "\$FSLDIR/etc" src/*)
-
-	sed -i "s:\${FSLDIR}/etc:${EPREFIX}/etc:g" \
-		$(grep -rl "\${FSLDIR}/etc" src/*)
-
-	sed -i "s:\$FSLDIR/doc:${EPREFIX}/usr/share/fsl/doc:g" \
-		$(grep -rl "\$FSLDIR/doc" src/*)
-
-	sed -i "s:\${FSLDIR}/doc:${EPREFIX}/usr/share/fsl/doc:g" \
-		$(grep -rl "\${FSLDIR}/doc" src/*)
-
-	sed -i "s:\'\${FSLDIR}\'/doc:${EPREFIX}/usr/share/fsl/doc:g" \
-		$(grep -rl "\'\${FSLDIR}\'/doc" src/*)
-
-	sed -i -e "s:\$FSLDIR/etc:/etc:g" `grep -rlI \$FSLDIR/etc *`
-}
-
-src_compile() {
-	export FSLDIR=${WORKDIR}/${PN}
-	export FSLCONDIR=${WORKDIR}/${PN}/config
-	export FSLMACHTYPE=generic
-
-	export USERLDFLAGS="${LDFLAGS}"
-	export USERCFLAGS="${CFLAGS}"
-	export USERCXXFLAGS="${CXXFLAGS}"
-
-	./build || die
-}
-
-src_install() {
-	sed -i "s:\${FSLDIR}/tcl:/usr/libexec/fsl:g" \
-		$(grep -lI "\${FSLDIR}/tcl" bin/*) \
-		$(grep -l "\${FSLDIR}/tcl"  tcl/*)
-	sed -i "s:\$FSLDIR/tcl:/usr/libexec/fsl:g" \
-		$(grep -l "\$FSLDIR/tcl" tcl/*)
-
-	exeinto /usr/bin
-	doexe bin/*
-
-	insinto /usr/share/${PN}
-	doins -r doc data refdoc
-
-	insinto /usr/libexec/fsl
-	doins -r tcl/*
-
-	insinto /etc/fslconf
-	doins etc/fslconf/fsl.sh
-
-	insinto /etc
-	doins etc/fslversion
-	doins -r etc/default_flobs.flobs etc/flirtsch etc/js etc/luts
-	#if use matlab; then
-	#	doins etc/matlab
-	#fi
-
-	doenvd "${FILESDIR}"/99fsl
-	rm "${D}"/usr/bin/cluster
-}

diff --git a/sci-biology/fsl/fsl-5.0.8.ebuild b/sci-biology/fsl/fsl-5.0.8.ebuild
index 4bf38ff..f82d5fe 100644
--- a/sci-biology/fsl/fsl-5.0.8.ebuild
+++ b/sci-biology/fsl/fsl-5.0.8.ebuild
@@ -15,25 +15,27 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-COMMON_DEPEND="media-libs/glu
-	media-libs/libpng
-	media-libs/gd
-	sys-libs/zlib
+COMMON_DEPEND="
 	dev-libs/boost
 	media-gfx/graphviz
+	media-libs/gd
+	media-libs/glu
+	media-libs/libpng:0=
+	sys-libs/zlib
 	"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
-	dev-lang/tcl
-	dev-lang/tk
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
 	"
 
 S=${WORKDIR}/${PN}
 
 src_prepare(){
-	epatch "${FILESDIR}/${PN}"-5.0.8-setup.patch
-	epatch "${FILESDIR}/${PN}"-5.0.8-headers.patch
-	epatch "${FILESDIR}/${PN}"-5.0.8-fsldir_redux.patch
+	epatch \
+		"${FILESDIR}/${PN}"-5.0.8-setup.patch \
+		"${FILESDIR}/${PN}"-5.0.8-headers.patch \
+		"${FILESDIR}/${PN}"-5.0.8-fsldir_redux.patch
 
 	sed -i \
 		-e "s:@@GENTOO_RANLIB@@:$(tc-getRANLIB):" \
@@ -102,15 +104,15 @@ src_compile() {
 src_install() {
 	sed -i "s:\${FSLDIR}/tcl:/usr/libexec/fsl:g" \
 		$(grep -lI "\${FSLDIR}/tcl" bin/*) \
-		$(grep -l "\${FSLDIR}/tcl"  tcl/*)
+		$(grep -l "\${FSLDIR}/tcl"  tcl/*) || die
 	sed -i "s:\$FSLDIR/tcl:/usr/libexec/fsl:g" \
-		$(grep -l "\$FSLDIR/tcl" tcl/*)
+		$(grep -l "\$FSLDIR/tcl" tcl/*) || die
 
-	exeinto /usr/bin
-	doexe bin/*
+	dobin bin/*
 
 	insinto /usr/share/${PN}
-	doins -r doc data refdoc
+	doins -r data
+	dodoc -r doc/. refdoc
 
 	insinto /usr/libexec/fsl
 	doins -r tcl/*
@@ -126,5 +128,5 @@ src_install() {
 	#fi
 
 	doenvd "${FILESDIR}"/99fsl
-	rm "${D}"/usr/bin/cluster
+	rm "${ED}"/usr/bin/cluster || die
 }