sci-physics/lammps-20140214-r1: Fixed some issues:

* Fixed file collision of header files by installing them into /usr/include/lammps
* Fixed missing .so name by adding proper linker flag.

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

3 files changed, 29 insertions, 16 deletions

diff --git a/sci-physics/lammps/ChangeLog b/sci-physics/lammps/ChangeLog
index 3344ec73ae94..5c7e21fa8849 100644
--- a/sci-physics/lammps/ChangeLog
+++ b/sci-physics/lammps/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2014/02/19 20:12:04 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.19 2014/02/19 22:49:50 nicolasbock Exp $
+
+  19 Feb 2014; Nicolas Bock <nicolasbock@gentoo.org> lammps-20140214-r1.ebuild:
+  sci-physics/lammps-20140214-r1: Fixed some issues:  * Fixed file collision of
+  header files by installing them into /usr/include/lammps * Fixed missing .so
+  name by adding proper linker flag.
 
 *lammps-20140214-r1 (19 Feb 2014)
 
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 705fdb0a8711..72a125fad3a5 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -16,14 +16,14 @@ EBUILD lammps-20140122.ebuild 2474 SHA256 a53722430133c48e79af46ea29e8f7ee2e15b9
 EBUILD lammps-20140129.ebuild 2474 SHA256 20b858dbf8bd276ce996b4a3abef1a67fc65cdac14944330f0a19b75f392854b SHA512 9db041db7994bdafd1470224c0c8f7ab8aec7849300ad3dd3579fe30300388b99cb732a8ab1f34e4c2c2e9a5c39c59cd345af87d81694cbc159abef9d44b64a3 WHIRLPOOL 1b13d493ddd0f0307c936f76d9422a7f601fd95e78c65db4d4524e5a01b546d1926a7b92f8df04c846b58f83631e086d304337552a9d4fa87988397d414ae170
 EBUILD lammps-20140201.ebuild 2474 SHA256 bf06324d1cfb529efb73ba6ac1cf44482b06e754ec8abd41b77dc5f034c34933 SHA512 2aed9cb6853a488c3a91c4f0935d913665e9fb9397ea7e393dd475830b4eea2d0d8b9d900f9f8c2d1516222a54c5d7f5b4460c05ef0524fcae053de7876af481 WHIRLPOOL 1104d3b7ded4e082519590065bc9698b61642fdbb6a75b5c4f0617465b3e5b89312c3c40cccbd86fe2d7fc4265314fa26d72c7c9362bc89b5dd9544217c09c6d
 EBUILD lammps-20140212.ebuild 3576 SHA256 c456eafcf1392e2c8cffe982cbb9f4d64e574bda3e1a9e91a8fbaf47124813a7 SHA512 c6ad5e506320af87cd8f270d494271936e3e7582ec5b7c6162cb8da15e2409747357959c9187fa047b806c8600b117cfafb1a25eca4fde845075b53bb81fc5c3 WHIRLPOOL bd8fb9a8ab1b624ae2645441a84af622371609fc5210678f06f711db510b1f5ad87959f5fa3235789399294fa3301882a7a5da273c8b13e64f72fa24c61d9ed9
-EBUILD lammps-20140214-r1.ebuild 3596 SHA256 9ea07ad32bf47c4bb0cb3f1e698bd38ed0e47c914818811b562bab9c310e670e SHA512 bac8da0802123676271c822c64363c8725c990b9b7e7c1d69267dd4ab4389bda72e30ec831bfcabe29068fdd1a68807eaadf1e83408051858179b0547f608556 WHIRLPOOL e87137fbd16fc93c1f0ce7fd3b278f46daf28a77706e175d6ab86c2816f06e53701b42ffaa3a6a3c4c0f88572262ea57670552cae566fb582b50e0156e0e6576
+EBUILD lammps-20140214-r1.ebuild 3902 SHA256 a303f544ff66ad713291a7e029773a1d742adf9829f45ff7bd55b01adfda58e2 SHA512 516a37fc7edb448551f1cf039c0982b8b46a0a28ef67b0643ba16d0cb2ccdd43bc3bb2c3cd58cd65ff6f68f9b723e341fc27d51566afced8597503b854215f6a WHIRLPOOL 8bcbafea32a3eaf499d2c64d3df9adabda430a907a22cbdc1feaba2bd7ce17ceb834b917e07c12f7efc63cf3566134cc109abb7323b1c4ba81e91b2112c11337
 EBUILD lammps-20140214.ebuild 3369 SHA256 4862cf13a843c6ba8110dfb000f32a4a683e55c11797cd4b7920f8f00da4da3a SHA512 afb853a19d96d75ed613fa03963d4a5e6b0cf98a8b40f05dea0eaff407154b9e1a105bd0056fa576abed6e7b30b95fbddb86f158b26a5a51ff31d4f7e31dec2b WHIRLPOOL 2cea4f815004770fdba5116b828efc51e6de875c7c43daad5c0285308ce80dbda92b44b5fb265a081d1bf2dbabad284484f25b51fbcb1002a177c610101570d9
