sci-biology/poa: [QA] Pass AR/RANLIB to build system

Closes: https://bugs.gentoo.org/725324
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: David Seifert <soap@gentoo.org>

2 files changed, 34 insertions, 23 deletions

diff --git a/sci-biology/poa/files/2-respect-flags.patch b/sci-biology/poa/files/poa-2-respect-flags.patch
index bdd638cf64b7..fb01f0b5f934 100644
--- a/sci-biology/poa/files/2-respect-flags.patch
+++ b/sci-biology/poa/files/poa-2-respect-flags.patch
@@ -1,26 +1,38 @@
-diff --git a/Makefile b/Makefile
-index a65bed0..713a7ab 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -26,9 +26,10 @@ LIBOBJECTS= \
+@@ -1,6 +1,3 @@
+-
+-AR=ar rc
+-
+ TARGETS=poa liblpo.a poa_doc libbflag.a
+ 
+ # align_score.c CAN BE USED TO ADD CUSTOMIZED SCORING FUNCTIONS
+@@ -26,9 +23,8 @@
  	stringptr.o
  
  
 -CC = gcc
-+CC ?= gcc
  #CFLAGS= -g -ansi-strict -W -Wall -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
 -CFLAGS= -g -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
-+OPT_CFLAGS = -g
-+CFLAGS= $(OPT_CFLAGS) -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
++CPPFLAGS+= -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
  # -I$(HOME)/lib/include
  # -DREPORT_MAX_ALLOC
  
-@@ -44,7 +45,7 @@ liblpo.a: $(LIBOBJECTS)
+@@ -37,14 +33,14 @@
+ 
+ liblpo.a: $(LIBOBJECTS)
+ 	rm -f $@
+-	$(AR) $@ $(LIBOBJECTS)
+-	ranlib $@
++	$(AR) rc $@ $(LIBOBJECTS)
++	$(RANLIB) $@
+ 
+ 
  
  # NB: LIBRARY MUST FOLLOW OBJECTS OR LINK FAILS WITH UNRESOLVED REFERENCES!!
  poa: $(OBJECTS) liblpo.a
 -	$(CC) -o $@ $(OBJECTS) -lm liblpo.a
-+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lm liblpo.a
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -lm liblpo.a
  
  what:
  	@echo poa: partial-order based sequence alignment program
diff --git a/sci-biology/poa/poa-2-r1.ebuild b/sci-biology/poa/poa-2-r1.ebuild
index 126272f06c60..d87f2a638117 100644
--- a/sci-biology/poa/poa-2-r1.ebuild
+++ b/sci-biology/poa/poa-2-r1.ebuild
@@ -1,9 +1,9 @@
 # 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}V${PV}"
 
@@ -15,31 +15,30 @@ SRC_URI="mirror://sourceforge/poamsa/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-respect-flags.patch
-	epatch "${FILESDIR}"/${P}-fno-common.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	tc-export AR CC RANLIB
 }
 
 src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		OPT_CFLAGS="${CFLAGS}" \
-		poa
+	emake poa
 }
 
 src_install() {
-	dobin "${S}"/poa "${S}"/make_pscores.pl
-	use static-libs && dolib.a "${S}"/liblpo.a
-	dodoc "${S}"/README "${S}"/multidom.*
+	dobin poa make_pscores.pl
+	dodoc README multidom.*
 	insinto /usr/share/poa
-	doins "${S}"/*.mat
+	doins *.mat
 }
 
 pkg_postinst() {
 	elog "poa requires a score matrix as the first argument."
-	elog "This package installs two examples to ${EROOT}usr/share/poa/."
+	elog "This package installs two examples to ${EROOT}/usr/share/poa/."
 }