[gentoo-commits] repo/gentoo:master commit in: sci-biology/muscle/files/, sci-biology/muscle/

[David Seifert]

commit:     45c64c3c183dc177c982882b9177abeb0df467dd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 21:40:04 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 21:40:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c64c3c

sci-biology/muscle: Port to EAPI 7

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-biology/muscle/files/3.8.31-make.patch |  6 ++----
 sci-biology/muscle/muscle-3.8.31.ebuild    | 15 +++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/sci-biology/muscle/files/3.8.31-make.patch 
b/sci-biology/muscle/files/3.8.31-make.patch
index 7c0e7308df5..fa3f5c3a014 100644
--- a/sci-biology/muscle/files/3.8.31-make.patch
+++ b/sci-biology/muscle/files/3.8.31-make.patch
@@ -1,7 +1,5 @@
-diff --git a/src/mk b/src/mk
-index 475d25a..d4b7e83 100755
---- a/src/mk
-+++ b/src/mk
+--- a/mk
++++ b/mk
 @@ -5,17 +5,14 @@ ObjNames='aligngivenpath.o aligngivenpathsw.o aligntwomsas.o 
aligntwoprofs.o aln
  rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt
  for CPPName in $CPPNames

diff --git a/sci-biology/muscle/muscle-3.8.31.ebuild 
b/sci-biology/muscle/muscle-3.8.31.ebuild
index 1e62a9d28ee..72c9a2c7e17 100644
--- a/sci-biology/muscle/muscle-3.8.31.ebuild
+++ b/sci-biology/muscle/muscle-3.8.31.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${PN}${PV}_src"
 
@@ -14,19 +14,18 @@ 
SRC_URI="http://www.drive5.com/muscle/downloads${PV}/${MY_P}.tar.gz";
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="!sci-libs/libmuscle"
-DEPEND=""
 
 S="${WORKDIR}"/${PN}${PV}/src
 
-src_prepare() {
-       epatch "${FILESDIR}"/${PV}-make.patch
+PATCHES=( "${FILESDIR}"/${PV}-make.patch )
+
+src_configure() {
        tc-export CXX
 }
 
 src_install() {
-       dobin "${PN}"
+       dobin muscle
        dodoc *.txt
 }