From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rz67r-00010h-4l for garchives@archives.gentoo.org; Sun, 19 Feb 2012 12:44:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8163AE0AAA; Sun, 19 Feb 2012 12:44:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4219BE0A9E for ; Sun, 19 Feb 2012 12:44:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 893F91B400D for ; Sun, 19 Feb 2012 12:44:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 50C66E53FF for ; Sun, 19 Feb 2012 12:44:09 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1328809647.99baf7005cdb082250bec718ff8501863143d34c.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/libxc/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/libxc/ChangeLog sci-libs/libxc/libxc-1.0.ebuild sci-libs/libxc/libxc-1.1.0-r1.ebuild sci-libs/libxc/libxc-1.1.0.ebuild sci-libs/libxc/libxc-9999.ebuild sci-libs/libxc/metadata.xml X-VCS-Directories: sci-libs/libxc/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 99baf7005cdb082250bec718ff8501863143d34c X-VCS-Branch: master Date: Sun, 19 Feb 2012 12:44:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: eb0ade82-acb9-4e3e-a99d-714dfbf5a486 X-Archives-Hash: 7a555f7e3ec4e051ebdeca3a6f9c75f2 commit: 99baf7005cdb082250bec718ff8501863143d34c Author: Justin Lecher gentoo org> AuthorDate: Thu Feb 9 17:47:27 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Feb 9 17:47:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D99baf700 Moved to autotools-utils, some more sanity (Portage version: 2.2.0_alpha85/git/Linux x86_64, unsigned Manifest commi= t) --- sci-libs/libxc/ChangeLog | 6 +++- sci-libs/libxc/libxc-1.0.ebuild | 50 ----------------------------= ------ sci-libs/libxc/libxc-1.1.0-r1.ebuild | 34 ++++++++++++----------- sci-libs/libxc/libxc-1.1.0.ebuild | 50 ----------------------------= ------ sci-libs/libxc/libxc-9999.ebuild | 39 +++++++++++++++----------- sci-libs/libxc/metadata.xml | 8 +++--- 6 files changed, 49 insertions(+), 138 deletions(-) diff --git a/sci-libs/libxc/ChangeLog b/sci-libs/libxc/ChangeLog index a4df308..db01b2c 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: $ =20 + 09 Feb 2012; Justin Lecher -libxc-1.0.ebuild, + -libxc-1.1.0.ebuild, libxc-1.1.0-r1.ebuild, libxc-9999.ebuild, metadat= a.xml: + Moved to autotools-utils, some more sanity + *libxc-1.1.0-r1 (16 Dec 2011) =20 16 Dec 2011; Honza Mach=C3=A1=C4=8Dek diff --git a/sci-libs/libxc/libxc-1.0.ebuild b/sci-libs/libxc/libxc-1.0.e= build deleted file mode 100644 index 576307c..0000000 --- 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=3D3 - -inherit fortran-2 multilib toolchain-funcs - -MY_P=3D${P//_/-} - -DESCRIPTION=3D"A library of exchange-correlation functionals for use in = DFT" -HOMEPAGE=3D"http://www.tddft.org/programs/octopus/wiki/index.php/Libxc/" -SRC_URI=3D"http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar= .gz" - -LICENSE=3D"LGPL-3" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"fortran" - -S=3D"${WORKDIR}"/${MY_P} - -src_configure() { - econf \ - $(use_enable fortran) \ - FCFLAGS=3D"${FCFLAGS:- ${FFLAGS:- -O2}}" -} - -## Upstream recommends not running the test suite because it requires -## human expert interpretation to determine whether output is an error o= r -## expected under certain circumstances. -# src_test() { :; } - -src_compile() { - emake -j1 || die -} - -src_install() { - emake DESTDIR=3D"${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 7d3deac..982be10 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: $ =20 -EAPI=3D3 +EAPI=3D4 =20 -inherit fortran-2 multilib toolchain-funcs +inherit autotools-utils fortran-2 multilib =20 MY_P=3D${P//_/-} =20 DESCRIPTION=3D"A library of exchange-correlation functionals for use in = DFT" -HOMEPAGE=3D"http://www.tddft.org/programs/octopus/wiki/index.php/Libxc/" +HOMEPAGE=3D"http://www.tddft.org/programs/octopus/wiki/index.php/Libxc" SRC_URI=3D"http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar= .gz" =20 LICENSE=3D"LGPL-3" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"fortran" +IUSE=3D"fortran static-libs" =20 S=3D"${WORKDIR}"/${MY_P} =20 +MAKEOPTS+=3D" -j1" + +pkg_setup() { + use fortran && fortran-2_pkg_setup +} + src_configure() { - econf \ - $(use_enable fortran) \ - FCFLAGS=3D"${FCFLAGS:- ${FFLAGS:- -O2}} -fPIC" \ + local myeconfargs=3D( + $(use_enable fortran) + FCFLAGS=3D"${FCFLAGS:- ${FFLAGS:- -O2}} -fPIC" CFLAGS=3D"${CFLAGS} -fPIC" + ) + autotools-utils_src_configure } =20 ## Upstream recommends not running the test suite because it requires @@ -31,19 +39,13 @@ src_configure() { ## expected under certain circumstances. # src_test() { :; } =20 -src_compile() { - emake -j1 || die -} - src_install() { - emake DESTDIR=3D"${D}" install || die - - dodoc README ChangeLog AUTHORS || die + autotools-utils_src_install =20 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 576307c..0000000 --- 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=3D3 - -inherit fortran-2 multilib toolchain-funcs - -MY_P=3D${P//_/-} - -DESCRIPTION=3D"A library of exchange-correlation functionals for use in = DFT" -HOMEPAGE=3D"http://www.tddft.org/programs/octopus/wiki/index.php/Libxc/" -SRC_URI=3D"http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar= .gz" - -LICENSE=3D"LGPL-3" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"fortran" - -S=3D"${WORKDIR}"/${MY_P} - -src_configure() { - econf \ - $(use_enable fortran) \ - FCFLAGS=3D"${FCFLAGS:- ${FFLAGS:- -O2}}" -} - -## Upstream recommends not running the test suite because it requires -## human expert interpretation to determine whether output is an error o= r -## expected under certain circumstances. -# src_test() { :; } - -src_compile() { - emake -j1 || die -} - -src_install() { - emake DESTDIR=3D"${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 761f43f..baf29d4 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: $ =20 -EAPI=3D3 +EAPI=3D4 =20 -inherit autotools eutils flag-o-matic fortran-2 multilib subversion tool= chain-funcs +inherit autotools-utils fortran-2 multilib subversion =20 -DESCRIPTION=3D"A library of exchange-correlation functionals" +DESCRIPTION=3D"A library of exchange-correlation functionals for use in = DFT" HOMEPAGE=3D"http://www.tddft.org/programs/octopus/wiki/index.php/Libxc" ESVN_REPO_URI=3D"http://www.tddft.org/svn/octopus/trunk/${PN}/" ESVN_BOOTSTRAP=3D"eautoreconf -i" =20 LICENSE=3D"LGPL-3" SLOT=3D"0" -IUSE=3D"debug fortran" -KEYWORDS=3D"~amd64 ~x86" +KEYWORDS=3D"" +IUSE=3D"fortran static-libs" =20 -src_configure() { - econf \ - $(use_enable fortran) \ - FCFLAGS=3D"${FCFLAGS:- ${FFLAGS:- -O2}}" +MAKEOPTS+=3D" -j1" + +pkg_setup() { + use fortran && fortran-2_pkg_setup } =20 -src_compile() { - emake -j1 || die "emake failed" +src_configure() { + local myeconfargs=3D( + $(use_enable fortran) + FCFLAGS=3D"${FCFLAGS:- ${FFLAGS:- -O2}} -fPIC" + CFLAGS=3D"${CFLAGS} -fPIC" + ) + autotools-utils_src_configure } =20 src_install() { - emake DESTDIR=3D"${D}" install || die "emake install failed" - - dodoc README NEWS ChangeLog AUTHORS || die "dodoc failed" + autotools-utils_src_install =20 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 efb490d..d747d72 100644 --- a/sci-libs/libxc/metadata.xml +++ b/sci-libs/libxc/metadata.xml @@ -1,8 +1,8 @@ -sci - - sci@gentoo.org - + sci + + sci@gentoo.org +