1 |
commit: ca69b642bf2637d5a897617d4ef5701a271bad33 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 29 10:59:29 2012 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 29 10:59:29 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ca69b642 |
7 |
|
8 |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci |
9 |
|
10 |
# By Justin Lecher (3) and others |
11 |
# Via Andrew Savchenko |
12 |
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci: |
13 |
sci-physics/root: remove unused patch |
14 |
sci-chemistry/nmrpipe: Version Bump |
15 |
sci-chemistry/wxmacmolplt: Fix prefix awareness; correct desktop file |
16 |
creation |
17 |
sci-physics/root, app-doc/root-doc: update Manifest |
18 |
ambertools: export AMBERHOME in ebuild |
19 |
gamess: Version bump to 20120501.1 |
20 |
sci-libs/mkl: Fix size of builddir |
21 |
|
22 |
Conflicts: |
23 |
sci-physics/root/ChangeLog |
24 |
|
25 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
26 |
|
27 |
|
28 |
app-doc/root-docs/Manifest | 2 +- |
29 |
sci-chemistry/ambertools/ambertools-12.ebuild | 2 +- |
30 |
sci-chemistry/gamess/ChangeLog | 11 + |
31 |
sci-chemistry/gamess/Manifest | 2 + |
32 |
.../gamess/files/gamess-20120501.1.gentoo.patch | 271 ++++++++++++++++ |
33 |
.../files/gamess-qmmm-tinker-fix-idate.patch | 20 ++ |
34 |
sci-chemistry/gamess/gamess-20120501.1.ebuild | 337 ++++++++++++++++++++ |
35 |
sci-chemistry/{trajng => gamess}/metadata.xml | 7 +- |
36 |
sci-chemistry/nmrpipe/ChangeLog | 8 + |
37 |
sci-chemistry/nmrpipe/Manifest | 6 +- |
38 |
....patch => nmrpipe-7.8.2012.295.14.58-lib.patch} | 0 |
39 |
...07.ebuild => nmrpipe-7.8.2012.295.14.58.ebuild} | 2 +- |
40 |
sci-chemistry/wxmacmolplt/ChangeLog | 4 + |
41 |
sci-chemistry/wxmacmolplt/metadata.xml | 10 +- |
42 |
sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.3.ebuild | 10 +- |
43 |
sci-libs/mkl/ChangeLog | 4 + |
44 |
sci-libs/mkl/metadata.xml | 4 +- |
45 |
sci-libs/mkl/mkl-11.0.0.079.ebuild | 9 +- |
46 |
sci-physics/root/ChangeLog | 4 + |
47 |
sci-physics/root/Manifest | 2 +- |
48 |
.../files/root-5.28.00h-explicit-functions.patch | 12 - |
49 |
21 files changed, 687 insertions(+), 40 deletions(-) |
50 |
|
51 |
diff --cc sci-physics/root/ChangeLog |
52 |
index 8e97e9c,eced212..f0d5394 |
53 |
--- a/sci-physics/root/ChangeLog |
54 |
+++ b/sci-physics/root/ChangeLog |
55 |
@@@ -2,9 -2,10 +2,13 @@@ |
56 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
57 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ |
58 |
|
59 |
+ 28 Oct 2012; Andrew Savchenko <bircoph@×××××.com> |
60 |
+ -files/root-5.28.00h-explicit-functions.patch: |
61 |
+ Remove unused patch. |
62 |
+ |
63 |
+ 26 Oct 2012; Justin Lecher <jlec@g.o> root-9999.ebuild, metadata.xml: |
64 |
+ Drop virtual/fortran from DEP as it is provided by the fortran-2.eclass |
65 |
+ |
66 |
*root-5.34.03 (25 Oct 2012) |
67 |
|
68 |
25 Oct 2012; Andrew Savchenko <bircoph@×××××.com> |