From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3A25C198005 for ; Thu, 21 Feb 2013 22:56:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 091CCE045E; Thu, 21 Feb 2013 22:56:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 243D2E0458 for ; Thu, 21 Feb 2013 22:56:55 +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 0CED733DF0F for ; Thu, 21 Feb 2013 22:56:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9EA95E407D for ; Thu, 21 Feb 2013 22:56:52 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1361485277.1111c8d5e893afcb2bc06209123164569f4e4894.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/openmx/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/openmx/ChangeLog sci-physics/openmx/metadata.xml sci-physics/openmx/openmx-3.6.ebuild X-VCS-Directories: sci-physics/openmx/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 1111c8d5e893afcb2bc06209123164569f4e4894 X-VCS-Branch: master Date: Thu, 21 Feb 2013 22:56:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c9e99a7b-0aca-4009-a2f4-0a90588dde92 X-Archives-Hash: 93d13ffc63a856ae49edf838a9a3912e commit: 1111c8d5e893afcb2bc06209123164569f4e4894 Author: Justin Lecher gentoo org> AuthorDate: Thu Feb 21 22:21:17 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Feb 21 22:21:17 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1111c8d5 sci-physics/openmx: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; add missing dep on virtual/pkgconfig Package-Manager: portage-2.2.0_alpha163 --- sci-physics/openmx/ChangeLog | 5 ++++ sci-physics/openmx/metadata.xml | 5 ++++ sci-physics/openmx/openmx-3.6.ebuild | 40 +++++++++++++++++----------------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/sci-physics/openmx/ChangeLog b/sci-physics/openmx/ChangeLog index 37b46f6..8ae1efd 100644 --- a/sci-physics/openmx/ChangeLog +++ b/sci-physics/openmx/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Feb 2013; Justin Lecher openmx-3.6.ebuild, + +metadata.xml: + Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; + add missing dep on virtual/pkgconfig + *openmx-3.6 (17 Jan 2013) 17 Jan 2013; Honza Macháček +openmx-3.6.ebuild: diff --git a/sci-physics/openmx/metadata.xml b/sci-physics/openmx/metadata.xml new file mode 100644 index 0000000..897aa2e --- /dev/null +++ b/sci-physics/openmx/metadata.xml @@ -0,0 +1,5 @@ + + + + sci + diff --git a/sci-physics/openmx/openmx-3.6.ebuild b/sci-physics/openmx/openmx-3.6.ebuild index 4f83c2a..b4832fd 100644 --- a/sci-physics/openmx/openmx-3.6.ebuild +++ b/sci-physics/openmx/openmx-3.6.ebuild @@ -6,25 +6,26 @@ EAPI="4" inherit eutils multilib toolchain-funcs -DESCRIPTION="Open source package for Material eXplorer using DFT, norm-conserving -pseudopotentials, and pseudo-atomic localized basis functions." +DESCRIPTION="Material eXplorer using DFT, norm-conserving pseudopotentials, and pseudo-atomic localized basis functions" HOMEPAGE="http://www.openmx-square.org/" -SRC_URI="http://www.openmx-square.org/${PN}${PV}.tar.gz - http://www.openmx-square.org/bugfixed/11Nov14/patch${PV}.1.tar.gz" +SRC_URI=" + http://www.openmx-square.org/${PN}${PV}.tar.gz + http://www.openmx-square.org/bugfixed/11Nov14/patch${PV}.1.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="-debug mpi openmp test" -S="${WORKDIR}/${PN}${PV}" -RDEPEND="virtual/blas - virtual/lapack - sci-libs/fftw:3.0[mpi?,openmp?] - mpi? ( virtual/mpi )" +RDEPEND=" + virtual/blas + virtual/lapack + sci-libs/fftw:3.0[mpi?,openmp?] + mpi? ( virtual/mpi )" DEPEND="${RDEPEND} - dev-util/pkgconfig" + virtual/pkgconfig" +S="${WORKDIR}/${PN}${PV}" pkg_setup() { if use mpi; then @@ -49,7 +50,6 @@ src_prepare() { } src_configure() { - CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}" local FFTW_FLAVOUR=fftw3 if use openmp; then FFTW_FLAVOUR=fftw3_omp @@ -61,26 +61,26 @@ src_configure() { else export CFLAGS="${CFLAGS} -Dnompi" fi - CFLAGS="${CFLAGS} $(pkg-config --cflags lapack)" - CFLAGS="${CFLAGS} $(pkg-config --cflags ${FFTW_FLAVOUR})" + CFLAGS="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags lapack)" + CFLAGS="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags ${FFTW_FLAVOUR})" export CFLAGS - local MX_LIB="$(pkg-config --static --libs lapack)" - local MX_LIB="${MX_LIB} $(pkg-config --static --libs ${FFTW_FLAVOUR})" + local MX_LIB="$($(tc-getPKG_CONFIG) --static --libs lapack)" + local MX_LIB="${MX_LIB} $($(tc-getPKG_CONFIG) --static --libs ${FFTW_FLAVOUR})" - sed -i -e "s%^CC *=.*$%CC = ${CC} ${CFLAGS}%" \ + sed \ + -e "s%^CC *=.*$%CC = ${CC} ${CFLAGS}%" \ -e "s%^LIB *=.*$%LIB = ${MX_LIB}%" \ - source/makefile + -i source/makefile || die } src_compile() { - cd source - emake || die "make failed" + emake -C source } src_test() { cd work - ../source/openmx -runtest + ../source/openmx -runtest || die } src_install() {