summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2017-02-25 21:00:12 +0100
committerDavid Seifert <soap@gentoo.org>2017-02-25 21:10:09 +0100
commitefcfc0c566bab9663adf112beb9f02051a02c91a (patch)
tree595dadef472897b69b7c9b26a004e69f4635bbd6 /sci-biology/phyml
parentmedia-gfx/scantailor: Remove 0.9.10 (diff)
downloadgentoo-efcfc0c566bab9663adf112beb9f02051a02c91a.tar.gz
gentoo-efcfc0c566bab9663adf112beb9f02051a02c91a.tar.bz2
gentoo-efcfc0c566bab9663adf112beb9f02051a02c91a.zip
sci-biology/phyml: Modernise to EAPI 6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sci-biology/phyml')
-rw-r--r--sci-biology/phyml/files/phyml-2.4.5-fix-build-system.patch67
-rw-r--r--sci-biology/phyml/phyml-2.4.5-r3.ebuild (renamed from sci-biology/phyml/phyml-2.4.5-r2.ebuild)17
2 files changed, 74 insertions, 10 deletions
diff --git a/sci-biology/phyml/files/phyml-2.4.5-fix-build-system.patch b/sci-biology/phyml/files/phyml-2.4.5-fix-build-system.patch
new file mode 100644
index 00000000000..9b1d9e03ca1
--- /dev/null
+++ b/sci-biology/phyml/files/phyml-2.4.5-fix-build-system.patch
@@ -0,0 +1,67 @@
+Fix build system to honour user flags.
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,4 @@
+-hello !!!
+-
+-CC = gcc #cc
+-CFLAGS = -O4 -fomit-frame-pointer -Wall -static
+-# CFLAGS = -Wall
+-# CFLAGS = -g -Wall
+-# CFLAGS = -pg -Wall -fprofile-arcs -static
++CC ?= gcc
+ LIBS = -lm
+
+ PROG = PHYML
+@@ -23,39 +17,39 @@
+
+
+ $(EXEC) : $(OBJS)
+- $(CC) -o $(EXEC) $(OBJS) $(LIBS) $(CFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) $(LIBS)
+
+ clean :
+ @rm *.o
+ ######################################################################################################
+
+ eigen.o : eigen.c eigen.h
+- $(CC) $(CFLAGS) $(DFLAG) -c eigen.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c eigen.c
+
+ simu.o : simu.c simu.h
+- $(CC) $(CFLAGS) $(DFLAG) -c simu.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c simu.c
+
+ lk.o : lk.c lk.h
+- $(CC) $(CFLAGS) $(DFLAG) -c lk.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c lk.c
+
+ utilities.o : utilities.c utilities.h
+- $(CC) $(CFLAGS) $(DFLAG) -c utilities.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c utilities.c
+
+ optimiz.o : optimiz.c optimiz.h
+- $(CC) $(CFLAGS) $(DFLAG) -c optimiz.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c optimiz.c
+
+ bionj.o : bionj.c bionj.h
+- $(CC) $(CFLAGS) $(DFLAG) -c bionj.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c bionj.c
+
+ main.o : main.c
+- $(CC) $(CFLAGS) $(DFLAG) -c main.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c main.c
+
+ models.o : models.c models.h
+- $(CC) $(CFLAGS) $(DFLAG) -c models.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c models.c
+
+ free.o : free.c free.h
+- $(CC) $(CFLAGS) $(DFLAG) -c free.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c free.c
+
+ options.o : options.c options.h
+- $(CC) $(CFLAGS) $(DFLAG) -c options.c
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c options.c
+
diff --git a/sci-biology/phyml/phyml-2.4.5-r2.ebuild b/sci-biology/phyml/phyml-2.4.5-r3.ebuild
index 7d9815baa78..37f7aa478eb 100644
--- a/sci-biology/phyml/phyml-2.4.5-r2.ebuild
+++ b/sci-biology/phyml/phyml-2.4.5-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=2
+EAPI=6
inherit toolchain-funcs
@@ -19,16 +19,13 @@ IUSE=""
S=${WORKDIR}/${MY_P}
-src_prepare() {
- sed -e 's/^hello !!!//' \
- -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' \
- -i Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.4.5-fix-build-system.patch )
-src_compile() {
- emake -e CC="$(tc-getCC)" || die
+src_prepare() {
+ default
+ tc-export CC
}
src_install() {
- dobin phyml || die
+ dobin phyml
}