commit: 868f040035e235b89ddcc524706cc64c93ebde92 Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org> AuthorDate: Mon Jul 7 19:56:50 2014 +0000 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> CommitDate: Mon Jul 7 19:56:50 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=868f0400
sync with gx86, fix FEATURES=test Package-Manager: portage-2.2.8-r1 --- sci-chemistry/gromacs/ChangeLog | 4 ++++ sci-chemistry/gromacs/gromacs-4.6.9999.ebuild | 25 +++++++++++++------------ sci-chemistry/gromacs/gromacs-5.0.9999.ebuild | 7 ++++--- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index e98a9ec..fa5fa26 100644 --- a/sci-chemistry/gromacs/ChangeLog +++ b/sci-chemistry/gromacs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 Jul 2014; Christoph Junghans <[email protected]> gromacs-4.6.9999.ebuild, + gromacs-5.0.9999.ebuild: + sync with gx86, fix FEATURES=test + 26 Jun 2014; Christoph Junghans <[email protected]> gromacs-5.0.9999.ebuild: live ebuild update diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild index 37018ba..2865833 100644 --- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild @@ -4,8 +4,8 @@ EAPI=5 -TEST_PV="4.6.2" -MANUAL_PV="4.6.2" +TEST_PV="4.6.6" +MANUAL_PV="4.6.6" CMAKE_MAKEFILE_GENERATOR="ninja" @@ -17,7 +17,7 @@ if [[ $PV = *9999* ]]; then git://github.com/gromacs/gromacs.git http://repo.or.cz/r/gromacs.git"; EGIT_BRANCH="release-4-6" - inherit git-2 + inherit git-r3 LIVE_DEPEND="doc? ( app-doc/doxygen dev-texlive/texlive-latex @@ -25,11 +25,13 @@ if [[ $PV = *9999* ]]; then media-gfx/imagemagick sys-apps/coreutils )" + KEYWORDS="" else SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${P}.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${MANUAL_PV}.pdf -> ${PN}-manual-${MANUAL_PV}.pdf ) - test? ( http://${PN}.googlecode.com/files/regressiontests-${TEST_PV}.tar.gz )" + test? ( http://gerrit.gromacs.org/download/regressiontests-${TEST_PV}.tar.gz )" LIVE_DEPEND="" + KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" fi ACCE_IUSE="sse2 sse4_1 avx128fma avx256" @@ -42,7 +44,6 @@ HOMEPAGE="http://www.gromacs.org/"; # base, vmd plugins, fftpack from numpy, blas/lapck from netlib, memtestG80 library, mpi_thread lib LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )" SLOT="0/${PV}" -KEYWORDS="" IUSE="X blas cuda doc -double-precision +fftw gsl lapack mkl mpi +offensive openmm openmp +single-precision test +threads zsh-completion ${ACCE_IUSE}" CDEPEND=" @@ -87,18 +88,18 @@ src_unpack() { if [[ ${PV} != *9999 ]]; then default else - git-2_src_unpack + git-r3_src_unpack if use doc; then EGIT_REPO_URI="git://git.gromacs.org/manual.git" \ - EGIT_BRANCH="release-4-6" EGIT_NOUNPACK="yes" EGIT_COMMIT="release-4-6" \ - EGIT_SOURCEDIR="${WORKDIR}/manual"\ - git-2_src_unpack + EGIT_BRANCH="release-4-6" EGIT_COMMIT="release-4-6" \ + EGIT_CHECKOUT_DIR="${WORKDIR}/manual"\ + git-r3_src_unpack fi if use test; then EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \ - EGIT_BRANCH="master" EGIT_NOUNPACK="yes" EGIT_COMMIT="release-4-6" \ - EGIT_SOURCEDIR="${WORKDIR}/regressiontests"\ - git-2_src_unpack + EGIT_BRANCH="release-4-6" EGIT_COMMIT="release-4-6" \ + EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\ + git-r3_src_unpack fi fi } diff --git a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild index 6488bd5..88169b2 100644 --- a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild @@ -17,9 +17,11 @@ if [[ $PV = *9999* ]]; then http://repo.or.cz/r/gromacs.git"; EGIT_BRANCH="release-5-0" inherit git-r3 + KEYWORDS="" else SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-${TEST_PV}.tar.gz )" + KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" fi ACCE_IUSE="sse2 sse4_1 avx_128_fma avx_256 avx2_256" @@ -32,7 +34,6 @@ HOMEPAGE="http://www.gromacs.org/"; # base, vmd plugins, fftpack from numpy, blas/lapck from netlib, memtestG80 library, mpi_thread lib LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )" SLOT="0/${PV}" -KEYWORDS="" IUSE="X blas boost cuda +doc -double-precision +fftw lapack +make-symlinks mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}" CDEPEND=" @@ -83,8 +84,8 @@ src_unpack() { git-r3_src_unpack if use test; then EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \ - EGIT_BRANCH="master" EGIT_NOUNPACK="yes" EGIT_COMMIT="master" \ - EGIT_SOURCEDIR="${WORKDIR}/regressiontests"\ + EGIT_BRANCH="master" EGIT_COMMIT="master" \ + EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\ git-r3_src_unpack fi fi
