[gentoo-commits] proj/sci:master commit in: sci-physics/atompaw2abinit/

["Justin Lecher" <jlec@gentoo.org>]

commit:     08ac889dc8671fc78df8abacf6628a66fe3f43e6
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 09:21:24 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 09:21:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=08ac889d

sci-physics/atompaw2abinit: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; correct dep for pkgconfig to virtual

Package-Manager: portage-2.2.0_alpha163

---
 sci-physics/atompaw2abinit/ChangeLog               |    7 ++++++-
 .../atompaw2abinit/atompaw2abinit-3.3.0-r1.ebuild  |   19 ++++++++-----------
 sci-physics/atompaw2abinit/metadata.xml            |    8 ++++----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/sci-physics/atompaw2abinit/ChangeLog b/sci-physics/atompaw2abinit/ChangeLog
index 42b7088..ee2f5bb 100644
--- a/sci-physics/atompaw2abinit/ChangeLog
+++ b/sci-physics/atompaw2abinit/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-physics/atompaw2abinit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org> atompaw2abinit-3.3.0-r1.ebuild,
+  metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  correct dep for pkgconfig to virtual
+
 *atompaw2abinit-3.3.0-r1 (17 Dec 2011)
 
   17 Dec 2011; Honza Macháček <Hloupy.Honza@centrum.cz>

diff --git a/sci-physics/atompaw2abinit/atompaw2abinit-3.3.0-r1.ebuild b/sci-physics/atompaw2abinit/atompaw2abinit-3.3.0-r1.ebuild
index d27516b..b609dc3 100644
--- a/sci-physics/atompaw2abinit/atompaw2abinit-3.3.0-r1.ebuild
+++ b/sci-physics/atompaw2abinit/atompaw2abinit-3.3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 
 inherit eutils fortran-2 multilib toolchain-funcs
 
@@ -10,7 +10,6 @@ DESCRIPTION="Abinit AtomPAW atomic data convertor"
 HOMEPAGE="http://www.abinit.org/downloads/PAW2/AtomPAW2Abinit-Manual-html/Old-AtomPAW2Abinit-Manual-html/AtomPAW2Abinit2.htm"
 SRC_URI="http://www.abinit.org/downloads/PAW2/AtomPAW2Abinit-Manual-html/Old-AtomPAW2Abinit-Manual-html/Atompaw2Abinit.tgz -> ${P}.tgz"
 
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -21,10 +20,12 @@ RDEPEND="
 	virtual/blas
 	sci-physics/atompaw"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 S=${WORKDIR}/Atompaw2Abinit.v${PV}
 
+MAKEOPTS+=" -j1"
+
 pkg_nofetch() {
 	elog "If there is a digest mismatch, please file a bug"
 	elog "at https://bugs.gentoo.org/ -- a version bump"
@@ -36,18 +37,14 @@ src_configure() {
 	tail -n +6 Makefile >Makefile.2
 	cp Makefile.1 Makefile
 	echo FC = $(tc-getFC) >>Makefile
-	echo FFLAGS = ${FCFLAGS:- ${FFLAGS:- -O2}} >>Makefile
+	echo FFLAGS = ${FFLAGS} >>Makefile
 	echo -n FFLAGS_LIBS= >>Makefile
-	pkg-config --libs lapack >>Makefile
+	$(tc-getPKG_CONFIG) --libs lapack >>Makefile
 	echo >>Makefile
 	sed -e's/^\(FC *=\)/#\1/' -e's/^\(FFLAGS *=\)/#\1/' \
 		-e's/^\(FFLAGS_LIBS *=\)/#\1/' Makefile.2 >>Makefile
 }
 
-src_compile() {
-	emake -j1 || die "Make failed"
-}
-
 src_install() {
-	dobin atompaw2abinit
+	dobin ${PN}
 }

diff --git a/sci-physics/atompaw2abinit/metadata.xml b/sci-physics/atompaw2abinit/metadata.xml
index 875538a..c620ca1 100644
--- a/sci-physics/atompaw2abinit/metadata.xml
+++ b/sci-physics/atompaw2abinit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
+  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>