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

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

[David Seifert]

commit:     2cb7d9aa5e80e00466947ae42c87844d2aea4fba
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 14:14:35 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 14:14:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb7d9aa

sci-biology/sibsim4: Port to EAPI 7

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

 .../sibsim4/files/sibsim4-0.20-makefile.patch      | 26 ++++++++++++++++++++++
 sci-biology/sibsim4/sibsim4-0.20.ebuild            | 19 +++++-----------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/sci-biology/sibsim4/files/sibsim4-0.20-makefile.patch b/sci-biology/sibsim4/files/sibsim4-0.20-makefile.patch
new file mode 100644
index 00000000000..6436747e3dd
--- /dev/null
+++ b/sci-biology/sibsim4/files/sibsim4-0.20-makefile.patch
@@ -0,0 +1,26 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,13 +21,12 @@
+ # to change it to this:
+ # CFLAGS = -Xc
+ 
+-CFLAGS = -std=gnu99 -W -Wall -Wconversion -pedantic $(DEBUG) $(OPT)
++CFLAGS += -std=gnu99 -Wall -Wconversion -pedantic
+ 
+ 
+ # The default is GCC.  On Solaris, you might put:
+ # CC = /opt/SUNWspro/bin/cc
+ 
+-CC = gcc
+ 
+ 
+ # Depending on the compile flags you use, you might need to explicitly use the
+@@ -42,7 +41,7 @@
+ OBJS = sim4b1.o align.o misc.o sim4.init.o
+ 
+ sim4: $(OBJS)
+-	$(CC) -o SIBsim4 $(CFLAGS) $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o SIBsim4 $(OBJS) $(LIBS)
+ 
+ clean:
+ 	rm -f SIBsim4 *.o

diff --git a/sci-biology/sibsim4/sibsim4-0.20.ebuild b/sci-biology/sibsim4/sibsim4-0.20.ebuild
index bf431c66692..679cb462e04 100644
--- a/sci-biology/sibsim4/sibsim4-0.20.ebuild
+++ b/sci-biology/sibsim4/sibsim4-0.20.ebuild
@@ -1,31 +1,22 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="A rewrite and improvement upon sim4, a DNA-mRNA aligner"
 HOMEPAGE="http://sibsim4.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/SIBsim4-${PV}.tar.gz"
+S="${WORKDIR}/SIBsim4-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="amd64 x86"
 
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/SIBsim4-${PV}"
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_prepare() {
-	sed \
-		-e 's/CFLAGS = /CFLAGS +=/' \
-		-e '/^CC/s:=:?=:' \
-		-e '/^OPT/d' \
-		-e "s:-o:${LDFLAGS} -o:g" \
-		-i "${S}/Makefile" || die
+src_configure() {
 	tc-export CC
 }