Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/muscle/files/, sci-biology/muscle/
Date: Tue, 27 Oct 2020 21:40:41
Message-Id: 1603834804.45c64c3c183dc177c982882b9177abeb0df467dd.soap@gentoo
1 commit: 45c64c3c183dc177c982882b9177abeb0df467dd
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 27 21:40:04 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 27 21:40:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c64c3c
7
8 sci-biology/muscle: Port to EAPI 7
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.2
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sci-biology/muscle/files/3.8.31-make.patch | 6 ++----
14 sci-biology/muscle/muscle-3.8.31.ebuild | 15 +++++++--------
15 2 files changed, 9 insertions(+), 12 deletions(-)
16
17 diff --git a/sci-biology/muscle/files/3.8.31-make.patch b/sci-biology/muscle/files/3.8.31-make.patch
18 index 7c0e7308df5..fa3f5c3a014 100644
19 --- a/sci-biology/muscle/files/3.8.31-make.patch
20 +++ b/sci-biology/muscle/files/3.8.31-make.patch
21 @@ -1,7 +1,5 @@
22 -diff --git a/src/mk b/src/mk
23 -index 475d25a..d4b7e83 100755
24 ---- a/src/mk
25 -+++ b/src/mk
26 +--- a/mk
27 ++++ b/mk
28 @@ -5,17 +5,14 @@ ObjNames='aligngivenpath.o aligngivenpathsw.o aligntwomsas.o aligntwoprofs.o aln
29 rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt
30 for CPPName in $CPPNames
31
32 diff --git a/sci-biology/muscle/muscle-3.8.31.ebuild b/sci-biology/muscle/muscle-3.8.31.ebuild
33 index 1e62a9d28ee..72c9a2c7e17 100644
34 --- a/sci-biology/muscle/muscle-3.8.31.ebuild
35 +++ b/sci-biology/muscle/muscle-3.8.31.ebuild
36 @@ -1,9 +1,9 @@
37 -# Copyright 1999-2015 Gentoo Foundation
38 +# Copyright 1999-2020 Gentoo Authors
39 # Distributed under the terms of the GNU General Public License v2
40
41 -EAPI=5
42 +EAPI=7
43
44 -inherit eutils toolchain-funcs
45 +inherit toolchain-funcs
46
47 MY_P="${PN}${PV}_src"
48
49 @@ -14,19 +14,18 @@ SRC_URI="http://www.drive5.com/muscle/downloads${PV}/${MY_P}.tar.gz"
50 LICENSE="public-domain"
51 SLOT="0"
52 KEYWORDS="amd64 ppc x86"
53 -IUSE=""
54
55 RDEPEND="!sci-libs/libmuscle"
56 -DEPEND=""
57
58 S="${WORKDIR}"/${PN}${PV}/src
59
60 -src_prepare() {
61 - epatch "${FILESDIR}"/${PV}-make.patch
62 +PATCHES=( "${FILESDIR}"/${PV}-make.patch )
63 +
64 +src_configure() {
65 tc-export CXX
66 }
67
68 src_install() {
69 - dobin "${PN}"
70 + dobin muscle
71 dodoc *.txt
72 }