summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-10-22 15:44:40 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-10-22 15:44:40 +0000
commit8fe42df80111b0d3670c4ed0183396878c8e0d3f (patch)
treedd20f23ee8fffe5f919a6d9060f497813fd67994 /sci-biology
parentstable x86, bug 341703 (diff)
downloadhistorical-8fe42df80111b0d3670c4ed0183396878c8e0d3f.tar.gz
historical-8fe42df80111b0d3670c4ed0183396878c8e0d3f.tar.bz2
historical-8fe42df80111b0d3670c4ed0183396878c8e0d3f.zip
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.
Package-Manager: portage-2.2_rc98/cvs/Linux x86_64
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/phyml/ChangeLog10
-rw-r--r--sci-biology/phyml/Manifest16
-rw-r--r--sci-biology/phyml/phyml-2.4.5-r2.ebuild (renamed from sci-biology/phyml/phyml-2.4.5-r1.ebuild)29
-rw-r--r--sci-biology/phyml/phyml-2.4.5.ebuild6
4 files changed, 37 insertions, 24 deletions
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 <xarthisius@gentoo.org> 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 <fauli@gentoo.org>
phyml-2.4.5-r1.ebuild:
diff --git a/sci-biology/phyml/Manifest b/sci-biology/phyml/Manifest
index 05c1e1aab7b2..257d5f9eedbc 100644
--- a/sci-biology/phyml/Manifest
+++ b/sci-biology/phyml/Manifest
@@ -2,14 +2,16 @@
Hash: SHA1
DIST phyml_v2.4.5.tar.gz 92143 RMD160 4883cefd023a59ec6a8e6a780774b1800b37d714 SHA1 d76920654ca50c97fa7db77125ccce29f572d238 SHA256 e8a1d3980137f8e528d0e59472aff37dbac615860a7d3ee4cdb64f30dfea296e
-EBUILD phyml-2.4.5-r1.ebuild 716 RMD160 032dc5163b88ff94853ab8911bf34670f7c14016 SHA1 be60d48af5de7113550e0e8e88af796930580f42 SHA256 7306ce738fc6970c7876d78001b78321b6a31f253009a59e841f483da82ea2a2
-EBUILD phyml-2.4.5.ebuild 708 RMD160 528fa479680214e422e2cac9c09bbd7f456c2ca1 SHA1 afc2076b696e7507604e51a7ea88dd600a788134 SHA256 1158910cd16a6540590bb27deb5d446595c1f4e71a6ce515bfed274ba52b96b1
-MISC ChangeLog 772 RMD160 3f275d76afd9a096641c86fefe6cde399828a2bc SHA1 7b9ab40d17f6580007c43406400aebfba8717d1e SHA256 242b6bd954fad147cbc0d32e93a5f493988ee10e6d7e33baa8c20bc9ebf2a3eb
+EBUILD phyml-2.4.5-r2.ebuild 718 RMD160 dd6236eff025b577468c49f0f55c71c83fb8cb73 SHA1 75288f84d9c4a56ff28f6c92f8143de06939881d SHA256 fb30747a542899164e7f378216fca7cbbee95d81862154796b27a912f97b5747
+EBUILD phyml-2.4.5.ebuild 715 RMD160 d49012ddf58df27b2beb5c66909809ade868a4e1 SHA1 519c6abb92487056757f17113badf29de609f840 SHA256 bffdefef389511fb6b42b36d9392f0bd9a53812a8003224948606021273c201e
+MISC ChangeLog 1104 RMD160 6c8c39fdac0c300455f3a04c64a82cdd29dada5d SHA1 09fb5c3fe0b83bad958ab7d65b6f1b8dbc5f3b7c SHA256 cad14dc1f65bba126b4cd42276988d6807974d6e1d8ec4454c9bdd134c6eab24
MISC metadata.xml 471 RMD160 db59b371ce5a4402a6c5620cf4e75fce066ff178 SHA1 663109f3d8793ae3c3fc800eb3639ae46add0dc6 SHA256 de8e1579b6bc09e581961036083d6947e0f968447106d130a5dd11e90ba9c5d6
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkxALOkACgkQNQqtfCuFneOy1gCglvWmnSCCWOp6GDh+uyPn5rUD
-WQAAniscLEdid8p5rcFoVIxqkg/NpY6F
-=p0Mi
+iJwEAQECAAYFAkzBsXQACgkQIiMqcbOVdxSTkgP/XSzU0iCwhJ0w4P6H+81u127W
+wE1h0zm9rxnDj3r8cU2t8lJsRpgg/amGT4mwy+uJT0l1JPw/3qELCK7rzrCOHGvT
+BUUmEHGB60yBQtZQUV3lf6368/h7e0QBeIz0b+KhYf//Q3gb3tQl9BZU5Tq4BLSw
+fwIGtQgGGH22rCqjr+o=
+=5M8c
-----END PGP SIGNATURE-----
diff --git a/sci-biology/phyml/phyml-2.4.5-r1.ebuild b/sci-biology/phyml/phyml-2.4.5-r2.ebuild
index d505663998af..6a3e21683547 100644
--- a/sci-biology/phyml/phyml-2.4.5-r1.ebuild
+++ b/sci-biology/phyml/phyml-2.4.5-r2.ebuild
@@ -1,31 +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-r1.ebuild,v 1.2 2010/07/16 09:54:58 fauli Exp $
+# $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/${PN}_v${PV}.tar.gz"
+SRC_URI="http://www.lirmm.fr/~guindon/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=""
-RDEPEND=""
+S=${WORKDIR}/${MY_P}
-S="${WORKDIR}/${PN}_v${PV}"
+src_prepare() {
+ sed -e 's/^hello !!!//' \
+ -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' \
+ -i Makefile || die
+}
-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_compile() {
+ emake -e CC="$(tc-getCC)" || die
}
src_install() {
- dobin phyml
+ 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
}