Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/psi/files: 3.4.0-dont-build-libint.patch 3.4.0-destdir.patch psi-3.4.0-parallel-make.patch 3.4.0-gcc-4.3.patch
Date: Thu, 24 Jun 2010 21:08:06
Message-Id: 20100624210801.650BC2CF4F@corvid.gentoo.org
1 jlec 10/06/24 21:08:01
2
3 Added: 3.4.0-dont-build-libint.patch 3.4.0-destdir.patch
4 psi-3.4.0-parallel-make.patch 3.4.0-gcc-4.3.patch
5 Log:
6 Version Bump, #279566
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sci-chemistry/psi/files/3.4.0-dont-build-libint.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/psi/files/3.4.0-dont-build-libint.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/psi/files/3.4.0-dont-build-libint.patch?rev=1.1&content-type=text/plain
14
15 Index: 3.4.0-dont-build-libint.patch
16 ===================================================================
17 diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
18 index 42e025d..b098a36 100644
19 --- a/src/lib/Makefile.in
20 +++ b/src/lib/Makefile.in
21 @@ -2,7 +2,7 @@
22 .PHONY: default all install depend clean dclean targetclean
23
24 subdirs = libipv1 libciomr libchkpt libqt libpsio libiwl libdpd libutil \
25 - liboptions libmoinfo libint libderiv libr12 libbasis libmints
26 + liboptions libmoinfo libbasis libmints
27
28 all: default
29
30
31
32
33 1.1 sci-chemistry/psi/files/3.4.0-destdir.patch
34
35 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/psi/files/3.4.0-destdir.patch?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/psi/files/3.4.0-destdir.patch?rev=1.1&content-type=text/plain
37
38 Index: 3.4.0-destdir.patch
39 ===================================================================
40 diff --git a/Makefile.in b/Makefile.in
41 index aca5a16..2e49f0a 100644
42 --- a/Makefile.in
43 +++ b/Makefile.in
44 @@ -8,6 +8,7 @@ subdirs = lib include src
45
46 top_srcdir = @top_srcdir@
47 srcdir = @srcdir@
48 +datarootdir = @datarootdir@
49 VPATH = @srcdir@
50 top_objdir = .
51
52 diff --git a/lib/ruby/Makefile.in b/lib/ruby/Makefile.in
53 index b31ce7f..e099e1b 100644
54 --- a/lib/ruby/Makefile.in
55 +++ b/lib/ruby/Makefile.in
56 @@ -29,10 +29,10 @@ ccenergy.rb cclambda.rb chkpt.rb color.rb deriv2.rb frequ
57 cceom.rb ccsort.rb cints.rb cphf.rb detci.rb input.rb optking.rb psi3.rb testcases.rb
58
59 install: $(RUBYSRC)
60 - $(MKDIRS) $(rubydatadir)
61 + $(MKDIRS) $(DESTDIR)/$(rubydatadir)
62 for rbfile in $(RUBYSRC); \
63 do \
64 - ($(INSTALL_DATA) $(srcdir)/$${rbfile} $(rubydatadir)) || exit 1; \
65 + ($(INSTALL_DATA) $(srcdir)/$${rbfile} $(DESTDIR)/$(rubydatadir)) || exit 1; \
66 done
67
68 install_man:
69 diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
70 index e1abb46..4eddf8d 100644
71 --- a/src/bin/Makefile.in
72 +++ b/src/bin/Makefile.in
73 @@ -65,6 +65,7 @@ targetclean:
74
75 top_srcdir = @top_srcdir@
76 srcdir = @srcdir@
77 +datarootdir = @datarootdir@
78 top_objdir = ../..
79
80 $(top_srcdir)/configure: $(top_srcdir)/configure.ac $(top_srcdir)/aclocal.m4
81
82
83
84 1.1 sci-chemistry/psi/files/psi-3.4.0-parallel-make.patch
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/psi/files/psi-3.4.0-parallel-make.patch?rev=1.1&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/psi/files/psi-3.4.0-parallel-make.patch?rev=1.1&content-type=text/plain
88
89 Index: psi-3.4.0-parallel-make.patch
90 ===================================================================
91 diff --git a/src/lib/libipv1/Makefile.in b/src/lib/libipv1/Makefile.in
92 index eafe8e2..141bf3b 100644
93 --- a/src/lib/libipv1/Makefile.in
94 +++ b/src/lib/libipv1/Makefile.in
95 @@ -33,10 +33,12 @@ LIBOBJ = $(ALLCSRC:%.c=%.o) $(ALLCXXSRC:%.cc=%.o)
96
97 include ../MakeRules
98
99 -y.tab.c y.tab.h: parse.y
100 +y.tab.h: y.tab.c
101 +
102 +y.tab.c: parse.y
103 $(YACC) -v -d $<
104
105 -scan.c: scan.l
106 +scan.c: scan.l y.tab.h
107 $(LEX) -t $^ > scan.c
108
109 install_inc:: $(ALLINCLUDE)
110
111
112
113 1.1 sci-chemistry/psi/files/3.4.0-gcc-4.3.patch
114
115 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/psi/files/3.4.0-gcc-4.3.patch?rev=1.1&view=markup
116 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/psi/files/3.4.0-gcc-4.3.patch?rev=1.1&content-type=text/plain
117
118 Index: 3.4.0-gcc-4.3.patch
119 ===================================================================
120 diff --git a/src/bin/mcscf/block_matrix.cc b/src/bin/mcscf/block_matrix.cc
121 index fe1e131..3ad0bcd 100644
122 --- a/src/bin/mcscf/block_matrix.cc
123 +++ b/src/bin/mcscf/block_matrix.cc
124 @@ -1,6 +1,7 @@
125 #include "block_matrix.h"
126 #include "matrix_base.h"
127 #include "memory_manager.h"
128 +#include <cstdio>
129
130 extern FILE* outfile;
131
132 diff --git a/src/bin/mcscf/block_vector.cc b/src/bin/mcscf/block_vector.cc
133 index fb383c7..36f55d4 100644
134 --- a/src/bin/mcscf/block_vector.cc
135 +++ b/src/bin/mcscf/block_vector.cc
136 @@ -1,6 +1,7 @@
137 #include "block_vector.h"
138 #include "vector_base.h"
139 #include "memory_manager.h"
140 +#include <cstdio>
141
142 extern FILE* outfile;
143
144 diff --git a/src/bin/mcscf/sblock_matrix.cc b/src/bin/mcscf/sblock_matrix.cc
145 index 61aa7cc..4da4263 100644
146 --- a/src/bin/mcscf/sblock_matrix.cc
147 +++ b/src/bin/mcscf/sblock_matrix.cc
148 @@ -1,4 +1,5 @@
149 #include <cstdlib>
150 +#include <cstdio>
151 #include <psifiles.h>
152 #include "sblock_matrix.h"
153
154 @@ -103,4 +104,4 @@ void SBlockMatrix::check(const char* cstr)
155 }
156 }
157
158 -}}
159 \ No newline at end of file
160 +}}
161 diff --git a/src/bin/mcscf/sblock_vector.cc b/src/bin/mcscf/sblock_vector.cc
162 index 63c3926..f24fc5b 100644
163 --- a/src/bin/mcscf/sblock_vector.cc
164 +++ b/src/bin/mcscf/sblock_vector.cc
165 @@ -1,4 +1,5 @@
166 #include <cstdlib>
167 +#include <cstdio>
168 #include <psifiles.h>
169
170 #include "sblock_vector.h"
171 @@ -58,4 +59,4 @@ void SBlockVector::check(const char* cstr)
172 }
173 }
174
175 -}}
176 \ No newline at end of file
177 +}}
178 diff --git a/src/bin/mcscf/scf.cc b/src/bin/mcscf/scf.cc
179 index 77318fd..7d1e17f 100644
180 --- a/src/bin/mcscf/scf.cc
181 +++ b/src/bin/mcscf/scf.cc
182 @@ -5,6 +5,7 @@
183
184 #include <iostream>
185 #include <cmath>
186 +#include <cstdio>
187
188 extern FILE* outfile;
189
190 diff --git a/src/bin/mcscf/scf_Feff.cc b/src/bin/mcscf/scf_Feff.cc
191 index 584aa83..8a99c3b 100644
192 --- a/src/bin/mcscf/scf_Feff.cc
193 +++ b/src/bin/mcscf/scf_Feff.cc
194 @@ -1,4 +1,5 @@
195 #include <liboptions/liboptions.h>
196 +#include <cstdio>
197
198 #include "scf.h"
199
200 diff --git a/src/bin/mcscf/scf_canonicalize_MO.cc b/src/bin/mcscf/scf_canonicalize_MO.cc
201 index a2b3915..96bb6cc 100644
202 --- a/src/bin/mcscf/scf_canonicalize_MO.cc
203 +++ b/src/bin/mcscf/scf_canonicalize_MO.cc
204 @@ -1,6 +1,7 @@
205 #include "scf.h"
206
207 #include <liboptions/liboptions.h>
208 +#include <cstdio>
209
210 namespace psi{ namespace mcscf{
211
212 diff --git a/src/bin/mcscf/scf_check_orthonormality.cc b/src/bin/mcscf/scf_check_orthonormality.cc
213 index 63fbbbb..a13436c 100644
214 --- a/src/bin/mcscf/scf_check_orthonormality.cc
215 +++ b/src/bin/mcscf/scf_check_orthonormality.cc
216 @@ -1,5 +1,6 @@
217 #include <iostream>
218 #include <cmath>
219 +#include <cstdio>
220
221 #include "scf.h"
222
223 diff --git a/src/bin/mcscf/scf_compute_energy.cc b/src/bin/mcscf/scf_compute_energy.cc
224 index fe7ee6d..20194eb 100644
225 --- a/src/bin/mcscf/scf_compute_energy.cc
226 +++ b/src/bin/mcscf/scf_compute_energy.cc
227 @@ -1,4 +1,5 @@
228 #include <iostream>
229 +#include <cstdio>
230
231 #include "scf.h"
232
233 diff --git a/src/bin/mcscf/scf_diis.cc b/src/bin/mcscf/scf_diis.cc
234 index 9bcde15..261492a 100644
235 --- a/src/bin/mcscf/scf_diis.cc
236 +++ b/src/bin/mcscf/scf_diis.cc
237 @@ -1,4 +1,5 @@
238 #include <iostream>
239 +#include <cstdio>
240
241 #include <liboptions/liboptions.h>
242
243 diff --git a/src/bin/mcscf/scf_iterate_scf_equations.cc b/src/bin/mcscf/scf_iterate_scf_equations.cc
244 index 9e96360..3a3acc3 100644
245 --- a/src/bin/mcscf/scf_iterate_scf_equations.cc
246 +++ b/src/bin/mcscf/scf_iterate_scf_equations.cc
247 @@ -1,6 +1,7 @@
248 #include <cstdlib>
249 #include <iostream>
250 #include <cmath>
251 +#include <cstdio>
252
253 #include <liboptions/liboptions.h>
254
255 diff --git a/src/bin/mcscf/scf_pairs.cc b/src/bin/mcscf/scf_pairs.cc
256 index b0a8c9d..af5fc35 100644
257 --- a/src/bin/mcscf/scf_pairs.cc
258 +++ b/src/bin/mcscf/scf_pairs.cc
259 @@ -1,4 +1,5 @@
260 #include <iostream>
261 +#include <cstdio>
262
263 #include <libmoinfo/libmoinfo.h>
264
265 diff --git a/src/bin/mcscf/scf_print_eigenvectors_and_MO.cc b/src/bin/mcscf/scf_print_eigenvectors_and_MO.cc
266 index 3aac92a..e28e9e3 100644
267 --- a/src/bin/mcscf/scf_print_eigenvectors_and_MO.cc
268 +++ b/src/bin/mcscf/scf_print_eigenvectors_and_MO.cc
269 @@ -3,6 +3,7 @@
270 #include <string>
271 #include <utility>
272 #include <algorithm>
273 +#include <cstdio>
274
275 #include <libmoinfo/libmoinfo.h>
276
277 diff --git a/src/bin/psimrcc/blas_algorithms.cc b/src/bin/psimrcc/blas_algorithms.cc
278 index bb36025..0a5a3e2 100644
279 --- a/src/bin/psimrcc/blas_algorithms.cc
280 +++ b/src/bin/psimrcc/blas_algorithms.cc
281 @@ -1,5 +1,6 @@
282 #include <libmoinfo/libmoinfo.h>
283 #include <libutil/libutil.h>
284 +#include <cstdio>
285
286 #include "blas.h"
287 #include "memory_manager.h"
288 diff --git a/src/bin/psimrcc/blas_compatibile.cc b/src/bin/psimrcc/blas_compatibile.cc
289 index 8de6d73..7caf4f3 100644
290 --- a/src/bin/psimrcc/blas_compatibile.cc
291 +++ b/src/bin/psimrcc/blas_compatibile.cc
292 @@ -1,6 +1,7 @@
293 #include "blas.h"
294 #include <libutil/libutil.h>
295 #include <cstdlib>
296 +#include <cstdio>
297
298 extern FILE *infile, *outfile;
299
300 diff --git a/src/bin/psimrcc/blas_parser.cc b/src/bin/psimrcc/blas_parser.cc
301 index d211a24..78fe60a 100644
302 --- a/src/bin/psimrcc/blas_parser.cc
303 +++ b/src/bin/psimrcc/blas_parser.cc
304 @@ -3,6 +3,7 @@
305 #include "debugging.h"
306 #include <libutil/libutil.h>
307 #include <algorithm>
308 +#include <cstdio>
309
310 namespace psi{ namespace psimrcc{
311
312 diff --git a/src/bin/psimrcc/blas_solve.cc b/src/bin/psimrcc/blas_solve.cc
313 index b138a5b..f5dcdfc 100644
314 --- a/src/bin/psimrcc/blas_solve.cc
315 +++ b/src/bin/psimrcc/blas_solve.cc
316 @@ -1,6 +1,7 @@
317 #include "blas.h"
318 #include "debugging.h"
319 #include <libmoinfo/libmoinfo.h>
320 +#include <cstdio>
321
322 namespace psi{ namespace psimrcc{
323
324 diff --git a/src/bin/psimrcc/index.cc b/src/bin/psimrcc/index.cc
325 index 3465d88..68c2b77 100644
326 --- a/src/bin/psimrcc/index.cc
327 +++ b/src/bin/psimrcc/index.cc
328 @@ -5,6 +5,7 @@
329 ***************************************************************************/
330 #include <iostream>
331 #include <algorithm>
332 +#include <cstdio>
333
334 #include <libmoinfo/libmoinfo.h>
335
336 diff --git a/src/bin/psimrcc/operation.cc b/src/bin/psimrcc/operation.cc
337 index edbaed5..f4e881f 100644
338 --- a/src/bin/psimrcc/operation.cc
339 +++ b/src/bin/psimrcc/operation.cc
340 @@ -7,6 +7,7 @@
341 #include "debugging.h"
342 #include "blas.h"
343 #include <libutil/libutil.h>
344 +#include <cstdio>
345
346 namespace psi{ namespace psimrcc{
347
348 diff --git a/src/bin/psimrcc/operation_compute.cc b/src/bin/psimrcc/operation_compute.cc
349 index 7d2553c..72a1b39 100644
350 --- a/src/bin/psimrcc/operation_compute.cc
351 +++ b/src/bin/psimrcc/operation_compute.cc
352 @@ -11,6 +11,7 @@
353 #include "algebra_interface.h"
354 #include <libmoinfo/libmoinfo.h>
355 #include <cstdlib>
356 +#include <cstdio>
357
358 extern FILE *infile, *outfile;
359
360 diff --git a/src/bin/psimrcc/sort_out_of_core.cc b/src/bin/psimrcc/sort_out_of_core.cc
361 index 3f255c9..8fa31a3 100644
362 --- a/src/bin/psimrcc/sort_out_of_core.cc
363 +++ b/src/bin/psimrcc/sort_out_of_core.cc
364 @@ -8,6 +8,7 @@
365 #include "sort.h"
366 #include "matrix.h"
367 #include <libmoinfo/libmoinfo.h>
368 +#include <cstdio>
369
370 extern FILE* outfile;
371
372 diff --git a/src/lib/libmoinfo/moinfo_model_space.cc b/src/lib/libmoinfo/moinfo_model_space.cc
373 index 3bf2030..0a63cde 100644
374 --- a/src/lib/libmoinfo/moinfo_model_space.cc
375 +++ b/src/lib/libmoinfo/moinfo_model_space.cc
376 @@ -1,6 +1,7 @@
377 #include <iostream>
378 #include <cmath>
379 #include <cstdlib>
380 +#include <cstdio>
381
382 #include <psifiles.h>
383 #include <liboptions/liboptions.h>
384 @@ -322,4 +323,4 @@ vector<string> MOInfo::get_matrix_names(std::string str)
385 return(names);
386 }
387
388 -}
389 \ No newline at end of file
390 +}
391 diff --git a/src/lib/libmoinfo/moinfo_slaterdeterminant.cc b/src/lib/libmoinfo/moinfo_slaterdeterminant.cc
392 index 8831cd5..a046679 100644
393 --- a/src/lib/libmoinfo/moinfo_slaterdeterminant.cc
394 +++ b/src/lib/libmoinfo/moinfo_slaterdeterminant.cc
395 @@ -1,4 +1,5 @@
396 #include <iostream>
397 +#include <cstdio>
398 #include "moinfo.h"
399
400 extern FILE *infile, *outfile;
401 diff --git a/src/lib/libutil/stl_string.cc b/src/lib/libutil/stl_string.cc
402 index 0ec247d..f719dcd 100644
403 --- a/src/lib/libutil/stl_string.cc
404 +++ b/src/lib/libutil/stl_string.cc
405 @@ -2,6 +2,7 @@
406 #include <cmath>
407 #include <iomanip>
408 #include <algorithm>
409 +#include <cstdio>
410
411 #include "libutil.h"