* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/, sci-libs/etsf_io/, sci-physics/elk/
@ 2012-06-19 14:14 Honza Macháček
0 siblings, 0 replies; only message in thread
From: Honza Macháček @ 2012-06-19 14:14 UTC (permalink / raw
To: gentoo-commits
commit: d61ffe7ceee197aad7dd32275a19c53fd59f0f1a
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Tue Jun 19 14:12:17 2012 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Tue Jun 19 14:12:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d61ffe7c
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 ++
...gdft-1.6.0-r1.ebuild => bigdft-1.6.0-r2.ebuild} | 6 +-
....6_pre1-r1.ebuild => bigdft-1.6_pre1-r2.ebuild} | 6 +-
sci-libs/etsf_io/ChangeLog | 8 ++-
...tsf_io-1.0.3.ebuild => etsf_io-1.0.3-r1.ebuild} | 7 +-
sci-physics/elk/elk-1.3.15.ebuild | 104 ------------------
sci-physics/elk/elk-1.4.18.ebuild | 115 --------------------
sci-physics/elk/elk-1.4.5.ebuild | 104 ------------------
8 files changed, 30 insertions(+), 328 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 5334648..1d25ede 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 <Hloupy.Honza@centrum.cz>
+ -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 <jlec@gentoo.org> 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/bigdft-1.6.0-r1.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
similarity index 97%
rename from sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
rename to sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
index cdb3049..b4e40f5 100644
--- a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
@@ -31,7 +31,11 @@ RDEPEND="
)
)
etsf_io? ( sci-libs/etsf_io )
- netcdf? ( sci-libs/netcdf[fortran] )"
+ netcdf? ( || (
+ sci-libs/netcdf[fortran]
+ sci-libs/netcdf-fortran
+ )
+ )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
>=sys-devel/autoconf-2.59
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
similarity index 97%
rename from sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
rename to sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
index 6cdd6e4..f9860f6 100644
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
@@ -32,7 +32,11 @@ RDEPEND="
)
)
etsf_io? ( sci-libs/etsf_io )
- netcdf? ( sci-libs/netcdf[fortran] )"
+ netcdf? ( || (
+ sci-libs/netcdf[fortran]
+ sci-libs/netcdf-fortran
+ )
+ )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
>=sys-devel/autoconf-2.59
diff --git a/sci-libs/etsf_io/ChangeLog b/sci-libs/etsf_io/ChangeLog
index b4391ae..19ac5b6 100644
--- a/sci-libs/etsf_io/ChangeLog
+++ b/sci-libs/etsf_io/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-libs/etsf_io
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*etsf_io-1.0.3-r1 (19 Jun 2012)
+
+ 19 Jun 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+ -etsf_io-1.0.3.ebuild, +etsf_io-1.0.3-r1.ebuild:
+ Reflect the split of the fortran interface out of sci-libs/netcdf
+
25 Jun 2011; Justin Lecher <jlec@gentoo.org> etsf_io-1.0.3.ebuild,
metadata.xml:
Fixed Malformed CVS Header on line: 3
diff --git a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild b/sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild
similarity index 88%
rename from sci-libs/etsf_io/etsf_io-1.0.3.ebuild
rename to sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild
index 402389b..a3c6234 100644
--- a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild
+++ b/sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -16,7 +16,10 @@ IUSE="examples"
KEYWORDS="~amd64 ~x86"
RDEPEND="
- sci-libs/netcdf[fortran]
+ || (
+ sci-libs/netcdf[fortran]
+ sci-libs/netcdf-fortran
+ )
virtual/fortran"
DEPEND="${RDEPEND}"
diff --git a/sci-physics/elk/elk-1.3.15.ebuild b/sci-physics/elk/elk-1.3.15.ebuild
deleted file mode 100644
index ac1b4f0..0000000
--- a/sci-physics/elk/elk-1.3.15.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave (FP-LAPW) code with advanced features."
-HOMEPAGE="http://elk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-debug lapack libxc mpi openmp test"
-
-RDEPEND="lapack? ( virtual/blas
- virtual/lapack )
- libxc? ( =sci-libs/libxc-1*[fortran] )
- mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
-}
-
-src_prepare() {
- if use libxc; then
- sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile"
- fi
- if use mpi; then
- sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile"
- fi
-}
-
-src_configure() {
- if use mpi; then
- MY_FC="mpif90"
- MY_CC="mpicc"
- MY_CXX="mpic++"
- else
- MY_FC="$(tc-getFC)"
- MY_CC="$(tc-getCC)"
- MY_CXX="$(tc-getCXX)"
- fi
- if use openmp; then
- MY_FC="${MY_FC} -fopenmp"
- MY_CC="${MY_CC} -fopenmp"
- MY_CXX="${MY_CXX} -fopenmp"
- fi
- MY_FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O3 -funroll-loops -ffast-math}}"
- MY_FCFLAGS="${MY_FCFLAGS} -I/usr/include -I/usr/$(get_libdir)/finclude"
- MY_CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}"
- MY_CXXFLAGS="${CXXFLAGS:- ${CFLAGS:- -O3 -funroll-loops -ffast-math}}"
- echo "MAKE = make" > make.inc
- echo "F90 = $MY_FC" >> make.inc
- echo "F90_OPTS = $MY_FCFLAGS" >> make.inc
- echo "F77 = $MY_FC" >> make.inc
- echo "F77_OPTS = $MY_FCFLAGS" >> make.inc
- echo "CC = ${MY_CC}" >> make.inc
- echo "CXX = ${MY_CXX}" >> make.inc
- echo "CFLAGS = ${MY_CFLAGS}" >> make.inc
- echo "CXXFLAGS = ${MY_CXXFLAGS}" >> make.inc
- echo "LD = $(tc-getLD)" >> make.inc
- echo "AR = ar" >> make.inc
- echo "LIB_SYS = " >> make.inc
- if use lapack; then
- echo "LIB_LPK = $(pkg-config --libs lapack)" >> make.inc
- else
- echo "LIB_LPK = lapack.a blas.a" >> make.inc
- fi
- echo "LIB_FFT = fftlib.a" >> make.inc
- if use libxc; then
- echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
- echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >>make.inc
- fi
-}
-
-src_compile() {
- emake -j1 || die "make failed"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- dobin src/elk src/eos/eos src/spacegroup/spacegroup utilities/elk-bands
- dodoc README
- for doc in docs/*; do
- dodoc $doc
- done
- insinto /usr/share/${P}
- doins -r species
- doins -r utilities
- doins -r examples
- doins -r tests
-}
diff --git a/sci-physics/elk/elk-1.4.18.ebuild b/sci-physics/elk/elk-1.4.18.ebuild
deleted file mode 100644
index 27b3f3a..0000000
--- a/sci-physics/elk/elk-1.4.18.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave (FP-LAPW) code with advanced features."
-HOMEPAGE="http://elk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-debug lapack libxc mpi openmp perl test"
-
-RDEPEND="lapack? ( virtual/blas
- virtual/lapack )
- libxc? ( =sci-libs/libxc-1*[fortran] )
- mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
- perl? ( dev-lang/perl )
- dev-util/pkgconfig"
-
-DOCS=( README )
-
-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"
- export CXX="mpic++"
- else
- tc-export FC F77 CC CXX
- fi
-
- if use openmp; then
- FORTRAN_NEED_OPENMP=1
- fi
-
- fortran-2_pkg_setup
-
- if use openmp; then
- export FC="${FC} -fopenmp"
- export F77="${F77} -fopenmp"
- export CC="${CC} -fopenmp"
- export CXX="${CXX} -fopenmp"
- fi
-}
-
-src_prepare() {
- if use libxc; then
- sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile"
- fi
- if use mpi; then
- sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile"
- fi
-}
-
-src_configure() {
- FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O3 -funroll-loops -ffast-math}}"
- FCFLAGS="${FCFLAGS} -I/usr/include -I/usr/$(get_libdir)/finclude"
- CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}"
- CXXFLAGS="${CXXFLAGS:- ${CFLAGS}}"
- export FCFLAGS CFLAGS CXXFLAGS
- echo "MAKE = make" > make.inc
- echo "F90 = $FC" >> make.inc
- echo "F90_OPTS = $FCFLAGS" >> make.inc
- echo "F77 = $FC" >> make.inc
- echo "F77_OPTS = $FCFLAGS" >> make.inc
- echo "CC = ${CC}" >> make.inc
- echo "CXX = ${CXX}" >> make.inc
- echo "CFLAGS = ${CFLAGS}" >> make.inc
- echo "CXXFLAGS = ${CXXFLAGS}" >> make.inc
- echo "LD = $(tc-getLD)" >> make.inc
- echo "AR = ar" >> make.inc
- echo "LIB_SYS = " >> make.inc
- if use lapack; then
- echo "LIB_LPK = $(pkg-config --libs lapack)" >> make.inc
- else
- echo "LIB_LPK = lapack.a blas.a" >> make.inc
- fi
- echo "LIB_FFT = fftlib.a" >> make.inc
- if use libxc; then
- echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
- echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >>make.inc
- fi
-}
-
-src_compile() {
- emake -j1 || die "make failed"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- dobin src/elk src/protex src/eos/eos src/spacegroup/spacegroup
- dobin utilities/elk-bands
- use perl && dobin utilities/xps_exc.pl utilities/se.pl
- dodoc README
- for doc in docs/*; do
- dodoc $doc
- done
- insinto /usr/share/${P}
- doins -r species
- doins -r utilities
- doins -r examples
- doins -r tests
-}
diff --git a/sci-physics/elk/elk-1.4.5.ebuild b/sci-physics/elk/elk-1.4.5.ebuild
deleted file mode 100644
index ac1b4f0..0000000
--- a/sci-physics/elk/elk-1.4.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave (FP-LAPW) code with advanced features."
-HOMEPAGE="http://elk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-debug lapack libxc mpi openmp test"
-
-RDEPEND="lapack? ( virtual/blas
- virtual/lapack )
- libxc? ( =sci-libs/libxc-1*[fortran] )
- mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-pkg_setup() {
- fortran-2_pkg_setup
- if use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
-}
-
-src_prepare() {
- if use libxc; then
- sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile"
- fi
- if use mpi; then
- sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile"
- fi
-}
-
-src_configure() {
- if use mpi; then
- MY_FC="mpif90"
- MY_CC="mpicc"
- MY_CXX="mpic++"
- else
- MY_FC="$(tc-getFC)"
- MY_CC="$(tc-getCC)"
- MY_CXX="$(tc-getCXX)"
- fi
- if use openmp; then
- MY_FC="${MY_FC} -fopenmp"
- MY_CC="${MY_CC} -fopenmp"
- MY_CXX="${MY_CXX} -fopenmp"
- fi
- MY_FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O3 -funroll-loops -ffast-math}}"
- MY_FCFLAGS="${MY_FCFLAGS} -I/usr/include -I/usr/$(get_libdir)/finclude"
- MY_CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}"
- MY_CXXFLAGS="${CXXFLAGS:- ${CFLAGS:- -O3 -funroll-loops -ffast-math}}"
- echo "MAKE = make" > make.inc
- echo "F90 = $MY_FC" >> make.inc
- echo "F90_OPTS = $MY_FCFLAGS" >> make.inc
- echo "F77 = $MY_FC" >> make.inc
- echo "F77_OPTS = $MY_FCFLAGS" >> make.inc
- echo "CC = ${MY_CC}" >> make.inc
- echo "CXX = ${MY_CXX}" >> make.inc
- echo "CFLAGS = ${MY_CFLAGS}" >> make.inc
- echo "CXXFLAGS = ${MY_CXXFLAGS}" >> make.inc
- echo "LD = $(tc-getLD)" >> make.inc
- echo "AR = ar" >> make.inc
- echo "LIB_SYS = " >> make.inc
- if use lapack; then
- echo "LIB_LPK = $(pkg-config --libs lapack)" >> make.inc
- else
- echo "LIB_LPK = lapack.a blas.a" >> make.inc
- fi
- echo "LIB_FFT = fftlib.a" >> make.inc
- if use libxc; then
- echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
- echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >>make.inc
- fi
-}
-
-src_compile() {
- emake -j1 || die "make failed"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- dobin src/elk src/eos/eos src/spacegroup/spacegroup utilities/elk-bands
- dodoc README
- for doc in docs/*; do
- dodoc $doc
- done
- insinto /usr/share/${P}
- doins -r species
- doins -r utilities
- doins -r examples
- doins -r tests
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-19 14:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-19 14:14 [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/, sci-libs/etsf_io/, sci-physics/elk/ Honza Macháček
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox