sci-physics/lammps-20140815: Fix linker error.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xAC91CA52

3 files changed, 21 insertions, 14 deletions

diff --git a/sci-physics/lammps/ChangeLog b/sci-physics/lammps/ChangeLog
index f49c5f4feef5..c8749640e41e 100644
--- a/sci-physics/lammps/ChangeLog
+++ b/sci-physics/lammps/ChangeLog
@@ -1,6 +1,9 @@
 # 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.36 2014/08/17 23:52:33 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.37 2014/08/20 18:22:23 nicolasbock Exp $
+
+  20 Aug 2014; Nicolas Bock <nicolasbock@gentoo.org> lammps-20140815.ebuild:
+  sci-physics/lammps-20140815: Fix linker error.
 
 *lammps-20140815 (17 Aug 2014)
 
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index cab966ac15cc..59fd02c12a40 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -32,13 +32,13 @@ EBUILD lammps-20140628.ebuild 4687 SHA256 3155ae3ca01dda584e43d4d1dc9f685cee0f60
 EBUILD lammps-20140711.ebuild 4687 SHA256 88a3a3caa2f795ab670db8baaed9c08f50326682381d10d3c2dcc12bf700bbea SHA512 469c448e7d2c0f2791f02057f7478714f95e1aa5c654dea648d62260c69718b1d8a5ec533957fb774ec93cff26239532004e85642fa8f4b73118b2660a415796 WHIRLPOOL 9838fc2e285422a447230d56b41327ed6058baa0ca7b129b4c0c07f3b54518e5770281ab73e4ab573b0a83b7c15920ce9fee8b4bba6090599c89d3a22165673d
 EBUILD lammps-20140806.ebuild 4687 SHA256 73d662e2a56966e1f8c4f1126f5823e28a87e10a03d189a41a6c1614f24e4a7d SHA512 4afb5a8e54f6be4dc0bb20e4109642ae1ec7c10c63b74064c7f1cee5c13d7060287ddcb06076fe037c8e5f366d12595da80c883fc5677150f5ab34cb85477c3e WHIRLPOOL d3089a683909d8b94f9720278c11afb2f3dc067778bee87a8a84ae5a23284eb5c27f1e58471630cb85baadbd3fed0f2449f841a933fe82b0ae9f2f6bc42f8e62
 EBUILD lammps-20140808.ebuild 4687 SHA256 1b152c7423025ba0204164e7dd7191295f8013f84d99a9f7dfbe3b3811577480 SHA512 ec902f8c2ee356ca01eb2c659896990b65e31ec3af25bda5d7fc1e303fddba5cea8845416c4e938a42ae9eb9a0c2e0864ee085f55f5453c707df14495c87cefd WHIRLPOOL 9ec4aa7d3b1a555d4bfafc57ce8985def79a8ad849620694d6caa9d3acf3deb37e000a3ba615416239c9cf767edf468a3ff70b79dda7018c8dd5e0bca129da1d
