[gentoo-commits] gentoo-x86 commit in sci-physics/lammps: lammps-20140201.ebuild lammps-20131217.ebuild lammps-20131201.ebuild lammps-20131216.ebuild lammps-20140122.ebuild lammps-20140129.ebuild ChangeLog

[Nicolas Bock (nicolasbock)]

nicolasbock    14/02/06 19:54:16

  Modified:             lammps-20131217.ebuild lammps-20131201.ebuild
                        lammps-20131216.ebuild lammps-20140122.ebuild
                        lammps-20140129.ebuild ChangeLog
  Added:                lammps-20140201.ebuild
  Log:
  sci-physics/lammps: Moved lammps-20140201 from sci overlay to portage.
  
  This version is considered "stable" by upstream, as opposed to the normal
  frequent snapshot releases. I had originally placed the stable version in a
  new slot, but after discussing this with ottxor, decided to move 20140201 back
  into slot 0 and open a stabilization request for it.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key AC91CA52)

Revision  Changes    Path
1.3                  sci-physics/lammps/lammps-20131217.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20131217.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20131217.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20131217.ebuild?r1=1.2&r2=1.3

Index: lammps-20131217.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20131217.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lammps-20131217.ebuild	5 Feb 2014 03:04:15 -0000	1.2
+++ lammps-20131217.ebuild	6 Feb 2014 19:54:16 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20131217.ebuild,v 1.2 2014/02/05 03:04:15 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20131217.ebuild,v 1.3 2014/02/06 19:54:16 nicolasbock Exp $
 
 EAPI=5
 
@@ -51,8 +51,7 @@
 IUSE="doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid"
 
 DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:stable"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 



1.5                  sci-physics/lammps/lammps-20131201.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20131201.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20131201.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20131201.ebuild?r1=1.4&r2=1.5

Index: lammps-20131201.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20131201.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lammps-20131201.ebuild	5 Feb 2014 03:04:14 -0000	1.4
+++ lammps-20131201.ebuild	6 Feb 2014 19:54:16 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20131201.ebuild,v 1.4 2014/02/05 03:04:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20131201.ebuild,v 1.5 2014/02/06 19:54:16 nicolasbock Exp $
 
 EAPI=5
 
@@ -51,8 +51,7 @@
 IUSE="doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid"
 
 DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:stable"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 



1.5                  sci-physics/lammps/lammps-20131216.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20131216.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20131216.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20131216.ebuild?r1=1.4&r2=1.5

Index: lammps-20131216.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20131216.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lammps-20131216.ebuild	5 Feb 2014 03:04:15 -0000	1.4
+++ lammps-20131216.ebuild	6 Feb 2014 19:54:16 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20131216.ebuild,v 1.4 2014/02/05 03:04:15 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20131216.ebuild,v 1.5 2014/02/06 19:54:16 nicolasbock Exp $
 
 EAPI=5
 
@@ -51,8 +51,7 @@
 IUSE="doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid"
 
 DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:stable"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 



1.3                  sci-physics/lammps/lammps-20140122.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140122.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140122.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140122.ebuild?r1=1.2&r2=1.3

Index: lammps-20140122.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140122.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lammps-20140122.ebuild	5 Feb 2014 03:04:15 -0000	1.2
+++ lammps-20140122.ebuild	6 Feb 2014 19:54:16 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140122.ebuild,v 1.2 2014/02/05 03:04:15 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140122.ebuild,v 1.3 2014/02/06 19:54:16 nicolasbock Exp $
 
 EAPI=5
 
@@ -51,8 +51,7 @@
 IUSE="doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid"
 
 DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:stable"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 



1.3                  sci-physics/lammps/lammps-20140129.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140129.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140129.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140129.ebuild?r1=1.2&r2=1.3

Index: lammps-20140129.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140129.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lammps-20140129.ebuild	5 Feb 2014 03:04:14 -0000	1.2
+++ lammps-20140129.ebuild	6 Feb 2014 19:54:16 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140129.ebuild,v 1.2 2014/02/05 03:04:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140129.ebuild,v 1.3 2014/02/06 19:54:16 nicolasbock Exp $
 
 EAPI=5
 
