Moved to autotoolutils.eclass, fixed detection of lapack

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

2 files changed, 32 insertions, 21 deletions

diff --git a/sci-chemistry/psi/ChangeLog b/sci-chemistry/psi/ChangeLog
index 16d8fa97f3b9..d347c1b6b82a 100644
--- a/sci-chemistry/psi/ChangeLog
+++ b/sci-chemistry/psi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/psi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.16 2011/06/21 15:58:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.17 2011/12/16 15:17:14 jlec Exp $
+
+  16 Dec 2011; Justin Lecher <jlec@gentoo.org> psi-3.4.0-r2.ebuild:
+  Moved to autotoolutils.eclass, fixed detection of lapack
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> psi-3.2.3.ebuild,
   psi-3.3.0.ebuild, psi-3.4.0-r1.ebuild, psi-3.4.0-r2.ebuild:
diff --git a/sci-chemistry/psi/psi-3.4.0-r2.ebuild b/sci-chemistry/psi/psi-3.4.0-r2.ebuild
index c5feb2271965..edf96a26676f 100644
--- a/sci-chemistry/psi/psi-3.4.0-r2.ebuild
+++ b/sci-chemistry/psi/psi-3.4.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.4.0-r2.ebuild,v 1.3 2011/06/21 15:58:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.4.0-r2.ebuild,v 1.4 2011/12/16 15:17:14 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit autotools fortran-2 eutils
+inherit autotools-utils fortran-2 multilib
 
 DESCRIPTION="Suite of ab initio quantum chemistry programs to compute various molecular properties"
 HOMEPAGE="http://www.psicode.org/"
@@ -13,9 +13,8 @@ SRC_URI="mirror://sourceforge/psicode/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="static-libs test"
 
-# File collision, see bug #249423
 RDEPEND="
 	virtual/fortran
 
@@ -28,17 +27,20 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}${PV:0:1}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-dont-build-libint.patch \
-		"${FILESDIR}"/use-external-libint.patch \
-		"${FILESDIR}"/${PV}-gcc-4.3.patch \
-		"${FILESDIR}"/${PV}-destdir.patch \
-		"${FILESDIR}"/${P}-parallel-make.patch \
-		"${FILESDIR}"/${PV}-man_paths.patch \
-		"${FILESDIR}"/${PV}-ldflags.patch \
-		"${FILESDIR}"/${PV}-parallel_fix.patch \
-		"${FILESDIR}"/${PV}-fortify.patch
+PATCHES=(
+	"${FILESDIR}"/${PV}-dont-build-libint.patch
+	"${FILESDIR}"/use-external-libint.patch
+	"${FILESDIR}"/${PV}-gcc-4.3.patch
+	"${FILESDIR}"/${PV}-destdir.patch
+	"${FILESDIR}"/${P}-parallel-make.patch
+	"${FILESDIR}"/${PV}-man_paths.patch
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-parallel_fix.patch
+	"${FILESDIR}"/${PV}-fortify.patch
+	)
 
+src_prepare() {
+	autotools-utils_src_prepare
 	# Broken test
 	sed \
 		-e 's:scf-mvd-opt ::g' \
@@ -55,14 +57,17 @@ src_configure() {
 	# This variable gets set sometimes to /usr/lib/src and breaks stuff
 	unset CLIBS
 
-	econf \
-		--with-opt="${CXXFLAGS}" \
-		--datadir="${EPREFIX}"/usr/share/${PN} \
+	local myeconfargs=(
+		--with-opt="${CXXFLAGS}"
+		--datadir="${EPREFIX}"/usr/share/${PN}
 		--with-blas="$(pkg-config blas --libs)"
+		--with-lapack="$(pkg-config --libs lapack)"
+		)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	emake SCRATCH="${WORKDIR}/libint" DODEPEND="no" || die
+	autotools-utils_src_compile SCRATCH="${WORKDIR}/libint" DODEPEND="no"
 }
 
 src_test() {
@@ -70,5 +75,8 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" DODEPEND="no" install || die
+	autotools-utils_src_install DODEPEND="no"
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
 }