| 1 |
bicatali 08/07/02 13:51:49 |
| 2 |
|
| 3 |
Modified: camfr-20070717.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Added gcc-4.3 patch, make it blas/lapack implementation more independent, run tests without X (close bug #229753) and some dep cleaning |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-physics/camfr/camfr-20070717.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/camfr-20070717.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/camfr-20070717.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/camfr-20070717.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: camfr-20070717.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- camfr-20070717.ebuild 21 Aug 2007 20:39:12 -0000 1.1 |
| 22 |
+++ camfr-20070717.ebuild 2 Jul 2008 13:51:49 -0000 1.2 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
-# Copyright 1999-2007 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717.ebuild,v 1.1 2007/08/21 20:39:12 pbienst Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717.ebuild,v 1.2 2008/07/02 13:51:49 bicatali Exp $ |
| 29 |
|
| 30 |
-inherit eutils distutils fortran python |
| 31 |
+inherit eutils distutils fortran |
| 32 |
|
| 33 |
DESCRIPTION="Full vectorial Maxwell solver based on eigenmode expansion" |
| 34 |
HOMEPAGE="http://camfr.sourceforge.net/" |
| 35 |
@@ -13,44 +13,55 @@ |
| 36 |
KEYWORDS="~amd64 ~x86" |
| 37 |
IUSE="" |
| 38 |
|
| 39 |
-RDEPEND="virtual/python |
| 40 |
- dev-python/numpy |
| 41 |
- sci-libs/scipy |
| 42 |
- >=dev-python/matplotlib-0.90.1 |
| 43 |
- >=dev-libs/boost-1.30.2 |
| 44 |
- >=dev-python/imaging-1.1.4 |
| 45 |
+RDEPEND="sci-libs/scipy |
| 46 |
+ dev-python/matplotlib |
| 47 |
+ dev-libs/boost |
| 48 |
dev-libs/blitz |
| 49 |
+ dev-python/imaging |
| 50 |
virtual/lapack" |
| 51 |
|
| 52 |
DEPEND="${RDEPEND} |
| 53 |
+ dev-util/pkgconfig |
| 54 |
dev-util/scons" |
| 55 |
|
| 56 |
-FORTAN="gfortran g77" |
| 57 |
- |
| 58 |
-S=${WORKDIR}/${P/-/_} |
| 59 |
+S="${WORKDIR}/${P/-/_}" |
| 60 |
|
| 61 |
pkg_setup() { |
| 62 |
- if ! built_with_use dev-lang/python tk \ |
| 63 |
- || ! built_with_use dev-python/imaging tk ; then |
| 64 |
+ if ! built_with_use dev-lang/python tk || \ |
| 65 |
+ ! built_with_use dev-python/imaging tk ; then |
| 66 |
eerror "Python and/or imaging don't have Tk support enabled." |
| 67 |
eerror "Set the tk USE flag and reinstall python and imaging before continuing." |
| 68 |
die |
| 69 |
fi |
| 70 |
+ FORTRAN="gfortran g77 ifc" |
| 71 |
fortran_pkg_setup |
| 72 |
} |
| 73 |
|
| 74 |
src_unpack() { |
| 75 |
unpack ${A} |
| 76 |
cd "${S}" |
| 77 |
+ epatch "${FILESDIR}"/${P}-gcc43.patch |
| 78 |
cp machine_cfg.py{.gentoo,} || die |
| 79 |
+ sed -i -e '/^library_dirs/d' -e '/^libs/d' machine_cfg.py || die |
| 80 |
+ local lapack_libs= |
| 81 |
+ for x in $(pkg-config --libs-only-l lapack); do |
| 82 |
+ lapack_libs="${lapack_libs}, \"${x/-l/}\"" |
| 83 |
+ done |
| 84 |
+ cat <<-EOF >> machine_cfg.py |
| 85 |
+ library_dirs = ["$(pkg-config --libs-only-L lapack | sed -e 's/-L/')"] |
| 86 |
+ libs = ["boost_python", "blitz"${lapack_libs}] |
| 87 |
+ EOF |
| 88 |
} |
| 89 |
|
| 90 |
src_test() { |
| 91 |
- PYTHONPATH=.:visualisation ${python} testsuite/camfr_test.py \ |
| 92 |
- || die "tests failed" |
| 93 |
+ # trick to avoid X in testing (bug #229753) |
| 94 |
+ echo "backend : Agg" > matplotlibrc |
| 95 |
+ PYTHONPATH=".:visualisation" ${python} testsuite/camfr_test.py \ |
| 96 |
+qq || die "tests failed" |
| 97 |
+ rm -f matplotlibrc |
| 98 |
} |
| 99 |
|
| 100 |
src_install() { |
| 101 |
distutils_src_install |
| 102 |
- dodoc docs/camfr.pdf || die |
| 103 |
+ dodoc docs/camfr.pdf || die "doc install failed" |
| 104 |
} |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
1.8 sci-physics/camfr/ChangeLog |
| 109 |
|
| 110 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/ChangeLog?rev=1.8&view=markup |
| 111 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/ChangeLog?rev=1.8&content-type=text/plain |
| 112 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/ChangeLog?r1=1.7&r2=1.8 |
| 113 |
|
| 114 |
Index: ChangeLog |
| 115 |
=================================================================== |
| 116 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v |
| 117 |
retrieving revision 1.7 |
| 118 |
retrieving revision 1.8 |
| 119 |
diff -u -r1.7 -r1.8 |
| 120 |
--- ChangeLog 5 May 2008 21:55:20 -0000 1.7 |
| 121 |
+++ ChangeLog 2 Jul 2008 13:51:49 -0000 1.8 |
| 122 |
@@ -1,6 +1,11 @@ |
| 123 |
# ChangeLog for sci-physics/camfr |
| 124 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 125 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.7 2008/05/05 21:55:20 bicatali Exp $ |
| 126 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.8 2008/07/02 13:51:49 bicatali Exp $ |
| 127 |
+ |
| 128 |
+ 02 Jul 2008; Sébastien Fabbro <bicatali@g.o> |
| 129 |
+ +files/camfr-20070717-gcc43.patch, camfr-20070717.ebuild: |
| 130 |
+ Added gcc-4.3 patch, make it blas/lapack implementation more independent, |
| 131 |
+ run tests without X (close bug #229753) and some dep cleaning |
| 132 |
|
| 133 |
05 May 2008; Sébastien Fabbro <bicatali@g.o> -files/SConstruct, |
| 134 |
-files/machine_cfg.py, -files/throw_patch.diff, -camfr-1.2.ebuild: |
| 135 |
|
| 136 |
|
| 137 |
|
| 138 |
-- |
| 139 |
gentoo-commits@l.g.o mailing list |
Archives