3 files changed, 39 insertions, 28 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/Manifest b/sci-chemistry/psi/Manifest
index 12fc8c901d32..c2f0bc535123 100644
--- a/sci-chemistry/psi/Manifest
+++ b/sci-chemistry/psi/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 3.3.0-gcc-4.3.patch 506 RMD160 40661bfb73577988ab160bd00e64a9590d47ccab SHA1 6f163fd1fbab1cf8b058e045a50896760ccea22f SHA256 6107fc41da44143f12904ca0fb317c0498b36b51af933badad48e2e878471e89
 AUX 3.4.0-destdir.patch 1320 RMD160 4f33ac3c171797bc0cab9ac492ab6ee1f32d12aa SHA1 54b524e161d5dcffc6817eb559aa4aff3ee44802 SHA256 17909af7b5dff643ef8ea134bf4468cd361457ba9192a1f9155a5870470af7a6
@@ -22,13 +22,13 @@ DIST psi-3.4.0.tar.gz 7413072 RMD160 34f34d2fb1fcabc973992eff19bb7fa1e80ce6a6 SH
 EBUILD psi-3.2.3.ebuild 1314 RMD160 887434d2c20e6f1307362c085bd69eadb3854b03 SHA1 34488b4cb6d4d37e130ccb7056cecd7d98ada2d3 SHA256 9a8d5e1442af31caa4917ce7ff17efb088091fce8183934437833fadb05a8e67
 EBUILD psi-3.3.0.ebuild 1381 RMD160 4c973c33e788661a406e9ce2ac790c9d1e31273d SHA1 cbababc8da5fea09d589e17a788ab672655201c8 SHA256 babf0e4301e1706786b9c0a98cf15fc597d2dca45f65e5834fe33ff05f0719ba
 EBUILD psi-3.4.0-r1.ebuild 1739 RMD160 188b7b3052d9eda8b7d7267354217c316c581e2e SHA1 dbe85e7ad5efd09e9473178c03fa8db86c259352 SHA256 541b3e1f59f7a4555f827db86eaf707a904a946f064ada1560c1c3f2e7ce0dc0
-EBUILD psi-3.4.0-r2.ebuild 1777 RMD160 176960572dd67ecdbae4b69bb113def35f10f140 SHA1 2665e5d6c63d4ead8592bb9580d55c42ae94d830 SHA256 97856e7bbfa6a125977d7736c487a906c86e49a355d3d109f34d052a96df520e
-MISC ChangeLog 3101 RMD160 898fc203f3610ec75cabfb95bf59c6aff462ddf1 SHA1 f3025668f725aefbbfb9cc162c32f54dc89eca9a SHA256 33fe16c11767dc2d3d071416cf6a070c35e8cf5bdc47f069d8b94b726e3c652e
+EBUILD psi-3.4.0-r2.ebuild 1945 RMD160 c9e4bc4529c2ab5b338d537eb2b17ddd510d2fd4 SHA1 988e50bce46c2d0055b1ddbd52a591f02b248705 SHA256 ec66de484f1e6420f7167a2a3af77c6e9f2eb384223dcfe8d010ebe29bf3a85b
+MISC ChangeLog 3229 RMD160 c8f1f1c4c765c2ed2ba693c4d860fa952feae936 SHA1 569026d96ef9fd9510c122c0f2e131a5a79b5c91 SHA256 6a261d8b7d23d6da141eca69cc7320627885e614bdbe08909182d02ab1dfc9f6
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4Av5EACgkQgAnW8HDreRaxsACfWw43vnRyoCGLt2Pf3za1Mea4
-PtwAoLR7bOS00xUc6OWmrz+Q0UD7D7L7
-=xi/i
+iEYEAREKAAYFAk7rYQQACgkQgAnW8HDreRaSNQCgmBTRR6U6pL+Oe/92kjefmzFT
+5WUAn2n1bqvRO5CDHTPDC3tMcTnvt2Qt
+=MERg
 -----END PGP SIGNATURE-----
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
 }