4 files changed, 67 insertions, 10 deletions
diff --git a/sci-biology/mummer/ChangeLog b/sci-biology/mummer/ChangeLog
index 1fe4f5bdda5c..25d6a6eaf080 100644
--- a/sci-biology/mummer/ChangeLog
+++ b/sci-biology/mummer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/mummer
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mummer/ChangeLog,v 1.2 2008/06/17 21:14:33 weaver Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mummer/ChangeLog,v 1.3 2009/03/09 15:29:37 weaver Exp $
+
+*mummer-3.21 (09 Mar 2009)
+
+  09 Mar 2009; Andrey Kislyuk <weaver@gentoo.org> mummer-3.20.ebuild,
+  +mummer-3.21.ebuild:
+  Revision bump and QA fixes
 
   17 Jun 2008; weaver <weaver@gentoo.org> ChangeLog:
   Add gcc-4.3 patch, bug 227561, thanks to Marek Miller
diff --git a/sci-biology/mummer/Manifest b/sci-biology/mummer/Manifest
index 78218506cc86..7361b9ad180a 100644
--- a/sci-biology/mummer/Manifest
+++ b/sci-biology/mummer/Manifest
@@ -1,5 +1,7 @@
 AUX mummer-3.20-gcc43.patch 258 RMD160 4d04d0d51ac3a0e5281474acc6ede7f32e332bc1 SHA1 6a1d7928652fc118b11435265d99827836d36d83 SHA256 8496c80683bd938b56bf8308768f56c034a18fd7dbfc30df1a68119e53155134
 DIST MUMmer3.20.tar.gz 3155446 RMD160 7e5fefef359c6a6ee49f2ebf14dc18caa19f48fb SHA1 68d6742de93d8524236ccf538f32ba8bb4edf7cc SHA256 9c7880b4ce25ef3c6bed9ccdc26f1c4d7e74eb0ef1ce403907790c0f96c0f260
-EBUILD mummer-3.20.ebuild 1629 RMD160 ef974af5acfacf48e1792c7847faf4b032f600eb SHA1 f3d9e263c3afc8bb088f4affc4e043c674ffb708 SHA256 22442aa4a2a76c51c45ba8bc3cd47131576fd790d5c526321d2a5fce060fc23e
-MISC ChangeLog 483 RMD160 0268547c312ab2841e33bf8593127395db304468 SHA1 dc4031aad666aa155810d5ac570838b71db8e00e SHA256 6bf0acc58b3e63c65c8f80fb9a5f259fea185027c52ac48efe329d5798ad790e
+DIST MUMmer3.21.tar.gz 3155965 RMD160 3a112ee3bc92c1585d42f4df72751a50548002d1 SHA1 228a5c283bef90d97d90d2dee12dd892a9f54c42 SHA256 7fb1456c8c21eab4913a522e4b79bc5c84b7373feb54614a7003b16d47dc23b8
+EBUILD mummer-3.20.ebuild 1652 RMD160 b9c940ce21c4261675b5c4d9352d5b0f50af9be1 SHA1 32f1b9aa35e76434f04c7ad2306eb4117308440d SHA256 2f783eb332ca6faea8488913a19cc097056576a94e3633c65ca69253d54e7cd9
+EBUILD mummer-3.21.ebuild 1571 RMD160 4957405821d539e1e0989d4f6bb7ff968a9388c9 SHA1 fdbdd764d7327c2ea122f980a3eafde9bacbe657 SHA256 595f3e5b6ae2ad332abe4cdaa1562f1c2d09fdc90528d6815c11c965ee8a8dc4
+MISC ChangeLog 634 RMD160 23c76a1f4a87c76af04b029246a64b5bc9a4876a SHA1 312892fd5f65fdab2f8a71f51e1aa05e5e030e7c SHA256 fc3bbab367a3d1e84af532c0660a70d5da240b5cd89a15bb4f0afc630a46eff1
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
diff --git a/sci-biology/mummer/mummer-3.20.ebuild b/sci-biology/mummer/mummer-3.20.ebuild
index 40ff2524fe30..136a810a7bd8 100644
--- a/sci-biology/mummer/mummer-3.20.ebuild
+++ b/sci-biology/mummer/mummer-3.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mummer/mummer-3.20.ebuild,v 1.3 2008/06/17 18:40:09 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mummer/mummer-3.20.ebuild,v 1.4 2009/03/09 15:29:37 weaver Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 DEPEND=""
 RDEPEND=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
@@ -41,13 +41,13 @@ src_compile() {
 src_install() {
 	dobin nucmer2xfig show-coords mapview show-snps run-mummer{1,3} \
 		exact-tandems promer repeat-match show-aligns gaps mummer \
-		show-tiling mgaps nucmer mummerplot delta-filter combineMUMs aux_bin/*
-	newbin annotate mummer-annotate
+		show-tiling mgaps nucmer mummerplot delta-filter combineMUMs aux_bin/* || die
+	newbin annotate mummer-annotate || die
 
 	insinto /usr/share/${PN}/scripts
 	doins scripts/{*.awk,*.csh,*.pl}
 	insinto /usr/share/${PN}/lib
-	doins scripts/Foundation.pm
+	doins scripts/Foundation.pm || die
 
 	dodoc ACKNOWLEDGEMENTS ChangeLog README
 	insinto /usr/share/doc/${PF}
diff --git a/sci-biology/mummer/mummer-3.21.ebuild b/sci-biology/mummer/mummer-3.21.ebuild
new file mode 100644
index 000000000000..7f0061d50651
--- /dev/null
+++ b/sci-biology/mummer/mummer-3.21.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mummer/mummer-3.21.ebuild,v 1.1 2009/03/09 15:29:37 weaver Exp $
+
+inherit eutils
+
+MY_P="MUMmer${PV}"
+DESCRIPTION="A rapid whole genome aligner"
+HOMEPAGE="http://mummer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mummer/${MY_P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	emake || die "emake failed"
+
+	sed -i -e 's|\($AUX_BIN_DIR = "\).*"|\1/usr/bin"|' \
+		-e 's|\($BIN_DIR = "\).*"|\1/usr/bin"|' \
+		-e 's|\($SCRIPT_DIR = "\).*"|\1/usr/share/'${PN}'/lib"|' \
+		-e 's|\(set bindir = \).*|\1/usr/bin|' \
+		-e 's|\(set scriptdir = \).*|\1/usr/share/'${PN}'/scripts|' \
+		-e 's|\(use lib "\).*"|\1/usr/share/'${PN}'/lib"|' \
+		scripts/* exact-tandems mapview mummerplot nucmer promer run-mummer{1,3} || die "Failed to replace paths"
+	sed -i 's|$bindir/annotate|$bindir/mummer-annotate|' run-mummer1 scripts/run-mummer1.csh
+}
+
+src_install() {
+	dobin nucmer2xfig show-coords mapview show-snps run-mummer{1,3} \
+		exact-tandems promer repeat-match show-aligns gaps mummer \
+		show-tiling mgaps nucmer mummerplot delta-filter combineMUMs aux_bin/* || die
+	newbin annotate mummer-annotate || die
+
+	insinto /usr/share/${PN}/scripts
+	doins scripts/{*.awk,*.csh,*.pl}
+	insinto /usr/share/${PN}/lib
+	doins scripts/Foundation.pm || die
+
+	dodoc ACKNOWLEDGEMENTS ChangeLog README
+	insinto /usr/share/doc/${PF}
+	use doc && doins -r docs
+}