@@ -51,8 +51,7 @@
 IUSE="doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid"
 
 DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:stable"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 



1.10                 sci-physics/lammps/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/ChangeLog?r1=1.9&r2=1.10

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog	5 Feb 2014 04:35:15 -0000	1.9
+++ ChangeLog	6 Feb 2014 19:54:16 -0000	1.10
@@ -1,6 +1,17 @@
 # ChangeLog for sci-physics/lammps
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.9 2014/02/05 04:35:15 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.10 2014/02/06 19:54:16 nicolasbock Exp $
+
+*lammps-20140201 (06 Feb 2014)
+
+  06 Feb 2014; Nicolas Bock <nicolasbock@g.o> +lammps-20140201.ebuild,
+  lammps-20131201.ebuild, lammps-20131216.ebuild, lammps-20131217.ebuild,
+  lammps-20140122.ebuild, lammps-20140129.ebuild:
+  sci-physics/lammps: Moved lammps-20140201 from sci overlay to portage.  This
+  version is considered "stable" by upstream, as opposed to the normal frequent
+  snapshot releases. I had originally placed the stable version in a new slot,
+  but after discussing this with ottxor, decided to move 20140201 back into slot
+  0 and open a stabilization request for it.
 
   05 Feb 2014; Nicolas Bock <nicolasbock@g.o> lammps-20140129.ebuild:
   sci-physics/lammps: Trying to add blocker, ottxor beat me to it :)



1.1                  sci-physics/lammps/lammps-20140201.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140201.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lammps/lammps-20140201.ebuild?rev=1.1&content-type=text/plain

Index: lammps-20140201.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140201.ebuild,v 1.1 2014/02/06 19:54:16 nicolasbock Exp $

EAPI=5

FORTRAN_NEEDED="package-meam"

inherit eutils fortran-2

convert_month() {
	case $1 in
		01) echo Jan
			;;
		02) echo Feb
			;;
		03) echo Mar
			;;
		04) echo Apr
			;;
		05) echo May
			;;
		06) echo Jun
			;;
		07) echo Jul
			;;
		08) echo Aug
			;;
		09) echo Sep
			;;
		10) echo Oct
			;;
		11) echo Nov
			;;
		12) echo Dec
			;;
		*)  echo unknown
			;;
	esac
}

MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}

DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
HOMEPAGE="http://lammps.sandia.gov/"
SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid"

DEPEND="mpi? ( virtual/mpi )"
RDEPEND="${DEPEND}"

S="${WORKDIR}/${MY_P}"

lmp_emake() {
	local LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"

	# Note: The lammps makefile uses CC to indicate the C++ compiler.
	emake \
		ARCHIVE=$(tc-getAR) \
		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=$(usex mpi '' "-I../STUBS") \
		MPI_PATH=$(usex mpi '' '-L../STUBS') \
		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
		"$@"
}

src_compile() {
	# Compile stubs for serial version.
	use mpi || lmp_emake -C src stubs

	# Build optional packages.
	if use package-meam; then
		lmp_emake -C src yes-meam
		lmp_emake -j1 -C lib/meam -f Makefile.gfortran
	fi
	use package-dipole && emake -C src yes-dipole
	use package-rigid && emake -C src yes-rigid

	# Compile.
	lmp_emake -C src serial
}

src_install() {
	newbin "src/lmp_serial" "lmp"

	local LAMMPS_POTENTIALS="/usr/share/${PF}/potentials"
	insinto "${LAMMPS_POTENTIALS}"
	doins potentials/*
	echo "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS}" > 99lammps
	doenvd 99lammps

	if use examples; then
		local LAMMPS_EXAMPLES="/usr/share/${PF}/examples"
		insinto "${LAMMPS_EXAMPLES}"
		doins -r examples/*
	fi

	dodoc README
	if use doc; then
		dodoc doc/Manual.pdf
		dohtml -r doc/*
	fi
}