Fix installpath for manpages, #278571

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-biology/mafft/ChangeLog b/sci-biology/mafft/ChangeLog
index a07155e73edb49b536e25dbde075fbe5e8e2e9f7..6de2cb42373bca578520e4fd295e5140dbaa7b1e 100644 (file)
--- a/sci-biology/mafft/ChangeLog
+++ b/sci-biology/mafft/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/mafft
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mafft/ChangeLog,v 1.7 2010/06/15 13:17:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mafft/ChangeLog,v 1.8 2010/06/24 19:30:59 jlec Exp $
+
+  24 Jun 2010; Justin Lecher <jlec@gentoo.org> mafft-6.240-r1.ebuild,
+  mafft-6.707.ebuild, mafft-6.811.ebuild:
+  Fix installpath for manpages, #278571
 
 *mafft-6.811 (15 Jun 2010)
 

diff --git a/sci-biology/mafft/Manifest b/sci-biology/mafft/Manifest
index 465b8b15fd48986b94062e8fad2e8a3f8261d87b..9e610c5ecfc6b74833dab112e29f461d13d8846e 100644 (file)
--- a/sci-biology/mafft/Manifest
+++ b/sci-biology/mafft/Manifest
@@ -6,15 +6,15 @@ AUX mafft-6.240-mktemp.patch 6497 RMD160 ffa5d5889315614fd065e72425b1db3e8272f7b
 DIST mafft-6.240-src.tgz 657197 RMD160 1cb77af7a5a6b9ab818560d9626e746fb7a3b839 SHA1 8fc05350d9dcf8a9f56bdeed20790a4e1f21ceba SHA256 d0183ab1d6a5e0d1132b95cb917fedb3b6dc16c38d3fde35d7140ecdca555e8f
 DIST mafft-6.707-without-extensions-src.tgz 455884 RMD160 6676133b9f50c2037f13f50ea86e9543022028ce SHA1 1dd955255e5572b8c4a0b23c65cea832383b6a97 SHA256 08789aa9351128e32b0003cb524668c3f2e35aec7ea9f834047f0780851989a0
 DIST mafft-6.811-without-extensions-src.tgz 500063 RMD160 1b26aeb742df3bf8ed3849907ca966b1ebd41ebc SHA1 09bc404c1d39609373989faffe9e04b043c2355e SHA256 a99b57444787b2e910b0b56a5cc8c69949dc987b7ff12995650a1dd0be065c43
-EBUILD mafft-6.240-r1.ebuild 910 RMD160 c09e76a79148cd64c8c931e33a9dbf4fdee086b7 SHA1 3de8b46a86dd83496ae1520893a576179b77ddf0 SHA256 45ebb273c1f05c1012a16b79305916792a8dedb42020d1ada18244ea5ea2d6aa
-EBUILD mafft-6.707.ebuild 873 RMD160 5551f700c2d01ea25d1b0074273db8292d22157f SHA1 6d1d10296e13df14ed3db9ae9ded77adbad10ed4 SHA256 fd2c6d4be6a8eb56fed19bfd0fecba8ad41beff499189bd0e0f982eaebe173eb
-EBUILD mafft-6.811.ebuild 1045 RMD160 491da2411ecd105d3b576a2ff87f78d79fd18e89 SHA1 902b6030b177b42491775f283a3a48d65c1f84e3 SHA256 6c603b6fd89a3e05419089c52676b6f4f87bf74871338a5762ec084a62392937
-MISC ChangeLog 1705 RMD160 3aec29961e6d241bc2981887f81c492ad59d4b00 SHA1 4d0e7f4d9f894f9ed2b8a9c87f054812aab62163 SHA256 4a949fdd1d7104e1f3fd200fb361af55312adf1ef3e3aa57abdebb494c1b3c83
+EBUILD mafft-6.240-r1.ebuild 1004 RMD160 b81d375d94b48681a9b08b54d8562b83c2f439ec SHA1 8bcd0b62a3c92b7fcb332496af8d8042324d45ac SHA256 70cb92f9d6a0a9e6dab1e5bae147191ffbe54c4517df9d2efd859cceb6df41e6
+EBUILD mafft-6.707.ebuild 998 RMD160 333ac5159c103cd02417919e95696d34ee23ebce SHA1 9aa1a78f1411f6410ed8dc3bdc6e3b5e926fc5da SHA256 ca548edebc7b720371b27b456d63c806141c2d6337d1436cd973b6c5261581bc
+EBUILD mafft-6.811.ebuild 1144 RMD160 b4412c2e08b2d8dc8571a33b73dcb056e6a09065 SHA1 10b4837c0b8c434c9c6ec7b8b4895c9fbf989023 SHA256 fa189fb0c16f362380026cb5723acd37317f2f5cb807a6e85b72e1b0dff0e4cf
+MISC ChangeLog 1858 RMD160 a8be841ebe741fb76575cdae53f9153012ca64b1 SHA1 afd6d57c8352599519c67b8c7737caf1b280e637 SHA256 bd7c9b26a1d3a03d1637347ac30e821fd1acee2e722705576aa18bc12abf23d1
 MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwXfVQACgkQgAnW8HDreRYqtgCgio15P2ZtblpM3MudSoGPimoH
