From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F36E8139085 for ; Thu, 5 Jan 2017 19:28:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D594234052; Thu, 5 Jan 2017 19:28:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0DAAE234052 for ; Thu, 5 Jan 2017 19:28:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0736B3413B7 for ; Thu, 5 Jan 2017 19:28:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A42E92604 for ; Thu, 5 Jan 2017 19:28:23 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1483528391.eda8f3c599b7c146c971ba0295235a99604062b8.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/fsl/, sci-biology/fsl/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/fsl/files/99fsl sci-biology/fsl/fsl-5.0.8.ebuild X-VCS-Directories: sci-biology/fsl/ sci-biology/fsl/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: eda8f3c599b7c146c971ba0295235a99604062b8 X-VCS-Branch: master Date: Thu, 5 Jan 2017 19:28:23 +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: 123a1292-a7b3-4997-b044-abba9b447b4c X-Archives-Hash: 3dac65546637ea42ee531921644d7074 commit: eda8f3c599b7c146c971ba0295235a99604062b8 Author: Horea Christian yandex com> AuthorDate: Wed Jan 4 11:13:11 2017 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Jan 4 11:13:11 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=eda8f3c5 sci-biology/fsl: fixed outstanding FSLDIR and GUI issues (#716) * sci-biology/fsl: addressing FSLDIR via symlinks * sci-biology/fsl: fixed FSL GUI Package-Manager: Portage-2.3.3, Repoman-2.3.1 * sci-biology/fsl: EAPI update Package-Manager: Portage-2.3.3, Repoman-2.3.1 sci-biology/fsl/files/99fsl | 2 +- sci-biology/fsl/fsl-5.0.8.ebuild | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sci-biology/fsl/files/99fsl b/sci-biology/fsl/files/99fsl index ca37941..41db5c5 100644 --- a/sci-biology/fsl/files/99fsl +++ b/sci-biology/fsl/files/99fsl @@ -2,4 +2,4 @@ FSLOUTPUTTYPE=NIFTI_GZ FSLMULTIFILEQUIT=TRUE FSLTCLSH=tclsh FSLWISH=wish -FSLDIR=/usr +FSLDIR=/usr/share/fsl diff --git a/sci-biology/fsl/fsl-5.0.8.ebuild b/sci-biology/fsl/fsl-5.0.8.ebuild index 3e9dc99..f6e57d1 100644 --- a/sci-biology/fsl/fsl-5.0.8.ebuild +++ b/sci-biology/fsl/fsl-5.0.8.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils toolchain-funcs prefix @@ -87,6 +87,7 @@ src_prepare(){ $(grep -rl "\'\${FSLDIR}\'/doc" src/*) sed -i -e "s:\$FSLDIR/etc:/etc:g" `grep -rlI \$FSLDIR/etc *` + default } src_compile() { @@ -127,6 +128,12 @@ src_install() { # doins etc/matlab #fi + #the following is needed for FSL and depending programs to be able + #to find its files, since FSL uses an uncommon: + #https://github.com/gentoo-science/sci/pull/612#r60289295 + dosym /etc /usr/share/fsl/etc + dosym /usr/share/doc/${P} /usr/share/fsl/doc + doenvd "${FILESDIR}"/99fsl mv "${ED}"/usr/bin/{,fsl_}cluster || die }