From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 016B1138CA3 for ; Mon, 20 Apr 2015 01:12:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DFF4E08AF; Mon, 20 Apr 2015 01:11:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B56E8E08AF for ; Mon, 20 Apr 2015 01:11:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DE14340C72 for ; Mon, 20 Apr 2015 01:11:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 055FD164DE for ; Mon, 20 Apr 2015 01:11:36 +0000 (UTC) From: "Francois Bissey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Francois Bissey" Message-ID: <1427578260.894067c2f8dd681a3a1a7219ee90f70cdf4e0f33.fbissey@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/fsl/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/fsl/ChangeLog sci-biology/fsl/fsl-5.0.8.ebuild X-VCS-Directories: sci-biology/fsl/ X-VCS-Committer: fbissey X-VCS-Committer-Name: Francois Bissey X-VCS-Revision: 894067c2f8dd681a3a1a7219ee90f70cdf4e0f33 X-VCS-Branch: master Date: Mon, 20 Apr 2015 01:11:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1e2b1741-ff19-4c80-8a1c-0192c983b3bb X-Archives-Hash: f97adeb72032973bef0da414ea303c5b commit: 894067c2f8dd681a3a1a7219ee90f70cdf4e0f33 Author: Horea Christian mail ru> AuthorDate: Sat Mar 28 21:31:00 2015 +0000 Commit: Francois Bissey massey ac nz> CommitDate: Sat Mar 28 21:31:00 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=894067c2 ported changes from 5.0.6 regarding FSLDIR Package-Manager: portage-2.2.18 sci-biology/fsl/ChangeLog | 3 +++ sci-biology/fsl/fsl-5.0.8.ebuild | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sci-biology/fsl/ChangeLog b/sci-biology/fsl/ChangeLog index 19478e2..e6857b2 100644 --- a/sci-biology/fsl/ChangeLog +++ b/sci-biology/fsl/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Mar 2015; fsl-5.0.8.ebuild: + ported changes from 5.0.6 regarding FSLDIR + 28 Mar 2015; files/fsl-5.0.4-headers.patch: hunk implemented by upstream diff --git a/sci-biology/fsl/fsl-5.0.8.ebuild b/sci-biology/fsl/fsl-5.0.8.ebuild index e185863..c2f8a10 100644 --- a/sci-biology/fsl/fsl-5.0.8.ebuild +++ b/sci-biology/fsl/fsl-5.0.8.ebuild @@ -83,6 +83,8 @@ src_prepare(){ 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() { @@ -98,6 +100,12 @@ src_compile() { } 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/* @@ -105,9 +113,13 @@ src_install() { doins -r doc data refdoc insinto /usr/libexec/fsl - doins -r tcl + 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