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 3805E1381F3 for ; Tue, 7 May 2013 10:13:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E084E081D; Tue, 7 May 2013 10:13:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2915AE0814 for ; Tue, 7 May 2013 10:13:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F2E233BE50 for ; Tue, 7 May 2013 10:13:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D0C09E4DA1 for ; Tue, 7 May 2013 10:13:31 +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: <1367921576.15481c73e161e27792f1173560ea3aa91382347b.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/modelfree/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/modelfree/ChangeLog sci-chemistry/modelfree/modelfree-4.20.ebuild X-VCS-Directories: sci-chemistry/modelfree/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 15481c73e161e27792f1173560ea3aa91382347b X-VCS-Branch: master Date: Tue, 7 May 2013 10:13:31 +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: e680a454-dc73-4e8d-8290-2d498a8dd3df X-Archives-Hash: c0dc676a0ec10f3810eaae74d54a8511 commit: 15481c73e161e27792f1173560ea3aa91382347b Author: Justin Lecher gentoo org> AuthorDate: Tue May 7 10:12:56 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue May 7 10:12:56 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=15481c73 sci-chemistry/modelfree: Merge changes from curvefit Package-Manager: portage-2.2.0_alpha174 RepoMan-Options: --force --- sci-chemistry/modelfree/ChangeLog | 3 ++ sci-chemistry/modelfree/modelfree-4.20.ebuild | 29 +++++++++++++------------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/sci-chemistry/modelfree/ChangeLog b/sci-chemistry/modelfree/ChangeLog index 7d88928..496cf46 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 modelfree-4.20.ebuild: + Merge changes from curvefit + 03 Mar 2013; Justin Lecher 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 c0865fb..b72c61b 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