1 |
commit: 82d567a68a4aa27513888fd86bd9ac2e471e7849 |
2 |
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz> |
3 |
AuthorDate: Sat Apr 28 11:46:37 2012 +0000 |
4 |
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz> |
5 |
CommitDate: Sat Apr 28 11:46:37 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=82d567a6 |
7 |
|
8 |
The dependence of sci-physics/abinit on sci-libs/fox corrected. |
9 |
|
10 |
--- |
11 |
sci-libs/fox/ChangeLog | 7 +++++++ |
12 |
.../fox/{fox-4.1.2.ebuild => fox-4.1.2-r1.ebuild} | 0 |
13 |
sci-physics/abinit/ChangeLog | 7 +++++++ |
14 |
...binit-6.12.3.ebuild => abinit-6.12.3-r1.ebuild} | 6 +++--- |
15 |
4 files changed, 17 insertions(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/fox/ChangeLog b/sci-libs/fox/ChangeLog |
18 |
index 7a9085f..da2ec66 100644 |
19 |
--- a/sci-libs/fox/ChangeLog |
20 |
+++ b/sci-libs/fox/ChangeLog |
21 |
@@ -2,6 +2,13 @@ |
22 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: $ |
24 |
|
25 |
+*fox-4.1.2-r1 (28 Apr 2012) |
26 |
+ |
27 |
+ 28 Apr 2012; Honza Macháček <Hloupy.Honza@×××××××.cz> -fox-4.1.2.ebuild, |
28 |
+ +fox-4.1.2-r1.ebuild: |
29 |
+ fox-4.1.2.ebuild made 4.1.2-r1 to mark the important change in patching |
30 |
+ FoX-config |
31 |
+ |
32 |
20 Apr 2012; Honza Macháček <Hloupy.Honza@×××××××.cz> fox-4.1.2.ebuild: |
33 |
Modular download enabled, FoX-config improved. |
34 |
|
35 |
|
36 |
diff --git a/sci-libs/fox/fox-4.1.2.ebuild b/sci-libs/fox/fox-4.1.2-r1.ebuild |
37 |
similarity index 100% |
38 |
rename from sci-libs/fox/fox-4.1.2.ebuild |
39 |
rename to sci-libs/fox/fox-4.1.2-r1.ebuild |
40 |
|
41 |
diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog |
42 |
index f0219bb..fbf4368 100644 |
43 |
--- a/sci-physics/abinit/ChangeLog |
44 |
+++ b/sci-physics/abinit/ChangeLog |
45 |
@@ -2,6 +2,13 @@ |
46 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
47 |
# $Header: $ |
48 |
|
49 |
+*abinit-6.12.3-r1 (28 Apr 2012) |
50 |
+ |
51 |
+ 28 Apr 2012; Honza Macháček <Hloupy.Honza@×××××××.cz> |
52 |
+ -abinit-6.12.3.ebuild, +abinit-6.12.3-r1.ebuild: |
53 |
+ Dependence on sci-libs/fox made right (Abinit needs SAX), FoX-config employed |
54 |
+ (needs the changes of FoX-config made in the sci-libs/fox-1.4.2-r1 ebuild) |
55 |
+ |
56 |
20 Apr 2012; Honza Macháček <Hloupy.Honza@×××××××.cz> |
57 |
-abinit-6.12.2.ebuild, abinit-6.12.3.ebuild: |
58 |
Dependence on unused sci-libs/fox modules removed. |
59 |
|
60 |
diff --git a/sci-physics/abinit/abinit-6.12.3.ebuild b/sci-physics/abinit/abinit-6.12.3-r1.ebuild |
61 |
similarity index 98% |
62 |
rename from sci-physics/abinit/abinit-6.12.3.ebuild |
63 |
rename to sci-physics/abinit/abinit-6.12.3-r1.ebuild |
64 |
index 58db1b6..9efcd06 100644 |
65 |
--- a/sci-physics/abinit/abinit-6.12.3.ebuild |
66 |
+++ b/sci-physics/abinit/abinit-6.12.3-r1.ebuild |
67 |
@@ -20,7 +20,7 @@ RDEPEND="=sci-libs/bigdft-1.6_pre1 |
68 |
=sci-libs/libxc-1*[fortran] |
69 |
sci-physics/atompaw[libxc] |
70 |
etsf_io? ( sci-libs/etsf_io ) |
71 |
- fox? ( sci-libs/fox[dom,sax,wcml,wxml] ) |
72 |
+ fox? ( >=sci-libs/fox-4.1.2-r1[sax] ) |
73 |
netcdf? ( |
74 |
sci-libs/netcdf[fortran] |
75 |
hdf5? ( |
76 |
@@ -118,8 +118,8 @@ src_prepare() { |
77 |
|
78 |
src_configure() { |
79 |
local libs="-L/usr/$(get_libdir)" |
80 |
- local modules="-I/usr/$(get_libdir)/finclude" |
81 |
- local FoX_libs="${libs} -lFoX_common -lFoX_utils -lFoX_fsys" |
82 |
+ local modules="-I/usr/$(get_libdir)/finclude $(FoX-config --sax --fcflags)" |
83 |
+ local FoX_libs="${libs} $(FoX-config --sax --libs)" |
84 |
local trio_flavor="" |
85 |
use etsf_io && trio_flavor="${trio_flavor}+etsf_io" |
86 |
use fox && trio_flavor="${trio_flavor}+fox" |