From d61ffe7ceee197aad7dd32275a19c53fd59f0f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Mach=C3=A1=C4=8Dek?= Date: Tue, 19 Jun 2012 16:12:17 +0200 Subject: Reflect the split of the fortran interface out of sci-libs/netcdf in sci-libs/bigdft and sci-libs/etsf_io. The version of sci-physics/elk bumped to 1.4.22, the old ones removed. --- sci-libs/bigdft/ChangeLog | 8 ++ sci-libs/bigdft/Manifest | 4 +- sci-libs/bigdft/bigdft-1.6.0-r1.ebuild | 118 --------------------------- sci-libs/bigdft/bigdft-1.6.0-r2.ebuild | 122 ++++++++++++++++++++++++++++ sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild | 124 ----------------------------- sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild | 128 ++++++++++++++++++++++++++++++ 6 files changed, 260 insertions(+), 244 deletions(-) delete mode 100644 sci-libs/bigdft/bigdft-1.6.0-r1.ebuild create mode 100644 sci-libs/bigdft/bigdft-1.6.0-r2.ebuild delete mode 100644 sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild create mode 100644 sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild (limited to 'sci-libs/bigdft') diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog index 5334648c2..1d25edefd 100644 --- a/sci-libs/bigdft/ChangeLog +++ b/sci-libs/bigdft/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*bigdft-1.6.0-r2 (19 Jun 2012) +*bigdft-1.6_pre1-r2 (19 Jun 2012) + + 19 Jun 2012; Honza Macháček + -bigdft-1.6_pre1-r1.ebuild, +bigdft-1.6_pre1-r2.ebuild, + -bigdft-1.6.0-r1.ebuild, +bigdft-1.6.0-r2.ebuild: + Reflect the split of the fortran interface out of sci-libs/netcdf + 22 May 2012; Justin Lecher bigdft-1.6_pre1-r1.ebuild, bigdft-1.6.0-r1.ebuild: Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits diff --git a/sci-libs/bigdft/Manifest b/sci-libs/bigdft/Manifest index 5f1f645ce..02177f45a 100644 --- a/sci-libs/bigdft/Manifest +++ b/sci-libs/bigdft/Manifest @@ -1,2 +1,2 @@ -DIST bigdft-1.6-tuto.1.tar.gz 7510733 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d -DIST bigdft-1.6.0.tar.gz 8876759 SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572 +DIST bigdft-1.6-tuto.1.tar.gz 7510733 RMD160 1f759a7590491e2f143c592db01d0263646bae82 SHA1 5308af2e44b15a9a2c5d9cb14eec9b934a16c9f0 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d +DIST bigdft-1.6.0.tar.gz 8876759 RMD160 6cc9f8c87447d540e0677311dfb9a1da6c7f0150 SHA1 b4c75d0bf95ddf66d8cade96f4c1c625a2b71f1b SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572 diff --git a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild deleted file mode 100644 index cdb304961..000000000 --- a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs - -REAL_P="${P/_pre0/-tuto}" - -DESCRIPTION="A DFT electronic structure code using a wavelet basis set" -HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/" -SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cuda doc etsf_io mpi netcdf opencl test" - -RDEPEND=" - =sci-libs/libxc-1*[fortran] - virtual/blas - virtual/fortran - virtual/lapack - mpi? ( virtual/mpi ) - cuda? ( dev-util/nvidia-cuda-sdk ) - opencl? ( - || ( - dev-util/nvidia-cuda-sdk - dev-util/amdstream - ) - ) - etsf_io? ( sci-libs/etsf_io ) - netcdf? ( sci-libs/netcdf[fortran] )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/autoconf-2.59 - doc? ( virtual/latex-base )" - -S="${WORKDIR}/${REAL_P}" - -DOCS=( README INSTALL ChangeLog AUTHORS NEWS ) - -FORTRAN_STANDARD=90 - -pkg_setup() { - # fortran-2.eclass does not handle mpi wrappers - if use mpi; then - export FC="mpif90" - export F77="mpif77" - export CC="mpicc" - else - tc-export FC F77 CC - fi - - fortran-2_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch - eautoreconf -} - -src_configure() { - local modules="/usr/$(get_libdir)/finclude" - local netcdff_libs="-lnetcdff" - filter-flags '-m*' '-O*' "-pipe" - local nvcflags="${CFLAGS}" -# _filter-var nvcflags '-m*' '-O*' "-pipe" - local myeconfargs=( - $(use_enable mpi) - --enable-optimised-convolution - --enable-pseudo - --enable-libbigdft - --enable-binaries - --disable-minima-hopping - --with-moduledir="${modules}" - --with-ext-linalg="$(pkg-config --libs-only-l lapack) \ - $(pkg-config --libs-only-l blas)" - --with-ext-linalg-path="$(pkg-config --libs-only-L lapack) \ - $(pkg-config --libs-only-L blas)" - --disable-internal-libxc - --with-libxc-path="/usr" - --with-libxc-include="${modules}" - $(use_enable cuda cuda-gpu) - $(use_with cuda cuda-path /opt/cuda) - $(use_with cuda nvcc-flags "${nvcflags}") - $(use_enable opencl) - $(use_with opencl ocl-path /usr) - $(use_with etsf_io etsf-io) - $(use_with etsf_io etsf-io-path "/usr") - $(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)") - "$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")" - FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}" - LD="$(tc-getLD)" - CPP="$(tc-getCPP)" - ) - autotools-utils_src_configure -} - -src_compile() { - #autotools-utils_src_compile() expanded - _check_build_dir - pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null - emake -j1 - sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc - popd > /dev/null - - use doc && autotools-utils_src_compile doc -} - -src_test() { - use test && autotools-utils_src_test -} - -src_install() { - autotools-utils_src_install HAVE_LIBXC=1 -} diff --git a/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild new file mode 100644 index 000000000..b4e40f540 --- /dev/null +++ b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs + +REAL_P="${P/_pre0/-tuto}" + +DESCRIPTION="A DFT electronic structure code using a wavelet basis set" +HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/" +SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cuda doc etsf_io mpi netcdf opencl test" + +RDEPEND=" + =sci-libs/libxc-1*[fortran] + virtual/blas + virtual/fortran + virtual/lapack + mpi? ( virtual/mpi ) + cuda? ( dev-util/nvidia-cuda-sdk ) + opencl? ( + || ( + dev-util/nvidia-cuda-sdk + dev-util/amdstream + ) + ) + etsf_io? ( sci-libs/etsf_io ) + netcdf? ( || ( + sci-libs/netcdf[fortran] + sci-libs/netcdf-fortran + ) + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/autoconf-2.59 + doc? ( virtual/latex-base )" + +S="${WORKDIR}/${REAL_P}" + +DOCS=( README INSTALL ChangeLog AUTHORS NEWS ) + +FORTRAN_STANDARD=90 + +pkg_setup() { + # fortran-2.eclass does not handle mpi wrappers + if use mpi; then + export FC="mpif90" + export F77="mpif77" + export CC="mpicc" + else + tc-export FC F77 CC + fi + + fortran-2_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch + eautoreconf +} + +src_configure() { + local modules="/usr/$(get_libdir)/finclude" + local netcdff_libs="-lnetcdff" + filter-flags '-m*' '-O*' "-pipe" + local nvcflags="${CFLAGS}" +# _filter-var nvcflags '-m*' '-O*' "-pipe" + local myeconfargs=( + $(use_enable mpi) + --enable-optimised-convolution + --enable-pseudo + --enable-libbigdft + --enable-binaries + --disable-minima-hopping + --with-moduledir="${modules}" + --with-ext-linalg="$(pkg-config --libs-only-l lapack) \ + $(pkg-config --libs-only-l blas)" + --with-ext-linalg-path="$(pkg-config --libs-only-L lapack) \ + $(pkg-config --libs-only-L blas)" + --disable-internal-libxc + --with-libxc-path="/usr" + --with-libxc-include="${modules}" + $(use_enable cuda cuda-gpu) + $(use_with cuda cuda-path /opt/cuda) + $(use_with cuda nvcc-flags "${nvcflags}") + $(use_enable opencl) + $(use_with opencl ocl-path /usr) + $(use_with etsf_io etsf-io) + $(use_with etsf_io etsf-io-path "/usr") + $(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)") + "$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")" + FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}" + LD="$(tc-getLD)" + CPP="$(tc-getCPP)" + ) + autotools-utils_src_configure +} + +src_compile() { + #autotools-utils_src_compile() expanded + _check_build_dir + pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null + emake -j1 + sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc + popd > /dev/null + + use doc && autotools-utils_src_compile doc +} + +src_test() { + use test && autotools-utils_src_test +} + +src_install() { + autotools-utils_src_install HAVE_LIBXC=1 +} diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild deleted file mode 100644 index 6cdd6e4e3..000000000 --- a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs - -REAL_P="${P/_pre/-tuto.}" -REAL_P="${REAL_P/-tuto.0/-tuto}" - -DESCRIPTION="A DFT electronic structure code using a wavelet basis set" -HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/" -SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cuda doc etsf_io mpi netcdf opencl test" - -RDEPEND=" - =sci-libs/libxc-1*[fortran] - virtual/blas - virtual/fortran - virtual/lapack - mpi? ( virtual/mpi ) - cuda? ( dev-util/nvidia-cuda-sdk ) - opencl? ( - || ( - dev-util/nvidia-cuda-sdk - dev-util/amdstream - ) - ) - etsf_io? ( sci-libs/etsf_io ) - netcdf? ( sci-libs/netcdf[fortran] )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/autoconf-2.59 - doc? ( virtual/latex-base )" - -S="${WORKDIR}/${REAL_P}" - -DOCS=( README INSTALL ChangeLog AUTHORS NEWS ) - -FORTRAN_STANDARD=90 - -pkg_setup() { - # fortran-2.eclass does not handle mpi wrappers - if use mpi; then - export FC="mpif90" - export F77="mpif77" - export CC="mpicc" - else - tc-export FC F77 CC - fi - - fortran-2_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch \ - "${FILESDIR}"/"${REAL_P}"-bigdft.pc.patch - sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure || die - sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure.ac || die - eautoreconf -} - -src_configure() { - local modules="/usr/$(get_libdir)/finclude" - local netcdff_libs="-lnetcdff" - filter-flags '-m*' '-O*' "-pipe" - local nvcflags="${CFLAGS}" -# _filter-var nvcflags '-m*' '-O*' "-pipe" - local myeconfargs=( - $(use_enable mpi) - --enable-optimised-convolution - --enable-pseudo - --enable-libbigdft - --enable-binaries - --disable-minima-hopping - --with-moduledir="${modules}" - --with-ext-linalg="$(pkg-config --libs-only-l lapack) \ - $(pkg-config --libs-only-l blas)" - --with-ext-linalg-path="$(pkg-config --libs-only-L lapack) \ - $(pkg-config --libs-only-L blas)" - --enable-libxc - --disable-internal-libxc - --with-libxc-path="/usr" - --with-libxc-include="${modules}" - $(use_enable cuda cuda-gpu) - $(use_with cuda cuda-path /opt/cuda) - $(use_with cuda nvcc-flags "${nvcflags}") - $(use_enable opencl) - $(use_with opencl ocl-path /usr) - $(use_with etsf_io etsf-io) - $(use_with etsf_io etsf-io-path "/usr") - $(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)") - "$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")" - FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}" - LD="$(tc-getLD)" - CPP="$(tc-getCPP)" - ) - autotools-utils_src_configure -} - -src_compile() { - #autotools-utils_src_compile() expanded - _check_build_dir - pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null - emake -j1 - sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc - popd > /dev/null - - use doc && autotools-utils_src_compile doc -} - -src_test() { - use test && autotools-utils_src_test -} - -src_install() { - autotools-utils_src_install HAVE_LIBXC=1 -} diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild new file mode 100644 index 000000000..f9860f679 --- /dev/null +++ b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs + +REAL_P="${P/_pre/-tuto.}" +REAL_P="${REAL_P/-tuto.0/-tuto}" + +DESCRIPTION="A DFT electronic structure code using a wavelet basis set" +HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/" +SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cuda doc etsf_io mpi netcdf opencl test" + +RDEPEND=" + =sci-libs/libxc-1*[fortran] + virtual/blas + virtual/fortran + virtual/lapack + mpi? ( virtual/mpi ) + cuda? ( dev-util/nvidia-cuda-sdk ) + opencl? ( + || ( + dev-util/nvidia-cuda-sdk + dev-util/amdstream + ) + ) + etsf_io? ( sci-libs/etsf_io ) + netcdf? ( || ( + sci-libs/netcdf[fortran] + sci-libs/netcdf-fortran + ) + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/autoconf-2.59 + doc? ( virtual/latex-base )" + +S="${WORKDIR}/${REAL_P}" + +DOCS=( README INSTALL ChangeLog AUTHORS NEWS ) + +FORTRAN_STANDARD=90 + +pkg_setup() { + # fortran-2.eclass does not handle mpi wrappers + if use mpi; then + export FC="mpif90" + export F77="mpif77" + export CC="mpicc" + else + tc-export FC F77 CC + fi + + fortran-2_pkg_setup +} + +src_prepare() { + epatch \ + "${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch \ + "${FILESDIR}"/"${REAL_P}"-bigdft.pc.patch + sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure || die + sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure.ac || die + eautoreconf +} + +src_configure() { + local modules="/usr/$(get_libdir)/finclude" + local netcdff_libs="-lnetcdff" + filter-flags '-m*' '-O*' "-pipe" + local nvcflags="${CFLAGS}" +# _filter-var nvcflags '-m*' '-O*' "-pipe" + local myeconfargs=( + $(use_enable mpi) + --enable-optimised-convolution + --enable-pseudo + --enable-libbigdft + --enable-binaries + --disable-minima-hopping + --with-moduledir="${modules}" + --with-ext-linalg="$(pkg-config --libs-only-l lapack) \ + $(pkg-config --libs-only-l blas)" + --with-ext-linalg-path="$(pkg-config --libs-only-L lapack) \ + $(pkg-config --libs-only-L blas)" + --enable-libxc + --disable-internal-libxc + --with-libxc-path="/usr" + --with-libxc-include="${modules}" + $(use_enable cuda cuda-gpu) + $(use_with cuda cuda-path /opt/cuda) + $(use_with cuda nvcc-flags "${nvcflags}") + $(use_enable opencl) + $(use_with opencl ocl-path /usr) + $(use_with etsf_io etsf-io) + $(use_with etsf_io etsf-io-path "/usr") + $(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)") + "$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")" + FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}" + LD="$(tc-getLD)" + CPP="$(tc-getCPP)" + ) + autotools-utils_src_configure +} + +src_compile() { + #autotools-utils_src_compile() expanded + _check_build_dir + pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null + emake -j1 + sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc + popd > /dev/null + + use doc && autotools-utils_src_compile doc +} + +src_test() { + use test && autotools-utils_src_test +} + +src_install() { + autotools-utils_src_install HAVE_LIBXC=1 +} -- cgit v1.2.3