sci-libs/fgsl: Don't use plain pkg-config

Package-Manager: portage-2.2.8

4 files changed, 47 insertions, 30 deletions

diff --git a/sci-libs/fgsl/ChangeLog b/sci-libs/fgsl/ChangeLog
index 9013e8077..d157df171 100644
--- a/sci-libs/fgsl/ChangeLog
+++ b/sci-libs/fgsl/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/fgsl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> fgsl-0.9.3.ebuild,
+  fgsl-0.9.4.ebuild, metadata.xml:
+  Don't use plain pkg-config
+
 *fgsl-0.9.4 (28 Jun 2011)
 
   28 Jun 2011; Justin Lecher <jlec@gentoo.org> fgsl-0.9.3.ebuild,
diff --git a/sci-libs/fgsl/fgsl-0.9.3.ebuild b/sci-libs/fgsl/fgsl-0.9.3.ebuild
index cb37221d7..93e52e3d2 100644
--- a/sci-libs/fgsl/fgsl-0.9.3.ebuild
+++ b/sci-libs/fgsl/fgsl-0.9.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit eutils fortran-2 multilib toolchain-funcs
 
@@ -15,28 +15,34 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="static-libs"
 
-DEPEND="
-	>=sci-libs/gsl-1.14
-	virtual/fortran"
-RDEPEND="${DEPEND}"
+RDEPEND=">=sci-libs/gsl-1.14"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 #TODO: make docs
 
 FORTRAN_STANDARD=90
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-sharedlibs.patch
-	use amd64 && ln -s interface/integer_ilp64.finc integer.finc
-	use x86 && ln -s interface/integer_ilp32.finc integer.finc
+	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 = $(pkg-config --libs gsl)
-		GSL_INC = $(pkg-config --cflags gsl)
+		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"
 }
 
@@ -46,8 +52,8 @@ src_configure() {
 
 src_install() {
 	dodoc NEWS README
-	ln -s lib${PN}.so.0.0.0 lib${PN}.so.0
-	ln -s lib${PN}.so.0.0.0 lib${PN}.so
+	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
diff --git a/sci-libs/fgsl/fgsl-0.9.4.ebuild b/sci-libs/fgsl/fgsl-0.9.4.ebuild
index d5fef4805..e5e717faf 100644
--- a/sci-libs/fgsl/fgsl-0.9.4.ebuild
+++ b/sci-libs/fgsl/fgsl-0.9.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit eutils fortran-2 multilib toolchain-funcs
 
@@ -15,27 +15,34 @@ SLOT="0"
 KEYWORDS="~amd64 ~amd64-linux"
 IUSE="static-libs"
 
-DEPEND=">=sci-libs/gsl-1.15
-	virtual/fortran"
-RDEPEND="${DEPEND}"
+RDEPEND=">=sci-libs/gsl-1.14"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 #TODO: make docs
 
 FORTRAN_STANDARD=90
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.3-sharedlibs.patch
-	use amd64 && ln -s interface/integer_ilp64.finc integer.finc
-	use x86 && ln -s interface/integer_ilp32.finc integer.finc
+	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 = $(pkg-config --libs gsl)
-		GSL_INC = $(pkg-config --cflags gsl)
+		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"
 }
 
@@ -45,8 +52,8 @@ src_configure() {
 
 src_install() {
 	dodoc NEWS README
-	ln -s lib${PN}.so.0.0.0 lib${PN}.so.0
-	ln -s lib${PN}.so.0.0.0 lib${PN}.so
+	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
diff --git a/sci-libs/fgsl/metadata.xml b/sci-libs/fgsl/metadata.xml
index 111e6a558..9cbb8f9a2 100644
--- a/sci-libs/fgsl/metadata.xml
+++ b/sci-libs/fgsl/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>xarthisius@gentoo.org</email>
-		<name>Kacper Kowalik</name>
-	</maintainer>
-	<longdescription>FGSL: A Fortran interface to the GNU Scientific Library</longdescription>
+  <herd>sci</herd>
+  <maintainer>
+    <email>xarthisius@gentoo.org</email>
+    <name>Kacper Kowalik</name>
+  </maintainer>
+  <longdescription>FGSL: A Fortran interface to the GNU Scientific Library</longdescription>
 </pkgmetadata>