commit: 3151038a1d2b980f87cf46bf6079a119a01ea3cc
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Aug 22 19:37:18 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 19:37:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3151038a
sci-biology/mrbayes: Port to EAPI 8
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-biology/mrbayes/files/mb_readline_312.patch | 20 ++++----------------
sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild | 15 +++++++++------
2 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/sci-biology/mrbayes/files/mb_readline_312.patch
b/sci-biology/mrbayes/files/mb_readline_312.patch
index 2f8bab1e766..d4198670470 100644
--- a/sci-biology/mrbayes/files/mb_readline_312.patch
+++ b/sci-biology/mrbayes/files/mb_readline_312.patch
@@ -1,25 +1,13 @@
-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
+--- a/Makefile
++++ b/Makefile
@@ -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
+--- a/bayes.c
++++ b/bayes.c
@@ -382,9 +382,11 @@
char **readline_completion(const char *text, int start, int stop) {
char **matches = (char **) NULL;
diff --git a/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
b/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
index ecc44fe4345..cee9e0f2d28 100644
--- a/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
+++ b/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
@@ -1,26 +1,29 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Bayesian Inference of Phylogeny"
HOMEPAGE="http://mrbayes.csit.fsu.edu/";
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="debug mpi readline"
DEPEND="
- sys-libs/ncurses:0=
+ sys-libs/ncurses:=
mpi? ( virtual/mpi )
- readline? ( sys-libs/readline:0= )"
+ readline? ( sys-libs/readline:= )
+"
RDEPEND="${DEPEND}"
src_prepare() {
+ default
+
if use mpi; then
sed -e "s:MPI ?= no:MPI=yes:" -i Makefile || die "Patching MPI
support."
fi
@@ -30,7 +33,7 @@ src_prepare() {
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
+ eapply "${FILESDIR}"/mb_readline_312.patch
fi
sed -e 's:-ggdb::g' -i Makefile || die
}
