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

Package-Manager: portage-2.2.0_alpha163

6 files changed, 19 insertions, 200 deletions

diff --git a/sci-mathematics/freefem++/ChangeLog b/sci-mathematics/freefem++/ChangeLog
index 79b2a3d54..b24646499 100644
--- a/sci-mathematics/freefem++/ChangeLog
+++ b/sci-mathematics/freefem++/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-mathematics/freefem++
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org>
+  -files/freefem++-3.4.2-no-doc-autobuild.patch, -freefem++-3.5.ebuild,
+  freefem++-3.8.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  drop old
+
   19 Sep 2010; Justin Lecher <jlec@gentoo.org> freefem++-3.5.ebuild,
   freefem++-3.8.ebuild:
   virtual/glut -> media-libs/freeglut & virtual/glu -> virtual/opengl
diff --git a/sci-mathematics/freefem++/Manifest b/sci-mathematics/freefem++/Manifest
index 75f7558d5..a7b3c4eae 100644
--- a/sci-mathematics/freefem++/Manifest
+++ b/sci-mathematics/freefem++/Manifest
@@ -1,2 +1 @@
-DIST freefem++-3.5.tar.gz 18472428 RMD160 3eccdd385566d470778d5a1fab494638f5bb1b85 SHA1 301fd85e72e7b4ca001fe20459ccde6d899b4895 SHA256 c67c859dc7e5b498fa52b5f7cf99e3325f6c2facf42afd5eb77e16f83192c687
-DIST freefem++-3.8.tar.gz 21848854 RMD160 31e3b23ede5c0097cbd7c36bd79d8c95be4ea868 SHA1 791783afb35f76b3638180b89a4cf39c6b91d545 SHA256 4ea6d754eb3914f20b1fe7620d562e95461b7206f289108e2fc803baecf70e6c
+DIST freefem++-3.8.tar.gz 21848854 SHA256 4ea6d754eb3914f20b1fe7620d562e95461b7206f289108e2fc803baecf70e6c
diff --git a/sci-mathematics/freefem++/files/freefem++-3.4.2-no-doc-autobuild.patch b/sci-mathematics/freefem++/files/freefem++-3.4.2-no-doc-autobuild.patch
deleted file mode 100644
index add003aea..000000000
--- a/sci-mathematics/freefem++/files/freefem++-3.4.2-no-doc-autobuild.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN freefem++-3.4.old/DOC/Makefile.am freefem++-3.4.new/DOC/Makefile.am
---- freefem++-3.4.old/DOC/Makefile.am	2009-07-15 17:19:57.000000000 +0200
-+++ freefem++-3.4.new/DOC/Makefile.am	2009-07-15 17:20:22.000000000 +0200
-@@ -1,4 +1,4 @@
--dist_pkgdata_DATA=$(DOCPDF)
-+all:
- documentation: $(DOCPDF) 
- docps:  $(DOCPS) $(DOCPSGZ) 
- docpdf: $(DOCPDF) 
-@@ -117,4 +117,4 @@
- 
- 
- # do not delete the copy figure to long to created 
--.PRECIOUS: $(CPFIGS_PDF) $(CPFIGS_EPS)
-\ No newline at end of file
-+.PRECIOUS: $(CPFIGS_PDF) $(CPFIGS_EPS)
-diff -urN freefem++-3.4.old/Makefile.am freefem++-3.4.new/Makefile.am
---- freefem++-3.4.old/Makefile.am	2009-07-15 17:19:57.000000000 +0200
-+++ freefem++-3.4.new/Makefile.am	2009-07-15 17:55:42.000000000 +0200
-@@ -147,10 +147,6 @@
- 
- # Native MacOS packaging
- # ----------------------
--install-exec-local:: 
--	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/$(VERSION)
--	tar cvf - $(FF_EXAMPLES_FILES)| (cd $(DESTDIR)$(pkgdatadir)/$(VERSION); tar xvf -)
--
- ListFiles-natives: .FORCE 
- #	echo COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION >$@	
- #	echo mode-mi-edp.zip >> $@
diff --git a/sci-mathematics/freefem++/freefem++-3.5.ebuild b/sci-mathematics/freefem++/freefem++-3.5.ebuild
deleted file mode 100644
index fd8d32d11..000000000
--- a/sci-mathematics/freefem++/freefem++-3.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils flag-o-matic mpi versionator
-
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Solve PDEs using FEM on 2d and 3d domains"
-HOMEPAGE="http://www.freefem.org/ff++/"
-SRC_URI="http://www.freefem.org/ff%2B%2B/ftp/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples mpi opengl vim-syntax X"
-
-RDEPEND="sci-libs/fftw
-	virtual/cblas
-	virtual/lapack
-	sci-libs/umfpack
-	>=sci-libs/arpack-96-r2
-	mpi? ( $(mpi_pkg_deplist) )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		)
-	vim-syntax? ( app-vim/freefem++-syntax )
-	X? (
-		media-fonts/font-misc-misc
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXxf86vm
-		)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? (
-		|| (
-			(
-				dev-texlive/texlive-latexrecommended
-				dev-texlive/texlive-latexextra
-			)
-			app-text/ptex
-			)
-		virtual/latex-base
-		media-gfx/imagemagick
-		)"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# acoptim.m4 forced -O2 removal
-	epatch "${FILESDIR}"/${PN}-acoptim.patch
-	# do not try to do a forced "manual" installation of
-	# examples and documentation
-	epatch "${FILESDIR}"/${PN}-no-doc-autobuild.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	if use mpi; then
-		myconf="${myconf} --with-mpi=$(mpi_pkg_cxx)"
-	else
-		myconf="--without-mpi"
-	fi
-
-	econf \
-		--disable-download \
-		--disable-optim \
-		--enable-generic \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
-		$(use_enable opengl) \
-		$(use_with X x) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc; then
-		emake documentation || die "emake documentation failed"
-	fi
-}
-
-src_test() {
-	if use mpi; then
-		# This may depend on the used MPI implementation. It is needed
-		# with mpich2, but should not be needed with lam-mpi or mpich
-		# (if the system is configured correctly).
-		ewarn "Please check that your MPI root ring is on before running"
-		ewarn "the test phase. Failing to start it before that phase may"
-		ewarn "result in a failing emerge."
-		epause
-	fi
-	emake -j1 check || die "check test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Fixing freefem++.pref
-	dodir /etc
-	cat > "${D}"/etc/freefem++.pref <<EOF
-loadpath += "./"
-loadpath += "/usr/lib/${PN}"
-EOF
-	rm "${D}"/usr/lib/ff++/${MY_PV}/etc/freefem++.pref
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}/etc
-
-	# Move the libraries to the right location
-	dodir /usr/lib/${PN}
-	mv "${D}"/usr/lib/ff++/${MY_PV}/lib/* "${D}"/usr/lib/${PN}
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}/lib
-
-	# Move the headers to the right location
-	dodir /usr/include/${PN}
-	mv "${D}"/usr/lib/ff++/${MY_PV}/include/* "${D}"/usr/include/${PN}
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}/include
-
-	# Remove empty directory tree
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}/idp
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}
-	rmdir "${D}"/usr/lib/ff++
-
-	dodoc AUTHORS INNOVATION HISTORY* README
-
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins DOC/freefem++doc.pdf || die
-	fi
-
-	if use examples; then
-		einfo "Installing examples..."
-
-		# Remove compiled examples:
-		emake clean || die "emake clean failed"
-
-		einfo "Some of the installed examples assumes that the user has write"
-		einfo "permissions in the working directory and other will look for"
-		einfo "data files in the working directory. For this reason in order to"
-		einfo "run the examples it's better to temporary copy them somewhere"
-		einfo "in the user folder. For example to run the tutorial examples"
-		einfo "it's better to copy the entire examples++-tutorial folder into"
-		einfo "the user directory."
-
-		rm -f examples*/Makefile*
-		doins -r examples*
-	fi
-}
diff --git a/sci-mathematics/freefem++/freefem++-3.8.ebuild b/sci-mathematics/freefem++/freefem++-3.8.ebuild
index 0b1eef451..d9532a87b 100644
--- a/sci-mathematics/freefem++/freefem++-3.8.ebuild
+++ b/sci-mathematics/freefem++/freefem++-3.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit autotools eutils flag-o-matic mpi versionator
+inherit autotools eutils flag-o-matic mpi versionator toolchain-funcs
 
 MY_PV=$(replace_version_separator 2 '-')
 
@@ -15,11 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc examples mpi opengl vim-syntax X"
 
-RDEPEND="sci-libs/fftw
+RDEPEND="
+	sci-libs/fftw
 	virtual/cblas
 	virtual/lapack
 	sci-libs/umfpack
-	>=sci-libs/arpack-96-r2
+	sci-libs/arpack
 	mpi? ( $(mpi_pkg_deplist) )
 	opengl? (
 		media-libs/freeglut
@@ -35,7 +36,7 @@ RDEPEND="sci-libs/fftw
 		)"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	doc? (
 		|| (
 			(
@@ -78,12 +79,11 @@ src_compile() {
 		--disable-download \
 		--disable-optim \
 		--enable-generic \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		$(use_enable opengl) \
 		$(use_with X x) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 
 	emake || die "emake failed"
 
diff --git a/sci-mathematics/freefem++/metadata.xml b/sci-mathematics/freefem++/metadata.xml
index a405992e2..a6d834003 100644
--- a/sci-mathematics/freefem++/metadata.xml
+++ b/sci-mathematics/freefem++/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-mathematics</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
     FreeFem++ is an implementation of a language dedicated to the finite
     element method. It enables you to solve Partial Differential Equations
     (PDE) easily.