1 |
commit: 38b011b475486566ee6ffc203fdc0c17b2cf577c |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 8 21:35:40 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 8 22:16:40 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b011b4 |
7 |
|
8 |
sci-biology/piler: Modernise to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/4165 |
12 |
|
13 |
.../piler/files/piler-1.0-fix-build-system.patch | 34 +++++++++++++++++++ |
14 |
sci-biology/piler/piler-1.0-r1.ebuild | 38 ++++++++++++++++++++++ |
15 |
sci-biology/piler/piler-1.0.ebuild | 35 -------------------- |
16 |
3 files changed, 72 insertions(+), 35 deletions(-) |
17 |
|
18 |
diff --git a/sci-biology/piler/files/piler-1.0-fix-build-system.patch b/sci-biology/piler/files/piler-1.0-fix-build-system.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..78a72f1b485 |
21 |
--- /dev/null |
22 |
+++ b/sci-biology/piler/files/piler-1.0-fix-build-system.patch |
23 |
@@ -0,0 +1,34 @@ |
24 |
+Make build system honour user variables |
25 |
+ |
26 |
+--- a/Makefile |
27 |
++++ b/Makefile |
28 |
+@@ -1,6 +1,4 @@ |
29 |
+-CFLAGS = -O3 -march=pentiumpro -mcpu=pentiumpro -funroll-loops -Winline -DNDEBUG=1 |
30 |
+-LDLIBS = -lm -static |
31 |
+-# LDLIBS = -lm |
32 |
++LDLIBS = -lm |
33 |
+ |
34 |
+ OBJ = .o |
35 |
+ EXE = |
36 |
+@@ -8,18 +6,13 @@ |
37 |
+ RM = rm -f |
38 |
+ CP = cp |
39 |
+ |
40 |
+-GPP = g++ |
41 |
+-LD = $(GPP) $(CFLAGS) |
42 |
+-CPP = $(GPP) -c $(CFLAGS) |
43 |
+-CC = gcc -c $(CFLAGS) |
44 |
+- |
45 |
+ all: piler |
46 |
+ |
47 |
+ CPPSRC = $(sort $(wildcard *.cpp)) |
48 |
+ CPPOBJ = $(subst .cpp,.o,$(CPPSRC)) |
49 |
+ |
50 |
+-$(CPPOBJ): %.o: %.cpp |
51 |
+- $(CPP) $< -o $@ |
52 |
++%.o: %.cpp |
53 |
++ $(CXX) $(CXXFLAGS) -DNDEBUG $(CPPFLAGS) -c $< -o $@ |
54 |
+ |
55 |
+ piler: $(CPPOBJ) |
56 |
+- $(LD) -o piler $(CPPOBJ) $(LDLIBS) |
57 |
++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -o piler $(CPPOBJ) $(LDLIBS) |
58 |
|
59 |
diff --git a/sci-biology/piler/piler-1.0-r1.ebuild b/sci-biology/piler/piler-1.0-r1.ebuild |
60 |
new file mode 100644 |
61 |
index 00000000000..276ee9bc873 |
62 |
--- /dev/null |
63 |
+++ b/sci-biology/piler/piler-1.0-r1.ebuild |
64 |
@@ -0,0 +1,38 @@ |
65 |
+# Copyright 1999-2017 Gentoo Foundation |
66 |
+# Distributed under the terms of the GNU General Public License v2 |
67 |
+ |
68 |
+EAPI=6 |
69 |
+ |
70 |
+inherit toolchain-funcs |
71 |
+ |
72 |
+DESCRIPTION="Analysis of repetitive DNA found in genome sequences" |
73 |
+HOMEPAGE="http://www.drive5.com/piler/" |
74 |
+SRC_URI="http://www.drive5.com/piler/piler_source.tar.gz -> ${P}.tar.gz" |
75 |
+ |
76 |
+LICENSE="public-domain" |
77 |
+SLOT="0" |
78 |
+KEYWORDS="amd64 x86" |
79 |
+IUSE="" |
80 |
+ |
81 |
+DEPEND="" |
82 |
+RDEPEND=" |
83 |
+ || ( |
84 |
+ sci-biology/muscle |
85 |
+ sci-libs/libmuscle |
86 |
+ ) |
87 |
+ sci-biology/pals" |
88 |
+ |
89 |
+S=${WORKDIR} |
90 |
+ |
91 |
+PATCHES=( |
92 |
+ "${FILESDIR}"/${PN}-1.0-fix-build-system.patch |
93 |
+ "${FILESDIR}"/${PN}-1.0-glibc-2.10.patch |
94 |
+) |
95 |
+ |
96 |
+src_configure() { |
97 |
+ tc-export CXX |
98 |
+} |
99 |
+ |
100 |
+src_install() { |
101 |
+ dobin piler |
102 |
+} |
103 |
|
104 |
diff --git a/sci-biology/piler/piler-1.0.ebuild b/sci-biology/piler/piler-1.0.ebuild |
105 |
deleted file mode 100644 |
106 |
index 99894726d3d..00000000000 |
107 |
--- a/sci-biology/piler/piler-1.0.ebuild |
108 |
+++ /dev/null |
109 |
@@ -1,35 +0,0 @@ |
110 |
-# Copyright 1999-2009 Gentoo Foundation |
111 |
-# Distributed under the terms of the GNU General Public License v2 |
112 |
- |
113 |
-EAPI="2" |
114 |
- |
115 |
-inherit eutils toolchain-funcs |
116 |
- |
117 |
-DESCRIPTION="Analysis of repetitive DNA found in genome sequences" |
118 |
-HOMEPAGE="http://www.drive5.com/piler/" |
119 |
-#SRC_URI="http://www.drive5.com/piler/piler_source.tar.gz" |
120 |
-SRC_URI="mirror://gentoo/${P}.tar.gz" |
121 |
- |
122 |
-LICENSE="public-domain" |
123 |
-SLOT="0" |
124 |
-KEYWORDS="amd64 x86" |
125 |
-IUSE="" |
126 |
- |
127 |
-DEPEND="" |
128 |
-RDEPEND="|| ( sci-biology/muscle |
129 |
- sci-libs/libmuscle ) |
130 |
- sci-biology/pals" |
131 |
- |
132 |
-S=${WORKDIR} |
133 |
- |
134 |
-src_prepare() { |
135 |
- epatch "${FILESDIR}"/${P}-glibc-2.10.patch |
136 |
-} |
137 |
- |
138 |
-src_compile() { |
139 |
- emake GPP="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" || die |
140 |
-} |
141 |
- |
142 |
-src_install() { |
143 |
- dobin piler |
144 |
-} |