New version. Added readline support.

(Portage version: 2.0.54)

5 files changed, 92 insertions, 1 deletions

diff --git a/sci-biology/mrbayes/ChangeLog b/sci-biology/mrbayes/ChangeLog
index 6c7020b0451c..34dbb3c446f5 100644
--- a/sci-biology/mrbayes/ChangeLog
+++ b/sci-biology/mrbayes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/mrbayes
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mrbayes/ChangeLog,v 1.10 2006/01/09 00:24:50 hparker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mrbayes/ChangeLog,v 1.11 2006/02/03 03:54:56 ribosome Exp $
+
+*mrbayes-3.1.2 (03 Feb 2006)
+
+  03 Feb 2006; Olivier Fisette <ribosome@gentoo.org>
+  +files/mb_readline_312.patch, +mrbayes-3.1.2.ebuild:
+  New version. Added readline support. Thanks to Paul van der Mark for his
+  work on this ebuild.
 
   09 Jan 2006; Homer Parker <hparker@gentoo.org> mrbayes-3.1.1.ebuild:
   Marked ~amd64.
diff --git a/sci-biology/mrbayes/Manifest b/sci-biology/mrbayes/Manifest
index a69e2a5683ca..153f69dfb8bf 100644
--- a/sci-biology/mrbayes/Manifest
+++ b/sci-biology/mrbayes/Manifest
@@ -1,4 +1,6 @@
 MD5 ebe716ebfa4e92c34b04a8cfeeb6e13e ChangeLog 1371
 MD5 633f96bc05400c5b178fdc58853587b5 files/digest-mrbayes-3.1.1 69
+MD5 cb2170ec57c56c01dedb5dee551a5e77 files/digest-mrbayes-3.1.2 65
 MD5 46d1202caca9c2f105090b5cc095f7e9 metadata.xml 817
 MD5 8a687395a16f5a66a06f3b5862caf073 mrbayes-3.1.1.ebuild 816
+MD5 605ba1cc887264e90eedc6102100cc6e mrbayes-3.1.2.ebuild 1132
diff --git a/sci-biology/mrbayes/files/digest-mrbayes-3.1.2 b/sci-biology/mrbayes/files/digest-mrbayes-3.1.2
new file mode 100644
index 000000000000..9cd8138a84ed
--- /dev/null
+++ b/sci-biology/mrbayes/files/digest-mrbayes-3.1.2
@@ -0,0 +1 @@
+MD5 942e4e0a90fa23481bb1f2e0fa0e0d66 mrbayes-3.1.2.tar.gz 545968
diff --git a/sci-biology/mrbayes/files/mb_readline_312.patch b/sci-biology/mrbayes/files/mb_readline_312.patch
new file mode 100644
index 000000000000..2f8bab1e7665
--- /dev/null
+++ b/sci-biology/mrbayes/files/mb_readline_312.patch
@@ -0,0 +1,37 @@
+Index: Makefile
+===================================================================
+RCS file: /cvsroot/mrbayes/mrbayes/Makefile,v
+retrieving revision 3.23
+retrieving revision 3.24
+diff -U2 -r3.23 -r3.24
+--- Makefile	22 Dec 2005 16:13:06 -0000	3.23
++++ Makefile	3 Jan 2006 16:43:13 -0000	3.24
+@@ -50,4 +50,5 @@
+ ifeq  ($(strip $(USEREADLINE)),yes)
+     CFLAGS += -DUSE_READLINE
++#   CFLAGS += -DCOMPLETIONMATCHES
+ 	LIBS += -lncurses -lreadline 
+ endif
+Index: bayes.c
+===================================================================
+RCS file: /cvsroot/mrbayes/mrbayes/bayes.c,v
+retrieving revision 3.39
+retrieving revision 3.40
+diff -U2 -r3.39 -r3.40
+--- bayes.c	23 Dec 2005 16:26:28 -0000	3.39
++++ bayes.c	3 Jan 2006 16:43:13 -0000	3.40
+@@ -382,9 +382,11 @@
+ char **readline_completion(const char *text, int start, int stop) {
+ 	char **matches = (char **) NULL;
+-	
++
++#ifdef COMPLETIONMATCHES	
+ 	if(start == 0)
+-    	matches = rl_completion_matches (text, command_generator);
++    		matches = rl_completion_matches (text, command_generator);
++#endif
+ 
+-  return (matches);	
++	return (matches);	
+ }
+ #endif
diff --git a/sci-biology/mrbayes/mrbayes-3.1.2.ebuild b/sci-biology/mrbayes/mrbayes-3.1.2.ebuild
new file mode 100644
index 000000000000..287a1274aad2
--- /dev/null
+++ b/sci-biology/mrbayes/mrbayes-3.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mrbayes/mrbayes-3.1.2.ebuild,v 1.1 2006/02/03 03:54:56 ribosome Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Bayesian Inference of Phylogeny"
+LICENSE="GPL-2"
+HOMEPAGE="http://mrbayes.csit.fsu.edu/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+IUSE="mpi readline"
+KEYWORDS="~amd64 ~ppc-macos ~x86"
+
+DEPEND="mpi? ( virtual/mpi )
+	readline? ( sys-libs/readline )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e "s:OPTFLAGS ?= -O3:CFLAGS = ${CFLAGS}:" \
+		-e "s:CC = gcc:CC = $(tc-getCC):" \
+		-i Makefile || die "Patching CC/CFLAGS."
+	if use mpi; then
+		sed -e "s:MPI ?= no:MPI=yes:" -i Makefile || die "Patching MPI support."
+	fi
+	if ! use readline; then
+		sed -e "s:USEREADLINE ?= yes:USEREADLINE=no:" \
+			-i Makefile || die "Patching readline support."
+	else
+	        # Only needed for OSX with an old (4.x) version of
+	        # libreadline, but it doesn't hurt for other distributions.
+	        epatch "${FILESDIR}"/mb_readline_312.patch
+	fi
+}
+
+src_compile() {
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	dobin mb || die "Installation failed."
+}