7 files changed, 10 insertions, 130 deletions
diff --git a/sci-biology/t-coffee/ChangeLog b/sci-biology/t-coffee/ChangeLog
index bb9060a083ae..df5ba4c4bb95 100644
--- a/sci-biology/t-coffee/ChangeLog
+++ b/sci-biology/t-coffee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/t-coffee
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/ChangeLog,v 1.13 2006/03/07 21:41:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/ChangeLog,v 1.14 2006/03/16 21:44:32 ribosome Exp $
+
+  16 Mar 2006; Olivier Fisette <ribosome@gentoo.org> -t-coffee-2.66.ebuild,
+  -t-coffee-3.27.ebuild, t-coffee-3.84.ebuild:
+  Add fno-unit-at-a-time when using GCC 3.4. Removed old versions.
 
 *t-coffee-3.84 (07 Mar 2006)
 
diff --git a/sci-biology/t-coffee/Manifest b/sci-biology/t-coffee/Manifest
index b754f4ffe62c..297447926810 100644
--- a/sci-biology/t-coffee/Manifest
+++ b/sci-biology/t-coffee/Manifest
@@ -1,24 +1,4 @@
-MD5 c98b69307acd74173b921a2370a7b6bd ChangeLog 2036
-RMD160 1d4704a8d0557b33ac1b308af3bd9451ee67a27d ChangeLog 2036
-SHA256 2fe1d37fbcace46053445deb075a3c353a7d97872be7adf6c08cda4f8514f275 ChangeLog 2036
-MD5 ed78ff61d489ff54debcffde53dca64e files/digest-t-coffee-2.66 87
-RMD160 8b79de0ebb8aa0ef3599d00ec4d121b851d45883 files/digest-t-coffee-2.66 87
-SHA256 eb34ae433647fe37de02beb57d10d0918d7c956ef0a936079911acf38971429b files/digest-t-coffee-2.66 87
-MD5 7a6ff5d9984814b20d79e15e0e300b63 files/digest-t-coffee-3.27 87
-RMD160 3d0df800530b88e403ce391f9bc5beb5436cdeca files/digest-t-coffee-3.27 87
-SHA256 8a3e705c3ca5372b211cb0c6fb9c9e6ca1ca5053886f80d539cb6c37a0342bc6 files/digest-t-coffee-3.27 87
+MD5 52b405839be53a3f6165ab9117ed8a4e ChangeLog 2226
 MD5 8663d9c02294b9417b3c82f0e9d3a570 files/digest-t-coffee-3.84 307
-RMD160 e234918666e5de1a15e6a0ccb831d7597608a08a files/digest-t-coffee-3.84 307
-SHA256 6717825503db3a5cc4d64a2506dc81d25498dcc2625f37eb64c8df50c25462f9 files/digest-t-coffee-3.84 307
 MD5 0bbfd32ca9864625c55ab6460dbbd963 metadata.xml 755
-RMD160 ef787b368ef20594ac1af412ab7ded9bd853c90d metadata.xml 755
-SHA256 c8669c3b6b58e9abbb36358b6577c76d595fab96fed1410c41694cff7cbe780a metadata.xml 755
-MD5 6fb318682c83d5a0f5d956f5272a66c6 t-coffee-2.66.ebuild 1142
-RMD160 489854fff502d68e230d5e2bc466a77d6bbad143 t-coffee-2.66.ebuild 1142
-SHA256 b4797a21fb58136b596412e55260aad568541aaef94de015c1c79048e032fa39 t-coffee-2.66.ebuild 1142
-MD5 14f801a8843f6bd12714937cd1b623b2 t-coffee-3.27.ebuild 1735
-RMD160 c1e6a17b069edfb77ceac44cc1740d7083c799e2 t-coffee-3.27.ebuild 1735
-SHA256 97324873d7ce74b289af6bce8f9e7c289a7667a768a7b7329adda475b1161ce9 t-coffee-3.27.ebuild 1735
-MD5 1c8061be4546124e96924f91ceb7c4d1 t-coffee-3.84.ebuild 1736
-RMD160 b9d825b9c3e9323ef38af0536c15a90578cca2e2 t-coffee-3.84.ebuild 1736
-SHA256 0c1e14aa5c9d894446e7599d33cfb9c55c319e1c02f2ece85ebc2f8995d52404 t-coffee-3.84.ebuild 1736
+MD5 fcfdcc954c05b00c91788544059fc109 t-coffee-3.84.ebuild 1815
diff --git a/sci-biology/t-coffee/files/digest-t-coffee-2.66 b/sci-biology/t-coffee/files/digest-t-coffee-2.66
deleted file mode 100644
index ba174557b6a3..000000000000
--- a/sci-biology/t-coffee/files/digest-t-coffee-2.66
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed49db50f3b618b77d719c111f21d915 T-COFFEE_distribution_Version_2.66.tar.gz 1509938
diff --git a/sci-biology/t-coffee/files/digest-t-coffee-3.27 b/sci-biology/t-coffee/files/digest-t-coffee-3.27
deleted file mode 100644
index 2eb2b6698379..000000000000
--- a/sci-biology/t-coffee/files/digest-t-coffee-3.27
+++ /dev/null
@@ -1 +0,0 @@
-MD5 747d907f4b87e07d7b1e670a2b263e23 T-COFFEE_distribution_Version_3.27.tar.gz 1295287
diff --git a/sci-biology/t-coffee/t-coffee-2.66.ebuild b/sci-biology/t-coffee/t-coffee-2.66.ebuild
deleted file mode 100644
index d3fb624c2678..000000000000
--- a/sci-biology/t-coffee/t-coffee-2.66.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/t-coffee-2.66.ebuild,v 1.4 2005/10/17 05:20:43 josejx Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A multiple sequence alignment package"
-HOMEPAGE="http://igs-server.cnrs-mrs.fr/~cnotred/Projects_home_page/t_coffee_home_page.html"
-SRC_URI="http://igs-server.cnrs-mrs.fr/~cnotred/Packages/T-COFFEE_distribution_Version_${PV}.tar.gz"
-LICENSE="t-coffee"
-
-RESTRICT="nomirror"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="ppc x86"
-
-DEPEND="sci-biology/clustalw"
-
-TCDIR="${WORKDIR}/T-COFFEE_distribution_Version_${PV}"
-S=${TCDIR}/t_coffee_source
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	sed -e "s/CC	= cc/CC	= $(tc-getCC) ${CFLAGS}/" -i makefile || die
-}
-
-src_compile() {
-	make all || die
-}
-
-src_install() {
-	cd ${TCDIR}/bin
-	dobin t_coffee
-	insinto /usr/share/${PN}/lib/html
-	doins ${TCDIR}/html/*
-
-	dodoc ${TCDIR}/doc/README4T-COFFEE
-	insinto /usr/share/doc/${PF}
-	doins ${TCDIR}/doc/t_coffee{_doc.{doc,pdf},.pdf}
-	doins ${TCDIR}/doc/*.txt
-
-	insinto /usr/share/${PN}/example
-	doins ${TCDIR}/example/*
-}
diff --git a/sci-biology/t-coffee/t-coffee-3.27.ebuild b/sci-biology/t-coffee/t-coffee-3.27.ebuild
deleted file mode 100644
index 867b7c96652e..000000000000
--- a/sci-biology/t-coffee/t-coffee-3.27.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/t-coffee-3.27.ebuild,v 1.2 2005/12/08 19:48:52 ribosome Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A multiple sequence alignment package"
-LICENSE="t-coffee"
-HOMEPAGE="http://igs-server.cnrs-mrs.fr/~cnotred/Projects_home_page/t_coffee_home_page.html"
-SRC_URI="http://igs-server.cnrs-mrs.fr/~cnotred/Packages/T-COFFEE_distribution_Version_${PV}.tar.gz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~ppc ~x86"
-
-RESTRICT="nomirror"
-
-DEPEND="sci-biology/clustalw"
-
-TCDIR="${WORKDIR}/T-COFFEE_distribution_Version_${PV}"
-S="${TCDIR}/t_coffee_source"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "s/CC	= cc/CC	= $(tc-getCC) ${CFLAGS}/" -i makefile || die \
-		"Failed to patch makefile."
-}
-
-die_compile() {
-	echo
-	eerror "If you experience an internal compiler error (consult the above"
-	eerror "messages), try compiling t-coffee using very modest compiler flags."
-	eerror "See bug #114745 on the Gentoo Bugzilla for more details."
-	die "Compilation failed"
-}
-
-src_compile() {
-	make all || die_compile
-}
-
-src_install() {
-	cd "${TCDIR}"/bin
-	dobin t_coffee || die "Failed to install program."
-	insinto /usr/share/${PN}/lib/html
-	doins ${TCDIR}/html/* || die "Failed to install HTML documentation,"
-
-	dodoc ${TCDIR}/doc/README4T-COFFEE || die \
-		"Failed to install basic documentation."
-	insinto /usr/share/doc/${PF}
-	doins ${TCDIR}/doc/t_coffee{_doc.{doc,pdf},.pdf} || die \
-		"Failed to install manuals and articles."
-	doins ${TCDIR}/doc/*.txt || die "Failed to install documentation."
-
-	insinto /usr/share/${PN}/example
-	doins ${TCDIR}/example/* || die "Failed to install example files."
-}
diff --git a/sci-biology/t-coffee/t-coffee-3.84.ebuild b/sci-biology/t-coffee/t-coffee-3.84.ebuild
index 100840872c61..c3dd1c5ce7ed 100644
--- a/sci-biology/t-coffee/t-coffee-3.84.ebuild
+++ b/sci-biology/t-coffee/t-coffee-3.84.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/t-coffee-3.84.ebuild,v 1.1 2006/03/07 21:41:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/t-coffee-3.84.ebuild,v 1.2 2006/03/16 21:44:32 ribosome Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A multiple sequence alignment package"
 LICENSE="t-coffee"
@@ -36,6 +36,7 @@ die_compile() {
 }
 
 src_compile() {
+	[[ $(gcc-version) == "3.4" ]] && append-flags -fno-unit-at-a-time
 	make all || die_compile
 }