diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-02-09 18:47:27 +0100 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-02-09 18:47:27 +0100 |
commit | 99baf7005cdb082250bec718ff8501863143d34c (patch) | |
tree | db3b5a00096faf5babdad5809f19c531e4855994 /sci-libs/libxc | |
parent | Remove double prefix (diff) | |
download | sci-99baf7005cdb082250bec718ff8501863143d34c.tar.gz sci-99baf7005cdb082250bec718ff8501863143d34c.tar.bz2 sci-99baf7005cdb082250bec718ff8501863143d34c.zip |
Moved to autotools-utils, some more sanity
(Portage version: 2.2.0_alpha85/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sci-libs/libxc')
-rw-r--r-- | sci-libs/libxc/ChangeLog | 6 | ||||
-rw-r--r-- | sci-libs/libxc/Manifest | 3 | ||||
-rw-r--r-- | sci-libs/libxc/libxc-1.0.ebuild | 50 | ||||
-rw-r--r-- | sci-libs/libxc/libxc-1.1.0-r1.ebuild | 34 | ||||
-rw-r--r-- | sci-libs/libxc/libxc-1.1.0.ebuild | 50 | ||||
-rw-r--r-- | sci-libs/libxc/libxc-9999.ebuild | 39 | ||||
-rw-r--r-- | sci-libs/libxc/metadata.xml | 8 |
7 files changed, 50 insertions, 140 deletions
diff --git a/sci-libs/libxc/ChangeLog b/sci-libs/libxc/ChangeLog index a4df30881..db01b2c75 100644 --- a/sci-libs/libxc/ChangeLog +++ b/sci-libs/libxc/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-libs/libxc -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 09 Feb 2012; Justin Lecher <jlec@gentoo.org> -libxc-1.0.ebuild, + -libxc-1.1.0.ebuild, libxc-1.1.0-r1.ebuild, libxc-9999.ebuild, metadata.xml: + Moved to autotools-utils, some more sanity + *libxc-1.1.0-r1 (16 Dec 2011) 16 Dec 2011; Honza Macháček <Hloupy.Honza@centrum.cz> diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest index 6fb085fcd..119f00634 100644 --- a/sci-libs/libxc/Manifest +++ b/sci-libs/libxc/Manifest @@ -1,2 +1 @@ -DIST libxc-1.0.tar.gz 502757 RMD160 0e48a6ab484d1c9f6e305dfc9c860e46c01aa330 SHA1 48a54c718bfb8784bf5e6aadf82d62ffb70bc5a2 SHA256 890544853fc8ff81d895fc973b5f1ed293f957b035301aad2d6caea1ce1efdaa -DIST libxc-1.1.0.tar.gz 543168 RMD160 a74ee2d9325f66e66711f6a121caff13342d4276 SHA1 7cafa212d38b5adafc33cf5a4ee0ac2e29c3178c SHA256 b75fb2a73a9e2d75e250cc77b71d5485c8e9b11c3b25c91899c366e217283c57 +DIST libxc-1.1.0.tar.gz 543168 SHA256 b75fb2a73a9e2d75e250cc77b71d5485c8e9b11c3b25c91899c366e217283c57 SHA512 a5ed3a4a7a7abaa11321fe877d01ff00132eab976205213e578cd57fbd2073eea00ce3a3afc188e30ebbd31deb32468c4472313df9992e8d9e3148e6f619936b WHIRLPOOL 8ff70acb2ee65b3373942b71e350fe146f1c205aa4c09dbb22adc04227ba6888482ce412b3e843a9402efd51f9cf6f478f9c65b97305b2035185e59b35484d9f diff --git a/sci-libs/libxc/libxc-1.0.ebuild b/sci-libs/libxc/libxc-1.0.ebuild deleted file mode 100644 index 576307c38..000000000 --- a/sci-libs/libxc/libxc-1.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit fortran-2 multilib toolchain-funcs - -MY_P=${P//_/-} - -DESCRIPTION="A library of exchange-correlation functionals for use in DFT" -HOMEPAGE="http://www.tddft.org/programs/octopus/wiki/index.php/Libxc/" -SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="fortran" - -S="${WORKDIR}"/${MY_P} - -src_configure() { - econf \ - $(use_enable fortran) \ - FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}" -} - -## Upstream recommends not running the test suite because it requires -## human expert interpretation to determine whether output is an error or -## expected under certain circumstances. -# src_test() { :; } - -src_compile() { - emake -j1 || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc README ChangeLog AUTHORS || die - - if use fortran; then - # argument for this: --with-moduledir from etsf_io/bigdft - insinto /usr/$(get_libdir)/finclude - pushd src >/dev/null - doins *.mod || die - rm -f "${D}"/usr/include/*.mod || die - popd >/dev/null - fi -} diff --git a/sci-libs/libxc/libxc-1.1.0-r1.ebuild b/sci-libs/libxc/libxc-1.1.0-r1.ebuild index 7d3deac98..982be1053 100644 --- a/sci-libs/libxc/libxc-1.1.0-r1.ebuild +++ b/sci-libs/libxc/libxc-1.1.0-r1.ebuild @@ -1,29 +1,37 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=3 +EAPI=4 -inherit fortran-2 multilib toolchain-funcs +inherit autotools-utils fortran-2 multilib MY_P=${P//_/-} DESCRIPTION="A library of exchange-correlation functionals for use in DFT" -HOMEPAGE="http://www.tddft.org/programs/octopus/wiki/index.php/Libxc/" +HOMEPAGE="http://www.tddft.org/programs/octopus/wiki/index.php/Libxc" SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="fortran" +IUSE="fortran static-libs" S="${WORKDIR}"/${MY_P} +MAKEOPTS+=" -j1" + +pkg_setup() { + use fortran && fortran-2_pkg_setup +} + src_configure() { - econf \ - $(use_enable fortran) \ - FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -fPIC" \ + local myeconfargs=( + $(use_enable fortran) + FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -fPIC" CFLAGS="${CFLAGS} -fPIC" + ) + autotools-utils_src_configure } ## Upstream recommends not running the test suite because it requires @@ -31,19 +39,13 @@ src_configure() { ## expected under certain circumstances. # src_test() { :; } -src_compile() { - emake -j1 || die -} - src_install() { - emake DESTDIR="${D}" install || die - - dodoc README ChangeLog AUTHORS || die + autotools-utils_src_install if use fortran; then # argument for this: --with-moduledir from etsf_io/bigdft insinto /usr/$(get_libdir)/finclude - pushd src >/dev/null + pushd "${AUTOTOOLS_BUILD_DIR}"/src >/dev/null doins *.mod || die rm -f "${D}"/usr/include/*.mod || die popd >/dev/null diff --git a/sci-libs/libxc/libxc-1.1.0.ebuild b/sci-libs/libxc/libxc-1.1.0.ebuild deleted file mode 100644 index 576307c38..000000000 --- a/sci-libs/libxc/libxc-1.1.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit fortran-2 multilib toolchain-funcs - -MY_P=${P//_/-} - -DESCRIPTION="A library of exchange-correlation functionals for use in DFT" -HOMEPAGE="http://www.tddft.org/programs/octopus/wiki/index.php/Libxc/" -SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="fortran" - -S="${WORKDIR}"/${MY_P} - -src_configure() { - econf \ - $(use_enable fortran) \ - FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}" -} - -## Upstream recommends not running the test suite because it requires -## human expert interpretation to determine whether output is an error or -## expected under certain circumstances. -# src_test() { :; } - -src_compile() { - emake -j1 || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc README ChangeLog AUTHORS || die - - if use fortran; then - # argument for this: --with-moduledir from etsf_io/bigdft - insinto /usr/$(get_libdir)/finclude - pushd src >/dev/null - doins *.mod || die - rm -f "${D}"/usr/include/*.mod || die - popd >/dev/null - fi -} diff --git a/sci-libs/libxc/libxc-9999.ebuild b/sci-libs/libxc/libxc-9999.ebuild index 761f43f3f..baf29d429 100644 --- a/sci-libs/libxc/libxc-9999.ebuild +++ b/sci-libs/libxc/libxc-9999.ebuild @@ -1,39 +1,44 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=3 +EAPI=4 -inherit autotools eutils flag-o-matic fortran-2 multilib subversion toolchain-funcs +inherit autotools-utils fortran-2 multilib subversion -DESCRIPTION="A library of exchange-correlation functionals" +DESCRIPTION="A library of exchange-correlation functionals for use in DFT" HOMEPAGE="http://www.tddft.org/programs/octopus/wiki/index.php/Libxc" ESVN_REPO_URI="http://www.tddft.org/svn/octopus/trunk/${PN}/" ESVN_BOOTSTRAP="eautoreconf -i" LICENSE="LGPL-3" SLOT="0" -IUSE="debug fortran" -KEYWORDS="~amd64 ~x86" +KEYWORDS="" +IUSE="fortran static-libs" -src_configure() { - econf \ - $(use_enable fortran) \ - FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}" +MAKEOPTS+=" -j1" + +pkg_setup() { + use fortran && fortran-2_pkg_setup } -src_compile() { - emake -j1 || die "emake failed" +src_configure() { + local myeconfargs=( + $(use_enable fortran) + FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -fPIC" + CFLAGS="${CFLAGS} -fPIC" + ) + autotools-utils_src_configure } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc README NEWS ChangeLog AUTHORS || die "dodoc failed" + autotools-utils_src_install if use fortran; then insinto /usr/$(get_libdir)/finclude - cd src - doins *.mod + pushd "${AUTOTOOLS_BUILD_DIR}"/src >/dev/null + doins *.mod || die + rm -f "${D}"/usr/include/*.mod || die + popd >/dev/null fi } diff --git a/sci-libs/libxc/metadata.xml b/sci-libs/libxc/metadata.xml index efb490d78..d747d72a2 100644 --- a/sci-libs/libxc/metadata.xml +++ b/sci-libs/libxc/metadata.xml @@ -1,8 +1,8 @@ <?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> + <herd>sci</herd> + <maintainer> + <email>sci@gentoo.org</email> + </maintainer> </pkgmetadata> |