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

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

6 files changed, 22 insertions, 131 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/Manifest b/sci-libs/gerris/Manifest
index b7e42f98cc16..e762ef4944bf 100644
--- a/sci-libs/gerris/Manifest
+++ b/sci-libs/gerris/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gerris-20100519-autotools.patch 1414 SHA256 bd758909b58ca74def5f9f962afddf4db0edb4ed68c16abdf2e12dfa9a3ee4dd SHA512 1dc7148a3f2d2bd19ba62a6760a0d331ac6dd2e5327bae76fb6032159743edbb4ddbe65ca7be0878930261bc224b3a47a375cf7d9db13682634c173a6c287323 WHIRLPOOL 99ff8c798d1894336370c653fb1d816205ecdcac474ffe21bcd56b43e9dec243b84e1e28d04e84d809d1da9e4e90f087c5b27b0c624a1fc6090bc3b80dc0969a
 AUX gerris-20111123-autotools.patch 3249 SHA256 8c485a120ed850406158e850ebe8e3e51a91085f938bbf1cd7d6d711ba51895e SHA512 5594a5ecd79504dc94ebd7f8a4d3efa6474a00e3b92d8938011f74afb32af7863bd031fc6b9324f78aa00bfdb1d546276bf88951897313316a8c819a3c1c1d54 WHIRLPOOL ac9f9b63b1c9a026c837091041657c64ef759acea52c37d62821734b9b29d4b3e1bfce346f2b3cc523f3bb965f255972456a0e8e31df6e6ede433e9a99cd9b59
 AUX gerris-hypre-no-mpi.patch 730 SHA256 a0d1df524a28c2ac9762475c448e5d317d6cbb2ade4a215f69ec939a936849dc SHA512 f2c58747496b5d5e94da30f53fb5598aba5a868399e14e9c009fba935a6697eca8efe352877ca0502b29459d39de4fdf483a0319e0f8c1dfdf5b8984ecc4f846 WHIRLPOOL 347877817f73d31cdd79497d6b3b323c0f7ca74c9f0704c126af85103e21311073f825a7a63c1d11626f226294120ff75f229904ab54ff58d65b96978de70325
-DIST gerris-20100519.tar.gz 1285580 SHA256 110f3cbc27d5f599467a1795dcb98a41814a3598402a0aebe8f0836b1aaa39c1
-DIST gerris-20111123.tar.gz 2562693 SHA256 f9c5aab9149fd156d9347ace48c257e0a8956e5ced83e747ab3aab3601bb2863 SHA512 f9869fb0b3115709d9bfb69fe0ae0cf135c8dae8cd5582b2d0f8e19ea186cfb6d9f58f1bfbdebcf697894ba58e6d8dc1e4d5d0b96b2849e64bc7a6f6233c2587 WHIRLPOOL 8179c9b218b9fd512e0851daa268e4c7e8c01f786dff690f48cf276cfb3cb5f0576d5d6bdc7660fc4a8f22611e0dfb5134e8a727008fc9368c79ed733cd56a28
 DIST gerris-snapshot-120731.tar.gz 2640044 SHA256 2a032e3418672057d1d83a5280380241d8865d4cc1a53f7bc21e95acd3a5f8fb SHA512 7ec58b715c4e52462c8e0507d34ccf554c71b3bf3575eafd8fb59002c60dcd91a749cfc53b7a4eda1822571777736dab15b0e75594b1d97b4627f72a97defb46 WHIRLPOOL abce090c4f79ee9bf4982ca9bc673ca43c6e40488e308f37a549348eb900ca1d74a8d95b59898bd173167cb849bd5afeca1e38be300d66d711f2a9225108e410
