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

Closes: https://bugs.gentoo.org/725288
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert
2022-07-07 21:56:42 +02:00
parent 016ff7aa63
commit bd2ca3655e
2 changed files with 21 additions and 21 deletions
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=8
inherit java-pkg-opt-2 java-ant-2 toolchain-funcs
@@ -10,6 +10,7 @@ MY_P=${PN}.${PV}
DESCRIPTION="Protein multiple-alignment-based sequence annealing"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="http://baboon.math.berkeley.edu/${PN}/download/${MY_P}.tar.gz"
S="${WORKDIR}/${PN}-align"
LICENSE="GPL-2"
SLOT="0"
@@ -17,9 +18,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="java"
RDEPEND="java? ( >=virtual/jre-1.8:* )"
DEPEND="java? ( >=virtual/jdk-1.8:* )"
S=${WORKDIR}/${PN}-align
BDEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-makefile.patch
@@ -31,8 +30,12 @@ src_prepare() {
java-pkg-opt-2_src_prepare
}
src_configure() {
tc-export CXX
}
src_compile() {
emake -C align CXX="$(tc-getCXX)" OPT_CXXFLAGS="${CXXFLAGS}"
emake -C align
if use java; then
pushd display >/dev/null || die
@@ -46,8 +49,8 @@ src_install() {
dodoc align/{README,PROBCONS.README}
insinto /usr/share/${PN}/examples
doins -r examples/.
insinto /usr/share/${PN}
doins -r examples
if use java; then
java-pkg_newjar display/AmapDisplay.jar amapdisplay.jar
+10 -13
View File
@@ -2,28 +2,25 @@ Respect {CXX,LD}FLAGS
http://bugs.gentoo.org/332009
--- amap-align/align/Makefile
+++ amap-align/align/Makefile
@@ -15,6 +15,8 @@
# c) RELEASE mode
--- a/align/Makefile
+++ b/align/Makefile
@@ -6,7 +6,6 @@
# 1) Choose C++ compiler.
################################################################################
+OPT_CXXFLAGS = -O3 -W -Wall -pedantic -funroll-loops
+
OTHERFLAGS = -DNumInsertStates=1 -DVERSION='"AMAP.2.2"'
-CXX = g++
# debug mode
@@ -26,8 +28,7 @@
################################################################################
# 2) Set C++ flags.
@@ -26,7 +25,7 @@
# release mode
#CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS) -mmmx -msse -msse2 -mfpmath=sse -march=pentium4 -mcpu=pentium4 -funroll-loops -fomit-frame-pointer
-CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS) -funroll-loops
-
+CXXFLAGS = $(OPT_CXXFLAGS) -DNDEBUG $(OTHERFLAGS)
+CXXFLAGS += -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS)
################################################################################
# 3) Dependencies
################################################################################
@@ -38,7 +37,7 @@
all : $(TARGETS)