Added gcc-4.3 patch, make it blas/lapack implementation more independent, run tests without X (close bug #229753) and some dep cleaning

Package-Manager: portage-2.1.4.4

4 files changed, 52 insertions, 23 deletions

diff --git a/sci-physics/camfr/ChangeLog b/sci-physics/camfr/ChangeLog
index cdfeac2a8079..eec5f806f443 100644
--- a/sci-physics/camfr/ChangeLog
+++ b/sci-physics/camfr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/camfr
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.7 2008/05/05 21:55:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.8 2008/07/02 13:51:49 bicatali Exp $
+
+  02 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/camfr-20070717-gcc43.patch, camfr-20070717.ebuild:
+  Added gcc-4.3 patch, make it blas/lapack implementation more independent,
+  run tests without X (close bug #229753) and some dep cleaning
 
   05 May 2008; Sébastien Fabbro <bicatali@gentoo.org> -files/SConstruct,
   -files/machine_cfg.py, -files/throw_patch.diff, -camfr-1.2.ebuild:
diff --git a/sci-physics/camfr/Manifest b/sci-physics/camfr/Manifest
index b69e8142349a..a49e94c4f19b 100644
--- a/sci-physics/camfr/Manifest
+++ b/sci-physics/camfr/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX camfr-20070717-gcc43.patch 391 RMD160 4addf806c2d8ddb5ee5dbd2cc1b02381dbf3f6b8 SHA1 41ef3f6be02d4d6b6bf6d03b4b1f6e9ef0fca3d9 SHA256 50cfc3e04c4774fd0404d044c128cf8346c1762e64808ca77147cb4207729db3
 DIST camfr-20070717.tgz 763070 RMD160 4e4237188caecd4dca3980b9cab381479e6382bc SHA1 7838482db8557b365dac51769950d49746397e29 SHA256 f675ba7d58947076c0679c8760c9282e2efc82828bec67de90567fd8a4f135de
-EBUILD camfr-20070717.ebuild 1280 RMD160 224f1824cce7ce3ddfff5262f38d0cc9ce74d53b SHA1 b3af8bc382da675646894ecddc1359abbac43447 SHA256 63057c9c8095467bc8447a87cadec8dd591bdb1f5778987646c7e961b7a9b091
-MISC ChangeLog 1408 RMD160 7a772574908e9314209d7f5a24f986c116c9dc69 SHA1 e157c18aa6c852d1791373679d42e16e92749c78 SHA256 93014bf79c8a2ff5201823622b906681f1e6132bb67b635fce09318acb860fa0
+EBUILD camfr-20070717.ebuild 1752 RMD160 060e1dcca38f045079edb60ad016275ea66a4dab SHA1 c41656fde4b6672470bedfa2249d4bf06ee451cc SHA256 eb71750bbac771d80c4106957251d176f18f164c4ed6dce9dfb39dc5b42dbbc1
+MISC ChangeLog 1664 RMD160 28fb7be0cd2a010deb58c8d9035afbc69031d29a SHA1 4a3968d15f44c2787686e417beda8a30ecb81035 SHA256 8dbc216a50d5b6fa49cb4677fb889d0a292ac2beb2a35cf8e542b5b0aa7a912d
 MISC metadata.xml 164 RMD160 6e4c63a6f70f174f40277eed39ac05fba4a49566 SHA1 e1af6f2028e69dee3c76e7e85353a144c83d3383 SHA256 9eddaccbdd2f6b3f93213d72782f07518dff1625fd8d63faf61dc97bd328b5e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgfgncACgkQ1ycZbhPLE2DG+QCfePkNbwpsgyLMDu94QBBQkqB+
-yWEAoJdRbh5m0VWL4uFvNVOjyNyTOxIJ
-=PbmO
+iEYEARECAAYFAkhrh/0ACgkQ1ycZbhPLE2CjGgCgidqgrtFNtbmklPGHZiN8b3/1
+pWEAn2Q9uNYY/wRhrYGDAIwIlWKaxpCj
+=YNFL
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/camfr/camfr-20070717.ebuild b/sci-physics/camfr/camfr-20070717.ebuild
index 26a7199baeaf..363439298a1c 100644
--- a/sci-physics/camfr/camfr-20070717.ebuild
+++ b/sci-physics/camfr/camfr-20070717.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717.ebuild,v 1.1 2007/08/21 20:39:12 pbienst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717.ebuild,v 1.2 2008/07/02 13:51:49 bicatali Exp $
 
-inherit eutils distutils fortran python
+inherit eutils distutils fortran
 
 DESCRIPTION="Full vectorial Maxwell solver based on eigenmode expansion"
 HOMEPAGE="http://camfr.sourceforge.net/"
@@ -13,44 +13,55 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/python
-	dev-python/numpy
-	sci-libs/scipy
-	>=dev-python/matplotlib-0.90.1
-	>=dev-libs/boost-1.30.2
-	>=dev-python/imaging-1.1.4
+RDEPEND="sci-libs/scipy
+	dev-python/matplotlib
+	dev-libs/boost
 	dev-libs/blitz
+	dev-python/imaging
 	virtual/lapack"
 
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	dev-util/scons"
 
-FORTAN="gfortran g77"
-
-S=${WORKDIR}/${P/-/_}
+S="${WORKDIR}/${P/-/_}"
 
 pkg_setup() {
-	if ! built_with_use dev-lang/python tk \
-		|| ! built_with_use dev-python/imaging tk ; then
+	if  ! built_with_use dev-lang/python tk || \
+		! built_with_use dev-python/imaging tk ; then
 		eerror "Python and/or imaging don't have Tk support enabled."
 		eerror "Set the tk USE flag and reinstall python and imaging before continuing."
 		die
 	fi
+	FORTRAN="gfortran g77 ifc"
 	fortran_pkg_setup
 }
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	cp machine_cfg.py{.gentoo,} || die
+	sed -i -e '/^library_dirs/d'  -e '/^libs/d' machine_cfg.py || die
+	local lapack_libs=
+	for x in $(pkg-config --libs-only-l lapack); do
+		lapack_libs="${lapack_libs}, \"${x/-l/}\""
+	done
+	cat <<-EOF >> machine_cfg.py
+		library_dirs = ["$(pkg-config --libs-only-L lapack | sed -e 's/-L/')"]
+		libs = ["boost_python", "blitz"${lapack_libs}]
+	EOF
 }
 
 src_test() {
-	PYTHONPATH=.:visualisation ${python} testsuite/camfr_test.py \
-		|| die "tests failed"
+	# trick to avoid X in testing (bug #229753)
+	echo "backend : Agg" > matplotlibrc
+	PYTHONPATH=".:visualisation" ${python} testsuite/camfr_test.py \
+qq		|| die "tests failed"
+	rm -f matplotlibrc
 }
 
 src_install() {
 	distutils_src_install
-	dodoc docs/camfr.pdf || die
+	dodoc docs/camfr.pdf || die "doc install failed"
 }
diff --git a/sci-physics/camfr/files/camfr-20070717-gcc43.patch b/sci-physics/camfr/files/camfr-20070717-gcc43.patch
new file mode 100644
index 000000000000..dd10cc25bdaa
--- /dev/null
+++ b/sci-physics/camfr/files/camfr-20070717-gcc43.patch
@@ -0,0 +1,12 @@
+--- camfr/primitives/section/sectiondisp.cpp~	2007-07-18 09:48:46.000000000 +0100
++++ camfr/primitives/section/sectiondisp.cpp	2008-07-02 11:18:24.000000000 +0100
+@@ -20,7 +20,8 @@
+ using std::cout;
+ using std::cerr;
+ using std::endl;
+-
++#include <complex>
++using std::abs;
+ #include "../../util/vectorutil.h"
+ 
+ /////////////////////////////////////////////////////////////////////////////