From 8ffced4af673b34402a09f0479557c4a61ca2ace Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 8 Mar 2013 19:43:18 -0700 Subject: sync with gx86 Package-Manager: portage-2.2.0_alpha166 --- sci-physics/espresso/ChangeLog | 5 ++++- sci-physics/espresso/espresso-9999.ebuild | 14 +++----------- 2 files changed, 7 insertions(+), 12 deletions(-) (limited to 'sci-physics/espresso') diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog index 7264ecad2..46977cec8 100644 --- a/sci-physics/espresso/ChangeLog +++ b/sci-physics/espresso/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-physics/espresso -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 09 Mar 2013; Christoph Junghans espresso-9999.ebuild: + sync with gx86 + 09 Oct 2012; Christoph Junghans espresso-9999.ebuild: sync with gx86 diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild index 18df79b86..fb3e5199c 100644 --- a/sci-physics/espresso/espresso-9999.ebuild +++ b/sci-physics/espresso/espresso-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.1.0.ebuild,v 1.5 2012/05/06 23:08:00 ottxor Exp $ @@ -12,6 +12,7 @@ HOMEPAGE="http://www.espressomd.org" if [[ ${PV} = 9999 ]]; then EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git" EGIT_BRANCH="master" + AUTOTOOLS_AUTORECONF=1 inherit git-2 else SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz" @@ -42,16 +43,6 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS NEWS README ChangeLog ) -src_prepare() { - autotools-utils_src_prepare - eautoreconf - restore_config myconfig.h - if [[ ${CHOST} == *-darwin* ]]; then - #tclline uses stty, which has different exit code on Darwin - sed -i '/source.*tclline/s/^/#/' "scripts/init.tcl" || die - fi -} - src_configure() { myeconfargs=( $(use_with fftw) \ @@ -60,6 +51,7 @@ src_configure() { $(use_with X x) ) autotools-utils_src_configure + restore_config myconfig.h } src_compile() { -- cgit v1.2.3-65-gdbad