Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Christoph Junghans <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/gromacs/
Date: Mon, 07 Jul 2014 19:57:20
Message-Id: 1404763010.868f040035e235b89ddcc524706cc64c93ebde92.ottxor@gentoo
1 commit: 868f040035e235b89ddcc524706cc64c93ebde92
2 Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 7 19:56:50 2014 +0000
4 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 7 19:56:50 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=868f0400
7
8 sync with gx86, fix FEATURES=test
9
10 Package-Manager: portage-2.2.8-r1
11
12 ---
13 sci-chemistry/gromacs/ChangeLog | 4 ++++
14 sci-chemistry/gromacs/gromacs-4.6.9999.ebuild | 25 +++++++++++++------------
15 sci-chemistry/gromacs/gromacs-5.0.9999.ebuild | 7 ++++---
16 3 files changed, 21 insertions(+), 15 deletions(-)
17
18 diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
19 index e98a9ec..fa5fa26 100644
20 --- a/sci-chemistry/gromacs/ChangeLog
21 +++ b/sci-chemistry/gromacs/ChangeLog
22 @@ -2,6 +2,10 @@
23 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
24 # $Header: $
25
26 + 07 Jul 2014; Christoph Junghans <ottxor@g.o> gromacs-4.6.9999.ebuild,
27 + gromacs-5.0.9999.ebuild:
28 + sync with gx86, fix FEATURES=test
29 +
30 26 Jun 2014; Christoph Junghans <ottxor@g.o> gromacs-5.0.9999.ebuild:
31 live ebuild update
32
33
34 diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
35 index 37018ba..2865833 100644
36 --- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
37 +++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
38 @@ -4,8 +4,8 @@
39
40 EAPI=5
41
42 -TEST_PV="4.6.2"
43 -MANUAL_PV="4.6.2"
44 +TEST_PV="4.6.6"
45 +MANUAL_PV="4.6.6"
46
47 CMAKE_MAKEFILE_GENERATOR="ninja"
48
49 @@ -17,7 +17,7 @@ if [[ $PV = *9999* ]]; then
50 git://github.com/gromacs/gromacs.git
51 http://repo.or.cz/r/gromacs.git"
52 EGIT_BRANCH="release-4-6"
53 - inherit git-2
54 + inherit git-r3
55 LIVE_DEPEND="doc? (
56 app-doc/doxygen
57 dev-texlive/texlive-latex
58 @@ -25,11 +25,13 @@ if [[ $PV = *9999* ]]; then
59 media-gfx/imagemagick
60 sys-apps/coreutils
61 )"
62 + KEYWORDS=""
63 else
64 SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${P}.tar.gz
65 doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${MANUAL_PV}.pdf -> ${PN}-manual-${MANUAL_PV}.pdf )
66 - test? ( http://${PN}.googlecode.com/files/regressiontests-${TEST_PV}.tar.gz )"
67 + test? ( http://gerrit.gromacs.org/download/regressiontests-${TEST_PV}.tar.gz )"
68 LIVE_DEPEND=""
69 + KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
70 fi
71
72 ACCE_IUSE="sse2 sse4_1 avx128fma avx256"
73 @@ -42,7 +44,6 @@ HOMEPAGE="http://www.gromacs.org/"
74 # base, vmd plugins, fftpack from numpy, blas/lapck from netlib, memtestG80 library, mpi_thread lib
75 LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
76 SLOT="0/${PV}"
77 -KEYWORDS=""
78 IUSE="X blas cuda doc -double-precision +fftw gsl lapack mkl mpi +offensive openmm openmp +single-precision test +threads zsh-completion ${ACCE_IUSE}"
79
80 CDEPEND="
81 @@ -87,18 +88,18 @@ src_unpack() {
82 if [[ ${PV} != *9999 ]]; then
83 default
84 else
85 - git-2_src_unpack
86 + git-r3_src_unpack
87 if use doc; then
88 EGIT_REPO_URI="git://git.gromacs.org/manual.git" \
89 - EGIT_BRANCH="release-4-6" EGIT_NOUNPACK="yes" EGIT_COMMIT="release-4-6" \
90 - EGIT_SOURCEDIR="${WORKDIR}/manual"\
91 - git-2_src_unpack
92 + EGIT_BRANCH="release-4-6" EGIT_COMMIT="release-4-6" \
93 + EGIT_CHECKOUT_DIR="${WORKDIR}/manual"\
94 + git-r3_src_unpack
95 fi
96 if use test; then
97 EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
98 - EGIT_BRANCH="master" EGIT_NOUNPACK="yes" EGIT_COMMIT="release-4-6" \
99 - EGIT_SOURCEDIR="${WORKDIR}/regressiontests"\
100 - git-2_src_unpack
101 + EGIT_BRANCH="release-4-6" EGIT_COMMIT="release-4-6" \
102 + EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
103 + git-r3_src_unpack
104 fi
105 fi
106 }
107
108 diff --git a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild
109 index 6488bd5..88169b2 100644
110 --- a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild
111 +++ b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild
112 @@ -17,9 +17,11 @@ if [[ $PV = *9999* ]]; then
113 http://repo.or.cz/r/gromacs.git"
114 EGIT_BRANCH="release-5-0"
115 inherit git-r3
116 + KEYWORDS=""
117 else
118 SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
119 test? ( http://gerrit.gromacs.org/download/regressiontests-${TEST_PV}.tar.gz )"
120 + KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
121 fi
122
123 ACCE_IUSE="sse2 sse4_1 avx_128_fma avx_256 avx2_256"
124 @@ -32,7 +34,6 @@ HOMEPAGE="http://www.gromacs.org/"
125 # base, vmd plugins, fftpack from numpy, blas/lapck from netlib, memtestG80 library, mpi_thread lib
126 LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
127 SLOT="0/${PV}"
128 -KEYWORDS=""
129 IUSE="X blas boost cuda +doc -double-precision +fftw lapack +make-symlinks mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
130
131 CDEPEND="
132 @@ -83,8 +84,8 @@ src_unpack() {
133 git-r3_src_unpack
134 if use test; then
135 EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
136 - EGIT_BRANCH="master" EGIT_NOUNPACK="yes" EGIT_COMMIT="master" \
137 - EGIT_SOURCEDIR="${WORKDIR}/regressiontests"\
138 + EGIT_BRANCH="master" EGIT_COMMIT="master" \
139 + EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
140 git-r3_src_unpack
141 fi
142 fi
Report Message
Find on MARC Find on Google Groups