-0s4Ani2O54CA4qBpfDWS3s01jeW/sID2
-=G0+h
+iEYEARECAAYFAkwjsnkACgkQgAnW8HDreRbumACfcAlu2pxCt3b+SoJ93i+eC6Iq
+TAcAn2BF7xIgJhvgoom9l9b506lFvHVl
+=KxnM
 -----END PGP SIGNATURE-----

diff --git a/sci-biology/mafft/mafft-6.240-r1.ebuild b/sci-biology/mafft/mafft-6.240-r1.ebuild
index 1dcb22d040432883599aee213d1cfcbb33092420..781407badf3b23d14e6f8e4e30ad907189a4a11a 100644 (file)
--- a/sci-biology/mafft/mafft-6.240-r1.ebuild
+++ b/sci-biology/mafft/mafft-6.240-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mafft/mafft-6.240-r1.ebuild,v 1.3 2009/07/27 04:23:06 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mafft/mafft-6.240-r1.ebuild,v 1.4 2010/06/24 19:30:59 jlec Exp $
 
 inherit toolchain-funcs multilib eutils
 
@@ -18,6 +18,7 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/${P}-mktemp.patch
+       sed -i -e "s/(PREFIX)\/man/(PREFIX)\/share\/man/" "${S}"/core/Makefile || die "sed failed"
 }
 
 src_compile() {
@@ -33,5 +34,5 @@ src_install() {
        pushd src
        emake PREFIX="${D}usr/$(get_libdir)/${PN}" install || die "install failed"
        popd
-       dodoc readme
+       dodoc readme || die
 }

diff --git a/sci-biology/mafft/mafft-6.707.ebuild b/sci-biology/mafft/mafft-6.707.ebuild
index 88edc2707fb23393455c02afc553f8ff2289a1af..eb4dcb75ad2ada75359050a4d52f65a1dc68f573 100644 (file)
--- a/sci-biology/mafft/mafft-6.707.ebuild
+++ b/sci-biology/mafft/mafft-6.707.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mafft/mafft-6.707.ebuild,v 1.1 2009/07/27 05:53:45 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mafft/mafft-6.707.ebuild,v 1.2 2010/06/24 19:30:59 jlec Exp $
 
 inherit toolchain-funcs multilib eutils
 
@@ -17,6 +17,11 @@ RDEPEND=""
 DEPEND="${RDEPEND}"
 S=${WORKDIR}/${P}${EXTENSIONS}
 
+src_unpack() {
+       unpack ${A}
+       sed -i -e "s/(PREFIX)\/man/(PREFIX)\/share\/man/" "${S}"/core/Makefile || die "sed failed"
+}
+
 src_compile() {
        pushd core
        emake \
@@ -31,5 +36,5 @@ src_install() {
        pushd core
        emake PREFIX="${D}usr" install || die "install failed"
        popd
-       dodoc readme
+       dodoc readme || die
 }

diff --git a/sci-biology/mafft/mafft-6.811.ebuild b/sci-biology/mafft/mafft-6.811.ebuild
index 6b4aa944516b7adbe97aff7caa100a8746558f60..2a24ab1e3d65d842dfe98b3eeebf157d39f4fcb2 100644 (file)
--- a/sci-biology/mafft/mafft-6.811.ebuild
+++ b/sci-biology/mafft/mafft-6.811.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/mafft/mafft-6.811.ebuild,v 1.1 2010/06/15 13:17:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mafft/mafft-6.811.ebuild,v 1.2 2010/06/24 19:30:59 jlec Exp $
 
 EAPI="3"
 
@@ -23,6 +23,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PV}-respect.patch
        use threads && append-flags -Denablemultithread
        sed "s:GENTOOLIBDIR:$(get_libdir):g" -i core/Makefile
+       sed -i -e "s/(PREFIX)\/man/(PREFIX)\/share\/man/" "${S}"/core/Makefile || die "sed failed"
 }
 
 src_compile() {
@@ -39,5 +40,5 @@ src_install() {
        pushd core
        emake PREFIX="${ED}usr" install || die "install failed"
        popd
-       dodoc readme
+       dodoc readme || die
 }