[gentoo-commits] proj/sci:master commit in: sci-libs/libxc/

["Justin Lecher" <jlec@gentoo.org>]

commit:     99baf7005cdb082250bec718ff8501863143d34c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 17:47:27 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 17:47:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=99baf700

Moved to autotools-utils, some more sanity

(Portage version: 2.2.0_alpha85/git/Linux x86_64, unsigned Manifest commit)

---
 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: $
 
+  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/libxc-1.0.ebuild b/sci-libs/libxc/libxc-1.0.ebuild
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=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 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: $
 
-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 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=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 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: $
 
-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 efb490d..d747d72 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>