-EBUILD lammps-20140815.ebuild 4758 SHA256 754fb4357d64c5c90f05b1b100c6529758868b29674d4bf974e8dcec543fe424 SHA512 671a4d7285e9ab80376c33bbc81e5af0acd9b51a9214ccfd1d8f96e026ca890bf70a5066f7d470366cc51d0e24b7b1fb3faf901b2908b5111db967676d83b886 WHIRLPOOL a37b33ac972756235eafb737880b610e2b372b9e5b202c2b09ba99e64a1e6c4e302e3f031ffca89c9d1708f8f4805534f2efa9ab3856518c9e6afc459f9f2955
-MISC ChangeLog 6571 SHA256 e727215ee54e4f4afc9c0e8c5506f4fa413fe5c37ae4ac4ad54540135946502b SHA512 28aebe430cf61f377815a84fe8a1e1b2e014e77b071231275f172383f34f19642626c8c68d9568d891933042085164f758fb0ab609028823dd9d400101e3d767 WHIRLPOOL 927d2a044ce13eb320f6eeff32719ef1407633ce24560fb7835bb2fb0e4718585a79449e50ee0527bda472280ef7c7fcf704c71d3a9e3be3cc0fbb12803cd28d
+EBUILD lammps-20140815.ebuild 4638 SHA256 1425c219e54b522fe31fd7971d8f397c05e6f7a18151353f90cf612de2d4ab8a SHA512 012c511a8e86c61471a8641a90e416cd9cf530c2e06062924c982a9d5ced035d944db1d76aaaab8b8cd5064fba892b540c2e1f2739f3318c5c6aa59da9862657 WHIRLPOOL 60a51a5c6a6d52e01ea4fdef6aa1d2e2656474da9dbe5d8814f7ec0b1cec7bfc39702c49318dd4b7476509508536fff67a705e11b95cb415646032c17122ab48
+MISC ChangeLog 6698 SHA256 2f59831fdb417ec1426a372a6fa91769fa3da4e25a0edf9a6d599202fff688af SHA512 aacee838e9aaa9d1ee035de758591a19ef02b75881b407178493ff7aac076ac2b9562eb1730292dd1383fda3e703d382471de59657a36e350052cdb68b0d8c5f WHIRLPOOL b5df7206a54948e082f9ac8c5d6b8f95f62fdc66f578e6bb4819782cfba02f5c0e650ec1be4c7996ca53a5532cc32665da3c4445a15bec447a29e59b875aa04d
 MISC metadata.xml 1584 SHA256 4d06db7368b155db1484a6c0792a366b37541260e700248ccf542e5fe28ffbc7 SHA512 b0bbd1fdd37e35ccc0cd4d34bb9afa09910b56a14daa078148aefcce4dc13408c1a5d5a40b865a37bc917764f5b91e266256b9ca83e0f8009859d955b68fe6a8 WHIRLPOOL ff65f1a03910b4fa5758d5537d898c733971e5f339dcd8150bc1596dfcf490b4de2be7f520405a47274e1e9827eddc3d8a1324f2f169d575d1e4584dc01e9787
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPxQEQACgkQf15tZKyRylI3KgCgvlaLcTRQPqBRgiSlJ7eu8YLl
-KUUAoOqT0quBLSiBP/7P/OVg3JMqY9uV
-=ru9C
+iEYEAREIAAYFAlP052IACgkQf15tZKyRylJz4QCffWCeRqyic9bggx+dh8hz05bL
+ZT4AnRHWu7GMzjatzFh/HuMvTGCf/iV7
+=5hgX
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/lammps/lammps-20140815.ebuild b/sci-physics/lammps/lammps-20140815.ebuild
index cc0011b41e21..41e8223108f9 100644
--- a/sci-physics/lammps/lammps-20140815.ebuild
+++ b/sci-physics/lammps/lammps-20140815.ebuild
@@ -1,10 +1,10 @@
 # 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-20140815.ebuild,v 1.1 2014/08/17 23:52:33 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140815.ebuild,v 1.2 2014/08/20 18:22:23 nicolasbock Exp $
 
 EAPI=5
 
-inherit eutils fortran-2 multilib
+inherit eutils flag-o-matic fortran-2 multilib
 
 convert_month() {
 	case $1 in
@@ -67,7 +67,7 @@ lmp_emake() {
 		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
 		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
 		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS} -I../../src" \
+		CCFLAGS="${CXXFLAGS}" \
 		F90FLAGS="${FCFLAGS}" \
 		LINKFLAGS="${LDFLAGS}" \
 		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
@@ -79,9 +79,6 @@ lmp_emake() {
 
 src_prepare() {
 	# Fix inconsistent use of SHFLAGS.
-	sed -i -e 's:$(CCFLAGS):$(CCFLAGS) -fPIC:' src/STUBS/Makefile || die
-	sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/meam/Makefile.gfortran || die
-	sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/reax/Makefile.gfortran || die
 	sed -i \
 		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
 		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
@@ -101,6 +98,10 @@ src_prepare() {
 }
 
 src_compile() {
+	# Prepare compiler flags.
+	append-cxxflags -fPIC -I../../src
+	append-fflags -fPIC
+
 	# Compile stubs for serial version.
 	use mpi || lmp_emake -C src stubs
 
@@ -137,8 +138,11 @@ src_compile() {
 	emake -C src yes-srd
 	emake -C src yes-voronoi
 	emake -C src yes-xtc
-	emake -C src yes-user-atc
-	lmp_emake -C lib/atc -f Makefile.g++
+
+	if use mpi; then
+		emake -C src yes-user-atc
+		lmp_emake -C lib/atc -f Makefile.g++
+	fi
 
 	if use static-libs; then
 		# Build static library.