* [gentoo-commits] proj/sci:master commit in: sci-physics/abinit/, sci-libs/fox/
@ 2012-04-20 16:06 Honza Macháček
0 siblings, 0 replies; 2+ messages in thread
From: Honza Macháček @ 2012-04-20 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 3da61c9714062223ff5b4e7cf96b00d90ab102c3
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Fri Apr 20 16:06:16 2012 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Fri Apr 20 16:06:16 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3da61c97
Minor improvements related to sci-libs/fox.
---
sci-libs/fox/ChangeLog | 3 +
sci-libs/fox/fox-4.0.4.ebuild | 57 ------
sci-libs/fox/fox-4.1.0.ebuild | 56 -----
sci-libs/fox/fox-4.1.2.ebuild | 16 +-
sci-physics/abinit/ChangeLog | 4 +
sci-physics/abinit/abinit-6.12.2.ebuild | 332 -------------------------------
sci-physics/abinit/abinit-6.12.3.ebuild | 2 +-
7 files changed, 20 insertions(+), 450 deletions(-)
diff --git a/sci-libs/fox/ChangeLog b/sci-libs/fox/ChangeLog
index 5ab07b1..7a9085f 100644
--- a/sci-libs/fox/ChangeLog
+++ b/sci-libs/fox/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz> fox-4.1.2.ebuild:
+ Modular download enabled, FoX-config improved.
+
*fox-4.1.2 (19 Apr 2012)
19 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz> +fox-4.1.2.ebuild,
diff --git a/sci-libs/fox/fox-4.0.4.ebuild b/sci-libs/fox/fox-4.0.4.ebuild
deleted file mode 100644
index 105d67b..0000000
--- a/sci-libs/fox/fox-4.0.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-MY_PN="FoX"
-MY_P="${MY_PN}-${PV}"
-DIRV="${PV/%[0-9]/X}"
-
-DESCRIPTION="A library designed to allow the easy use of XML from Fortran"
-HOMEPAGE="http://www1.gly.bris.ac.uk/~walker/FoX/"
-SRC_URI="http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_PN}-${DIRV}/${MY_P}-full.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc dom fast sax wcml wxml"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/4.0.4-install-customizations.patch
-}
-
-src_configure() {
- econf --prefix=/usr \
- $(use_enable debug) \
- $(use_enable dom) \
- $(use_enable fast) \
- $(use_enable sax) \
- $(use_enable wcml) \
- $(use_enable wxml) \
- FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}"
-}
-
-src_compile() {
- emake -j1 || die "make failed"
-}
-
-src_test() {
- emake -j1 check || die "make check failed"
- einfo "Please look at the last few RESULT lines for a summary."
-}
-
-src_install() {
- sed -i -e's%^comp_prefix=.*$%comp_prefix=/usr%' \
- -e's%comp_prefix/finclude%comp_prefix/lib/finclude%' \
- FoX-config
- emake -j1 DESTDIR="${D}" install || die "make install failed"
- dodoc README.FoX.txt Changelog || die "dodoc failed"
- if use doc; then
- dohtml -r DoX/ || die "installing the HTML docs failed"
- fi
-}
diff --git a/sci-libs/fox/fox-4.1.0.ebuild b/sci-libs/fox/fox-4.1.0.ebuild
deleted file mode 100644
index c57b614..0000000
--- a/sci-libs/fox/fox-4.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-MY_PN="FoX"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library designed to allow the easy use of XML from Fortran"
-HOMEPAGE="http://www1.gly.bris.ac.uk/~walker/FoX/"
-SRC_URI="http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-full.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc dom fast sax wcml wxml"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/4.0.4-install-customizations.patch
-}
-
-src_configure() {
- econf --prefix=/usr \
- $(use_enable debug) \
- $(use_enable dom) \
- $(use_enable fast) \
- $(use_enable sax) \
- $(use_enable wcml) \
- $(use_enable wxml) \
- FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}"
-}
-
-src_compile() {
- emake -j1 || die "make failed"
-}
-
-src_test() {
- emake -j1 check || die "make check failed"
- einfo "Please look at the last few RESULT lines for a summary."
-}
-
-src_install() {
- sed -i -e's%^comp_prefix=.*$%comp_prefix=/usr%' \
- -e's%comp_prefix/finclude%comp_prefix/lib/finclude%' \
- FoX-config
- emake -j1 DESTDIR="${D}" install || die "make install failed"
- dodoc README.FoX.txt Changelog || die "dodoc failed"
- if use doc; then
- dohtml -r DoX/ || die "installing the HTML docs failed"
- fi
-}
diff --git a/sci-libs/fox/fox-4.1.2.ebuild b/sci-libs/fox/fox-4.1.2.ebuild
index de3ba9f..631af36 100644
--- a/sci-libs/fox/fox-4.1.2.ebuild
+++ b/sci-libs/fox/fox-4.1.2.ebuild
@@ -11,16 +11,21 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="A library designed to allow the easy use of XML from Fortran"
HOMEPAGE="http://www1.gly.bris.ac.uk/~walker/FoX/"
-SRC_URI="http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-full.tar.gz"
LICENSE="BSD ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug doc +dom +fast +sax +wcml +wkml +wxml"
-S="${WORKDIR}/${MY_P}"
+SRC_URI=" doc? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-full.tar.gz )
+ !doc? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}.tar.gz
+ dom? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-dom.tar.gz )
+ sax? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-sax.tar.gz )
+ wcml? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-wcml.tar.gz )
+ wkml? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-wkml.tar.gz )
+ wxml? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-wxml.tar.gz ) )"
-DOCS=( README.FoX.txt Changelog )
+S="${WORKDIR}/${MY_P}"
FORTRAN_STANDARD=90
@@ -52,10 +57,13 @@ src_test() {
src_install() {
sed -i -e's%^comp_prefix=.*$%comp_prefix=/usr%' \
-e's%comp_prefix/finclude%comp_prefix/lib/finclude%' \
+ -e's%\$libdir/lib\([^ ]\+\)\.a\>%-l\1%g' \
+ -e's%\(echo\( -I"$moddir"\)\?\) \$LIBS%\1 -L"$libdir" $LIBS%' \
FoX-config
emake -j1 DESTDIR="${D}" install || die "make install failed"
- dodoc README.FoX.txt Changelog || die "dodoc failed"
+ dodoc README.FoX.txt || die "dodoc failed"
if use doc; then
+ dodoc Changelog
dohtml -r DoX/ || die "installing the HTML docs failed"
fi
}
diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog
index 23db32a..f0219bb 100644
--- a/sci-physics/abinit/ChangeLog
+++ b/sci-physics/abinit/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+ -abinit-6.12.2.ebuild, abinit-6.12.3.ebuild:
+ Dependence on unused sci-libs/fox modules removed.
+
19 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
-files/6.12.1-gui-conf.patch, abinit-6.12.2.ebuild, abinit-6.12.3.ebuild:
GUI configuration corrected (to find uudecode).
diff --git a/sci-physics/abinit/abinit-6.12.2.ebuild b/sci-physics/abinit/abinit-6.12.2.ebuild
deleted file mode 100644
index 5fa4e8c..0000000
--- a/sci-physics/abinit/abinit-6.12.2.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit autotools-utils flag-o-matic fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="Find total energy, charge density and electronic structure using density functional theory"
-HOMEPAGE="http://www.abinit.org/"
-SRC_URI="http://ftp.abinit.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda cuda-double -debug +etsf_io +fftw +fftw-threads +fox gsl gui +hdf5 libabinit mpi +netcdf python -test +threads -vdwxc"
-
-RDEPEND="=sci-libs/bigdft-1.6_pre1
- sci-libs/etsf_io
- =sci-libs/libxc-1*[fortran]
- sci-physics/atompaw[libxc]
- etsf_io? ( sci-libs/etsf_io )
- fox? ( sci-libs/fox[dom,sax,wcml,wxml] )
- netcdf? (
- sci-libs/netcdf[fortran]
- hdf5? (
- sci-libs/netcdf[fortran,hdf5]
- )
- )
- hdf5? ( sci-libs/hdf5[fortran] )
- sci-libs/wannier90
- virtual/blas
- virtual/lapack
- gsl? ( sci-libs/gsl )
- fftw? (
- sci-libs/fftw:3.0
- fftw-threads? ( sci-libs/fftw:3.0[threads] )
- )
- mpi? ( virtual/mpi )
- python? ( dev-python/numpy )
- cuda? ( dev-util/nvidia-cuda-sdk )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gui? ( >=virtual/jdk-1.6.0
- app-arch/sharutils
- sys-apps/gawk )
- dev-perl/Text-Markdown"
-
-S=${WORKDIR}/${P%[a-z]}
-
-lat1loc=""
-
-DOCS=( AUTHORS ChangeLog COPYING INSTALL KNOWN_PROBLEMS NEWS PACKAGING
- README README.ChangeLog README.GPU README.xlf RELNOTES THANKS )
-
-FORTRAN_STANDARD=90
-
-pkg_setup() {
- # Doesn't compile with gcc-4.0, only >=4.1
- if [[ $(tc-getFC) == *gfortran ]]; then
- if [[ $(gcc-major-version) -eq 4 ]] \
- && [[ $(gcc-minor-version) -lt 1 ]]; then
- die "Requires gcc-4.1 or newer"
- fi
- fi
-
- # 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
-
- # Preprocesor macross can make some lines really long
- append-fflags -ffree-line-length-none
-
- fortran-2_pkg_setup
-
- # Sort out some USE options
- if use fftw-threads && ! use fftw; then
- ewarn "fftw-threads set but fftw not used, ignored"
- fi
- if use cuda-double && ! use cuda; then
- ewarn "cuda-double set but cuda not used, ignored"
- fi
- if use gui; then
- lat1loc="$(locale |awk '/LC_CTYPE="(.*)"/{sub("LC_CTYPE=\"",""); sub("\" *$", ""); print}')"
- if locale charmap |grep -i "\<iso885915\?\>"; then
- einfo "Good, locale compatible with the GUI build"
- else
- ewarn "The locale ${lat1loc} incompatible with the GUI build"
- if latloc=`locale -a| grep -i "\<iso885915\?\>"`; then
- if echo "${latloc}" |grep -q "^fr"; then
- lat1loc="$(echo "${latloc}" | grep -im1 "^fr")"
- else
- lat1loc="$(echo "${latloc}" | grep -im1 "iso88591")"
- fi
- einfo "Will use ${lat1loc} to build the GUI"
- else
- ewarn "No ISO-8859-1 nor ISO-8859-15 locale available, the GUI build may crash"
- fi
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/6.2.2-change-default-directories.patch
- epatch "${FILESDIR}"/6.0.3-fftw.patch
- epatch "${FILESDIR}"/6.12.1-autoconf.patch
- epatch "${FILESDIR}"/6.12.1-xmalloc.patch
- epatch "${FILESDIR}"/6.12.1-libabinit_options.patch
- eautoreconf
-
-}
-
-src_configure() {
- local libs="-L/usr/$(get_libdir)"
- local modules="-I/usr/$(get_libdir)/finclude"
- local FoX_libs="${libs} -lFoX_dom -lFoX_sax -lFoX_wcml -lFoX_wxml -lFoX_common -lFoX_utils -lFoX_fsys"
- local trio_flavor=""
- use etsf_io && trio_flavor="${trio_flavor}+etsf_io"
- use fox && trio_flavor="${trio_flavor}+fox"
- use netcdf && trio_flavor="${trio_flavor}+netcdf"
- test "no${trio_flavor}" = "no" && trio_flavor="none"
- local netcdff_libs="-lnetcdff"
- use hdf5 && netcdff_libs="${netcdff_libs} -lhdf5_fortran"
- local fft_flavor="fftw3"
- local fft_libs="-L/usr/lib"
- # The fftw threads support is protected by black magick.
- # Anybody removes it, dies.
- # New USE flag "fftw-threads" was added to control usage
- # of the threaded fftw variant. Since fftw-3.3 has expanded
- # the paralel options by MPI and OpenMP support, analogical
- # USE flags should be added to select them in future;
- # unusable with previous FFTW versions, they are postponed
- # for now.
- if use fftw-threads; then
- fft_flavor="fftw3-threads"
- if has_version '>=sci-libs/fftw-3.3'; then
- # pkg-config files for fftw-3.3 are broken
- # All the parallel stuff is separated
- # from the main body of common routines,
- # and -lfftw3 must be always included alongside.
- # Until version 3.3 this used to be masked by
- # .la files.
- # Bug 384645
- fft_libs="${fft_libs} $(pkg-config --libs fftw3_threads) $(pkg-config --libs fftw3)"
- else
- fft_libs="${fft_libs} $(pkg-config --libs fftw3_threads)"
- fi
- else
- fft_libs="${fft_libs} $(pkg-config --libs fftw3)"
- fi
- local gpu_flavor="none"
- if use cuda; then
- gpu_flavor="cuda-single"
- if use cuda-double; then
- gpu_flavor="cuda-double"
- fi
- fi
-
- local myeconfargs=(
- --enable-clib
- --enable-exports
- $(use_enable gui)
- $(use_enable debug debug enhanced)
- $(use_enable mpi)
- $(use_enable mpi mpi-io)
- --disable-smp
- $(use_enable vdwxc)
- $(use_enable cuda gpu)
- "$(use cuda && echo "--with-gpu-flavor=${gpu_flavor}")"
- "$(use cuda && echo "--with-gpu-prefix=/opt/cuda/")"
- "$(use gsl && echo "--with-math-flavor=gsl")"
- "$(use gsl && echo "--with-math-incs=$(pkg-config --cflags gsl)")"
- "$(use gsl && echo "--with-math-libs=$(pkg-config --libs gsl)")"
- --with-linalg-flavor="atlas"
- --with-linalg-libs="$(pkg-config --libs lapack)"
- --with-trio-flavor="${trio_flavor}"
- "$(use netcdf && echo "--with-netcdf-incs=-I/usr/include")"
- "$(use netcdf && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")"
- "$(use fox && echo "--with-fox-incs=${modules}")"
- "$(use fox && echo "--with-fox-libs=${FoX_libs}")"
- "$(use etsf_io && echo "--with-etsf-io-incs=${modules}")"
- "$(use etsf_io && echo "--with-etsf-io-libs=${libs} -letsf_io -letsf_io_utils -letsf_io_low_level")"
- --with-dft-flavor="libxc+bigdft+atompaw+wannier90"
- --with-libxc-incs="${modules}"
- --with-libxc-libs="${libs} -lxc"
- --with-bigdft-incs="${modules}"
- --with-bigdft-libs="$(pkg-config --libs bigdft)"
- --with-atompaw-incs="${modules}"
- --with-atompaw-libs="${libs} -latompaw"
- --with-wannier90-bins="/usr/bin"
- --with-wannier90-incs="${modules}"
- --with-wannier90-libs="${libs} -lwannier $(pkg-config --libs lapack)"
- "$(use fftw && echo "--with-fft-flavor=${fft_flavor}")"
- "$(use fftw && echo "--with-fft-incs=-I/usr/include")"
- "$(use fftw && echo "--with-fft-libs=${fft_libs}")"
- --with-timer-flavor="abinit"
- LD="$(tc-getLD)"
- FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} ${modules} -I/usr/include"
- )
-
- MARKDOWN=Markdown.pl autotools-utils_src_configure
-
- if use gui; then
- # autotools-utils_src_configure() part expanded
- _check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- mkdir -p gui
- cd gui
- ECONF_SOURCE="${S}"/gui econf UUDECODE="uudecode"
- fi
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- # Apparently libabinit.a is not built by default
- # Used by BigDFT. Should probably be built separately,
- # as a package of its own: BigDFT used by Abinit.
- # Does libabinit.a depend on BigDFT, if used?
- # Can Abinit use external libabinit.a?
- use libabinit && autotools-utils_src_compile libabinit.a
-
- if use gui; then
- #autotools-utils_src_compile() expanded
- # _check_build_dir has already been called
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- # now what the function cannot be called to do
- cd gui
- LC_CTYPE="${lat1loc}" emake || die "Making GUI failed"
- popd > /dev/null
- fi
-
- sed -i -e's/libatlas/lapack/' "${AUTOTOOLS_BUILD_DIR}"/config.pc
-}
-
-src_test() {
- einfo "The tests take quite a while, easily several hours"
- # autotools-utils_src_test() expanded
- _check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- # again something the autotools-utils function cannot be called to do
- # now quite a lot of work actually
- cd tests
- emake tests_acc || ewarn "Accuracy tests failed"
- emake tests_paw || ewarn "PAW tests failed"
- emake tests_gw || ewarn "GW tests failed"
- emake tests_gw_paw || ewarn "GW-PAW tests failed"
- emake tests_bs || ewarn "BSE tests failed"
- emake tests_tddft || ewarn "TDDFT tests failed"
- emake tests_eph || ewarn "Elphon tests failed"
-
- local REPORT
- for REPORT in $(find . -name report); do
- REPORT=${REPORT#*/}
- elog "Parameters and unusual results for ${REPORT%%/*} tests"
- echo "Parameters and unusual results for ${REPORT%%/*} tests" >>tests_summary.txt
- while read line; do
- elog "${line}"
- echo "${line}" >>tests_summary.txt
- done \
- < <(grep -v -e succeeded -e passed ${REPORT})
- done
-
- local testdir
- find . -name "tmp-test*" -print | \
- while read testdir; do
- if [ -e summary_of_tests.tar ]; then
- tar rvf summary_of_tests.tar ${testdir}
- else tar cvf summary_of_tests.tar ${testdir}
- fi
- done
- popd > /dev/null
-
- elog "The full test results will be installed as summary_of_tests.tar.bz2."
- elog "Also a concise report tests_summary.txt is installed."
-}
-
-src_install() {
- #autotools-utils_src_install() expanded
- _check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- emake DESTDIR="${D}" install || die "make install failed"
-
- use libabinit && dolib libabinit.a
-
- if use gui; then
- pushd gui
- emake DESTDIR="${D}" install || die "The GUI install failed"
- popd
- fi
-
- if use test; then
- for dc in tests_summary.txt summary_tests.tar summary_of_tests.tar; do
- test -e tests/"${dc}" && dodoc tests/"${dc}" || ewarn "Copying tests results failed"
- done
- fi
-
- popd > /dev/null
-
- # XXX: support installing them from builddir as well!!!
- if [[ ${DOCS} ]]; then
- dodoc "${DOCS[@]}" || die "dodoc failed"
- else
- local f
- # same list as in PMS
- for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \
- THANKS BUGS FAQ CREDITS CHANGELOG; do
- if [[ -s ${f} ]]; then
- dodoc "${f}" || die "(default) dodoc ${f} failed"
- fi
- done
- fi
- if [[ ${HTML_DOCS} ]]; then
- dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed"
- fi
-
- # Remove libtool files and unnecessary static libs
- remove_libtool_files
-}
-
-pkg_postinst() {
- if use test; then
- elog "The full test results will be installed as summary_tests.tar.bz2."
- elog "Also a concise report tests_summary.txt is installed."
- fi
-}
diff --git a/sci-physics/abinit/abinit-6.12.3.ebuild b/sci-physics/abinit/abinit-6.12.3.ebuild
index aacc90a..58db1b6 100644
--- a/sci-physics/abinit/abinit-6.12.3.ebuild
+++ b/sci-physics/abinit/abinit-6.12.3.ebuild
@@ -119,7 +119,7 @@ src_prepare() {
src_configure() {
local libs="-L/usr/$(get_libdir)"
local modules="-I/usr/$(get_libdir)/finclude"
- local FoX_libs="${libs} -lFoX_dom -lFoX_sax -lFoX_wcml -lFoX_wxml -lFoX_common -lFoX_utils -lFoX_fsys"
+ local FoX_libs="${libs} -lFoX_common -lFoX_utils -lFoX_fsys"
local trio_flavor=""
use etsf_io && trio_flavor="${trio_flavor}+etsf_io"
use fox && trio_flavor="${trio_flavor}+fox"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/abinit/, sci-libs/fox/
@ 2012-04-28 11:46 Honza Macháček
0 siblings, 0 replies; 2+ messages in thread
From: Honza Macháček @ 2012-04-28 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 82d567a68a4aa27513888fd86bd9ac2e471e7849
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Sat Apr 28 11:46:37 2012 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Sat Apr 28 11:46:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=82d567a6
The dependence of sci-physics/abinit on sci-libs/fox corrected.
---
sci-libs/fox/ChangeLog | 7 +++++++
.../fox/{fox-4.1.2.ebuild => fox-4.1.2-r1.ebuild} | 0
sci-physics/abinit/ChangeLog | 7 +++++++
...binit-6.12.3.ebuild => abinit-6.12.3-r1.ebuild} | 6 +++---
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/sci-libs/fox/ChangeLog b/sci-libs/fox/ChangeLog
index 7a9085f..da2ec66 100644
--- a/sci-libs/fox/ChangeLog
+++ b/sci-libs/fox/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*fox-4.1.2-r1 (28 Apr 2012)
+
+ 28 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz> -fox-4.1.2.ebuild,
+ +fox-4.1.2-r1.ebuild:
+ fox-4.1.2.ebuild made 4.1.2-r1 to mark the important change in patching
+ FoX-config
+
20 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz> fox-4.1.2.ebuild:
Modular download enabled, FoX-config improved.
diff --git a/sci-libs/fox/fox-4.1.2.ebuild b/sci-libs/fox/fox-4.1.2-r1.ebuild
similarity index 100%
rename from sci-libs/fox/fox-4.1.2.ebuild
rename to sci-libs/fox/fox-4.1.2-r1.ebuild
diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog
index f0219bb..fbf4368 100644
--- a/sci-physics/abinit/ChangeLog
+++ b/sci-physics/abinit/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*abinit-6.12.3-r1 (28 Apr 2012)
+
+ 28 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+ -abinit-6.12.3.ebuild, +abinit-6.12.3-r1.ebuild:
+ Dependence on sci-libs/fox made right (Abinit needs SAX), FoX-config employed
+ (needs the changes of FoX-config made in the sci-libs/fox-1.4.2-r1 ebuild)
+
20 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
-abinit-6.12.2.ebuild, abinit-6.12.3.ebuild:
Dependence on unused sci-libs/fox modules removed.
diff --git a/sci-physics/abinit/abinit-6.12.3.ebuild b/sci-physics/abinit/abinit-6.12.3-r1.ebuild
similarity index 98%
rename from sci-physics/abinit/abinit-6.12.3.ebuild
rename to sci-physics/abinit/abinit-6.12.3-r1.ebuild
index 58db1b6..9efcd06 100644
--- a/sci-physics/abinit/abinit-6.12.3.ebuild
+++ b/sci-physics/abinit/abinit-6.12.3-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="=sci-libs/bigdft-1.6_pre1
=sci-libs/libxc-1*[fortran]
sci-physics/atompaw[libxc]
etsf_io? ( sci-libs/etsf_io )
- fox? ( sci-libs/fox[dom,sax,wcml,wxml] )
+ fox? ( >=sci-libs/fox-4.1.2-r1[sax] )
netcdf? (
sci-libs/netcdf[fortran]
hdf5? (
@@ -118,8 +118,8 @@ src_prepare() {
src_configure() {
local libs="-L/usr/$(get_libdir)"
- local modules="-I/usr/$(get_libdir)/finclude"
- local FoX_libs="${libs} -lFoX_common -lFoX_utils -lFoX_fsys"
+ local modules="-I/usr/$(get_libdir)/finclude $(FoX-config --sax --fcflags)"
+ local FoX_libs="${libs} $(FoX-config --sax --libs)"
local trio_flavor=""
use etsf_io && trio_flavor="${trio_flavor}+etsf_io"
use fox && trio_flavor="${trio_flavor}+fox"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-28 11:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-28 11:46 [gentoo-commits] proj/sci:master commit in: sci-physics/abinit/, sci-libs/fox/ Honza Macháček
-- strict thread matches above, loose matches on Subject: below --
2012-04-20 16:06 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