From 569a87b78c4cd13e49a3dfb15a4254ed84a75850 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Fri, 22 Oct 2010 15:44:40 +0000 Subject: Respect LDFLAGS wrt bug 342089. Thanks to Diego for the report. Bump to EAPI=2, add missing dies, drop empty depends. Drop old. Add missing quotes to stable ebuild. (Portage version: 2.2_rc98/cvs/Linux x86_64) --- sci-biology/phyml/ChangeLog | 10 +++++++++- sci-biology/phyml/phyml-2.4.5-r1.ebuild | 31 ------------------------------ sci-biology/phyml/phyml-2.4.5-r2.ebuild | 34 +++++++++++++++++++++++++++++++++ sci-biology/phyml/phyml-2.4.5.ebuild | 6 +++--- 4 files changed, 46 insertions(+), 35 deletions(-) delete mode 100644 sci-biology/phyml/phyml-2.4.5-r1.ebuild create mode 100644 sci-biology/phyml/phyml-2.4.5-r2.ebuild diff --git a/sci-biology/phyml/ChangeLog b/sci-biology/phyml/ChangeLog index 84cd56c8ecec..3e4a0456ea13 100644 --- a/sci-biology/phyml/ChangeLog +++ b/sci-biology/phyml/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-biology/phyml # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/phyml/ChangeLog,v 1.5 2010/07/16 09:54:58 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/phyml/ChangeLog,v 1.6 2010/10/22 15:44:40 xarthisius Exp $ + +*phyml-2.4.5-r2 (22 Oct 2010) + + 22 Oct 2010; Kacper Kowalik phyml-2.4.5.ebuild, + -phyml-2.4.5-r1.ebuild, +phyml-2.4.5-r2.ebuild: + Respect LDFLAGS wrt bug 342089. Thanks to Diego for the report. Bump to + EAPI=2, add missing dies, drop empty depends. Drop old. Add missing quotes + to stable ebuild. 16 Jul 2010; Christian Faulhammer phyml-2.4.5-r1.ebuild: diff --git a/sci-biology/phyml/phyml-2.4.5-r1.ebuild b/sci-biology/phyml/phyml-2.4.5-r1.ebuild deleted file mode 100644 index d505663998af..000000000000 --- a/sci-biology/phyml/phyml-2.4.5-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/phyml/phyml-2.4.5-r1.ebuild,v 1.2 2010/07/16 09:54:58 fauli Exp $ - -inherit toolchain-funcs - -DESCRIPTION="Estimation of large phylogenies by maximum likelihood" -HOMEPAGE="http://atgc.lirmm.fr/phyml/" -SRC_URI="http://www.lirmm.fr/~guindon/${PN}_v${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/${PN}_v${PV}" - -src_unpack() { - unpack ${A} - sed -i -e 's/^hello !!!//' \ - -e 's/^CFLAGS =/#CFLAGS =/' \ - -e 's/^CC =/CC ='$(tc-getCC)'#/' \ - -e 's/-static//' "${S}/Makefile" -} - -src_install() { - dobin phyml -} diff --git a/sci-biology/phyml/phyml-2.4.5-r2.ebuild b/sci-biology/phyml/phyml-2.4.5-r2.ebuild new file mode 100644 index 000000000000..6a3e21683547 --- /dev/null +++ b/sci-biology/phyml/phyml-2.4.5-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-biology/phyml/phyml-2.4.5-r2.ebuild,v 1.1 2010/10/22 15:44:40 xarthisius Exp $ + +EAPI=2 + +inherit toolchain-funcs + +MY_P=${PN}_v${PV} + +DESCRIPTION="Estimation of large phylogenies by maximum likelihood" +HOMEPAGE="http://atgc.lirmm.fr/phyml/" +SRC_URI="http://www.lirmm.fr/~guindon/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + sed -e 's/^hello !!!//' \ + -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' \ + -i Makefile || die +} + +src_compile() { + emake -e CC="$(tc-getCC)" || die +} + +src_install() { + dobin phyml || die +} diff --git a/sci-biology/phyml/phyml-2.4.5.ebuild b/sci-biology/phyml/phyml-2.4.5.ebuild index 8b1398ebd17a..929df30fb96b 100644 --- a/sci-biology/phyml/phyml-2.4.5.ebuild +++ b/sci-biology/phyml/phyml-2.4.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/phyml/phyml-2.4.5.ebuild,v 1.2 2008/02/17 11:24:21 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/phyml/phyml-2.4.5.ebuild,v 1.3 2010/10/22 15:44:40 xarthisius Exp $ DESCRIPTION="A simple, fast, and accurate algorithm to estimate large phylogenies by maximum likelihood." HOMEPAGE="http://atgc.lirmm.fr/phyml/" @@ -18,7 +18,7 @@ S=${WORKDIR}/${PN}_v${PV} src_unpack() { unpack ${A} - cd ${S} + cd "${S}" sed -i -e 's/^hello !!!//' -e 's/^CFLAGS =/#CFLAGS =/' -e 's/^CC =/#CC =/' Makefile } -- cgit v1.2.3-65-gdbad