sci-libs/gerris: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; drop old

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

5 files changed, 15 insertions, 120 deletions

diff --git a/sci-libs/gerris/ChangeLog b/sci-libs/gerris/ChangeLog
index 5ba4ef95b6e1..8cb71447eb05 100644
--- a/sci-libs/gerris/ChangeLog
+++ b/sci-libs/gerris/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gerris
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.17 2012/08/08 17:11:25 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.18 2013/02/21 22:03:35 jlec Exp $
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> -gerris-20100519.ebuild,
+  -gerris-20111123.ebuild, gerris-20120731.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  drop old
 
   08 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
   +files/gerris-hypre-no-mpi.patch, gerris-20120731.ebuild:
diff --git a/sci-libs/gerris/gerris-20100519.ebuild b/sci-libs/gerris/gerris-20100519.ebuild
deleted file mode 100644
index 6b1b9ae7dafb..000000000000
--- a/sci-libs/gerris/gerris-20100519.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20100519.ebuild,v 1.3 2012/05/04 08:22:51 jdhore Exp $
-
-EAPI=2
-
-inherit autotools eutils
-
-DESCRIPTION="The Gerris Flow Solver"
-LICENSE="GPL-2"
-HOMEPAGE="http://gfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gfs/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples mpi"
-
-RDEPEND="dev-libs/glib:2
-	sci-libs/netcdf
-	sci-libs/gsl
-	sci-libs/gts
-	sci-libs/proj
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# test assume it is installed
-RESTRICT="test"
-
-S="${WORKDIR}"/${PN}-snapshot-100519
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable mpi)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake nstall failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		rm -f doc/examples/*.pyc || die "Failed to remove python object"
-		doins -r doc/examples/* || die
-	fi
-}
diff --git a/sci-libs/gerris/gerris-20111123.ebuild b/sci-libs/gerris/gerris-20111123.ebuild
deleted file mode 100644
index 083f7c2b2e48..000000000000
--- a/sci-libs/gerris/gerris-20111123.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20111123.ebuild,v 1.2 2012/05/04 08:22:51 jdhore Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Gerris Flow Solver"
-HOMEPAGE="http://gfs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples mpi static-libs"
-
-# all these deps could be optional
-# but the configure.in would have to be modified
-# heavily for the automagic
-RDEPEND="dev-libs/glib:2
-	dev-games/ode
-	sci-libs/netcdf
-	sci-libs/gsl
-	sci-libs/gts
-	sci-libs/hypre
-	sci-libs/lis
-	sci-libs/proj
-	>=sci-libs/fftw-3
-	virtual/lapack
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# test assume it is installed
-#RESTRICT="test"
-
-S="${WORKDIR}"/${P/-20/-snapshot-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-I${EPREFIX}/usr/include/hypre"
-	econf \
-		$(use_enable mpi) \
-		$(use_enable static-libs static) \
-		LAPACK_LIBS="$(pkg-config --libs lapack)"
-}
-
-src_install() {
-	default
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		rm -f doc/examples/*.pyc || die "Failed to remove python object"
-		doins -r doc/examples/*
-	fi
-}
diff --git a/sci-libs/gerris/gerris-20120731.ebuild b/sci-libs/gerris/gerris-20120731.ebuild
index 82b465505371..6834f60f850e 100644
--- a/sci-libs/gerris/gerris-20120731.ebuild
+++ b/sci-libs/gerris/gerris-20120731.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: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20120731.ebuild,v 1.2 2012/08/08 17:11:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20120731.ebuild,v 1.3 2013/02/21 22:03:35 jlec Exp $
 
 EAPI=4
 
-inherit eutils flag-o-matic autotools
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 MYP=${P/-20/-snapshot-}
 
@@ -21,7 +21,8 @@ IUSE="examples mpi static-libs"
 # all these deps could be optional
 # but the configure.in would have to be modified
 # heavily for the automagic
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	dev-games/ode
 	sci-libs/netcdf
 	sci-libs/gsl
@@ -50,7 +51,7 @@ src_configure() {
 	econf \
 		$(use_enable mpi) \
 		$(use_enable static-libs static) \
-		LAPACK_LIBS="$(pkg-config --libs lapack)"
+		LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 }
 
 src_install() {
diff --git a/sci-libs/gerris/metadata.xml b/sci-libs/gerris/metadata.xml
index 14c7a6b771ae..2406d4e01ce8 100644
--- a/sci-libs/gerris/metadata.xml
+++ b/sci-libs/gerris/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>
-<longdescription lang='en'>
+  <herd>sci</herd>
+  <longdescription lang="en">
   Gerris Flow Solver is a software program for the solution of the partial
   differential equations describing fluid flow.
 </longdescription>