Propagate LDFLAGS, FFLAGS for newer scons, avoid parsing make.conf

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 63 insertions, 10 deletions

diff --git a/sci-physics/camfr/ChangeLog b/sci-physics/camfr/ChangeLog
index 37068edbd6fc..c6ddcf10af22 100644
--- a/sci-physics/camfr/ChangeLog
+++ b/sci-physics/camfr/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2008/07/07 23:47:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.12 2008/12/09 15:39:43 bicatali Exp $
+
+  09 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/machine_cfg.py.gentoo, camfr-20070717-r1.ebuild:
+  Propagate LDFLAGS, FFLAGS for newer scons, avoid parsing make.conf
 
 *camfr-20070717-r1 (07 Jul 2008)
 
diff --git a/sci-physics/camfr/Manifest b/sci-physics/camfr/Manifest
index dc7dfdd60541..c5219cc3f3a8 100644
--- a/sci-physics/camfr/Manifest
+++ b/sci-physics/camfr/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 AUX camfr-20070717-gcc43.patch 391 RMD160 4addf806c2d8ddb5ee5dbd2cc1b02381dbf3f6b8 SHA1 41ef3f6be02d4d6b6bf6d03b4b1f6e9ef0fca3d9 SHA256 50cfc3e04c4774fd0404d044c128cf8346c1762e64808ca77147cb4207729db3
+AUX machine_cfg.py.gentoo 1177 RMD160 3424d19ee66eacf6aeff3677d2acd844d2feb764 SHA1 4453d6bda496fe00b2a8842bed3c0212d9d581cb SHA256 2aa781f2f6be7cd0311a746080c250fde9b626ac3bac0598b89598977e19c76f
 DIST camfr-20070717.tgz 763070 RMD160 4e4237188caecd4dca3980b9cab381479e6382bc SHA1 7838482db8557b365dac51769950d49746397e29 SHA256 f675ba7d58947076c0679c8760c9282e2efc82828bec67de90567fd8a4f135de
-EBUILD camfr-20070717-r1.ebuild 1959 RMD160 d450caf8405cd4e6b8a8bcf4619015d113301641 SHA1 132d975a83bf8ebe452018d0607259e090441933 SHA256 42859f3f7c58f3a2ccbfaaca48e6e17bc6dad4bf038dedbe12618466f20451b4
-MISC ChangeLog 2118 RMD160 b757a1e69da0632a0f72146b3e0b1ec4d73b2c8c SHA1 9c525dfb147a1afa5bfe650a482be22ddb9218e5 SHA256 79276dcd23dcc7419da8f4e830a5eee3060f0c84413128111847f870f0ff92c3
+EBUILD camfr-20070717-r1.ebuild 2022 RMD160 e4f28b6ad2d7a88fa612ed319e172a16a26047bd SHA1 0d7ec42481730377ac8955b6337997769c3a8be3 SHA256 b2fc72db84f9a45000319e732c78b9d05c2aed691bc5c7451cd2d64de10d9936
+MISC ChangeLog 2301 RMD160 b47a566c51da8abb691280e1fee7a87bacb01590 SHA1 c766d9a5416915ab7616e6516848d90e32f2e3a4 SHA256 c716d7a64a539f0e542f6d55431490262a4678794552aabb8091e1b08a233191
 MISC metadata.xml 164 RMD160 6e4c63a6f70f174f40277eed39ac05fba4a49566 SHA1 e1af6f2028e69dee3c76e7e85353a144c83d3383 SHA256 9eddaccbdd2f6b3f93213d72782f07518dff1625fd8d63faf61dc97bd328b5e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk7qn8ACgkQ1ycZbhPLE2C8mgCfepBUabfwvBeY/S/KZFbALn5h
-Rz4An3A4ogP+frly2lJJt38k2GXgqb71
-=k5eP
+iEYEARECAAYFAkk+kUgACgkQ1ycZbhPLE2Br6ACeKvPtK6dqDu2rK3D3ykwbypV8
+j/IAn21tep6zm8C6Ybuf8g+aFVaXAA7I
+=q7RI
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/camfr/camfr-20070717-r1.ebuild b/sci-physics/camfr/camfr-20070717-r1.ebuild
index 6aba83ae00c8..227fc889971c 100644
--- a/sci-physics/camfr/camfr-20070717-r1.ebuild
+++ b/sci-physics/camfr/camfr-20070717-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2008/07/07 23:47:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717-r1.ebuild,v 1.2 2008/12/09 15:39:43 bicatali Exp $
 
 inherit eutils distutils fortran
 
@@ -33,7 +33,7 @@ pkg_setup() {
 		eerror "Set the tk USE flag and reinstall python and imaging before continuing."
 		die
 	fi
-	FORTRAN="gfortran g77"
+	FORTRAN="gfortran ifc g77"
 	fortran_pkg_setup
 }
 
@@ -41,8 +41,7 @@ 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
+	cp "${FILESDIR}"/machine_cfg.py.gentoo machine_cfg.py || die
 	local lapack_libs=
 	for x in $(pkg-config --libs-only-l lapack); do
 		lapack_libs="${lapack_libs}, \"${x#-l}\""
@@ -60,6 +59,9 @@ src_unpack() {
 		library_dirs = [${lapack_libdirs#,}]
 		libs = ["boost_python", "${libfort}", "blitz"${lapack_libs}]
 	EOF
+
+	# scons redefines F77 to FORTRAN for env variables
+	sed -i -e 's/F77/FORTRAN/g' SConstruct || die
 }
 
 src_test() {
diff --git a/sci-physics/camfr/files/machine_cfg.py.gentoo b/sci-physics/camfr/files/machine_cfg.py.gentoo
new file mode 100644
index 000000000000..673287ff2ad0
--- /dev/null
+++ b/sci-physics/camfr/files/machine_cfg.py.gentoo
@@ -0,0 +1,46 @@
+import os
+
+cc = os.getenv("CC")
+if cc == None:
+   cc = "gcc"
+cxx = os.getenv("CXX")
+if cxx == None:
+   cxx = "g++"
+f77 = os.getenv("F77")
+if f77 == None:
+   f77 = "gfortran"    
+link = cxx
+flags = os.getenv("CXXFLAGS")
+if flags == None:
+   flags = "-O"
+fflags = os.getenv("FFLAGS")
+if fflags == None:
+   fflags = flags
+link_flags = os.getenv("LDFLAGS")
+if link_flags == None:
+   link_flags = ""
+
+base_flags = " -DFORTRAN_SYMBOLS_WITH_SINGLE_TRAILING_UNDERSCORE -DNDEBUG "
+flags_noopt = base_flags
+flags = flags + base_flags 
+fflags =  fflags + base_flags
+
+
+include_dirs = []
+
+if os.path.isdir("/usr/include/python2.5"):
+   include_dirs.append("/usr/include/python2.5")   
+   include_dirs.append("/usr/lib/python2.5/site-packages")
+elif os.path.isdir("/usr/include/python2.4"):
+   include_dirs.append("/usr/include/python2.4")
+   include_dirs.append("/usr/lib/python2.4/site-packages")
+elif os.path.isdir("/usr/include/python2.3"):
+   include_dirs.append("/usr/include/python2.3")   
+   include_dirs.append("/usr/lib/python2.3/site-packages")
+else:
+   print "Python dir not found!"
+   sys.exit()
+
+dllsuffix = ".so"
+strip_command = ""
+extra_files = [("doc", ["docs/camfr.pdf"])]