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 1SWv0v-0005fT-R2 for garchives@archives.gentoo.org; Tue, 22 May 2012 19:45:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE7B1E076E; Tue, 22 May 2012 19:43:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8DC39E072D for ; Tue, 22 May 2012 19:43:19 +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 F03751B4008 for ; Tue, 22 May 2012 19:43:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6AB9BE5430 for ; Tue, 22 May 2012 19:43:15 +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: <1337714259.4698f715c843a1f91a32dd8b4f993fcf50f27f68.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/bigdft/ChangeLog sci-libs/bigdft/bigdft-1.6.0-r1.ebuild sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild X-VCS-Directories: sci-libs/bigdft/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 4698f715c843a1f91a32dd8b4f993fcf50f27f68 X-VCS-Branch: master Date: Tue, 22 May 2012 19:43:15 +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: 3ad7c5bc-6e36-4236-b056-3c0a8f13ee80 X-Archives-Hash: 124525511a665ef48ac23c9557455543 commit: 4698f715c843a1f91a32dd8b4f993fcf50f27f68 Author: Justin Lecher gentoo org> AuthorDate: Tue May 22 19:17:39 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue May 22 19:17:39 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D4698f715 sci-libs/bigdft: Add missing eutils.eclass, bump to EAPI=3D4, remove unne= cessary bits (Portage version: 2.2.0_alpha107/git/Linux x86_64, RepoMan options: --for= ce, 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: $ =20 + 22 May 2012; Justin Lecher bigdft-1.6_pre1-r1.ebuild= , + bigdft-1.6.0-r1.ebuild: + Add missing eutils.eclass, bump to EAPI=3D4, remove unnecessary bits + *bigdft-1.6.0-r1 (15 May 2012) *bigdft-1.6_pre1-r1 (15 May 2012) =20 diff --git a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild b/sci-libs/bigdft/big= dft-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: $ =20 -EAPI=3D"4" +EAPI=3D4 =20 -inherit autotools-utils flag-o-matic fortran-2 toolchain-funcs - -DESCRIPTION=3D"A DFT electronic structure code using a wavelet basis set= " -HOMEPAGE=3D"http://inac.cea.fr/L_Sim/BigDFT/" +inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs =20 REAL_P=3D"${P/_pre0/-tuto}" -S=3D"${WORKDIR}/${REAL_P}" =20 -SRC_URI=3D" - http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz - " +DESCRIPTION=3D"A DFT electronic structure code using a wavelet basis set= " +HOMEPAGE=3D"http://inac.cea.fr/L_Sim/BigDFT/" +SRC_URI=3D"http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz" =20 LICENSE=3D"GPL-3" SLOT=3D"0" @@ -35,15 +31,14 @@ RDEPEND=3D" ) ) etsf_io? ( sci-libs/etsf_io ) - netcdf? ( - sci-libs/netcdf[fortran] - ) - " + netcdf? ( sci-libs/netcdf[fortran] )" DEPEND=3D"${RDEPEND} dev-util/pkgconfig >=3Dsys-devel/autoconf-2.59 doc? ( virtual/latex-base )" =20 +S=3D"${WORKDIR}/${REAL_P}" + DOCS=3D( README INSTALL ChangeLog AUTHORS NEWS ) =20 FORTRAN_STANDARD=3D90 @@ -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 =20 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: $ =20 -EAPI=3D"4" +EAPI=3D4 =20 -inherit autotools-utils flag-o-matic fortran-2 toolchain-funcs - -DESCRIPTION=3D"A DFT electronic structure code using a wavelet basis set= " -HOMEPAGE=3D"http://inac.cea.fr/L_Sim/BigDFT/" +inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs =20 REAL_P=3D"${P/_pre/-tuto.}" REAL_P=3D"${REAL_P/-tuto.0/-tuto}" -S=3D"${WORKDIR}/${REAL_P}" =20 -SRC_URI=3D" - http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz - " +DESCRIPTION=3D"A DFT electronic structure code using a wavelet basis set= " +HOMEPAGE=3D"http://inac.cea.fr/L_Sim/BigDFT/" +SRC_URI=3D"http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz" =20 LICENSE=3D"GPL-3" SLOT=3D"0" @@ -36,15 +32,14 @@ RDEPEND=3D" ) ) etsf_io? ( sci-libs/etsf_io ) - netcdf? ( - sci-libs/netcdf[fortran] - ) - " + netcdf? ( sci-libs/netcdf[fortran] )" DEPEND=3D"${RDEPEND} dev-util/pkgconfig >=3Dsys-devel/autoconf-2.59 doc? ( virtual/latex-base )" =20 +S=3D"${WORKDIR}/${REAL_P}" + DOCS=3D( README INSTALL ChangeLog AUTHORS NEWS ) =20 FORTRAN_STANDARD=3D90 @@ -63,10 +58,11 @@ pkg_setup() { } =20 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 } =20 @@ -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 =20