-MISC ChangeLog 3653 SHA256 f0867f169d6add70aad626f669a92ab33c4ba2ecbcafcdc932edd813e684402b SHA512 5dc7db9632499bbf2827278c81b210a41d657ce48b7c586593e2da40fe3e1633836126eea4f8c65c9aaa17f5964f11a76ce2a4c84b3fe7c97ef85b400cc31aad WHIRLPOOL 4d47d08e9a241cd82320079e67510f11a7c99c9e59abeb8364156d3c8acfff24dd2279ef2030aec489d43e821b6a10eaf2b6178da97eaaa0c4c0097d862e4266
+MISC ChangeLog 3930 SHA256 d3ccf83f16a0f7a87b288ec095f527891960d8182b1f7c670ec08a15a81f58c5 SHA512 bbad4e6db7807d43eb25b33c5de621add1dbbfa21ea2101acb6f4380e51da16f48aa34e6e8aaf957a82763552e661b215d6277d4b2f200d69dbfd74a11ae38b7 WHIRLPOOL 39036af02264aab7b200ff02f6680c5d5f4c11d8bfd27700695c9e32a759abf6340d2bcc105eeae1304698d88307160c32b829e1e7eadd3cb0fc215f7373b690
 MISC metadata.xml 1518 SHA256 9b336b82f3b9669913073f0e598dc8dec9dc7b3e70c4b66eed0b9e7bd2454a35 SHA512 c111f5f63527f0802921888ca058244f585e3e55763d6c3e86e9ab21e180190efe0f59f5af8b70ab78d9d04f9df4f14f7715beac5a58cf528c2a5c4d08564798 WHIRLPOOL 55e4b0bd07a34cb48326680b048b27e8189c286f4a9e720c5951996b02ee0227a3ff0aa0b385440562003b0e4b1e1f73c7a4b6ed7180e64a6b9874b97f779eb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMFEB0ACgkQf15tZKyRylL6cgCg2QIn1kO/FZn7DD2lKJsBY6XD
-1D8An19yvAQ12Ho68BI1+PGU4X12zAtX
-=0fCy
+iEYEAREIAAYFAlMFNRUACgkQf15tZKyRylKKjwCeNIjIgSJzhTjxoPZuII9JHed4
+lLoAnjuxKC2FgXnxH4rpoU7qA3fu6RlE
+=nvt+
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/lammps/lammps-20140214-r1.ebuild b/sci-physics/lammps/lammps-20140214-r1.ebuild
index 1549844affbd..22203be2841f 100644
--- a/sci-physics/lammps/lammps-20140214-r1.ebuild
+++ b/sci-physics/lammps/lammps-20140214-r1.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-20140214-r1.ebuild,v 1.1 2014/02/19 20:12:04 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140214-r1.ebuild,v 1.2 2014/02/19 22:49:50 nicolasbock Exp $
 
 EAPI=5
 
-inherit eutils fortran-2
+inherit eutils fortran-2 multilib
 
 convert_month() {
 	case $1 in
@@ -80,12 +80,17 @@ src_prepare() {
 	sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/meam/Makefile.gfortran || die
 	sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/reax/Makefile.gfortran || die
 
+	# Fix missing .so name.
+	sed -i \
+		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+		src/MAKE/Makefile.serial || die
+
 	# Fix makefile in tools.
 	sed -i \
 		-e 's:g++:$(CXX) $(CXXFLAGS):' \
 		-e 's:gcc:$(CC) $(CCFLAGS):' \
 		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile
+		tools/Makefile || die
 }
 
 src_compile() {
@@ -123,19 +128,22 @@ src_compile() {
 }
 
 src_install() {
-	use static-libs && newlib.a "src/liblammps_serial.a" "liblammps.a"
-	newlib.so "src/liblammps_serial.so" "liblammps.so"
-	newbin "src/lmp_serial" "lmp"
+	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+	newbin src/lmp_serial lmp
 	dobin tools/binary2txt
 	# Don't forget to add header files of optional packages as they are added
 	# to this ebuild. There may also be .mod files from Fortran based
 	# packages.
-	doheader -r src/*.h lib/meam/*.mod
+	insinto "/usr/include/${PN}"
+	doins -r src/*.h lib/meam/*.mod
 
-	local LAMMPS_POTENTIALS="/usr/share/${PN}/potentials"
-	insinto "${LAMMPS_POTENTIALS}"
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
 	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS}" > 99lammps
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
 	doenvd 99lammps
 
 	if use examples; then