From: Nicolas Bock Date: Tue, 14 Apr 2015 11:45:20 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1bb59d06be2a2e36f739591893a8b97909348bc6;p=gentoo.git Version bump. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xAC91CA52 --- diff --git a/sci-physics/lammps/ChangeLog b/sci-physics/lammps/ChangeLog index a0859bb490bc..21da9b78a78f 100644 --- a/sci-physics/lammps/ChangeLog +++ b/sci-physics/lammps/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-physics/lammps # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.93 2015/04/12 17:49:55 nicolasbock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/ChangeLog,v 1.94 2015/04/14 11:45:15 nicolasbock Exp $ + +*lammps-20150411 (14 Apr 2015) + + 14 Apr 2015; Nicolas Bock + +files/lammps-python3.patch, +lammps-20150411.ebuild: + Version bump. *lammps-20150406 (12 Apr 2015) diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest index bfdd15f58cd5..9ab6735cdfbf 100644 --- a/sci-physics/lammps/Manifest +++ b/sci-physics/lammps/Manifest @@ -2,8 +2,10 @@ Hash: SHA256 AUX chunk.patch 608 SHA256 1e8eae1e25b0975c949efda91fb97899ca4bedc99f40dbb23eaabb86b6b4e035 SHA512 a45a78cdaff4aca1a352f8f302fe0706eb7c119fb33d284e256d41cf2fa7d5c1d3f38ccc7f7b6e0678956eaf212de4ef5db787a77762b71b0a511dfba7fb014a WHIRLPOOL ff6d3648bbd9255cc9969d531572d74aea3d51ee4afb65c0e295c2a4918f7f1f615bacca242c9f01a6b8a5d5005da80a47d41d1aa7c97e6836bcc33f67cd96db +AUX lammps-python3.patch 509 SHA256 85ab3e1d1cc123af8d63400ec1b83f52f50325aa6990ae9f2f032d6753f8553f SHA512 e88b7e036c3ea86c032a7e8dde771073c08ed96c0a3da240a824fd7f424553ef4d5db2ba6c4fcfcb9f0ec4550a073e7370a163165352911ee4f1d64f91094056 WHIRLPOOL bb73c0b001b39266d4586ff7c409789599b8e64785609037b96e6bbcb89ac100fa4171230fc8e6b28017d898b591c8c0188aace223caaaa728477865a2e97699 AUX python-shebang.patch 393 SHA256 77ffe7208de583b53f0ec4e688d647218135fa0cafbe374b56c6f4ceec3229e1 SHA512 fd4663ac2ce6949e59509ab03a7eda4471e38350440fe6c64c9fe5321941a5951074578148d0da335292a4e19c6c0b13d3e97c174123eb1d9662bbd63247b5e7 WHIRLPOOL bd792c3cfe7bb85b436ba11e2574c6bfd21364566236c89ca7330206f781d474117daa9cf44c9a4ba902349c673aaefeffb84e45b2afc2553359dcf270370370 DIST lammps-10Feb15.tar.gz 62912048 SHA256 59373e9b5592f7b697a144bbce1fb742726e03536b7bb355dac7a9e013ddf9b8 SHA512 a7804377a23f03f338bdaf443439dffcdc52293b4c45e6369b340a1107510fed0b8a198e3b5afcff2e04e109985b52ee62e7b28276697bae37ac6f783d1ab9f2 WHIRLPOOL 09f29cadf8b072d388abe45ec219341d2a14a6c9cc9e4010a0f7945e930e9984738f7837748d117ab95ca76ce0c8d9160fe88dcec17e8d21b81f385dec8f7005 +DIST lammps-11Apr15.tar.gz 63843170 SHA256 21ceb4154a1439abeb2f0ac50f3058021facf0636b280e596b75a3f1a5fae46b SHA512 e9bf8c0612784fae73982e2da2d6034a0ca8d9da69930b9dd953897432e108bcae86d7307591a3e491cac4b5e34e3a148767e5e0e2e89f2b52e37fe272b9bdee WHIRLPOOL f275d4b3c5cd532e3cadd729f8b8cc1d65bb62f1616d121d59f004564238b55724dff37bc311c8ca789a0d1febe94ca7d89a72ec62cc4d65f678493d6afa1600 DIST lammps-12Mar15.tar.gz 63521532 SHA256 048dc4d5f9f4d26d6f9bfeb4e20bb48cd01d3b064fb0b091309218c0895dbb3e SHA512 2581d795adcde9ef7bd10ebea5cfa1897835849c8aea112b8d45614e2eabb610316c6f7cba94b5324203b08382d31bdb17a3031d4d7f1ef4e951c35a08eda6f3 WHIRLPOOL 7fd33fed676b5b833dd053d79e64d090aa8384b462026147ee9e62313e937abaaef1d95d04c152254b2a1593f8b0baa077e5b68f85cb9f461f7128363a50214e DIST lammps-13Feb15.tar.gz 62974524 SHA256 6be39873ff30eaaf467ac201d7f9b06b7fb175c5fcc4687dc38b7e8ab8ac0544 SHA512 20a0e7ba4905cf3e1f57df9bb9ddba298c8ee03e823d920ffa526a6ee318e4c9a5d3319bd79a46441a895c5b03ba0d296a2921f38f5795014f544ec58b3be629 WHIRLPOOL 22e9534dc84a9ce5cc2f5ca0ff693a05cc8afa1f307cac71d739c7504e56a11121acda62cc1d141f2e8f556a4c35bddeeac09cd429cddde531dec115925f4b00 DIST lammps-14Mar15.tar.gz 63563980 SHA256 10dba8d347a7ab7a5ba3e4a87f555177cb0ad5cbf4bcee4125cca5e67cb31dfa SHA512 99dd8fece0ec220f324a0c9dc14b80260119c1038afd4312ad85d6672a65164a6cee6625677f8ef337962677b82d4a0c7b2ca361d004dfd9fb0083c5b7eb1737 WHIRLPOOL 1fc20a1d388d575c3313a65d601b2f099464767c1585f601a961269317fcb320bb9b8dda7a7e4122808d8234d120300a379ba4d119c32d2dcc9ad0e5616893b2 @@ -51,16 +53,17 @@ EBUILD lammps-20150329.ebuild 5521 SHA256 df3a7f71ac4859491e06af4612e01de0e99593 EBUILD lammps-20150402.ebuild 5521 SHA256 1de0818c7362674917a09b51cb7a4456194f49c0fb392b2f65dd9e5864248481 SHA512 b5e53c3a00af57556b8a9c9924c93265c09818dba89530ef73eb78716b96972f0c040ee987763de916c58bd07dd49df43618494e8b06ffdca965bb88cc9da72a WHIRLPOOL 2cb4e79ec1c04ae27ff4dfa2a7c215dae9235ba6577d95411d25bcc7cf7e47a98eab760bb3ef5462d0693b1f7f3ea0ef536c2a5cebae2296e791d1ccf5ab96de EBUILD lammps-20150403.ebuild 5639 SHA256 009c0165f643c9ff35da312848abd88081043e31b38ecfed47bd428421bdd58b SHA512 bdef1ebc0d38426960f2935a11a437ff18997e750d880b2d421616092df60512223d086aec67206a1c3ae6c0605e92bca1aab12ad81f049e03a2615c450c6ab1 WHIRLPOOL bbb10a5b797453c61a76dcc898457d07357c3fcc42abf02c21a0a45adf4bcf0645d7157666a4aecd30c5d670cc774623f06e94ef0a07a2123952a30b90587ec8 EBUILD lammps-20150406.ebuild 5639 SHA256 2803a644d843d77f4896d4af5c94e18c72c797ce4783271242da44d1024449b8 SHA512 b6c6ae44df6ee0be857141a0e0da094b8936d8dc03a907c182dcc5834c8d0895d5eef2224266b89580e7d58df4d15035cbb4bac35976edfef2beaa3ca52213fb WHIRLPOOL a4422314ec7109a1f2f983861beb0a1b7d6228f2b5bcece83f73087c890e4ffa1cf06149005724f289332a20ee4088d04e560f6a031c36d6b10068b89d25ae06 -MISC ChangeLog 15864 SHA256 2432a6f395968acdba5c412af61a8c3f2bb02880f37f1de690ddcfb8415bcaff SHA512 7ce6edde270a63a4c596ffd53fc521c64926b88e8dc049ccc761927f1b49863303c9582b078632afe0f247a7a9ee2744748866e4b78d5cc8511feca3e0666b6e WHIRLPOOL c53f85cd7f248fefeea8b14ea2e18ae1f5632307e162fa6e964c952ca6c22e4b69e0d593777d3a3bf884e686695f3d097fe2f25266c864e5d8d8f00b8dc56d10 +EBUILD lammps-20150411.ebuild 6832 SHA256 6fde6a18fde97b78370934585ad466bfdec116e2d913af6feb3419afb78029e5 SHA512 3b5035bbb06ee6be1b44f36e5e0befd871041ce6bb60a8204108f3c979ec74ae514a2fac43a3ffe4faaf66eba49baa22b35e271d1dc3a956c63ee14748df1b6c WHIRLPOOL a72393012ef64237711199af01c234465eb0217c8e56ea2378d404e3974ed44fa872f403b097c87d9d655ba78f2eecccb53f02da0ea2e2c2309c4d8065dd020c +MISC ChangeLog 16022 SHA256 97c9fd1e020b3def333fbe7e2c17eab8348dc17f19e7688fbcd2fa6d736d0345 SHA512 075f478832cc58333921f6f3bdfb1da830c773937004411136336382552401c96b54305eefe0dda34b09f42f1f7ca2e05498aa8bd0f98e6a519977fd22918814 WHIRLPOOL eb0c46074f99e1b41454cff22b3b341de83c7eb8de5c39f5e004c3a30d60704a0e1a83b067c52fd9382dbe36b9db3ac45d7f2d59e359b45fec2cc547e7399986 MISC metadata.xml 1104 SHA256 cd019e3b907b935374e9818167b4a9c406d938cf132b6656a7aed15fb8070d4c SHA512 9fa9919de32eb24c720fecbb449112b997e331b4ecb37aba8cdfcf90bc832e00ff8deef570f8eb92341f8c82b90787d65befa9ebeacb904abb467b8f3e1c5054 WHIRLPOOL 88fbd760afe74c12310ed3417e8c6d242b282bc78fee612b1c0c1dd1532ec9253f7b5134a9fb8f463f9fe469ce1d5fada43b97b348c221c84869907cfc0dd37e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJVKrBGAAoJEF1ww0n44d9N2MYH/AsAwR1vJrdZ9T0yr85DxXmI -IdRGFEsJz/zwHd4Gjjv9lX4n+QgnPnLi/zPCjYY2QngBj4AgrZU2EfXdtxaUdJ/k -WR0hj/L3OUK/3pI5xvgc3IrdVrUulvRovSczcqpTH39zWRA3L7EBXCg1bsqV1fbI -G6jvrGg4mVRLotrnEMqZ8jXxnxqgHamRww/zwt8Hmfj9zqpxeWGm/J/fwdhwB6UQ -fLfVUKXxpOMHoeN8rgxk4JSgJoSaV6KAmwG6bULYoCayAPAroDXAp+mri9x63ERu -5TPQhEtXe6dNHUki9js9JIK3zmTiI0yIGyf33E9di2tXl+m4ADrjH1i/pRArlOA= -=LesG +iQEcBAEBCAAGBQJVLP3PAAoJEF1ww0n44d9NeRkH/30KJYhbrplBqvUCxG0QJWFk +soCI5Is8WcAiehkrERCrLRvRB766RE11fkgRf5MsNuXhp3Ly/ESjASI7hWOeXBMF +wiObuGIcQXJk5QQCZcq0q8od5glaGS0EF2CCRn4N5+MB72q9vvQKNoo+t45OkrGJ +U4dbGmWgVT9eBRfBy1au7VaiwL75tCnPJ3TBbvR2Ieai5RBLFSxbkm2rg9MUplf3 +HILD7vtuJDiw9EDec0MeiX7hxK/PNxF98+QaYwmljx2RQqKtIoRjuxzealoEHCmk +QO3uRGln7IrZ5vt0RmRPPUkaiFGGCsHXipZxVhpfzw8auaKkbH7yXMuBZra0VA0= +=lYeA -----END PGP SIGNATURE----- diff --git a/sci-physics/lammps/files/lammps-python3.patch b/sci-physics/lammps/files/lammps-python3.patch new file mode 100644 index 000000000000..1937881c9339 --- /dev/null +++ b/sci-physics/lammps/files/lammps-python3.patch @@ -0,0 +1,11 @@ +--- lammps-11Apr15/python/lammps.py 2015-03-13 16:06:20.000000000 -0600 ++++ lammps-11Apr15-new/python/lammps.py 2015-04-13 09:40:43.000000000 -0600 +@@ -28,7 +28,7 @@ + except: + type,value,tb = sys.exc_info() + traceback.print_exception(type,value,tb) +- raise OSError,"Could not load LAMMPS dynamic library" ++ raise OSError("Could not load LAMMPS dynamic library") + + # if no ptr provided, create an instance of LAMMPS + # don't know how to pass an MPI communicator from PyPar diff --git a/sci-physics/lammps/lammps-20150411.ebuild b/sci-physics/lammps/lammps-20150411.ebuild new file mode 100644 index 000000000000..7544bdf16032 --- /dev/null +++ b/sci-physics/lammps/lammps-20150411.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150411.ebuild,v 1.1 2015/04/14 11:45:15 nicolasbock Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3} ) + +inherit eutils flag-o-matic fortran-2 multilib python-r1 + +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 ~x86" +IUSE="doc examples gzip lammps-memalign mpi python static-libs" + +DEPEND=" + mpi? ( + virtual/blas + virtual/lapack + virtual/mpi + ) + gzip? ( app-arch/gzip ) + sci-libs/voro++ + python? ( ${PYTHON_DEPS} ) + " +RDEPEND="${DEPEND}" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S="${WORKDIR}/${MY_P}" + +lmp_emake() { + local LAMMPS_INCLUDEFLAGS + LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')" + LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')" + + # 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") \ + user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\ + "$@" +} + +lmp_activate_packages() { + # Build packages + lmp_emake -C src yes-asphere + lmp_emake -C src yes-body + lmp_emake -C src yes-class2 + lmp_emake -C src yes-colloid + lmp_emake -C src yes-coreshell + lmp_emake -C src yes-dipole + lmp_emake -C src yes-fld + #lmp_emake -C src yes-gpu + lmp_emake -C src yes-granular + # Need OpenKIM external dependency. + #lmp_emake -C src yes-kim + # Need Kokkos external dependency. + #lmp_emake -C src yes-kokkos + lmp_emake -C src yes-kspace + lmp_emake -C src yes-manybody + lmp_emake -C src yes-mc + lmp_emake -C src yes-meam + lmp_emake -C src yes-misc + lmp_emake -C src yes-molecule + #lmp_emake -C src yes-mpiio + lmp_emake -C src yes-opt + lmp_emake -C src yes-peri + lmp_emake -C src yes-poems + lmp_emake -C src yes-qeq + lmp_emake -C src yes-reax + lmp_emake -C src yes-replica + lmp_emake -C src yes-rigid + lmp_emake -C src yes-shock + lmp_emake -C src yes-snap + lmp_emake -C src yes-srd + lmp_emake -C src yes-voronoi + lmp_emake -C src yes-xtc + + if use mpi; then + lmp_emake -C src yes-user-atc + fi + lmp_emake -C src yes-user-eff + lmp_emake -C src yes-user-fep + use mpi && lmp_emake -C src yes-user-lb + lmp_emake -C src yes-user-phonon + lmp_emake -C src yes-user-sph +} + +lmp_build_packages() { + lmp_emake -C lib/meam -j1 -f Makefile.gfortran + lmp_emake -C lib/poems -f Makefile.g++ + lmp_emake -C lib/reax -j1 -f Makefile.gfortran + use mpi && lmp_emake -C lib/atc -f Makefile.g++ +} + +lmp_clean_packages() { + lmp_emake -C lib/meam -f Makefile.gfortran clean + lmp_emake -C lib/poems -f Makefile.g++ clean + lmp_emake -C lib/reax -f Makefile.gfortran clean + use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean +} + +src_prepare() { + # Fix inconsistent use of SHFLAGS. + sed -i \ + -e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \ + -e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \ + lib/voronoi/Makefile.lammps || 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 || die + + # Patch python. + epatch "${FILESDIR}/lammps-python3.patch" + epatch "${FILESDIR}/python-shebang.patch" +} + +src_compile() { + # Fix atc... + append-cxxflags -I../../src + + # Acticate packages. + elog "Activating lammps packages..." + lmp_activate_packages + + # Compile stubs for serial version. + use mpi || lmp_emake -C src mpi-stubs + + elog "Building packages..." + lmp_build_packages + + if use static-libs; then + # Build static library. + elog "Building static library..." + lmp_emake -C src mode=lib serial + fi + + # Clean out packages (that's not done by the build system with the clean + # target), so we can rebuild the packages with -fPIC. + elog "Cleaning packages..." + lmp_clean_packages + + # The build system does not rebuild the packages with -fPIC, adding flag + # manually. + append-cxxflags -fPIC + append-fflags -fPIC + + # Compile stubs for serial version. + use mpi || lmp_emake -C src mpi-stubs + + elog "Building packages..." + lmp_build_packages + + # Build shared library. + elog "Building shared library..." + lmp_emake -C src mode=shlib serial + + # Compile main executable. The shared library is always built, and + # mode=shexe is simply a way to re-use the object files built in the + # "shlib" step when linking the executable. The executable is not actually + # using the shared library. If we have built the static library, then we + # link that into the executable. + elog "Linking executable..." + if use static-libs; then + lmp_emake -C src mode=exe serial + else + lmp_emake -C src mode=shexe serial + fi + + # Compile tools. + elog "Building tools..." + lmp_emake -C tools binary2txt chain data2xmovie micelle2d +} + +src_install() { + 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 + dobin tools/chain + dobin tools/data2xmovie + dobin tools/micelle2d + # 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. + insinto "/usr/include/${PN}" + doins -r src/*.h lib/meam/*.mod + + local LAMMPS_POTENTIALS="usr/share/${PN}/potentials" + insinto "/${LAMMPS_POTENTIALS}" + doins potentials/* + echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps + doenvd 99lammps + + # Install python script. + use python && python_foreach_impl python_domodule python/lammps.py + + if use examples; then + local LAMMPS_EXAMPLES="/usr/share/${PN}/examples" + insinto "${LAMMPS_EXAMPLES}" + doins -r examples/* + fi + + dodoc README + if use doc; then + dodoc doc/Manual.pdf + dohtml -r doc/* + fi +}