From: Olivier Fisette Date: Thu, 14 Oct 2004 15:02:34 +0000 (+0000) Subject: Added to x86. Use gcc-getCC rather than CC. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4f412ec10795c42caff42af8f806393d35730d2;p=gentoo.git Added to x86. Use gcc-getCC rather than CC. --- diff --git a/app-sci/tree-puzzle/ChangeLog b/app-sci/tree-puzzle/ChangeLog index 9559494b0261..c91cf1a84e70 100644 --- a/app-sci/tree-puzzle/ChangeLog +++ b/app-sci/tree-puzzle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-sci/tree-puzzle # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/tree-puzzle/ChangeLog,v 1.5 2004/07/23 16:01:23 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/tree-puzzle/ChangeLog,v 1.6 2004/10/14 15:02:34 ribosome Exp $ + + 14 Oct 2004; Olivier Fisette tree-puzzle-5.1.ebuild, + tree-puzzle-5.2.ebuild: + Added to x86. Use gcc-getCC from gcc.eclass rather than ${CC}. 23 Jul 2004; Jon Hood tree-puzzle-5.2.ebuild: Change virtual/glibc -> virtual/libc. diff --git a/app-sci/tree-puzzle/Manifest b/app-sci/tree-puzzle/Manifest index 66b62faf0a30..1961ac3b9535 100644 --- a/app-sci/tree-puzzle/Manifest +++ b/app-sci/tree-puzzle/Manifest @@ -1,6 +1,6 @@ -MD5 0f2bdbf745fb3a0f7270526497df4d8e ChangeLog 865 +MD5 37fd72859f823608b1d25b8d714e6081 tree-puzzle-5.2.ebuild 1343 +MD5 6e85db98ad5224d147ccbd37345254fb tree-puzzle-5.1.ebuild 909 +MD5 bb587ae964646bff085b8ea64d452259 ChangeLog 1033 MD5 d034503a05e54849a282d5baca880756 metadata.xml 1548 -MD5 0d4a63cf20942f2d6c71199a260536ad tree-puzzle-5.1.ebuild 910 -MD5 924d31304dd282212416bc0fe9ebc6da tree-puzzle-5.2.ebuild 1325 MD5 432840347efef142f52c23eb03c21e89 files/digest-tree-puzzle-5.1 67 MD5 91165e7d2ebcd4a70e55b5e8bea21e43 files/digest-tree-puzzle-5.2 67 diff --git a/app-sci/tree-puzzle/tree-puzzle-5.1.ebuild b/app-sci/tree-puzzle/tree-puzzle-5.1.ebuild index 5b224a63e76a..f1fcb74ea173 100644 --- a/app-sci/tree-puzzle/tree-puzzle-5.1.ebuild +++ b/app-sci/tree-puzzle/tree-puzzle-5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/tree-puzzle/tree-puzzle-5.1.ebuild,v 1.3 2004/06/24 22:19:48 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/tree-puzzle/tree-puzzle-5.1.ebuild,v 1.4 2004/10/14 15:02:34 ribosome Exp $ DESCRIPTION="Maximum likelihood analysis for nucleotide, amino acid, and two-state data." HOMEPAGE="http://www.tree-puzzle.de" @@ -8,7 +8,7 @@ SRC_URI="http://www.tree-puzzle.de/${P}.tar.gz" LICENSE="GPL-1" SLOT="0" -KEYWORDS="~x86 ~ppc" +KEYWORDS="x86 ~ppc" IUSE="" src_compile() { diff --git a/app-sci/tree-puzzle/tree-puzzle-5.2.ebuild b/app-sci/tree-puzzle/tree-puzzle-5.2.ebuild index e8f6541908af..40adabbf686c 100644 --- a/app-sci/tree-puzzle/tree-puzzle-5.2.ebuild +++ b/app-sci/tree-puzzle/tree-puzzle-5.2.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/tree-puzzle/tree-puzzle-5.2.ebuild,v 1.3 2004/07/23 19:29:26 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/tree-puzzle/tree-puzzle-5.2.ebuild,v 1.4 2004/10/14 15:02:34 ribosome Exp $ + +inherit gcc DESCRIPTION="Maximum likelihood analysis for nucleotide, amino acid, and two-state data." HOMEPAGE="http://www.tree-puzzle.de" @@ -8,14 +10,14 @@ SRC_URI="http://www.tree-puzzle.de/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="x86" IUSE="mpi" DEPEND="virtual/libc mpi? ( sys-cluster/lam-mpi )" pkg_setup () { - use mpi && [ ${CC} = icc ] && die "The parallelized version of tree-puzzle cannot be compiled using icc. + use mpi && [ $(gcc-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\")." }