diff options
author | Sébastien Fabbro <bicatali@gentoo.org> | 2014-02-16 20:49:06 -0800 |
---|---|---|
committer | Sébastien Fabbro <bicatali@gentoo.org> | 2014-02-16 20:49:06 -0800 |
commit | 2f68e5ea68f9a9d3c8fc7c301b21d0cd712b67e9 (patch) | |
tree | ac25341df026e966898d63a84f87feb382eb6e79 | |
parent | sys-cluster/hpx: Version bump (diff) | |
parent | git-r3 too smart, migrate back to git-2 (diff) | |
download | sci-2f68e5ea68f9a9d3c8fc7c301b21d0cd712b67e9.tar.gz sci-2f68e5ea68f9a9d3c8fc7c301b21d0cd712b67e9.tar.bz2 sci-2f68e5ea68f9a9d3c8fc7c301b21d0cd712b67e9.zip |
Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci; github.com:gentoo-science/sci
-rw-r--r-- | sci-chemistry/gromacs/ChangeLog | 3 | ||||
-rw-r--r-- | sci-chemistry/gromacs/gromacs-4.6.9999.ebuild | 10 | ||||
-rw-r--r-- | sci-libs/armadillo/ChangeLog | 7 | ||||
-rw-r--r-- | sci-libs/armadillo/Manifest | 1 | ||||
-rw-r--r-- | sci-libs/armadillo/armadillo-4.000.3.ebuild | 1 | ||||
-rw-r--r-- | sci-libs/armadillo/armadillo-4.000.4.ebuild | 114 | ||||
-rw-r--r-- | sci-libs/armadillo/files/armadillo-opt_wrapper.patch | 15 | ||||
-rw-r--r-- | sci-physics/espresso++/ChangeLog | 3 | ||||
-rw-r--r-- | sci-physics/espresso++/espresso++-9999.ebuild | 7 |
9 files changed, 136 insertions, 25 deletions
diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index 0d3f2b013..ed1841b9b 100644 --- a/sci-chemistry/gromacs/ChangeLog +++ b/sci-chemistry/gromacs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Feb 2014; Christoph Junghans <ottxor@gentoo.org> gromacs-4.6.9999.ebuild: + git-r3 too smart, migrate back to git-2 + 05 Feb 2014; Alexey Shvetsov <alexxy@gentoo.org> gromacs-9999.ebuild: Bash completion changes are comming =D diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild index c2f343502..73e8445cd 100644 --- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild @@ -17,7 +17,7 @@ if [[ $PV = *9999* ]]; then git://github.com/gromacs/gromacs.git http://repo.or.cz/r/gromacs.git" EGIT_BRANCH="release-4-6" - inherit git-r3 + inherit git-2 LIVE_DEPEND="doc? ( app-doc/doxygen dev-texlive/texlive-latex @@ -87,18 +87,18 @@ src_unpack() { if [[ ${PV} != *9999 ]]; then default else - git-r3_src_unpack + git-2_src_unpack if use doc; then EGIT_REPO_URI="git://git.gromacs.org/manual.git" \ EGIT_BRANCH="release-4-6" EGIT_NOUNPACK="yes" EGIT_COMMIT="release-4-6" \ EGIT_SOURCEDIR="${WORKDIR}/manual"\ - git-r3_src_unpack + git-2_src_unpack fi if use test; then EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \ - EGIT_BRANCH="master" EGIT_NOUNPACK="yes" EGIT_COMMIT="master" \ + EGIT_BRANCH="master" EGIT_NOUNPACK="yes" EGIT_COMMIT="release-4-6" \ EGIT_SOURCEDIR="${WORKDIR}/regressiontests"\ - git-r3_src_unpack + git-2_src_unpack fi fi } diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index 5d0748c8f..bdacb7ff2 100644 --- a/sci-libs/armadillo/ChangeLog +++ b/sci-libs/armadillo/ChangeLog @@ -2,9 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ - 14 Feb 2014; Reinis Danne <rei4dan@gmail.com> armadillo-4.000.3.ebuild, - +files/armadillo-opt_wrapper.patch: - Add patch to make the wrapper optional at consumer compile time. +*armadillo-4.000.4 (16 Feb 2014) + + 16 Feb 2014; Reinis Danne <rei4dan@gmail.com> +armadillo-4.000.4.ebuild: + Bump to version 4.000.4. 10 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> armadillo-4.000.3.ebuild: sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index 752926dd7..c06baf776 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,2 +1,3 @@ DIST armadillo-3.930.0.tar.gz 3250101 SHA256 3d0bdb313fa2f553536a5d978f8d56e0284f6ec423cfd4ad1200336d848ba95e SHA512 44bae7ea03a28b7f2613fb9525b8167b5446842e1d6573f857340db30667bbf847d90837bcca20b04fa990cfb818ab33b2372088880bc4d6c676019719bd66a7 WHIRLPOOL c96b555a24311f7f76d422ff5c749420f6c8c6d80524720e279a72597e9b0841b80d93fd410f6246d03d7752617e85f0ffbd521c7b5c6edca978935098767b19 DIST armadillo-4.000.3.tar.gz 5470527 SHA256 044bce3ec2564393c6704ad4322011f2a6c6f2f606eefaa03387a825912fc7c4 SHA512 da8c7736c4715f7194713b4e6e420f77f12c5dbce61a7eca2a42f0ac1ec14071b682c8de7da8fd6fb3457fae6909f6e51d4cde96b9011c8516c674f453c67995 WHIRLPOOL c20f4796e99706e202fe7683e1409f967dbc57554e008111ffb37e08c7ca697a3dd58cfbf9b5e521a8988e532d25a84ab8464ff8c97da84b28ef471b6ba456e7 +DIST armadillo-4.000.4.tar.gz 5470962 SHA256 0664caca9a9be410ba467a3f4fd7d4556ccda62a9e061f2935904be2afe22132 SHA512 308c20876f1e6e7373c636d6e8f0b5b3b47a15707f97af7e32481fdb762486cd2c6116e80dc11ede26edb62b50d23ffbb2304dc0b4a35cbe2a806bbfcf398514 WHIRLPOOL 94b16d795d485e0582ce68d5f66f20e0f1659f35f326d57debbce65c14279f296332c89d931c3b77c197f59cd7ac086b2f5dcdebd6afb61f54d1a4fc04d1da71 diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.000.3.ebuild index c17fbf20b..6dab24828 100644 --- a/sci-libs/armadillo/armadillo-4.000.3.ebuild +++ b/sci-libs/armadillo/armadillo-4.000.3.ebuild @@ -40,7 +40,6 @@ PDEPEND="${RDEPEND} src_prepare() { epatch \ "${FILESDIR}"/${PN}-4.000.3-hdf5.patch \ - "${FILESDIR}"/${PN}-opt_wrapper.patch \ "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch # avoid the automagic cmake macros sed -i -e '/ARMA_Find/d' CMakeLists.txt || die diff --git a/sci-libs/armadillo/armadillo-4.000.4.ebuild b/sci-libs/armadillo/armadillo-4.000.4.ebuild new file mode 100644 index 000000000..6dab24828 --- /dev/null +++ b/sci-libs/armadillo/armadillo-4.000.4.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +CMAKE_IN_SOURCE_BUILD=1 + +inherit cmake-utils toolchain-funcs multilib eutils + +DESCRIPTION="Streamlined C++ linear algebra library" +HOMEPAGE="http://arma.sourceforge.net/" +SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0/4" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" +REQUIRED_USE="test? ( lapack )" + +RDEPEND=" + dev-libs/boost + arpack? ( sci-libs/arpack ) + atlas? ( sci-libs/atlas[lapack] ) + blas? ( virtual/blas ) + lapack? ( virtual/lapack )" +DEPEND="${RDEPEND} + arpack? ( virtual/pkgconfig ) + atlas? ( virtual/pkgconfig ) + blas? ( virtual/pkgconfig ) + hdf5? ( sci-libs/hdf5 ) + lapack? ( virtual/pkgconfig ) + mkl? ( sci-libs/mkl ) + tbb? ( dev-cpp/tbb )" +PDEPEND="${RDEPEND} + hdf5? ( sci-libs/hdf5 ) + mkl? ( sci-libs/mkl ) + tbb? ( dev-cpp/tbb )" + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-4.000.3-hdf5.patch \ + "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch + # avoid the automagic cmake macros + sed -i -e '/ARMA_Find/d' CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + $(cmake-utils_use debug ARMA_EXTRA_DEBUG) + $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) + $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) + ) + if use arpack; then + mycmakeargs+=( + -DARPACK_FOUND=ON + -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" + ) + fi + if use atlas; then + local c=atlas-cblas l=atlas-clapack + $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads + $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads + mycmakeargs+=( + -DCBLAS_FOUND=ON + -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" + -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" + -DCLAPACK_FOUND=ON + -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" + -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" + ) + fi + if use blas; then + mycmakeargs+=( + -DBLAS_FOUND=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + ) + fi + if use hdf5; then + mycmakeargs+=( + -DHDF5_FOUND=ON + -DHDF5_LIBRARIES="-lhdf5" + ) + fi + if use lapack; then + mycmakeargs+=( + -DLAPACK_FOUND=ON + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + fi + cmake-utils_src_configure +} + +src_test() { + pushd examples > /dev/null + emake \ + CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ + EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)" + LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die + LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die + emake clean + popd > /dev/null +} + +src_install() { + cmake-utils_src_install + dodoc README.txt + use doc && dodoc *pdf && dohtml *html + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples + fi +} diff --git a/sci-libs/armadillo/files/armadillo-opt_wrapper.patch b/sci-libs/armadillo/files/armadillo-opt_wrapper.patch deleted file mode 100644 index be5b38684..000000000 --- a/sci-libs/armadillo/files/armadillo-opt_wrapper.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- include/armadillo_bits/config.hpp.cmake 2014-02-14 02:22:31.792051878 +0200 -+++ include/armadillo_bits/config.hpp.cmake 2014-02-14 02:24:56.423587416 +0200 -@@ -29,10 +29,12 @@ - //// ARPACK is required for eigendecompositions of sparse matrices, eg. eigs_sym() - #endif - -+#if !defined(ARMA_NO_WRAPPER) - #cmakedefine ARMA_USE_WRAPPER - //// Comment out the above line if you're getting linking errors when compiling your programs, - //// or if you prefer to directly link with LAPACK, BLAS or ARPACK. - //// You will then need to link your programs directly with -llapack -lblas instead of -larmadillo -+#endif - - // #define ARMA_BLAS_CAPITALS - //// Uncomment the above line if your BLAS and LAPACK libraries have capitalised function names (eg. ACML on 64-bit Windows) diff --git a/sci-physics/espresso++/ChangeLog b/sci-physics/espresso++/ChangeLog index 3d4182ad4..477342007 100644 --- a/sci-physics/espresso++/ChangeLog +++ b/sci-physics/espresso++/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Feb 2014; Christoph Junghans <ottxor@gentoo.org> espresso++-9999.ebuild: + live ebuild update + 07 Feb 2014; Christoph Junghans <ottxor@gentoo.org> espresso++-9999.ebuild, metadata.xml: live ebuild update diff --git a/sci-physics/espresso++/espresso++-9999.ebuild b/sci-physics/espresso++/espresso++-9999.ebuild index 694093a10..d36b56288 100644 --- a/sci-physics/espresso++/espresso++-9999.ebuild +++ b/sci-physics/espresso++/espresso++-9999.ebuild @@ -40,6 +40,11 @@ DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README ) src_configure() { - mycmakeargs=( -DEXTERNAL_BOOST=ON -DEXTERNAL_MPI4PY=ON -DLIB="$(get_libdir)" ) + mycmakeargs=( + -DEXTERNAL_BOOST=ON + -DEXTERNAL_MPI4PY=ON + -DLIB="$(get_libdir)" + -DWITH_RC_FILES=OFF + ) cmake-utils_src_configure } |