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

["David Seifert" <soap@gentoo.org>]

commit:     39e97c83356a57c6181602feda6a2da0e1127f6b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 19:57:08 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 19:57:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e97c83

sci-biology/prank: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../prank/files/prank-140603-fix-c++14.patch       |  2 +-
 .../prank/files/prank-140603-makefile.patch        | 28 ++++++++++++++++
 sci-biology/prank/prank-140603-r1.ebuild           | 28 ++++++++++++++++
 sci-biology/prank/prank-140603.ebuild              | 38 ----------------------
 4 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/sci-biology/prank/files/prank-140603-fix-c++14.patch b/sci-biology/prank/files/prank-140603-fix-c++14.patch
index 5779207e294f..211e377d798a 100644
--- a/sci-biology/prank/files/prank-140603-fix-c++14.patch
+++ b/sci-biology/prank/files/prank-140603-fix-c++14.patch
@@ -8,7 +8,7 @@ See also: https://bugs.gentoo.org/show_bug.cgi?id=594060
      else
      {
 -        cout<<"HMModel::alignmentModel: impossible 'as'"<<cout;
-+        cout<<"HMModel::alignmentModel: impossible 'as'"<<bool(cout);
++        cout<<"HMModel::alignmentModel: impossible 'as'";
          exit(-1);
      }
  

diff --git a/sci-biology/prank/files/prank-140603-makefile.patch b/sci-biology/prank/files/prank-140603-makefile.patch
new file mode 100644
index 000000000000..eeb74df89b4c
--- /dev/null
+++ b/sci-biology/prank/files/prank-140603-makefile.patch
@@ -0,0 +1,28 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,14 +4,8 @@
+ 
+ ####### Compiler, tools and options
+ 
+-CC            = gcc
+-CXX           = g++
+-DEFINES       = 
+-CFLAGS        = -m64 -pipe -O3 $(DEFINES)
+-CXXFLAGS      = -m64 -pipe -O3 $(DEFINES)
+-INCPATH       = -I. -I/usr/include
+-LINK          = g++
+-LFLAGS        = -m64
++INCPATH       = $(CPPFLAGS) -I.
++LINK          = $(CXX)
+ LIBS          = $(SUBLIBS)    
+ AR            = ar cqs
+ RANLIB        = 
+@@ -136,7 +130,7 @@
+ all: Makefile $(TARGET) $(MANPAGES)
+ 
+ $(TARGET):  $(OBJECTS)  
+-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
++	$(LINK) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+ 
+ 
+ clean:compiler_clean 

diff --git a/sci-biology/prank/prank-140603-r1.ebuild b/sci-biology/prank/prank-140603-r1.ebuild
new file mode 100644
index 000000000000..9128cf9cf99b
--- /dev/null
+++ b/sci-biology/prank/prank-140603-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Probabilistic Alignment Kit"
+HOMEPAGE="http://wasabiapp.org/software/prank/"
+SRC_URI="http://wasabiapp.org/download/${PN}/${PN}.source.${PV}.tgz"
+S="${WORKDIR}/${PN}-msa/src"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+)
+
+src_configure() {
+	tc-export CXX
+}
+
+src_install() {
+	dobin prank
+}

diff --git a/sci-biology/prank/prank-140603.ebuild b/sci-biology/prank/prank-140603.ebuild
deleted file mode 100644
index a29e425f43bf..000000000000
--- a/sci-biology/prank/prank-140603.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Probabilistic Alignment Kit"
-HOMEPAGE="http://wasabiapp.org/software/prank/"
-SRC_URI="http://wasabiapp.org/download/${PN}/${PN}.source.${PV}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-msa/src"
-PATCHES=( "${FILESDIR}/${PN}-140603-fix-c++14.patch" )
-
-src_prepare() {
-	sed \
-		-e "s/\$(LINK)/& \$(LDFLAGS)/" \
-		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
-		-i Makefile || die
-	default
-}
-
-src_compile() {
-	emake \
-		LINK="$(tc-getCXX)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-}