Added to x86. Use gcc-getCC rather than CC.

diff --git a/app-sci/tree-puzzle/ChangeLog b/app-sci/tree-puzzle/ChangeLog
index 9559494b0261e69efc3a099725518068bdff24e2..c91cf1a84e702ed1ad8062b2b466c93c534f45ae 100644 (file)
--- 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 <ribosome@gentoo.org> 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 <squinky86@gentoo.org> 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 66b62faf0a30dd2e95e7be06664532165fdae5c5..1961ac3b9535dacf27d12728a72386a52125c61d 100644 (file)
--- 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 5b224a63e76a5135e9b17e15d7b51b19d0caa246..f1fcb74ea1731cddfa355bb59c0efd1204dd38fb 100644 (file)
--- 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 e8f6541908afd44aeb6ed9ee6fbb718d341f154d..40adabbf686c3ef97dea107a9e42e94b0a2724b3 100644 (file)
--- 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\")."
 }