sci-libs/fgsl: Use doheader

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

3 files changed, 3 insertions, 69 deletions

diff --git a/sci-libs/fgsl/Manifest b/sci-libs/fgsl/Manifest
index a255872f4..1fd6ac931 100644
--- a/sci-libs/fgsl/Manifest
+++ b/sci-libs/fgsl/Manifest
@@ -1,2 +1 @@
-DIST fgsl-0.9.3.tar.gz 293761 SHA256 ba6c7d95ea73ea81435b6960fa9dc1e6e11d2da7fa145117111352d873c71ce9 SHA512 6cba7f3b50f43d66deb27791cc5e59aaa41305797246469f48e5060693830987d7397c6b7088ae7918e9576190015d4b11ea2ffca34196becffd8a7d1a8dec2a WHIRLPOOL 4ed970f10e8b96205ff68658552dcea9c8b1b77acdbc80de31b5e46d563e28b3cfa9b4125861e913716a25cf4eb97fa2fc59fd3be148bb23ea95e691cfd7ea41
 DIST fgsl-0.9.4.tar.gz 999825 SHA256 f589283f5b9df5df9ef39b108114df2ed740109fabb8956fe98eaaac20924ba7 SHA512 45186a17d2b7e46968a29e99cbb1c7bb4cb22c14b322337e0166ee2e05e6bd63f709d6da566c30e7b350231dff268e65908e542288bdec7ca88ff1cb505eae3e WHIRLPOOL 3c6e2c1221b1e5f8aeee83b78951c2d777550401c41c416d4dd911e946b6f03fd4f2ede6df7c123f59ada9477e3c6cd05b202d2f0e8c121cedf250001610deb8
diff --git a/sci-libs/fgsl/fgsl-0.9.3.ebuild b/sci-libs/fgsl/fgsl-0.9.3.ebuild
deleted file mode 100644
index 3140d3116..000000000
--- a/sci-libs/fgsl/fgsl-0.9.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="A Fortran interface to the GNU Scientific Library"
-HOMEPAGE="http://www.lrz.de/services/software/mathematik/gsl/fortran/"
-SRC_URI="http://www.lrz.de/services/software/mathematik/gsl/fortran/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-RDEPEND=">=sci-libs/gsl-1.14"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-#TODO: make docs
-
-FORTRAN_STANDARD=90
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sharedlibs.patch
-	if use amd64; then
-		ln -s interface/integer_ilp64.finc integer.finc || die
-	elif use x86; then
-		ln -s interface/integer_ilp32.finc integer.finc || die
-	else
-		die "Don't know who you are"
-	fi
-
-	cat <<- EOF > "${S}/make.inc"
-		F90 = $(tc-getFC)
-		CC = $(tc-getCC)
-		GSL_LIB = $($(tc-getPKG_CONFIG) --libs gsl)
-		GSL_INC = $($(tc-getPKG_CONFIG) --cflags gsl)
-		PREFIX = /usr
-		ARFLAGS = -csrv
-		FPP = -cpp
-		LIB = $(get_libdir)
-	EOF
-
-	use static-libs && echo "STATIC_LIBS = yes" >> "${S}/make.inc"
-}
-
-src_configure() {
-	return
-}
-
-src_install() {
-	dodoc NEWS README
-	ln -s lib${PN}.so.0.0.0 lib${PN}.so.0 || die
-	ln -s lib${PN}.so.0.0.0 lib${PN}.so || die
-	dolib.so lib${PN}.so*
-	insinto /usr/include
-	doins ${PN}.mod
-	if use static-libs ; then
-		newlib.a lib${PN}_$(tc-getFC).a lib${PN}.a
-	fi
-}
diff --git a/sci-libs/fgsl/fgsl-0.9.4.ebuild b/sci-libs/fgsl/fgsl-0.9.4.ebuild
index 9f9c180a4..35d325dea 100644
--- a/sci-libs/fgsl/fgsl-0.9.4.ebuild
+++ b/sci-libs/fgsl/fgsl-0.9.4.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$
 
@@ -55,9 +55,7 @@ src_install() {
 	ln -s lib${PN}.so.0.0.0 lib${PN}.so.0 || die
 	ln -s lib${PN}.so.0.0.0 lib${PN}.so || die
 	dolib.so lib${PN}.so*
-	insinto /usr/include
-	doins ${PN}.mod
-	if use static-libs ; then
+	doheader ${PN}.mod
+	use static-libs && \
 		newlib.a lib${PN}_$(tc-getFC).a lib${PN}.a
-	fi
 }