* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/
@ 2011-06-21 11:54 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2011-06-21 11:54 UTC (permalink / raw
To: gentoo-commits
commit: 69d3b59935eea538d42e5b233871f681a6696e45
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:03:31 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:03:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=69d3b599
Added fortran-2.eclass support
(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
sci-libs/bigdft/ChangeLog | 4 ++++
sci-libs/bigdft/bigdft-1.2.0.2.ebuild | 31 +++++++++++++++++--------------
sci-libs/bigdft/metadata.xml | 9 +++++++++
3 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 4aa039a..e738960 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> bigdft-1.2.0.2.ebuild,
+ +metadata.xml:
+ Added fortran-2.eclass support
+
*bigdft-1.2.0.2 (17 Jan 2011)
17 Jan 2011; Honza Macháček <Hloupy.Honza@centrum.cz>
diff --git a/sci-libs/bigdft/bigdft-1.2.0.2.ebuild b/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
index 55d34f5..1fdf1d3 100644
--- a/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
+++ b/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
@@ -1,36 +1,40 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Header: $
-EAPI="3"
+EAPI=3
-inherit eutils toolchain-funcs
+inherit eutils fortran-2 toolchain-funcs
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/${P}.tar.gz
- http://inac.cea.fr/L_Sim/BigDFT/${PN}-1.3.2.tar.gz"
+SRC_URI="
+ http://inac.cea.fr/L_Sim/BigDFT/${P}.tar.gz
+ http://inac.cea.fr/L_Sim/BigDFT/${PN}-1.3.2.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cuda doc mpi test"
-RDEPEND="virtual/blas
+RDEPEND="
+ =sci-libs/libxc-1.0[fortran]
+ virtual/blas
virtual/lapack
mpi? ( virtual/mpi )
- cuda? ( dev-util/nvidia-cuda-sdk )
- =sci-libs/libxc-1.0[fortran]"
+ cuda? ( dev-util/nvidia-cuda-sdk )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
>=sys-devel/autoconf-2.59
doc? ( virtual/latex-base )"
src_prepare() {
- epatch ${FILESDIR}/${P}-0001.patch
- epatch ${FILESDIR}/${P}-0002.patch
- epatch ${FILESDIR}/${P}-0003.patch
- epatch ${FILESDIR}/${P}-0004.patch
- epatch ${FILESDIR}/${P}-testH.patch
+ epatch \
+ "${FILESDIR}"/${P}-0001.patch \
+ "${FILESDIR}"/${P}-0002.patch \
+ "${FILESDIR}"/${P}-0003.patch \
+ "${FILESDIR}"/${P}-0004.patch \
+ "${FILESDIR}"/${P}-testH.patch
rm -r src/PSolver/ABINIT-common
mv ../${PN}-1.3.2/src/PSolver/ABINIT-common src/PSolver/
@@ -83,6 +87,5 @@ src_test() {
src_install() {
emake HAVE_LIBXC=1 DESTDIR="${D}" install || die "install failed"
- dodoc README INSTALL COPYING ChangeLog AUTHORS NEWS || die "dodoc failed"
+ dodoc README INSTALL ChangeLog AUTHORS NEWS || die "dodoc failed"
}
-
diff --git a/sci-libs/bigdft/metadata.xml b/sci-libs/bigdft/metadata.xml
new file mode 100644
index 0000000..4f728fd
--- /dev/null
+++ b/sci-libs/bigdft/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+ <email>sci@gentoo.org</email>
+</maintainer>
+<use><flag name='cuda'>Add cuda support</flag></use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/
@ 2011-06-24 17:09 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 03e46df8ec234b81dd2277e3c8812ba589a52293
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 12:13:17 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 12:13:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=03e46df8
Streamlined fortran-2 eclass usage
(Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)
---
sci-libs/bigdft/ChangeLog | 3 +++
sci-libs/bigdft/bigdft-1.2.0.2.ebuild | 11 ++++-------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index e738960..3511aab 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> bigdft-1.2.0.2.ebuild:
+ Streamlined fortran-2 eclass usage
+
21 Jun 2011; Justin Lecher <jlec@gentoo.org> bigdft-1.2.0.2.ebuild,
+metadata.xml:
Added fortran-2.eclass support
diff --git a/sci-libs/bigdft/bigdft-1.2.0.2.ebuild b/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
index 1fdf1d3..c81e730 100644
--- a/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
+++ b/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
@@ -20,6 +20,7 @@ IUSE="cuda doc mpi test"
RDEPEND="
=sci-libs/libxc-1.0[fortran]
virtual/blas
+ virtual/fortran
virtual/lapack
mpi? ( virtual/mpi )
cuda? ( dev-util/nvidia-cuda-sdk )"
@@ -48,11 +49,10 @@ src_configure() {
if use mpi; then
MY_FC="mpif90"
MY_CC="mpicc"
- else
- MY_FC="$(tc-getFC)"
- MY_CC="$(tc-getCC)"
fi
+ tc-export FC CC
+
econf \
$(use_enable mpi) \
--enable-libpoissonsolver \
@@ -66,10 +66,7 @@ src_configure() {
$(use_with cuda cuda-path /opt/cuda) \
$(use_with cuda lib-cutils /opt/cuda/lib) \
FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}" \
- FC="${MY_FC}" \
- CC="${MY_CC}" \
- LD="$(tc-getLD)" \
- || die "configure failed"
+ LD="$(tc-getLD)"
}
src_compile() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/
@ 2011-07-11 11:24 Honza Macháček
0 siblings, 0 replies; 9+ messages in thread
From: Honza Macháček @ 2011-07-11 11:24 UTC (permalink / raw
To: gentoo-commits
commit: bf9b631994cb55d61820c333061eb4d6047a866b
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Mon Jul 11 11:23:57 2011 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Mon Jul 11 11:23:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bf9b6319
Restored the MPI support in sci-libs/bigdft-1.2.0.2, broken by the introduction of the fortran-2.eclass.
---
sci-libs/bigdft/ChangeLog | 4 ++++
sci-libs/bigdft/bigdft-1.2.0.2.ebuild | 9 +++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 3511aab..49be94c 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 Jul 2011; Honza Macháček <Hloupy.Honza@centrum.cz>
+ bigdft-1.2.0.2.ebuild:
+ The MPI support, broken by fortran-2.eclass usage, made work again.
+
24 Jun 2011; Justin Lecher <jlec@gentoo.org> bigdft-1.2.0.2.ebuild:
Streamlined fortran-2 eclass usage
diff --git a/sci-libs/bigdft/bigdft-1.2.0.2.ebuild b/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
index c81e730..dc03955 100644
--- a/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
+++ b/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
@@ -46,13 +46,14 @@ src_prepare() {
}
src_configure() {
+ # fortran-2.eclass does not handle mpi wrappers
if use mpi; then
- MY_FC="mpif90"
- MY_CC="mpicc"
+ export FC="mpif90"
+ export CC="mpicc"
+ else
+ tc-export FC CC
fi
- tc-export FC CC
-
econf \
$(use_enable mpi) \
--enable-libpoissonsolver \
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/
@ 2012-02-19 12:44 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2012-02-19 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 51e9940989c4ce76ccafcbffd0096248606abc67
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 13:55:45 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 13:55:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=51e99409
Move to EAPI=4 and autotools-util.eclass
(Portage version: 2.2.0_alpha86/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/bigdft/ChangeLog | 8 ++-
sci-libs/bigdft/bigdft-1.2.0.2.ebuild | 89 --------------------
.../{bigdft-1.2.0.5.ebuild => bigdft-1.6.0.ebuild} | 79 ++++++++---------
sci-libs/bigdft/metadata.xml | 12 ++-
4 files changed, 52 insertions(+), 136 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 74f12e7..ec29389 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-libs/bigdft
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*bigdft-1.6.0 (18 Feb 2012)
+
+ 18 Feb 2012; Justin Lecher <jlec@gentoo.org> -bigdft-1.2.0.2.ebuild,
+ -bigdft-1.2.0.5.ebuild, +bigdft-1.6.0.ebuild, metadata.xml:
+ Move to EAPI=4 and autotools-util.eclass
+
*bigdft-1.2.0.5 (14 Dec 2011)
14 Dec 2011; Honza Macháček <Hloupy.Honza@centrum.cz>
diff --git a/sci-libs/bigdft/bigdft-1.2.0.2.ebuild b/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
deleted file mode 100644
index fc3d383..0000000
--- a/sci-libs/bigdft/bigdft-1.2.0.2.ebuild
+++ /dev/null
@@ -1,89 +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 toolchain-funcs
-
-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/${P}.tar.gz
- http://inac.cea.fr/L_Sim/BigDFT/${PN}-1.3.2.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda doc mpi test"
-
-RDEPEND="
- =sci-libs/libxc-1*[fortran]
- virtual/blas
- virtual/fortran
- virtual/lapack
- mpi? ( virtual/mpi )
- cuda? ( dev-util/nvidia-cuda-sdk )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- >=sys-devel/autoconf-2.59
- doc? ( virtual/latex-base )"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-0001.patch \
- "${FILESDIR}"/${P}-0002.patch \
- "${FILESDIR}"/${P}-0003.patch \
- "${FILESDIR}"/${P}-0004.patch \
- "${FILESDIR}"/${P}-testH.patch
-
- rm -r src/PSolver/ABINIT-common
- mv ../${PN}-1.3.2/src/PSolver/ABINIT-common src/PSolver/
- sed -i -e's%@LIBXC_INCLUDE@%-I/usr/lib/finclude%g' \
- src/PSolver/ABINIT-common/Makefile.*
- sed -i -e's%config\.inc%config.h%g' \
- src/PSolver/ABINIT-common/*.F90
-}
-
-src_configure() {
- # fortran-2.eclass does not handle mpi wrappers
- if use mpi; then
- export FC="mpif90"
- export CC="mpicc"
- else
- tc-export FC CC
- fi
-
- econf \
- $(use_enable mpi) \
- --enable-libpoissonsolver \
- --enable-libbigdft \
- --enable-binaries \
- --with-moduledir=/usr/$(get_libdir)/finclude \
- --with-ext-linalg="`pkg-config --libs-only-l lapack`" \
- --with-ext-linalg-path="`pkg-config --libs-only-L lapack`" \
- --with-xc-module-path="/usr/lib/finclude" \
- $(use_enable cuda cuda-gpu) \
- $(use_with cuda cuda-path /opt/cuda) \
- $(use_with cuda lib-cutils /opt/cuda/lib) \
- FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}" \
- LD="$(tc-getLD)"
-}
-
-src_compile() {
- emake -j1 HAVE_LIBXC=1 || die "make failed"
- if use doc; then
- emake HAVE_LIBXC=1 doc || die "make doc failed"
- fi
-}
-
-src_test() {
- if use test; then
- emake check
- fi
-}
-
-src_install() {
- emake HAVE_LIBXC=1 DESTDIR="${D}" install || die "install failed"
- dodoc README INSTALL ChangeLog AUTHORS NEWS || die "dodoc failed"
-}
diff --git a/sci-libs/bigdft/bigdft-1.2.0.5.ebuild b/sci-libs/bigdft/bigdft-1.6.0.ebuild
similarity index 50%
rename from sci-libs/bigdft/bigdft-1.2.0.5.ebuild
rename to sci-libs/bigdft/bigdft-1.6.0.ebuild
index 43b4bd9..2def6c6 100644
--- a/sci-libs/bigdft/bigdft-1.2.0.5.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
-inherit eutils fortran-2 toolchain-funcs
+FORTRAN_STANDARD=90
+
+inherit autotools-utils eutils fortran-2 toolchain-funcs
DESCRIPTION="A DFT electronic structure code using a wavelet basis set"
HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/"
@@ -15,13 +17,14 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="cuda doc mpi test"
+IUSE="cuda doc mpi static-libs test"
RDEPEND="
- =sci-libs/libxc-1*[fortran]
+ sci-libs/libxc[fortran]
virtual/blas
virtual/fortran
virtual/lapack
+ virtual/opencl
mpi? ( virtual/mpi )
cuda? ( dev-util/nvidia-cuda-sdk )"
DEPEND="${RDEPEND}
@@ -29,20 +32,7 @@ DEPEND="${RDEPEND}
>=sys-devel/autoconf-2.59
doc? ( virtual/latex-base )"
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-0001.patch \
- "${FILESDIR}"/${PN}-1.2.0.2-testH.patch
-
- rm -r src/PSolver/ABINIT-common
- mv ../${PN}-1.3.2/src/PSolver/ABINIT-common src/PSolver/
- sed -i -e's%@LIBXC_INCLUDE@%-I/usr/lib/finclude%g' \
- src/PSolver/ABINIT-common/Makefile.*
- sed -i -e's%config\.inc%config.h%g' \
- src/PSolver/ABINIT-common/*.F90
-}
-
-src_configure() {
+pkg_setup() {
# fortran-2.eclass does not handle mpi wrappers
if use mpi; then
export FC="mpif90"
@@ -50,34 +40,41 @@ src_configure() {
else
tc-export FC CC
fi
+ fortran-2_pkg_setup
+}
- econf \
- $(use_enable mpi) \
- --enable-libpoissonsolver \
- --enable-libbigdft \
- --enable-binaries \
- --with-moduledir=/usr/$(get_libdir)/finclude \
- --with-ext-linalg="`pkg-config --libs-only-l lapack`" \
- --with-ext-linalg-path="`pkg-config --libs-only-L lapack`" \
- --with-xc-module-path="/usr/lib/finclude" \
- $(use_enable cuda cuda-gpu) \
- $(use_with cuda cuda-path /opt/cuda) \
- $(use_with cuda lib-cutils /opt/cuda/lib) \
- FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}" \
- LD="$(tc-getLD)"
+src_prepare() {
+ mv ../${PN}-1.3.2/src/PSolver/ABINIT-common src/PSolver/ || die
+ sed -i -e's%@LIBXC_INCLUDE@%-I/usr/lib/finclude%g' \
+ src/PSolver/ABINIT-common/Makefile.* || die
+ sed -i -e's%config\.inc%config.h%g' \
+ src/PSolver/ABINIT-common/*.F90 || die
+ autotools-utils_src_prepare
}
-src_compile() {
- emake -j1 HAVE_ETSF_XC=1 || die "make failed"
- if use doc; then
- emake HAVE_ETSF_XC=1 doc || die "make doc failed"
- fi
+src_configure() {
+
+ local myeconfargs=(
+ --enable-libpoissonsolver
+ --enable-libbigdft
+ --enable-binaries
+ --with-moduledir=/usr/$(get_libdir)/finclude
+ --with-ext-linalg="$(pkg-config --libs-only-l lapack)"
+ --with-ext-linalg-path="$(pkg-config --libs-only-L lapack)"
+ --with-xc-module-path="/usr/lib/finclude"
+ $(use_enable mpi)
+ $(use_enable cuda cuda-gpu)
+ $(use_with cuda cuda-path /opt/cuda)
+ $(use_with cuda lib-cutils /opt/cuda/lib)
+ FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}"
+ LD="$(tc-getLD)"
+ )
+ autotools-utils_src_configure
}
-src_test() {
- if use test; then
- emake check
- fi
+src_compile() {
+ autotools-utils_src_compile HAVE_ETSF_XC=1
+ use doc && autotools-utils_src_compile HAVE_ETSF_XC=1 doc
}
src_install() {
diff --git a/sci-libs/bigdft/metadata.xml b/sci-libs/bigdft/metadata.xml
index 4f728fd..3c06155 100644
--- a/sci-libs/bigdft/metadata.xml
+++ b/sci-libs/bigdft/metadata.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<maintainer>
- <email>sci@gentoo.org</email>
-</maintainer>
-<use><flag name='cuda'>Add cuda support</flag></use>
+ <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="cuda">Add cuda support</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/
@ 2012-05-15 6:49 Honza Macháček
0 siblings, 0 replies; 9+ messages in thread
From: Honza Macháček @ 2012-05-15 6:49 UTC (permalink / raw
To: gentoo-commits
commit: 74dc0cae68676fa0689216e5c9d8d312988b6e3a
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Tue May 15 06:48:53 2012 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Tue May 15 06:48:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=74dc0cae
The pkg-config file of sci-libs/bigdft corrected.
---
sci-libs/bigdft/ChangeLog | 8 ++++++++
...{bigdft-1.6.0.ebuild => bigdft-1.6.0-r1.ebuild} | 2 +-
...t-1.6_pre1.ebuild => bigdft-1.6_pre1-r1.ebuild} | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index f378708..80ea11c 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-r1 (15 May 2012)
+*bigdft-1.6_pre1-r1 (15 May 2012)
+
+ 15 May 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+ -bigdft-1.6_pre1.ebuild, +bigdft-1.6_pre1-r1.ebuild, -bigdft-1.6.0.ebuild,
+ +bigdft-1.6.0-r1.ebuild:
+ pkg-config file corrected
+
30 Mar 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
-bigdft-1.2.0.2.ebuild, -files/bigdft-1.2.0.2-0001.patch,
-files/bigdft-1.2.0.2-0002.patch, -files/bigdft-1.2.0.2-0003.patch,
diff --git a/sci-libs/bigdft/bigdft-1.6.0.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
similarity index 97%
rename from sci-libs/bigdft/bigdft-1.6.0.ebuild
rename to sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
index 66ea41f..ef9b7f1 100644
--- a/sci-libs/bigdft/bigdft-1.6.0.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
@@ -108,7 +108,7 @@ src_compile() {
_check_build_dir
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
emake -j1 || die 'emake failed'
- sed -i -e's%\$(top_builddir)/src/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
+ sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
popd > /dev/null
use doc && autotools-utils_src_compile doc
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
similarity index 97%
rename from sci-libs/bigdft/bigdft-1.6_pre1.ebuild
rename to sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
index 21cff15..861a9db 100644
--- a/sci-libs/bigdft/bigdft-1.6_pre1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
@@ -113,7 +113,7 @@ src_compile() {
_check_build_dir
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
emake -j1 || die 'emake failed'
- sed -i -e's%\$(top_builddir)/src/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
+ sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
popd > /dev/null
use doc && autotools-utils_src_compile doc
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/
@ 2012-05-22 19:43 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2012-05-22 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 4698f715c843a1f91a32dd8b4f993fcf50f27f68
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 19:17:39 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May 22 19:17:39 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4698f715
sci-libs/bigdft: Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits
(Portage version: 2.2.0_alpha107/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
sci-libs/bigdft/ChangeLog | 4 +++
sci-libs/bigdft/bigdft-1.6.0-r1.ebuild | 23 ++++++++------------
sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild | 32 ++++++++++++----------------
3 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 80ea11c..5334648 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 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
+
*bigdft-1.6.0-r1 (15 May 2012)
*bigdft-1.6_pre1-r1 (15 May 2012)
diff --git a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
index ef9b7f1..cdb3049 100644
--- a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
@@ -2,19 +2,15 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI=4
-inherit autotools-utils flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="A DFT electronic structure code using a wavelet basis set"
-HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/"
+inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs
REAL_P="${P/_pre0/-tuto}"
-S="${WORKDIR}/${REAL_P}"
-SRC_URI="
- http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz
- "
+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"
@@ -35,15 +31,14 @@ RDEPEND="
)
)
etsf_io? ( sci-libs/etsf_io )
- netcdf? (
- sci-libs/netcdf[fortran]
- )
- "
+ 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
@@ -107,7 +102,7 @@ src_compile() {
#autotools-utils_src_compile() expanded
_check_build_dir
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- emake -j1 || die 'emake failed'
+ emake -j1
sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
popd > /dev/null
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
index 861a9db..6cdd6e4 100644
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
@@ -2,20 +2,16 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI=4
-inherit autotools-utils flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="A DFT electronic structure code using a wavelet basis set"
-HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/"
+inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs
REAL_P="${P/_pre/-tuto.}"
REAL_P="${REAL_P/-tuto.0/-tuto}"
-S="${WORKDIR}/${REAL_P}"
-SRC_URI="
- http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz
- "
+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"
@@ -36,15 +32,14 @@ RDEPEND="
)
)
etsf_io? ( sci-libs/etsf_io )
- netcdf? (
- sci-libs/netcdf[fortran]
- )
- "
+ 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
@@ -63,10 +58,11 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch
- epatch "${FILESDIR}"/"${REAL_P}"-bigdft.pc.patch
- sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure
- sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure.ac
+ 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
}
@@ -112,7 +108,7 @@ src_compile() {
#autotools-utils_src_compile() expanded
_check_build_dir
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- emake -j1 || die 'emake failed'
+ emake -j1
sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
popd > /dev/null
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/
@ 2012-06-22 22:49 Alexey Shvetsov
0 siblings, 0 replies; 9+ messages in thread
From: Alexey Shvetsov @ 2012-06-22 22:49 UTC (permalink / raw
To: gentoo-commits
commit: e98144bba85fd0a8f57fe83dd353d11934e5dc03
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 22:48:21 2012 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 22:48:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e98144bb
[sci-libs/bigdft] add ~amd64-linux
(Portage version: 2.2.0_alpha110/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
sci-libs/bigdft/ChangeLog | 4 ++++
sci-libs/bigdft/bigdft-1.6.0-r2.ebuild | 8 ++++----
sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild | 8 ++++----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 1d25ede..91b08d6 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Jun 2012; Alexey Shvetsov <alexxy@gentoo.org> bigdft-1.6.0-r2.ebuild,
+ bigdft-1.6_pre1-r2.ebuild:
+ [sci-libs/bigdft] add ~amd64-linux
+
*bigdft-1.6.0-r2 (19 Jun 2012)
*bigdft-1.6_pre1-r2 (19 Jun 2012)
diff --git a/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
index b4e40f5..0935054 100644
--- a/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="cuda doc etsf_io mpi netcdf opencl test"
RDEPEND="
@@ -66,7 +66,7 @@ src_prepare() {
}
src_configure() {
- local modules="/usr/$(get_libdir)/finclude"
+ local modules="${EPREFIX}/usr/$(get_libdir)/finclude"
local netcdff_libs="-lnetcdff"
filter-flags '-m*' '-O*' "-pipe"
local nvcflags="${CFLAGS}"
@@ -90,9 +90,9 @@ src_configure() {
$(use_with cuda cuda-path /opt/cuda)
$(use_with cuda nvcc-flags "${nvcflags}")
$(use_enable opencl)
- $(use_with opencl ocl-path /usr)
+ $(use_with opencl ocl-path "${EPREFIX}/usr")
$(use_with etsf_io etsf-io)
- $(use_with etsf_io etsf-io-path "/usr")
+ $(use_with etsf_io etsf-io-path "${EPREFIX}/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}"
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
index f9860f6..6fa598f 100644
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="cuda doc etsf_io mpi netcdf opencl test"
RDEPEND="
@@ -71,7 +71,7 @@ src_prepare() {
}
src_configure() {
- local modules="/usr/$(get_libdir)/finclude"
+ local modules="${EPREFIX}/usr/$(get_libdir)/finclude"
local netcdff_libs="-lnetcdff"
filter-flags '-m*' '-O*' "-pipe"
local nvcflags="${CFLAGS}"
@@ -96,9 +96,9 @@ src_configure() {
$(use_with cuda cuda-path /opt/cuda)
$(use_with cuda nvcc-flags "${nvcflags}")
$(use_enable opencl)
- $(use_with opencl ocl-path /usr)
+ $(use_with opencl ocl-path "${EPREFIX}/usr")
$(use_with etsf_io etsf-io)
- $(use_with etsf_io etsf-io-path "/usr")
+ $(use_with etsf_io etsf-io-path "${EPREFIX}/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}"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/
@ 2013-02-20 12:10 Honza Macháček
0 siblings, 0 replies; 9+ messages in thread
From: Honza Macháček @ 2013-02-20 12:10 UTC (permalink / raw
To: gentoo-commits
commit: 7495b10a7136f211bc6535d65c0ff56f5c419ad5
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Wed Feb 20 12:10:45 2013 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Wed Feb 20 12:10:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7495b10a
The setup of python for the compilation of the GPU support in sci-libs/bigdft-1.7_pre12 improved.
---
sci-libs/bigdft/ChangeLog | 5 +++++
sci-libs/bigdft/bigdft-1.7_pre12.ebuild | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 93ecd7e..0765022 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -5,6 +5,11 @@
<<<<<<< HEAD
20 Feb 2013; Honza Macháček <Hloupy.Honza@centrum.cz>
+ bigdft-1.7_pre12.ebuild:
+ The setup of python for the compilation of the GPU support in
+ bigdft-1.7_pre12 improved.
+
+ 20 Feb 2013; Honza Macháček <Hloupy.Honza@centrum.cz>
bigdft-1.7_pre12.ebuild, +files/bigdft-1.7-dev.12-GPUlink.patch:
Compilation of GPU support in bigdft-1.7_pre12 improved. Yet to be tested.
diff --git a/sci-libs/bigdft/bigdft-1.7_pre12.ebuild b/sci-libs/bigdft/bigdft-1.7_pre12.ebuild
index 7e28cdc..45623f0 100644
--- a/sci-libs/bigdft/bigdft-1.7_pre12.ebuild
+++ b/sci-libs/bigdft/bigdft-1.7_pre12.ebuild
@@ -6,7 +6,7 @@ EAPI=5
PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
-inherit autotools-utils eutils flag-o-matic fortran-2 python-r1 toolchain-funcs
+inherit autotools-utils eutils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
REAL_P="${P/_pre/-dev.}"
@@ -68,7 +68,8 @@ pkg_setup() {
if use openmp; then
tc-has-openmp || \
die "Please select an openmp capable compiler like gcc[openmp]"
- fi
+ fi
+ python-any-r1_pkg_setup
}
src_prepare() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/
@ 2013-02-22 10:15 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2013-02-22 10:15 UTC (permalink / raw
To: gentoo-commits
commit: d1c619c129a1f78f4b030114621bc3adbe15d810
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 10:11:58 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 10:11:58 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d1c619c1
sci-libs/bigdft: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; drop old
Package-Manager: portage-2.2.0_alpha163
---
sci-libs/bigdft/ChangeLog | 5 +
sci-libs/bigdft/bigdft-1.6.0-r2.ebuild | 18 ++--
sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild | 130 -----------------------------
sci-libs/bigdft/bigdft-1.7_pre12.ebuild | 19 ++--
sci-libs/bigdft/metadata.xml | 20 +++--
5 files changed, 36 insertions(+), 156 deletions(-)
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 0765022..224a6f3 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -4,6 +4,11 @@
<<<<<<< HEAD
+ 22 Feb 2013; Justin Lecher <jlec@gentoo.org> -bigdft-1.6_pre1-r4.ebuild,
+ bigdft-1.6.0-r2.ebuild, bigdft-1.7_pre12.ebuild, metadata.xml:
+ Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+ drop old
+
20 Feb 2013; Honza Macháček <Hloupy.Honza@centrum.cz>
bigdft-1.7_pre12.ebuild:
The setup of python for the compilation of the GPU support in
diff --git a/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
index 0935054..e43d7e4 100644
--- a/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -37,7 +37,7 @@ RDEPEND="
)
)"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
>=sys-devel/autoconf-2.59
doc? ( virtual/latex-base )"
@@ -79,10 +79,10 @@ src_configure() {
--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)"
+ --with-ext-linalg="$($(tc-getPKG_CONFIG) --libs-only-l lapack) \
+ $($(tc-getPKG_CONFIG) --libs-only-l blas)"
+ --with-ext-linalg-path="$($(tc-getPKG_CONFIG) --libs-only-L lapack) \
+ $($(tc-getPKG_CONFIG) --libs-only-L blas)"
--disable-internal-libxc
--with-libxc-path="/usr"
--with-libxc-include="${modules}"
@@ -93,9 +93,9 @@ src_configure() {
$(use_with opencl ocl-path "${EPREFIX}/usr")
$(use_with etsf_io etsf-io)
$(use_with etsf_io etsf-io-path "${EPREFIX}/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}"
+ $(use_with etsf_io netcdf-path "$($(tc-getPKG_CONFIG) --libs-only-L netcdf)")
+ "$(use etsf_io && echo "--with-netcdf-libs=$($(tc-getPKG_CONFIG) --libs netcdf) ${netcdff_libs}")"
+ FCFLAGS+=" -I${modules}"
LD="$(tc-getLD)"
CPP="$(tc-getCPP)"
)
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild
deleted file mode 100644
index 95bbebf..0000000
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild
+++ /dev/null
@@ -1,130 +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 ~amd64-linux"
-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-1.patch \
- "${FILESDIR}"/"${REAL_P}"-gcc-4.6.patch \
- "${FILESDIR}"/"${REAL_P}"-GPUlibs-1.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="${EPREFIX}/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 "${EPREFIX}/usr")
- $(use_with etsf_io etsf-io)
- $(use_with etsf_io etsf-io-path "${EPREFIX}/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.7_pre12.ebuild b/sci-libs/bigdft/bigdft-1.7_pre12.ebuild
index 45623f0..7028453 100644
--- a/sci-libs/bigdft/bigdft-1.7_pre12.ebuild
+++ b/sci-libs/bigdft/bigdft-1.7_pre12.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
)
)"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
>=sys-devel/autoconf-2.59
doc? ( virtual/latex-base )
cuda? ( ${PYTHON_DEPS} )
@@ -65,9 +65,8 @@ pkg_setup() {
fi
fortran-2_pkg_setup
- if use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
+ if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+ die "Please select an openmp capable compiler like gcc[openmp]"
fi
python-any-r1_pkg_setup
}
@@ -99,10 +98,10 @@ src_configure() {
--disable-internal-libyaml
--enable-internal-libabinit
--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)"
+ --with-ext-linalg="$($(tc-getPKG_CONFIG) --libs-only-l lapack) \
+ $($(tc-getPKG_CONFIG) --libs-only-l blas)"
+ --with-ext-linalg-path="$($(tc-getPKG_CONFIG) --libs-only-L lapack) \
+ $($(tc-getPKG_CONFIG) --libs-only-L blas)"
--enable-libxc
--disable-internal-libxc
--with-libxc-include="${modules}"
@@ -111,8 +110,8 @@ src_configure() {
$(use_with cuda nvcc-flags "${nvcflags}")
$(use_enable opencl)
$(use_with etsf_io etsf-io)
- "$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")"
- FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} ${openmp} -I${modules}"
+ "$(use etsf_io && echo "--with-netcdf-libs=$($(tc-getPKG_CONFIG) --libs netcdf) ${netcdff_libs}")"
+ FCFLAGS+=" ${openmp} -I${modules}"
LD="$(tc-getLD)"
CPP="$(tc-getCPP)"
)
diff --git a/sci-libs/bigdft/metadata.xml b/sci-libs/bigdft/metadata.xml
index 3c06155..71f04f4 100644
--- a/sci-libs/bigdft/metadata.xml
+++ b/sci-libs/bigdft/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <maintainer>
- <email>sci@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="cuda">Add cuda support</flag>
- </use>
+ <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="cuda">Add cuda support</flag>
+ </use>
+ <use>
+ <flag name="etsf_io">Undocumented USE</flag>
+ </use>
+ <use>
+ <flag name="opencl">Undocumented USE</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-02-22 10:16 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-24 17:09 [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2013-02-22 10:15 Justin Lecher
2013-02-20 12:10 Honza Macháček
2012-06-22 22:49 Alexey Shvetsov
2012-05-22 19:43 Justin Lecher
2012-05-15 6:49 Honza Macháček
2012-02-19 12:44 Justin Lecher
2011-07-11 11:24 Honza Macháček
2011-06-21 11:54 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox