From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 18 Jun 2010 07:55:33 +0000 (+0000)
Subject: Fix installation, #324307
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7cdb4b54ccde89d5330ad5300bd9c0086c3db410;p=gentoo.git

Fix installation, #324307
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/sci-biology/t-coffee/ChangeLog b/sci-biology/t-coffee/ChangeLog
index f76a00ca8a26..c193d433bd28 100644
--- a/sci-biology/t-coffee/ChangeLog
+++ b/sci-biology/t-coffee/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/t-coffee
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/ChangeLog,v 1.41 2010/06/15 13:47:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/ChangeLog,v 1.42 2010/06/18 07:55:33 jlec Exp $
+
+  18 Jun 2010; Justin Lecher <jlec@gentoo.org> t-coffee-8.69.ebuild:
+  Fix installation, #324307
 
 *t-coffee-8.69 (15 Jun 2010)
 
diff --git a/sci-biology/t-coffee/Manifest b/sci-biology/t-coffee/Manifest
index 07e4cbb0261f..b59c3cfb7d74 100644
--- a/sci-biology/t-coffee/Manifest
+++ b/sci-biology/t-coffee/Manifest
@@ -10,13 +10,13 @@ DIST T-COFFEE_distribution_Version_8.69.tar.gz 4112765 RMD160 5a2e7e089a5d2cc536
 EBUILD t-coffee-5.65.ebuild 1999 RMD160 7ae18da2d689343547258b54f1de66f289f47114 SHA1 6518aae4c5e8b9bc55eaff6c0e763ae22995c393 SHA256 25d353182a9e946df52ad7dea404800a169067c77441c8d2456042b0cbea4d25
 EBUILD t-coffee-7.54.ebuild 1857 RMD160 ee23165c9f4e40b608c960d6c14886b1a680a4e6 SHA1 eb77681d7a1facb7fdab7c0ca45fe6dc02b99e61 SHA256 3da47ef23cf41088177fe5c8b90f96627c0f29f777145e79bf28b7aab618f372
 EBUILD t-coffee-8.14.ebuild 1863 RMD160 9dcfe5c6bbd1cf21d9f0ed0c9bae2ffab4816b02 SHA1 67cfd906a72e472fbf83156d0d3ee5371ad8b6b1 SHA256 75e3382c765661e1aca0900fc389a04999b72c08ee650950d5c3c98d3d21378f
-EBUILD t-coffee-8.69.ebuild 2054 RMD160 b3356175d2bee3f6fd1462382a56318ef761a0f5 SHA1 14d55744c4da0a41a131bd9aa8d5dd0214c824e6 SHA256 396a8047dda0d3bc881332be6f92410bf8cbe19833c5758cad5343c9fc746151
-MISC ChangeLog 5578 RMD160 76be18d2a71acb3a2459c19597bf2bec24b08d54 SHA1 2115db9be417cf05b42a6af58c68888469fb320c SHA256 9d59f96ce6fdfe2c5708d8053c433eb0ec5216b2fe927b805d0caeb2b8927bdc
+EBUILD t-coffee-8.69.ebuild 1912 RMD160 12709f2c5d029c95218ad9e365c31460e742e5aa SHA1 e4b058868af8ee3337be9fb330a98320e2d19f5f SHA256 1aaafe514f188dbdabdc9cd88150ba4bde3c1711daef5a76d429d30426522c8f
+MISC ChangeLog 5676 RMD160 62f3d432c3c8803075964f1a5e351862958f2b87 SHA1 fd07de776d29d4b4966e35126d082e80d6a00688 SHA256 a2e2568d924d5ecdde6b000b5e872180d5e5c779ba43684dea1aafedb6d8d55e
 MISC metadata.xml 760 RMD160 b9b95d31917ca092fbc88aaf871ffc6c22746860 SHA1 ee9d60b1947e1fb1542488003713ec1bcf3f3b71 SHA256 9d60cbec2e12219f15e311a1e8cb694b77fd7897c98186be3012f815c0f7bd12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwXhIMACgkQgAnW8HDreRZm7gCeM8fDXAH3x9GFrdR0DmAAlLO9
-xmQAoJvuewrcpje2P3cP6zAnYkyvLNrB
-=L7I/
+iEYEARECAAYFAkwbJnsACgkQgAnW8HDreRachACfYKg1aDSAbSXgp1vTWLhmZgw7
+UoYAoJVcAU8sCCakuPa6baliRD6y4jsW
+=7nHE
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/t-coffee/t-coffee-8.69.ebuild b/sci-biology/t-coffee/t-coffee-8.69.ebuild
index c08ac6cf7813..1f775ef65647 100644
--- a/sci-biology/t-coffee/t-coffee-8.69.ebuild
+++ b/sci-biology/t-coffee/t-coffee-8.69.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/t-coffee-8.69.ebuild,v 1.1 2010/06/15 13:47:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/t-coffee-8.69.ebuild,v 1.2 2010/06/18 07:55:33 jlec Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.tcoffee.org/Packages/T-COFFEE_distribution_Version_${PV}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="examples test"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sci-biology/clustalw"
@@ -48,25 +48,20 @@ src_test() {
 }
 
 src_install() {
-	dobin t_coffee || die "Failed to install program."
+	dobin t_coffee_source/t_coffee || die "Failed to install program."
 
 	insinto /usr/share/${PN}/lib/html
-	doins "${TCDIR}"/html/* \
-		|| die "Failed to install Web interface files."
+	doins html/* || die "Failed to install Web interface files."
 
-	cd "${TCDIR}"/doc
-	dodoc aln_compare.doc.txt seq_reformat.doc.txt \
-			t_coffee_technical.txt t_coffee_tutorial.txt \
-			|| die "Failed to install text documentation."
-
-	dohtml t_coffee_technical.htm t_coffee_tutorial.htm \
-		|| die "Failed to install HTML documentation."
+#	cd IR}"/doc
+	dodoc doc/*.txt || die "Failed to install text documentation."
+	dohtml doc/*.htm || die "Failed to install HTML documentation."
 
 	insinto /usr/share/doc/${PF}
-	doins t_coffee_technical.doc t_coffee_tutorial.doc \
-		|| die "Failed to install DOC documentation."
+	doins doc/*.doc || die "Failed to install DOC documentation."
 
-	insinto /usr/share/${PN}
-	doins -r "${TCDIR}"/example \
-		|| die "Failed to install example files."
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r example || die "Failed to install example files."
+	fi
 }