From: Olivier Fisette Date: Sun, 2 Jan 2005 22:37:02 +0000 (+0000) Subject: Use toolchain-funcs rather than gcc X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bc4e105b1cd4ba9160197eca9bc49a6dd6a8e02d;p=gentoo.git Use toolchain-funcs rather than gcc --- diff --git a/sci-biology/tree-puzzle/ChangeLog b/sci-biology/tree-puzzle/ChangeLog index 836f3e0973b2..8f65183631ac 100644 --- a/sci-biology/tree-puzzle/ChangeLog +++ b/sci-biology/tree-puzzle/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-biology/tree-puzzle -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/ChangeLog,v 1.2 2004/12/23 20:20:08 swegener Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/ChangeLog,v 1.3 2005/01/02 22:37:02 ribosome Exp $ + + 02 Jan 2005; Olivier Fisette tree-puzzle-5.2.ebuild: + Use the toolchain-funcs rather than the gcc eclass. *tree-puzzle-5.2 (23 Dec 2004) diff --git a/sci-biology/tree-puzzle/Manifest b/sci-biology/tree-puzzle/Manifest index 262733eafddf..e723618c9e11 100644 --- a/sci-biology/tree-puzzle/Manifest +++ b/sci-biology/tree-puzzle/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 d5a82f1ad1544c07fec98dec970f8689 tree-puzzle-5.2.ebuild 1347 -MD5 d3cb9eb158b98302c0e084c0e0cc26c4 tree-puzzle-5.1.ebuild 924 -MD5 16c8442d5d43646ef2a4d255908515d9 ChangeLog 1353 +MD5 e2b4702d637f3db7a187ec7e88624670 tree-puzzle-5.2.ebuild 1359 +MD5 6ad6abf27fb33e3fc9340294e80b624a tree-puzzle-5.1.ebuild 924 +MD5 35fd3905de12416651b112ce98caf646 ChangeLog 1485 MD5 d034503a05e54849a282d5baca880756 metadata.xml 1548 MD5 432840347efef142f52c23eb03c21e89 files/digest-tree-puzzle-5.1 67 MD5 91165e7d2ebcd4a70e55b5e8bea21e43 files/digest-tree-puzzle-5.2 67 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFByyh+I1lqEGTUzyQRAppSAKCIGIgL3uzK5XHTRHEDWGO8k5kjOQCfUQwu -oynE7fVLIHROarjJB5aENt8= -=L/h9 ------END PGP SIGNATURE----- diff --git a/sci-biology/tree-puzzle/tree-puzzle-5.1.ebuild b/sci-biology/tree-puzzle/tree-puzzle-5.1.ebuild index 1e7df801683a..7af4baacf092 100644 --- a/sci-biology/tree-puzzle/tree-puzzle-5.1.ebuild +++ b/sci-biology/tree-puzzle/tree-puzzle-5.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/tree-puzzle-5.1.ebuild,v 1.1 2004/12/23 18:14:07 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/tree-puzzle-5.1.ebuild,v 1.2 2005/01/02 22:37:02 ribosome Exp $ DESCRIPTION="Maximum likelihood analysis for nucleotide, amino acid, and two-state data." HOMEPAGE="http://www.tree-puzzle.de" diff --git a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild index baeb97170c3f..f4918e685664 100644 --- a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild +++ b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild,v 1.1 2004/12/23 18:14:07 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild,v 1.2 2005/01/02 22:37:02 ribosome Exp $ -inherit gcc +inherit toolchain-funcs DESCRIPTION="Maximum likelihood analysis for nucleotide, amino acid, and two-state data." HOMEPAGE="http://www.tree-puzzle.de" @@ -17,7 +17,7 @@ DEPEND="virtual/libc mpi? ( sys-cluster/lam-mpi )" pkg_setup () { - use mpi && [ $(gcc-getCC) = icc ] && die "The parallelized version of tree-puzzle cannot be compiled using icc. + use mpi && [ $(tc-getCC) = icc ] && die "The parallelized version of tree-puzzle cannot be compiled using icc. Either disable the \"mpi\" USE flag to compile only the non-parallelized version of the program, or use gcc as your compiler (CC=\"gcc\")." } @@ -29,7 +29,7 @@ src_compile() { sed -i -e 's:bin_PROGRAMS = puzzle$(EXEEXT) ppuzzle:bin_PROGRAMS = puzzle :' Makefile sed -i -e 's:DIST_SOURCES = $(ppuzzle_SOURCES) $(puzzle_SOURCES):DIST_SOURCES = $(puzzle_SOURCES):' Makefile fi - cd {S} + cd ${S} emake || die }