aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-05-07 12:12:56 +0200
committerJustin Lecher <jlec@gentoo.org>2013-05-07 12:12:56 +0200
commit15481c73e161e27792f1173560ea3aa91382347b (patch)
treea3d9017f24098d08b630e973bc10db934c227848 /sci-chemistry
parentnfft: moved to gx86 (diff)
downloadsci-15481c73e161e27792f1173560ea3aa91382347b.tar.gz
sci-15481c73e161e27792f1173560ea3aa91382347b.tar.bz2
sci-15481c73e161e27792f1173560ea3aa91382347b.zip
sci-chemistry/modelfree: Merge changes from curvefit
Package-Manager: portage-2.2.0_alpha174 RepoMan-Options: --force
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/modelfree/ChangeLog3
-rw-r--r--sci-chemistry/modelfree/modelfree-4.20.ebuild29
2 files changed, 18 insertions, 14 deletions
diff --git a/sci-chemistry/modelfree/ChangeLog b/sci-chemistry/modelfree/ChangeLog
index 7d8892842..496cf46d4 100644
--- a/sci-chemistry/modelfree/ChangeLog
+++ b/sci-chemistry/modelfree/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 07 May 2013; Justin Lecher <jlec@gentoo.org> modelfree-4.20.ebuild:
+ Merge changes from curvefit
+
03 Mar 2013; Justin Lecher <jlec@gentoo.org> modelfree-4.20.ebuild,
metadata.xml:
Add missing multilib.eclass; move to EAPI=5
diff --git a/sci-chemistry/modelfree/modelfree-4.20.ebuild b/sci-chemistry/modelfree/modelfree-4.20.ebuild
index c0865fb89..b72c61b8d 100644
--- a/sci-chemistry/modelfree/modelfree-4.20.ebuild
+++ b/sci-chemistry/modelfree/modelfree-4.20.ebuild
@@ -11,34 +11,35 @@ HOMEPAGE="http://www.palmer.hs.columbia.edu/software/modelfree.html"
SRC_URI="http://www.palmer.hs.columbia.edu/software/modelfree4_linux.tar.gz"
SLOT="0"
+LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="as-is"
IUSE="doc examples"
-DEPEND=""
RDEPEND="
- sys-devel/gcc:4.1
sci-libs/blas-reference
- sci-libs/lapack-reference
-"
+ sys-devel/gcc:4.1"
+DEPEND="dev-util/patchelf"
S="${WORKDIR}"
+QA_PREBUILT="opt/bin/.*"
+
src_install() {
+ local _exe
dosym ../../usr/$(get_libdir)/librefblas.so /opt/${PN}/libblas.so.3
dosym ../../usr/$(get_libdir)/libreflapack.so /opt/${PN}/liblapack.so.3
- cat >> "${T}"/${PN} <<- EOF
- #!${EPREFIX}/bin/bash
- LD_LIBRARY_PATH="${EPREFIX}/opt/${PN}" "${EPREFIX}/opt/${PN}/${PN}4" \$@
- EOF
-
exeinto /opt/bin
- doexe "${T}"/${PN}
+ if use x86; then
+ _exe=./linux_32/${PN}4
+ elif use amd64; then
+ _exe=./linux_64/${PN}4
+ fi
+
+ patchelf --set-rpath "${EPREFIX}/opt/${PN}:${EPREFIX}/usr/$(get_libdir)/gcc/x86_64-pc-linux-gnu/4.1.2/" ${_exe}
- exeinto /opt/${PN}
- use amd64 && doexe linux_64/${PN}4
- use x86 && doexe linux_32/${PN}4
+ doexe ${_exe}
+ dosym ${PN} "${EPREFIX}"/opt/bin/${PN}4
use doc && dodoc docs/{modelfree_manual.pdf,VERSIONS.README}
use examples && insinto /usr/share/${PN} && doins -r testing