Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:pkg-config commit in: /
Date: Thu, 29 Nov 2012 21:06:40
Message-Id: 1353860214.025bf2727babc62c8535119690e47e3da9a649f3.jlec@gentoo
1 commit: 025bf2727babc62c8535119690e47e3da9a649f3
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 25 16:16:54 2012 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 25 16:16:54 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=025bf272
7
8 Merge branch 'cuda' of github.com:gentoo-science/sci into cuda
9
10 # By Justin Lecher (7) and others
11 # Via Justin Lecher (2) and others
12 * 'cuda' of github.com:gentoo-science/sci:
13 Be a little more informative.
14 do not call pkg_setup from cuda.eclass
15 Move pkg_postinst to dev-util/nvidia-cuda-toolkit
16 Adding ignores for Mac
17 Add comments and streamline
18 sci-physics/LoopTools: Manifest fixed
19 live ebuild update
20 updated build and deps
21 dev-java/netcdf: Add the netCDF licence (which is *not* MIT)
22 sci-chemistry/avogadro: Add test phase
23 sci-chemistry/simpson: Fix underlinking
24 Added live ebuild for MDP
25
26 Conflicts:
27 eclass/cuda.eclass
28
29 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
30
31
32 .gitignore | 1 +
33 app-doc/gromacs-manual/ChangeLog | 4 ++
34 .../gromacs-manual/gromacs-manual-4.6.9999.ebuild | 7 ++-
35 dev-java/netcdf/ChangeLog | 5 ++
36 dev-java/netcdf/netcdf-4.2.ebuild | 2 +-
37 .../nvidia-cuda-toolkit-5.0.35.ebuild | 30 +++++++++--
38 eclass/cuda.eclass | 53 +++++++++++++-------
39 licenses/netCDF | 31 +++++++++++
40 sci-chemistry/avogadro/ChangeLog | 3 +
41 sci-chemistry/avogadro/avogadro-9999.ebuild | 8 ++-
42 sci-chemistry/gromacs/ChangeLog | 3 +
43 sci-chemistry/gromacs/gromacs-4.6.9999.ebuild | 34 +++++-------
44 sci-chemistry/simpson/ChangeLog | 3 +
45 sci-chemistry/simpson/files/3.1.0-gentoo.patch | 2 +-
46 sci-mathematics/mdp/Manifest | 2 +-
47 sci-mathematics/mdp/mdp-9999.ebuild | 31 +++++++++++
48 sci-physics/LoopTools/Manifest | 2 +-
49 17 files changed, 167 insertions(+), 54 deletions(-)
50
51 diff --cc eclass/cuda.eclass
52 index e722fa0,3bb779a..fc6fe51
53 --- a/eclass/cuda.eclass
54 +++ b/eclass/cuda.eclass
55 @@@ -72,10 -90,10 +88,10 @@@ cuda_gccdir()
56 echo ${_ret}
57 return 0
58 else
59 - eerror "Only gcc version(s) ${_args} are supported,"
60 - eerror "Only gcc version(s) ${_args} are supported,"
61 ++ eerror "Only gcc version(s) ${_args} are supported,"
62 eerror "of which none is installed"
63 - die "Only gcc version(s) ${_args} are supported"
64 - return 1
65 - die "Only gcc version(s) ${_args} are supported"
66 - return 1
67 ++ die "Only gcc version(s) ${_args} are supported"
68 ++ return 1
69 fi
70 }