sci-biology/fasta: Drop hardwired icc support

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 27 insertions, 39 deletions

diff --git a/sci-biology/fasta/ChangeLog b/sci-biology/fasta/ChangeLog
index f7669e9832f7..9c58ea46a232 100644
--- a/sci-biology/fasta/ChangeLog
+++ b/sci-biology/fasta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/fasta
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/fasta/ChangeLog,v 1.7 2011/11/21 15:30:09 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/fasta/ChangeLog,v 1.8 2012/12/10 19:48:44 jlec Exp $
+
+  10 Dec 2012; Justin Lecher <jlec@gentoo.org> fasta-35.4.10.ebuild,
+  metadata.xml:
+  Drop hardwired icc support
 
   21 Nov 2011; Justin Lecher <jlec@gentoo.org> fasta-35.4.10.ebuild:
   keyworded for ~x86-macos ~x64-macos, tested by Johan Hattne #390123
diff --git a/sci-biology/fasta/Manifest b/sci-biology/fasta/Manifest
index e2cdff419afd..55930556e5fe 100644
--- a/sci-biology/fasta/Manifest
+++ b/sci-biology/fasta/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 35.4.10-ldflags.patch 1036 RMD160 49cfa8e067824012b46086e6878699dcadf2938e SHA1 1013030756dfadf0ef9d04305e4500701c9a3561 SHA256 21b6c290ca565c50376da61cd980f21f7a96598ea5da046294321d8d6be5d5fe
-DIST fasta-35.4.10.tar.gz 618971 RMD160 6dc98a555f88cdf1d5033c50cdb37371f868acc8 SHA1 0595d369d7a4a9a9e35d57a77703616c6c9b7d14 SHA256 60616963093784d2e41ff9c125d68d7a43bbe411cdef8dc37ce922b4c3aec758
-EBUILD fasta-35.4.10.ebuild 1643 RMD160 191e9b64ea507c23dbec2bb3e61796095e292286 SHA1 d8abab037659a5bc09dc751ab638c088b8cf83a9 SHA256 b8ed308c5f14531631c85d17a2958b8d003e1680f940cae6c5c0d2d057adfe27
-MISC ChangeLog 1101 RMD160 7ffb845c6c345d95970a87f933febb46e705e3fa SHA1 dbe9bd9000c66dcaf65b9b647a8cf56ae469759b SHA256 80b500547dea243ca557fa6c096c3bed556da4d8b861bd7e093f02341304dd2a
-MISC metadata.xml 382 RMD160 75d40acc3b5a8fb8ea656817aa204cc524ef7059 SHA1 7c7a5b42930a24b3fb2609716b7238ba3193e18d SHA256 2d9cc9ccec1bcd41294ff75ff29b4b449868a1dc2cd763ac28ee946a90611185
+AUX 35.4.10-ldflags.patch 1036 SHA256 21b6c290ca565c50376da61cd980f21f7a96598ea5da046294321d8d6be5d5fe SHA512 8136536c7f9887920a045dbcd04fa9d01dc0a3b22ed0a1771df715e288d6c889d87b0a6d0f52c947b54185f6a5e92fe902316b502074200a13820cac9dfa6594 WHIRLPOOL 35ff6b7fba2b8f16eb51795c48fd1636708155b1ad405be62850def9934a7d7556644ce808360375b4e658098ada81d7d89d2c53eb04f020d4af2aea127c8100
+DIST fasta-35.4.10.tar.gz 618971 SHA256 60616963093784d2e41ff9c125d68d7a43bbe411cdef8dc37ce922b4c3aec758 SHA512 f04268f0eea59cd40985c86597ab68bef40ee28e6ca914a7182c0edfe943ec8fb2a860558f422f210a4c03f3c34f36c677bd3971bc240cb87695826c755f5a47 WHIRLPOOL 87eb008bc507923ceaebe93c5eb2ab367ca184c0fa2304491ba8edf09e5f6eabe16a8823a1b6a11d5157355406157d1c97da9bd1e194dc26709188b995a386ce
+EBUILD fasta-35.4.10.ebuild 1435 SHA256 29715aa9f2596b5ebeaa444b0b11740aca6e26bfbb120146b81a4242d2989f24 SHA512 08a99bf0ebd6ec3c4f13065955533cf27244d19aad7476ac8b09364ce2e7e306f7092b6e22618897a5bb1f2d2fa174fce67f27e4c5305e7d4f4d6d402d9cceb0 WHIRLPOOL d576cd1ccf23b781113a487974f9a37bfc86ec72a20f2344e9b3966141a5c967ecec112dd257a51d6366126b7c5cdcc8c9c03e4671f773360573d0a65f156cef
+MISC ChangeLog 1216 SHA256 ae31345292de5c8204e5ae374e3a6cb8025c04815143762338eaa2c56ea2fe3f SHA512 cca30cd503a98b100d926c0f7a5ba84f3899b071425490ba6dbe9f740461bea3b38f8ee43371fdef072a5b67ca80b3659378da7385e5c8b61b7ffe1178c8b33e WHIRLPOOL 82921ba182082aa34f28dd38e19ef488b46ddea80453a1624f67b55cf92821966f87f500754c92df7572f196ed364796c146bae0268de1fc22c4df00359e6eef
+MISC metadata.xml 314 SHA256 0b3407f27cc0f34c599f9e93093bb2ea5ed80701942f38b327fcf4a71e3593f8 SHA512 c8c9b9bbd59ba0dbae64b994f7c7e7839a5eabdb1eaf1c3b6427271fd3bc048711852b98ee1f041526395ff58c96f4d040c4f2e7c87a8584129991a41a216650 WHIRLPOOL 11286c17eb1013b5fab18034a58dd3c46ae634f17f9c1e89f2783ebc6e39c863c9d864ac303f96e9d4857b1ec2cfdec85741aaf3583ece9fe6846025c456b2ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk7KbocACgkQgAnW8HDreRZE2QCfT3GYpvIG76EOr0IPWPpqETF4
-K9AAn22CZeDAgvCM2f9A2TbcW963xh4r
-=BeLx
+iEYEAREKAAYFAlDGPK4ACgkQgAnW8HDreRZv5gCfdhG81LPhVktam24er87UPjrb
+fgMAoL3JCliShLqMFZl7xNP+StML1m7X
+=0vFk
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/fasta/fasta-35.4.10.ebuild b/sci-biology/fasta/fasta-35.4.10.ebuild
index bcd9ca25cedc..41ebcaa340fa 100644
--- a/sci-biology/fasta/fasta-35.4.10.ebuild
+++ b/sci-biology/fasta/fasta-35.4.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/fasta/fasta-35.4.10.ebuild,v 1.8 2011/11/21 15:30:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/fasta/fasta-35.4.10.ebuild,v 1.9 2012/12/10 19:48:44 jlec Exp $
 
 EAPI="2"
 
