diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-12-10 19:48:44 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-12-10 19:48:44 +0000 |
commit | d9884b0b6f269f49991fb74967c276299064420d (patch) | |
tree | 9479b078d93d968f2c50e065accdd6d002dc15e5 /sci-biology/fasta | |
parent | sci-libs/ipp: Version BUmp (diff) | |
download | gentoo-2-d9884b0b6f269f49991fb74967c276299064420d.tar.gz gentoo-2-d9884b0b6f269f49991fb74967c276299064420d.tar.bz2 gentoo-2-d9884b0b6f269f49991fb74967c276299064420d.zip |
sci-biology/fasta: Drop hardwired icc support
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sci-biology/fasta')
-rw-r--r-- | sci-biology/fasta/ChangeLog | 8 | ||||
-rw-r--r-- | sci-biology/fasta/fasta-35.4.10.ebuild | 24 | ||||
-rw-r--r-- | sci-biology/fasta/metadata.xml | 16 |
3 files changed, 18 insertions, 30 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/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> - |