1 |
commit: efcfc0c566bab9663adf112beb9f02051a02c91a |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 25 20:00:12 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 25 20:10:09 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efcfc0c5 |
7 |
|
8 |
sci-biology/phyml: Modernise to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
.../phyml/files/phyml-2.4.5-fix-build-system.patch | 67 ++++++++++++++++++++++ |
13 |
...phyml-2.4.5-r2.ebuild => phyml-2.4.5-r3.ebuild} | 17 +++--- |
14 |
2 files changed, 74 insertions(+), 10 deletions(-) |
15 |
|
16 |
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 |
17 |
new file mode 100644 |
18 |
index 0000000000..9b1d9e03ca |
19 |
--- /dev/null |
20 |
+++ b/sci-biology/phyml/files/phyml-2.4.5-fix-build-system.patch |
21 |
@@ -0,0 +1,67 @@ |
22 |
+Fix build system to honour user flags. |
23 |
+ |
24 |
+--- a/Makefile |
25 |
++++ b/Makefile |
26 |
+@@ -1,10 +1,4 @@ |
27 |
+-hello !!! |
28 |
+- |
29 |
+-CC = gcc #cc |
30 |
+-CFLAGS = -O4 -fomit-frame-pointer -Wall -static |
31 |
+-# CFLAGS = -Wall |
32 |
+-# CFLAGS = -g -Wall |
33 |
+-# CFLAGS = -pg -Wall -fprofile-arcs -static |
34 |
++CC ?= gcc |
35 |
+ LIBS = -lm |
36 |
+ |
37 |
+ PROG = PHYML |
38 |
+@@ -23,39 +17,39 @@ |
39 |
+ |
40 |
+ |
41 |
+ $(EXEC) : $(OBJS) |
42 |
+- $(CC) -o $(EXEC) $(OBJS) $(LIBS) $(CFLAGS) |
43 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) $(LIBS) |
44 |
+ |
45 |
+ clean : |
46 |
+ @rm *.o |
47 |
+ ###################################################################################################### |
48 |
+ |
49 |
+ eigen.o : eigen.c eigen.h |
50 |
+- $(CC) $(CFLAGS) $(DFLAG) -c eigen.c |
51 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c eigen.c |
52 |
+ |
53 |
+ simu.o : simu.c simu.h |
54 |
+- $(CC) $(CFLAGS) $(DFLAG) -c simu.c |
55 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c simu.c |
56 |
+ |
57 |
+ lk.o : lk.c lk.h |
58 |
+- $(CC) $(CFLAGS) $(DFLAG) -c lk.c |
59 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c lk.c |
60 |
+ |
61 |
+ utilities.o : utilities.c utilities.h |
62 |
+- $(CC) $(CFLAGS) $(DFLAG) -c utilities.c |
63 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c utilities.c |
64 |
+ |
65 |
+ optimiz.o : optimiz.c optimiz.h |
66 |
+- $(CC) $(CFLAGS) $(DFLAG) -c optimiz.c |
67 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c optimiz.c |
68 |
+ |
69 |
+ bionj.o : bionj.c bionj.h |
70 |
+- $(CC) $(CFLAGS) $(DFLAG) -c bionj.c |
71 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c bionj.c |
72 |
+ |
73 |
+ main.o : main.c |
74 |
+- $(CC) $(CFLAGS) $(DFLAG) -c main.c |
75 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c main.c |
76 |
+ |
77 |
+ models.o : models.c models.h |
78 |
+- $(CC) $(CFLAGS) $(DFLAG) -c models.c |
79 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c models.c |
80 |
+ |
81 |
+ free.o : free.c free.h |
82 |
+- $(CC) $(CFLAGS) $(DFLAG) -c free.c |
83 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c free.c |
84 |
+ |
85 |
+ options.o : options.c options.h |
86 |
+- $(CC) $(CFLAGS) $(DFLAG) -c options.c |
87 |
++ $(CC) $(CFLAGS) $(DFLAG) $(CPPFLAGS) -c options.c |
88 |
+ |
89 |
|
90 |
diff --git a/sci-biology/phyml/phyml-2.4.5-r2.ebuild b/sci-biology/phyml/phyml-2.4.5-r3.ebuild |
91 |
similarity index 65% |
92 |
rename from sci-biology/phyml/phyml-2.4.5-r2.ebuild |
93 |
rename to sci-biology/phyml/phyml-2.4.5-r3.ebuild |
94 |
index 7d9815baa7..37f7aa478e 100644 |
95 |
--- a/sci-biology/phyml/phyml-2.4.5-r2.ebuild |
96 |
+++ b/sci-biology/phyml/phyml-2.4.5-r3.ebuild |
97 |
@@ -1,8 +1,8 @@ |
98 |
-# Copyright 1999-2014 Gentoo Foundation |
99 |
+# Copyright 1999-2017 Gentoo Foundation |
100 |
# Distributed under the terms of the GNU General Public License v2 |
101 |
# $Id$ |
102 |
|
103 |
-EAPI=2 |
104 |
+EAPI=6 |
105 |
|
106 |
inherit toolchain-funcs |
107 |
|
108 |
@@ -19,16 +19,13 @@ IUSE="" |
109 |
|
110 |
S=${WORKDIR}/${MY_P} |
111 |
|
112 |
-src_prepare() { |
113 |
- sed -e 's/^hello !!!//' \ |
114 |
- -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' \ |
115 |
- -i Makefile || die |
116 |
-} |
117 |
+PATCHES=( "${FILESDIR}"/${PN}-2.4.5-fix-build-system.patch ) |
118 |
|
119 |
-src_compile() { |
120 |
- emake -e CC="$(tc-getCC)" || die |
121 |
+src_prepare() { |
122 |
+ default |
123 |
+ tc-export CC |
124 |
} |
125 |
|
126 |
src_install() { |
127 |
- dobin phyml || die |
128 |
+ dobin phyml |
129 |
} |