diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2013-06-25 23:03:54 -0600 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2013-06-25 23:03:54 -0600 |
| commit | 3114fa5fef6a9d59605bc0ca3463329f86862964 (patch) | |
| tree | f51758724384ed3e590027dedd7defe120c94e9e | |
| parent | make use of usex (diff) | |
| download | sci-3114fa5fef6a9d59605bc0ca3463329f86862964.tar.gz sci-3114fa5fef6a9d59605bc0ca3463329f86862964.tar.bz2 sci-3114fa5fef6a9d59605bc0ca3463329f86862964.zip | |
clean up
Package-Manager: portage-2.2.0_alpha185
| -rw-r--r-- | sci-physics/lammps/ChangeLog | 3 | ||||
| -rw-r--r-- | sci-physics/lammps/lammps-20130526.ebuild | 25 |
2 files changed, 15 insertions, 13 deletions
diff --git a/sci-physics/lammps/ChangeLog b/sci-physics/lammps/ChangeLog index 7e5c044dd..7734e6588 100644 --- a/sci-physics/lammps/ChangeLog +++ b/sci-physics/lammps/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Jun 2013; Christoph Junghans <ottxor@gentoo.org> lammps-20130526.ebuild: + clean up + 28 May 2013; Nicolas Bock <nicolasbock@gmail.com> lammps-20130526.ebuild: Moved html documentation one folder up. diff --git a/sci-physics/lammps/lammps-20130526.ebuild b/sci-physics/lammps/lammps-20130526.ebuild index fe092cf62..af4830cdd 100644 --- a/sci-physics/lammps/lammps-20130526.ebuild +++ b/sci-physics/lammps/lammps-20130526.ebuild @@ -8,40 +8,39 @@ FORTRAN_NEEDED="package-meam" inherit eutils fortran-2 -LAMMPSDATE="26May13" +MY_P="${PN}-$(date -d "${PV}" +"%d%b%y")" DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator" HOMEPAGE="http://lammps.sandia.gov/" -SRC_URI="http://lammps.sandia.gov/tars/lammps-${LAMMPSDATE}.tar.gz" +SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" IUSE="doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid" DEPEND="mpi? ( virtual/mpi )" RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${LAMMPSDATE}" +S="${WORKDIR}/${MY_P}" lmp_emake() { - local LAMMPS_INCLUDEFLAGS= - use gzip && LAMMPS_INCLUDEFLAGS+=" -DLAMMPS_GZIP" - use lammps-memalign && LAMMPS_INCLUDEFLAGS+=" -DLAMMPS_MEMALIGN" + local LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')" + LAMMPS_INCLUDEFLAGS+="$(usex ' -DLAMMPS_MEMALIGN' '')" # Note: The lammps makefile uses CC to indicate the C++ compiler. emake \ ARCHIVE=$(tc-getAR) \ - CC=$(use mpi && echo mpic++ || echo $(tc-getCXX)) \ - F90=$(use mpi && echo mpif90 || echo $(tc-getFC)) \ - LINK=$(use mpi && echo mpic++ || echo $(tc-getCXX)) \ + CC=$(usex mpi "mpic++" "$(tc-getCXX)") \ + F90=$(usex mpi "mpif90" "$(tc-getFC)") \ + LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \ CCFLAGS="${CXXFLAGS}" \ F90FLAGS="${FCFLAGS}" \ LINKFLAGS="${LDFLAGS}" \ LMP_INC="${LAMMPS_INCLUDEFLAGS}" \ - MPI_INC=$(use mpi || echo -I../STUBS) \ - MPI_PATH=$(use mpi || echo -L../STUBS) \ - MPI_LIB=$(use mpi || echo -lmpi_stubs) \ + MPI_INC=$(usex mpi '' "-I../STUBS") \ + MPI_PATH=$(usex mpi '' '-L../STUBS') \ + MPI_LIB=$(usex mpi '' '-lmpi_stubs') \ "$@" } |