-EBUILD gerris-20100519.ebuild 1096 SHA256 7fa430803ccde59ba2b3fe863dd40c0e5c04e43d031cf97a505ace4c9b713478 SHA512 6724a80254b9d2f036be826b27aec06a5fc094652361eb6f2add412c75b0339d7572048defbf6cc277d41cf8d239d8fcfe58c3655bb175da644c587360275b9a WHIRLPOOL b9d1af543b4edc1d68090f53afbd10e4e72e6cf201b9b7d87e6ccf95aa706e07f80a2a2a5106bb34cdf34f53b9660c0de4be15eea6b41430ed974e322d38e72d
-EBUILD gerris-20111123.ebuild 1356 SHA256 5a6fae8c8bcbfc420f39830660120aca26e7ed1fbb1e15e7052b195d5518274d SHA512 102cce1a5a3196ea25e83e81f4a7df356e19bacb67bdac7f4146caf77844e34195791479a39e6a5db07d50410532e4030d341fb60c4ffd2f71ea6c7becc7cfd5 WHIRLPOOL 659d4da4bea3a1e099c4e929c5c571b1800b2306774cac679653cddf7ee3787951e1928ed0e295c72b102e2204781e2042dff8882f315ab026bc0c3fe799cc25
-EBUILD gerris-20120731.ebuild 1455 SHA256 8ec7e050508c868c49c0053068cdacc0aba3518346db241acb4e50bf433170e7 SHA512 2c58ea7023a012bbb4d6433045ab73e8842a1fe12786ccc1813fbe7721c5bd566f9684accb838d9c0dbeb48895d02300c3f9f0f54b452ef90afe6730e321a3c5 WHIRLPOOL d27b953e5e9a6e652c753c0ade8892d4660dfef60089176190d593cf5884939754fede91cc9d80c1f17138b42f076bb71917c99dab7a3fbf1a1962a3ad9b900f
-MISC ChangeLog 3543 SHA256 02d7745ce9f941687d99e90f6482fa2abb6981823d05a2375b18bcad25dbc87b SHA512 229ae65b27d4b1458057180a8f99a8c6b62ee48db68bde91450ab5e788800a859efa4020efd81d01b10d18fd1e979d525b538f3a423c7f7c8a40b05aa7af9e82 WHIRLPOOL 12ae0d1802b61686b29302ae1f64d5bd097156e213745261638002ec1e47eed62acdb8b0ce81d49e94f07258fbbd6a3f7dcecd7219417d4b77492709d315f361
-MISC metadata.xml 326 SHA256 b703973b39f55b88505f9efde23f9317c80505c82564a1c7dd9233bcb14f4d8e SHA512 b71ddea8a349b11dfc831ebf0453ff97ca247ed0b896ce0081c88f28ecbdfa2a913082c92858a0c204745fa0f41705fb67ad1f1cc47b161fd349fcba8a25c7f3 WHIRLPOOL 4f91ae67ed32b11f56bca932652ba09eb53c951c89bfa1c4ebeabd120b94e08891b58a07cc34d39d810a322f7b0a83af415aea866f56e469fe4163dc88f98a41
+EBUILD gerris-20120731.ebuild 1478 SHA256 85a67eded91746ab7a7b352fc7f932973c9a86b9ac06b99d3f8a561ce5f1e41c SHA512 161794d793738f69a5e0ff51336994ff2589bb824d0952ee274bc02362535a6a8ade93cd6269209467137ae8d163dff7bea34199284db571d924bcfa758fa6c8 WHIRLPOOL 43736a92c1c47be937103d05da2171d69f7914bd0a17327136f7bc7d06a3eacd88b4f7f46db8381fbd871a954988d5e7906ef75b7e4f7b47f4f8e31ca0b039e5
+MISC ChangeLog 3768 SHA256 7b1fca0c2433c003722514669bd9c7a5f8dad7540a5a6f8f4b77f2b41bafd294 SHA512 e5eff55c184927bb5595be6d7b43552ddb13848031d8070d23a6ed9bbafb49ccab4c538399901951ca48147916ca9b47a05c8c4b2ebfdac8812436c4fdfdde52 WHIRLPOOL d07eb006e35dee332055f271f04084d0342bbf312953bf363b2471cfc64c1b981ec5bb6f0a47e98f27c3d2c26c5e1baf060529deb1faeb20ecf2c7bdc6936db5
+MISC metadata.xml 330 SHA256 7b6bb0c273e7dd66c1c3b1882303ee64c487c3ae41201a113a61af786b5912f9 SHA512 1b2752486f77017b10b77f22aaeb5bfb3ecbbac4481c667a0b03b0d9799009a4973a201c6fb7394f0a994d57767953130f7f5da6f47c25dcd215431785693bbc WHIRLPOOL b1eb088a0bfdf35b97b5713146b2d63d8a8ebcec97654d5b39153c0a3041b940537bb2d4b4b3951941bb5367e410d64b9d67465b9003c6bc7b0cb6b06e0403d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAincYACgkQ1ycZbhPLE2CWMgCglhTFmDzllvj+zxkLiego4cYq
-SxwAoIiidjq+DyDwlTm0xlU3CXOKN1qe
-=EQLl
+iEYEAREKAAYFAlEmmeUACgkQgAnW8HDreRaprwCeJgpnJ/CfAjtN805luFbHzRq9
+DIIAnA7FpWuOu61czITECTI97KVN3l/p
+=whLt
 -----END PGP SIGNATURE-----
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>