[gentoo-commits] proj/sci:master commit in: sci-libs/wannier90/

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

commit:     75c2410ad17ce2d4878c09a2fdcb62203bfb281e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 09:42:41 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 09:42:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=75c2410a

sci-libs/wannier90: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; bump to EAPI=5

Package-Manager: portage-2.2.0_alpha163

---
 sci-libs/wannier90/ChangeLog            |    7 ++++-
 sci-libs/wannier90/metadata.xml         |    8 ++--
 sci-libs/wannier90/wannier90-1.2.ebuild |   51 ++++++++++++++-----------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/sci-libs/wannier90/ChangeLog b/sci-libs/wannier90/ChangeLog
index 9209f04..dfe5c7a 100644
--- a/sci-libs/wannier90/ChangeLog
+++ b/sci-libs/wannier90/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-libs/wannier90
-# Copyright 1999-2012 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> wannier90-1.2.ebuild,
+  metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  bump to EAPI=5
+
   22 Jun 2012; Alexey Shvetsov <alexxy@gentoo.org> wannier90-1.2.ebuild:
   [sci-libs/wannier90] add ~amd64-linux
 

diff --git a/sci-libs/wannier90/metadata.xml b/sci-libs/wannier90/metadata.xml
index efb490d..4bf6dbc 100644
--- a/sci-libs/wannier90/metadata.xml
+++ b/sci-libs/wannier90/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</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
+  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>

diff --git a/sci-libs/wannier90/wannier90-1.2.ebuild b/sci-libs/wannier90/wannier90-1.2.ebuild
index 53a77dc..2527922 100644
--- a/sci-libs/wannier90/wannier90-1.2.ebuild
+++ b/sci-libs/wannier90/wannier90-1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 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
+inherit eutils fortran-2 multilib toolchain-funcs
 
 DESCRIPTION="Calculates maximally localized Wannier functions (MLWFs)"
 HOMEPAGE="http://www.wannier.org/"
@@ -20,13 +20,14 @@ RDEPEND="
 	virtual/lapack
 	perl? ( dev-lang/perl )"
 DEPEND="${RDEPEND}
-		doc? ( virtual/latex-base
-			|| (
-				dev-texlive/texlive-latexextra
-				app-text/tetex
-				app-tex/ptex
-			)
-		)"
+	virtual/pkgconfig
+	doc? ( virtual/latex-base
+		|| (
+			dev-texlive/texlive-latexextra
+			app-text/tetex
+			app-tex/ptex
+		)
+	)"
 
 src_prepare() {
 	# Patch taken from sci-physics/abinit-5.7.3 bundled version
@@ -40,39 +41,33 @@ src_configure() {
 		F90 = $(tc-getFC)
 		FCOPTS = ${FCFLAGS:- ${FFLAGS:- -O2}}
 		LDOPTS = ${LDFLAGS}
-		LIBS = $(pkg-config --libs blas lapack)
+		LIBS = $($(tc-getPKG_CONFIG) --libs blas lapack)
 	EOF
 }
 
 src_compile() {
-	emake -j1 wannier || die "make wannier failed"
-	emake -j1 lib || die "make lib failed"
-	if use doc; then
-		emake -j1 doc || die "make doc failed"
-	fi
+	emake -j1 wannier
+	emake -j1 lib
+	use doc & emake -j1 doc
 }
 
 src_test() {
 	einfo "Compare the 'Standard' and 'Current' outputs of this test."
 	pushd tests
-	emake test || die
+	emake test
 	cat wantest.log
 }
 
 src_install() {
-	dobin wannier90.x || die "Wannier executable cannot be installed"
-	if use perl; then
-		( cd utility; dobin kmesh.pl )
-	fi
-	dolib.a libwannier.a || die "libwannier.a cannot be installed"
+	dobin wannier90.x
+	use perl && dobin utility/kmesh.pl
+	dolib.a libwannier.a
 	insinto /usr/$(get_libdir)/finclude
-	doins src/*.mod || die
+	doins src/*.mod
 	if use examples; then
-		mkdir -p "${D}"/usr/share/${PN}
-		cp -r examples "${D}"/usr/share/${PN}/;
-	fi
-	if use doc; then
-		(cd doc; dodoc *.pdf )
+		insinto /usr/share/${PN}
+		doins -r examples
 	fi
+	use doc && dodoc doc/*.pdf
 	dodoc README README.install CHANGE.log
 }