sci-libs/wannier90: Use doheader

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec@gentoo.org>

4 files changed, 15 insertions, 18 deletions

diff --git a/sci-libs/wannier90/metadata.xml b/sci-libs/wannier90/metadata.xml
index b229aec85..d369d068f 100644
--- a/sci-libs/wannier90/metadata.xml
+++ b/sci-libs/wannier90/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci</herd>
 </pkgmetadata>
diff --git a/sci-libs/wannier90/wannier90-1.2-r3.ebuild b/sci-libs/wannier90/wannier90-1.2-r3.ebuild
index c21d63907..08621ac99 100644
--- a/sci-libs/wannier90/wannier90-1.2-r3.ebuild
+++ b/sci-libs/wannier90/wannier90-1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="http://wannier.org/code/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="doc examples perl test"
+IUSE="doc examples perl static-libs test"
 
 RDEPEND="
 	virtual/blas
@@ -52,7 +52,7 @@ src_compile() {
 
 src_test() {
 	einfo "Compare the 'Standard' and 'Current' outputs of this test."
-	pushd tests
+	cd tests
 	emake test
 	cat wantest.log
 }
@@ -60,9 +60,8 @@ src_test() {
 src_install() {
 	dobin wannier90.x
 	use perl && dobin utility/kmesh.pl
-	dolib.a libwannier.a
-	insinto /usr/include
-	doins src/*.mod
+	use static-libs && dolib.a libwannier.a
+	doheader src/*.mod
 	if use examples; then
 		insinto /usr/share/${PN}
 		doins -r examples
diff --git a/sci-libs/wannier90/wannier90-2.0.0.ebuild b/sci-libs/wannier90/wannier90-2.0.0.ebuild
index 6d6cff0c4..66fde81ec 100644
--- a/sci-libs/wannier90/wannier90-2.0.0.ebuild
+++ b/sci-libs/wannier90/wannier90-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="http://wannier.org/code/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="doc examples perl test"
+IUSE="doc examples perl static-libs test"
 
 RDEPEND="
 	virtual/blas
@@ -45,7 +45,7 @@ src_compile() {
 
 src_test() {
 	einfo "Compare the 'Standard' and 'Current' outputs of this test."
-	pushd tests
+	cd tests
 	emake test
 	cat wantest.log
 }
@@ -53,9 +53,8 @@ src_test() {
 src_install() {
 	dobin wannier90.x
 	use perl && dobin utility/kmesh.pl
-	dolib.a libwannier.a
-	insinto /usr/include
-	doins src/obj/*.mod
+	use static-libs && dolib.a libwannier.a
+	doheader src/obj/*.mod
 	if use examples; then
 		insinto /usr/share/${PN}
 		doins -r examples
diff --git a/sci-libs/wannier90/wannier90-2.0.1.ebuild b/sci-libs/wannier90/wannier90-2.0.1.ebuild
index e58bf47e0..cd0e03249 100644
--- a/sci-libs/wannier90/wannier90-2.0.1.ebuild
+++ b/sci-libs/wannier90/wannier90-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://wannier.org/code/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="doc examples perl test"
+IUSE="doc examples perl static-libs test"
 
 RDEPEND="
 	virtual/blas
@@ -46,7 +46,7 @@ src_compile() {
 
 src_test() {
 	einfo "Compare the 'Standard' and 'Current' outputs of this test."
-	pushd tests
+	cd tests
 	emake test
 	cat wantest.log
 }
@@ -54,9 +54,8 @@ src_test() {
 src_install() {
 	dobin wannier90.x
 	use perl && dobin utility/kmesh.pl
-	dolib.a libwannier.a
-	insinto /usr/include
-	doins src/obj/*.mod
+	use static-libs && dolib.a libwannier.a
+	doheader src/obj/*.mod
 	if use examples; then
 		insinto /usr/share/${PN}
 		doins -r examples