@@ -13,23 +13,11 @@ SRC_URI="http://faculty.virginia.edu/wrpearson/${PN}/${PN}3/${P}.tar.gz"
 LICENSE="fasta"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="debug icc sse2 test"
+IUSE="debug sse2 test"
 
-DEPEND="
-	icc? ( dev-lang/icc )
-	test? ( app-shells/tcsh )"
+DEPEND="test? ( app-shells/tcsh )"
 RDEPEND=""
 
-pkg_setup() {
-	if use icc; then
-		elog "Please make your CFLAGS are supported by icc"
-		elog "Either make sure they are set in /etc/make.conf"
-		elog "or run"
-		elog "env CFLAGS="..." emerge fasta"
-		epause 5
-	fi
-}
-
 src_prepare() {
 	CC_ALT=
 	CFLAGS_ALT=
@@ -37,7 +25,7 @@ src_prepare() {
 
 	use debug && append-flags -DDEBUG
 
-	if use icc ; then
+	if [[ $(tc-getCC) == *icc* ]]; then
 		CC_ALT=icc
 		ALT="${ALT}_icc"
 	else
@@ -49,7 +37,7 @@ src_prepare() {
 	if use sse2 ; then
 		ALT="${ALT}_sse2"
 		append-flags -msse2
-		use icc || append-flags -ffast-math
+		[[ $(tc-getCC) == *icc* ]] || append-flags -ffast-math
 	fi
 
 	export CC_ALT="${CC_ALT}"
diff --git a/sci-biology/fasta/metadata.xml b/sci-biology/fasta/metadata.xml
index 7bf7a49aa862..b98c9919d241 100644
--- a/sci-biology/fasta/metadata.xml
+++ b/sci-biology/fasta/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
-	<maintainer>
-		<email>je_fro@gentoo.org</email>
-		<name>Jeff Gardner</name>
-	</maintainer>
-	<longdescription lang="en">
+  <herd>sci-biology</herd>
+  <maintainer>
+    <email>je_fro@gentoo.org</email>
+    <name>Jeff Gardner</name>
+  </maintainer>
+  <longdescription lang="en">
 	</longdescription>
-	<use>
-		<flag name='icc'>Use intel compiler instead of gcc</flag>
-	</use>
 </pkgmetadata>
-