1 |
commit: 297c25831be85619015cb3f854b757570601bb5e |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 25 19:17:42 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 25 19:18:39 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297c2583 |
7 |
|
8 |
sci-biology/cd-hit: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
sci-biology/cd-hit/Manifest | 3 - |
13 |
sci-biology/cd-hit/cd-hit-4.5.1.ebuild | 42 ---------- |
14 |
sci-biology/cd-hit/cd-hit-4.5.4.ebuild | 43 ---------- |
15 |
sci-biology/cd-hit/cd-hit-4.6.ebuild | 44 ----------- |
16 |
sci-biology/cd-hit/files/4.5.1-gentoo.patch | 85 -------------------- |
17 |
sci-biology/cd-hit/files/4.5.4-gentoo.patch | 98 ----------------------- |
18 |
sci-biology/cd-hit/files/4.6-gentoo.patch | 117 ---------------------------- |
19 |
7 files changed, 432 deletions(-) |
20 |
|
21 |
diff --git a/sci-biology/cd-hit/Manifest b/sci-biology/cd-hit/Manifest |
22 |
index b671c47b32..f2d3e0b6ed 100644 |
23 |
--- a/sci-biology/cd-hit/Manifest |
24 |
+++ b/sci-biology/cd-hit/Manifest |
25 |
@@ -1,4 +1 @@ |
26 |
DIST cd-hit-4.6.6.tar.gz 1152570 SHA256 97946f8ae62c3efa20ad4c527b8ea22200cf1b75c9941fb14de2bdaf1d6910f1 SHA512 8241d6674fb041559792dbbb58c12b41302d2275d3bacb1362946094b48a0b8e1236e71b5dc77d13405220b60f8253e6f996753a8b051995a72c8353d4333c51 WHIRLPOOL 4ee404e34a9c22aef0b809568aa1a7cefcd8d08e4a8c97d1c65b7692ae14b0567e5cc446054083219b56e89895117f69f786e6183f6c67d03d1f8404f7ba9632 |
27 |
-DIST cd-hit-v4.5.1-2011-01-31.tgz 368740 SHA256 c1c3a3a772fc683fec3ff1763fdeec62a0a2a3925124f7a723fe3b271da35281 SHA512 84beba384eb6e9bcf94c7e2ca63f862493fc0d058ad186752524a09016e01274229ca9b7a5275cd5454f54488235a6949e17090ffbf68ff441a613dbe5cf05a8 WHIRLPOOL 698d72f347b92091ade411bdbf540f4b4eeea6c742d3766e891bede7f1aa03024bd2f611a4235a6dec0ed9b9b5e06b3d69a7b8e6a7ab7d8139297b5a8b0da9d2 |
28 |
-DIST cd-hit-v4.5.4-2011-03-07.tgz 370264 SHA256 6de9074fada3c5f8109b670b8bdf96679dab45b841d36270d6c5e61a34284f6a SHA512 a093d15e26d6e226e5b37e43ed36affe58c0ee265bd43fd2098a39eafb54c7154ee1a7585da785324dc57532abe3401d48ad5a4a2de080fa6e1422091083683a WHIRLPOOL 3e2ea2db07ecc553d5f03f13a1092e85211257fb4a681629be0350d9cc3f3cc384d24bdb8b3e31d3f469fbc93070363afee608904b9ce3956ca24a8fa6d4d8e5 |
29 |
-DIST cd-hit-v4.6-2012-04-25.tgz 652228 SHA256 aa91e57bba61f04db39e83cdd6c8cdf082a006ea8c4c818b956b7531e4bcc2e9 SHA512 1004a4190643b6f5f1da067a4b911abc068d0bf7d909edd84f45d5fe9a1b17eb3276c0ddde391cbc5053a9ab979d09cbbe832615b7cce4fc2aeefce1d1bec52c WHIRLPOOL 1c7a50e40e9753c035a2920af09b024e9403f4a7cf1a801b998afd5b64189256857a236439f5b2935603fd4a691a722a9d74c3a373ab66c79faee9d8335834b4 |
30 |
|
31 |
diff --git a/sci-biology/cd-hit/cd-hit-4.5.1.ebuild b/sci-biology/cd-hit/cd-hit-4.5.1.ebuild |
32 |
deleted file mode 100644 |
33 |
index e1eeac9a03..0000000000 |
34 |
--- a/sci-biology/cd-hit/cd-hit-4.5.1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,42 +0,0 @@ |
37 |
-# Copyright 1999-2012 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Id$ |
40 |
- |
41 |
-EAPI=3 |
42 |
- |
43 |
-inherit eutils flag-o-matic toolchain-funcs |
44 |
- |
45 |
-RELDATE="2011-01-31" |
46 |
-RELEASE="${PN}-v${PV}-${RELDATE}" |
47 |
- |
48 |
-DESCRIPTION="Clustering Database at High Identity with Tolerance" |
49 |
-HOMEPAGE="http://weizhong-lab.ucsd.edu/cd-hit/" |
50 |
-SRC_URI="https://cdhit.googlecode.com/files/${RELEASE}.tgz" |
51 |
- |
52 |
-SLOT="0" |
53 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
54 |
-LICENSE="GPL-2" |
55 |
-IUSE="openmp" |
56 |
- |
57 |
-S="${WORKDIR}"/${RELEASE} |
58 |
- |
59 |
-pkg_setup() { |
60 |
- use openmp && ! tc-has-openmp && die "Please switch to an openmp compatible compiler" |
61 |
-} |
62 |
- |
63 |
-src_prepare() { |
64 |
- tc-export CXX |
65 |
- use openmp || append-flags -DNO_OPENMP |
66 |
- epatch "${FILESDIR}"/${PV}-gentoo.patch |
67 |
-} |
68 |
- |
69 |
-src_compile() { |
70 |
- local myconf= |
71 |
- use openmp && myconf="openmp=yes" |
72 |
- emake ${myconf} || die |
73 |
-} |
74 |
- |
75 |
-src_install() { |
76 |
- dobin cd-hit cd-hit-est cd-hit-2d cd-hit-est-2d cd-hit-div *.pl || die |
77 |
- dodoc ChangeLog cdhit-user-guide.pdf || die |
78 |
-} |
79 |
|
80 |
diff --git a/sci-biology/cd-hit/cd-hit-4.5.4.ebuild b/sci-biology/cd-hit/cd-hit-4.5.4.ebuild |
81 |
deleted file mode 100644 |
82 |
index 032aafc43b..0000000000 |
83 |
--- a/sci-biology/cd-hit/cd-hit-4.5.4.ebuild |
84 |
+++ /dev/null |
85 |
@@ -1,43 +0,0 @@ |
86 |
-# Copyright 1999-2012 Gentoo Foundation |
87 |
-# Distributed under the terms of the GNU General Public License v2 |
88 |
-# $Id$ |
89 |
- |
90 |
-EAPI=4 |
91 |
- |
92 |
-inherit eutils flag-o-matic toolchain-funcs |
93 |
- |
94 |
-RELDATE="2011-03-07" |
95 |
-RELEASE="${PN}-v${PV}-${RELDATE}" |
96 |
- |
97 |
-DESCRIPTION="Clustering Database at High Identity with Tolerance" |
98 |
-HOMEPAGE="http://weizhong-lab.ucsd.edu/cd-hit/" |
99 |
-SRC_URI="https://cdhit.googlecode.com/files/${RELEASE}.tgz" |
100 |
- |
101 |
-SLOT="0" |
102 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
103 |
-LICENSE="GPL-2" |
104 |
-IUSE="openmp" |
105 |
- |
106 |
-S="${WORKDIR}"/${RELEASE} |
107 |
- |
108 |
-pkg_setup() { |
109 |
- use openmp && ! tc-has-openmp && die "Please switch to an openmp compatible compiler" |
110 |
-} |
111 |
- |
112 |
-src_prepare() { |
113 |
- tc-export CXX |
114 |
- use openmp || append-flags -DNO_OPENMP |
115 |
- epatch "${FILESDIR}"/${PV}-gentoo.patch |
116 |
-} |
117 |
- |
118 |
-src_compile() { |
119 |
- local myconf= |
120 |
- use openmp && myconf="openmp=yes" |
121 |
- emake ${myconf} |
122 |
-} |
123 |
- |
124 |
-src_install() { |
125 |
- dodir /usr/bin |
126 |
- emake PREFIX="${ED}/usr/bin" install |
127 |
- dodoc ChangeLog cdhit-user-guide.pdf |
128 |
-} |
129 |
|
130 |
diff --git a/sci-biology/cd-hit/cd-hit-4.6.ebuild b/sci-biology/cd-hit/cd-hit-4.6.ebuild |
131 |
deleted file mode 100644 |
132 |
index 73c8e48636..0000000000 |
133 |
--- a/sci-biology/cd-hit/cd-hit-4.6.ebuild |
134 |
+++ /dev/null |
135 |
@@ -1,44 +0,0 @@ |
136 |
-# Copyright 1999-2012 Gentoo Foundation |
137 |
-# Distributed under the terms of the GNU General Public License v2 |
138 |
-# $Id$ |
139 |
- |
140 |
-EAPI=4 |
141 |
- |
142 |
-inherit eutils flag-o-matic toolchain-funcs |
143 |
- |
144 |
-RELDATE="2012-04-25" |
145 |
-RELEASE="${PN}-v${PV}-${RELDATE}" |
146 |
- |
147 |
-DESCRIPTION="Clustering Database at High Identity with Tolerance" |
148 |
-HOMEPAGE="http://weizhong-lab.ucsd.edu/cd-hit/" |
149 |
-SRC_URI="https://cdhit.googlecode.com/files/${RELEASE}.tgz" |
150 |
- |
151 |
-SLOT="0" |
152 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
153 |
-LICENSE="GPL-2" |
154 |
-IUSE="doc openmp" |
155 |
- |
156 |
-S="${WORKDIR}"/${RELEASE} |
157 |
- |
158 |
-pkg_setup() { |
159 |
- use openmp && ! tc-has-openmp && die "Please switch to an openmp compatible compiler" |
160 |
-} |
161 |
- |
162 |
-src_prepare() { |
163 |
- tc-export CXX |
164 |
- use openmp || append-flags -DNO_OPENMP |
165 |
- epatch "${FILESDIR}"/${PV}-gentoo.patch |
166 |
-} |
167 |
- |
168 |
-src_compile() { |
169 |
- local myconf= |
170 |
- use openmp && myconf="openmp=yes" |
171 |
- emake ${myconf} |
172 |
-} |
173 |
- |
174 |
-src_install() { |
175 |
- dodir /usr/bin |
176 |
- emake PREFIX="${ED}/usr/bin" install |
177 |
- dodoc ChangeLog |
178 |
- use doc && dodoc doc/* |
179 |
-} |
180 |
|
181 |
diff --git a/sci-biology/cd-hit/files/4.5.1-gentoo.patch b/sci-biology/cd-hit/files/4.5.1-gentoo.patch |
182 |
deleted file mode 100644 |
183 |
index c3eaf79cc8..0000000000 |
184 |
--- a/sci-biology/cd-hit/files/4.5.1-gentoo.patch |
185 |
+++ /dev/null |
186 |
@@ -1,85 +0,0 @@ |
187 |
-diff --git a/Makefile b/Makefile |
188 |
-index f1eaa26..92d3130 100644 |
189 |
---- a/Makefile |
190 |
-+++ b/Makefile |
191 |
-@@ -10,7 +10,7 @@ CCFLAGS = -O2 -DNO_OPENMP |
192 |
- # in command line: |
193 |
- # make openmp=yes |
194 |
- ifeq ($(openmp),yes) |
195 |
--CCFLAGS = -O2 -fopenmp |
196 |
-+CXXFLAGS += -fopenmp |
197 |
- endif |
198 |
- |
199 |
- # support debugging |
200 |
-@@ -18,16 +18,16 @@ endif |
201 |
- # make debug=yes |
202 |
- # make openmp=yes debug=yes |
203 |
- ifeq ($(debug),yes) |
204 |
--CCFLAGS += -ggdb |
205 |
-+CXXFLAGS += -ggdb |
206 |
- endif |
207 |
- |
208 |
- #LDFLAGS = -static -o |
209 |
--LDFLAGS = -o |
210 |
-+LDFLAGS += -o |
211 |
- |
212 |
- PROGS = cd-hit cd-hit-est cd-hit-2d cd-hit-est-2d cd-hit-div |
213 |
- |
214 |
- .c++.o: |
215 |
-- $(CC) $(CCFLAGS) -c $< |
216 |
-+ $(CXX) $(CXXFLAGS) -c $< |
217 |
- |
218 |
- all: $(PROGS) |
219 |
- |
220 |
-@@ -37,39 +37,39 @@ clean: |
221 |
- # programs |
222 |
- |
223 |
- cd-hit: cdhit-common.o cdhit-utility.o cdhit.o |
224 |
-- $(CC) $(CCFLAGS) cdhit.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit |
225 |
-+ $(CXX) $(CXXFLAGS) cdhit.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit |
226 |
- |
227 |
- cd-hit-2d: cdhit-common.o cdhit-utility.o cdhit-2d.o |
228 |
-- $(CC) $(CCFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-2d |
229 |
-+ $(CXX) $(CXXFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-2d |
230 |
- |
231 |
- cd-hit-est: cdhit-common.o cdhit-utility.o cdhit-est.o |
232 |
-- $(CC) $(CCFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est |
233 |
-+ $(CXX) $(CXXFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est |
234 |
- |
235 |
- cd-hit-est-2d: cdhit-common.o cdhit-utility.o cdhit-est-2d.o |
236 |
-- $(CC) $(CCFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est-2d |
237 |
-+ $(CXX) $(CXXFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est-2d |
238 |
- |
239 |
- cd-hit-div: cdhit-common.o cdhit-utility.o cdhit-div.o |
240 |
-- $(CC) $(CCFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-div |
241 |
-+ $(CXX) $(CXXFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-div |
242 |
- |
243 |
- # objects |
244 |
- cdhit-common.o: cdhit-common.c++ cdhit-common.h |
245 |
-- $(CC) $(CCFLAGS) cdhit-common.c++ -c |
246 |
-+ $(CXX) $(CXXFLAGS) cdhit-common.c++ -c |
247 |
- |
248 |
- cdhit-utility.o: cdhit-utility.c++ cdhit-utility.h |
249 |
-- $(CC) $(CCFLAGS) cdhit-utility.c++ -c |
250 |
-+ $(CXX) $(CXXFLAGS) cdhit-utility.c++ -c |
251 |
- |
252 |
- cdhit.o: cdhit.c++ cdhit-utility.h |
253 |
-- $(CC) $(CCFLAGS) cdhit.c++ -c |
254 |
-+ $(CXX) $(CXXFLAGS) cdhit.c++ -c |
255 |
- |
256 |
- cdhit-2d.o: cdhit-2d.c++ cdhit-utility.h |
257 |
-- $(CC) $(CCFLAGS) cdhit-2d.c++ -c |
258 |
-+ $(CXX) $(CXXFLAGS) cdhit-2d.c++ -c |
259 |
- |
260 |
- cdhit-est.o: cdhit-est.c++ cdhit-utility.h |
261 |
-- $(CC) $(CCFLAGS) cdhit-est.c++ -c |
262 |
-+ $(CXX) $(CXXFLAGS) cdhit-est.c++ -c |
263 |
- |
264 |
- cdhit-est-2d.o: cdhit-est-2d.c++ cdhit-utility.h |
265 |
-- $(CC) $(CCFLAGS) cdhit-est-2d.c++ -c |
266 |
-+ $(CXX) $(CXXFLAGS) cdhit-est-2d.c++ -c |
267 |
- |
268 |
- cdhit-div.o: cdhit-div.c++ cdhit-common.h |
269 |
-- $(CC) $(CCFLAGS) cdhit-div.c++ -c |
270 |
-+ $(CXX) $(CXXFLAGS) cdhit-div.c++ -c |
271 |
- |
272 |
|
273 |
diff --git a/sci-biology/cd-hit/files/4.5.4-gentoo.patch b/sci-biology/cd-hit/files/4.5.4-gentoo.patch |
274 |
deleted file mode 100644 |
275 |
index 5aa9b79e02..0000000000 |
276 |
--- a/sci-biology/cd-hit/files/4.5.4-gentoo.patch |
277 |
+++ /dev/null |
278 |
@@ -1,98 +0,0 @@ |
279 |
- Makefile | 36 ++++++++++++++++++------------------ |
280 |
- 1 files changed, 18 insertions(+), 18 deletions(-) |
281 |
- |
282 |
-diff --git a/Makefile b/Makefile |
283 |
-index e8bac1d..bd31093 100644 |
284 |
---- a/Makefile |
285 |
-+++ b/Makefile |
286 |
-@@ -10,7 +10,7 @@ CCFLAGS = -O2 -DNO_OPENMP |
287 |
- # in command line: |
288 |
- # make openmp=yes |
289 |
- ifeq ($(openmp),yes) |
290 |
--CCFLAGS = -O2 -fopenmp |
291 |
-+CXXFLAGS += -fopenmp |
292 |
- endif |
293 |
- |
294 |
- # support debugging |
295 |
-@@ -18,16 +18,16 @@ endif |
296 |
- # make debug=yes |
297 |
- # make openmp=yes debug=yes |
298 |
- ifeq ($(debug),yes) |
299 |
--CCFLAGS += -ggdb |
300 |
-+CXXFLAGS += -ggdb |
301 |
- endif |
302 |
- |
303 |
- #LDFLAGS = -static -o |
304 |
--LDFLAGS = -o |
305 |
-+LDFLAGS += -o |
306 |
- |
307 |
- PROGS = cd-hit cd-hit-est cd-hit-2d cd-hit-est-2d cd-hit-div cd-hit-454 |
308 |
- |
309 |
- .c++.o: |
310 |
-- $(CC) $(CCFLAGS) -c $< |
311 |
-+ $(CXX) $(CXXFLAGS) -c $< |
312 |
- |
313 |
- all: $(PROGS) |
314 |
- |
315 |
-@@ -37,47 +37,47 @@ clean: |
316 |
- # programs |
317 |
- |
318 |
- cd-hit: cdhit-common.o cdhit-utility.o cdhit.o |
319 |
-- $(CC) $(CCFLAGS) cdhit.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit |
320 |
-+ $(CXX) $(CXXFLAGS) cdhit.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit |
321 |
- |
322 |
- cd-hit-2d: cdhit-common.o cdhit-utility.o cdhit-2d.o |
323 |
-- $(CC) $(CCFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-2d |
324 |
-+ $(CXX) $(CXXFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-2d |
325 |
- |
326 |
- cd-hit-est: cdhit-common.o cdhit-utility.o cdhit-est.o |
327 |
-- $(CC) $(CCFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est |
328 |
-+ $(CXX) $(CXXFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est |
329 |
- |
330 |
- cd-hit-est-2d: cdhit-common.o cdhit-utility.o cdhit-est-2d.o |
331 |
-- $(CC) $(CCFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est-2d |
332 |
-+ $(CXX) $(CXXFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est-2d |
333 |
- |
334 |
- cd-hit-div: cdhit-common.o cdhit-utility.o cdhit-div.o |
335 |
-- $(CC) $(CCFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-div |
336 |
-+ $(CXX) $(CXXFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-div |
337 |
- |
338 |
- cd-hit-454: cdhit-common.o cdhit-utility.o cdhit-454.o |
339 |
-- $(CC) $(CCFLAGS) cdhit-454.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-454 |
340 |
-+ $(CXX) $(CXXFLAGS) cdhit-454.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-454 |
341 |
- |
342 |
- # objects |
343 |
- cdhit-common.o: cdhit-common.c++ cdhit-common.h |
344 |
-- $(CC) $(CCFLAGS) cdhit-common.c++ -c |
345 |
-+ $(CXX) $(CXXFLAGS) cdhit-common.c++ -c |
346 |
- |
347 |
- cdhit-utility.o: cdhit-utility.c++ cdhit-utility.h |
348 |
-- $(CC) $(CCFLAGS) cdhit-utility.c++ -c |
349 |
-+ $(CXX) $(CXXFLAGS) cdhit-utility.c++ -c |
350 |
- |
351 |
- cdhit.o: cdhit.c++ cdhit-utility.h |
352 |
-- $(CC) $(CCFLAGS) cdhit.c++ -c |
353 |
-+ $(CXX) $(CXXFLAGS) cdhit.c++ -c |
354 |
- |
355 |
- cdhit-2d.o: cdhit-2d.c++ cdhit-utility.h |
356 |
-- $(CC) $(CCFLAGS) cdhit-2d.c++ -c |
357 |
-+ $(CXX) $(CXXFLAGS) cdhit-2d.c++ -c |
358 |
- |
359 |
- cdhit-est.o: cdhit-est.c++ cdhit-utility.h |
360 |
-- $(CC) $(CCFLAGS) cdhit-est.c++ -c |
361 |
-+ $(CXX) $(CXXFLAGS) cdhit-est.c++ -c |
362 |
- |
363 |
- cdhit-est-2d.o: cdhit-est-2d.c++ cdhit-utility.h |
364 |
-- $(CC) $(CCFLAGS) cdhit-est-2d.c++ -c |
365 |
-+ $(CXX) $(CXXFLAGS) cdhit-est-2d.c++ -c |
366 |
- |
367 |
- cdhit-div.o: cdhit-div.c++ cdhit-common.h |
368 |
-- $(CC) $(CCFLAGS) cdhit-div.c++ -c |
369 |
-+ $(CXX) $(CXXFLAGS) cdhit-div.c++ -c |
370 |
- |
371 |
- cdhit-454.o: cdhit-454.c++ cdhit-common.h |
372 |
-- $(CC) $(CCFLAGS) cdhit-454.c++ -c |
373 |
-+ $(CXX) $(CXXFLAGS) cdhit-454.c++ -c |
374 |
- |
375 |
- PREFIX ?= /usr/local/bin |
376 |
- |
377 |
|
378 |
diff --git a/sci-biology/cd-hit/files/4.6-gentoo.patch b/sci-biology/cd-hit/files/4.6-gentoo.patch |
379 |
deleted file mode 100644 |
380 |
index 7a376eb8e7..0000000000 |
381 |
--- a/sci-biology/cd-hit/files/4.6-gentoo.patch |
382 |
+++ /dev/null |
383 |
@@ -1,117 +0,0 @@ |
384 |
- Makefile | 47 ++++++++++++++++++++++------------------------- |
385 |
- 1 files changed, 22 insertions(+), 25 deletions(-) |
386 |
- |
387 |
-diff --git a/Makefile b/Makefile |
388 |
-index e9796a1..97dd72b 100644 |
389 |
---- a/Makefile |
390 |
-+++ b/Makefile |
391 |
-@@ -1,16 +1,13 @@ |
392 |
-- |
393 |
--CC = g++ -Wall -ggdb |
394 |
--CC = g++ -pg |
395 |
--CC = g++ |
396 |
-+CXX ?= g++ |
397 |
- |
398 |
- # without OpenMP |
399 |
--CCFLAGS = -DNO_OPENMP |
400 |
-+#CXXFLAGS = -DNO_OPENMP |
401 |
- |
402 |
- # with OpenMP |
403 |
- # in command line: |
404 |
- # make openmp=yes |
405 |
- ifeq ($(openmp),yes) |
406 |
--CCFLAGS = -fopenmp |
407 |
-+CXXFLAGS += -fopenmp |
408 |
- endif |
409 |
- |
410 |
- # support debugging |
411 |
-@@ -18,22 +15,22 @@ endif |
412 |
- # make debug=yes |
413 |
- # make openmp=yes debug=yes |
414 |
- ifeq ($(debug),yes) |
415 |
--CCFLAGS += -ggdb |
416 |
-+CXXFLAGS += |
417 |
- else |
418 |
--CCFLAGS += -O2 |
419 |
-+CXXFLAGS += |
420 |
- endif |
421 |
- |
422 |
- ifdef MAX_SEQ |
423 |
--CCFLAGS += -DMAX_SEQ=$(MAX_SEQ) |
424 |
-+CXXFLAGS += -DMAX_SEQ=$(MAX_SEQ) |
425 |
- endif |
426 |
- |
427 |
- #LDFLAGS = -static -o |
428 |
--LDFLAGS = -o |
429 |
-+#LDFLAGS += -o |
430 |
- |
431 |
- PROGS = cd-hit cd-hit-est cd-hit-2d cd-hit-est-2d cd-hit-div cd-hit-454 |
432 |
- |
433 |
- .c++.o: |
434 |
-- $(CC) $(CCFLAGS) -c $< |
435 |
-+ $(CXX) $(CXXFLAGS) -c $< |
436 |
- |
437 |
- all: $(PROGS) |
438 |
- |
439 |
-@@ -43,47 +40,47 @@ clean: |
440 |
- # programs |
441 |
- |
442 |
- cd-hit: cdhit-common.o cdhit-utility.o cdhit.o |
443 |
-- $(CC) $(CCFLAGS) cdhit.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit |
444 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) cdhit.o cdhit-common.o cdhit-utility.o -o cd-hit |
445 |
- |
446 |
- cd-hit-2d: cdhit-common.o cdhit-utility.o cdhit-2d.o |
447 |
-- $(CC) $(CCFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-2d |
448 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) cdhit-2d.o cdhit-common.o cdhit-utility.o -o cd-hit-2d |
449 |
- |
450 |
- cd-hit-est: cdhit-common.o cdhit-utility.o cdhit-est.o |
451 |
-- $(CC) $(CCFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est |
452 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) cdhit-est.o cdhit-common.o cdhit-utility.o -o cd-hit-est |
453 |
- |
454 |
- cd-hit-est-2d: cdhit-common.o cdhit-utility.o cdhit-est-2d.o |
455 |
-- $(CC) $(CCFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-est-2d |
456 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) cdhit-est-2d.o cdhit-common.o cdhit-utility.o -o cd-hit-est-2d |
457 |
- |
458 |
- cd-hit-div: cdhit-common.o cdhit-utility.o cdhit-div.o |
459 |
-- $(CC) $(CCFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-div |
460 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) cdhit-div.o cdhit-common.o cdhit-utility.o -o cd-hit-div |
461 |
- |
462 |
- cd-hit-454: cdhit-common.o cdhit-utility.o cdhit-454.o |
463 |
-- $(CC) $(CCFLAGS) cdhit-454.o cdhit-common.o cdhit-utility.o $(LDFLAGS) cd-hit-454 |
464 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) cdhit-454.o cdhit-common.o cdhit-utility.o -o cd-hit-454 |
465 |
- |
466 |
- # objects |
467 |
- cdhit-common.o: cdhit-common.c++ cdhit-common.h |
468 |
-- $(CC) $(CCFLAGS) cdhit-common.c++ -c |
469 |
-+ $(CXX) $(CXXFLAGS) cdhit-common.c++ -c |
470 |
- |
471 |
- cdhit-utility.o: cdhit-utility.c++ cdhit-utility.h |
472 |
-- $(CC) $(CCFLAGS) cdhit-utility.c++ -c |
473 |
-+ $(CXX) $(CXXFLAGS) cdhit-utility.c++ -c |
474 |
- |
475 |
- cdhit.o: cdhit.c++ cdhit-utility.h |
476 |
-- $(CC) $(CCFLAGS) cdhit.c++ -c |
477 |
-+ $(CXX) $(CXXFLAGS) cdhit.c++ -c |
478 |
- |
479 |
- cdhit-2d.o: cdhit-2d.c++ cdhit-utility.h |
480 |
-- $(CC) $(CCFLAGS) cdhit-2d.c++ -c |
481 |
-+ $(CXX) $(CXXFLAGS) cdhit-2d.c++ -c |
482 |
- |
483 |
- cdhit-est.o: cdhit-est.c++ cdhit-utility.h |
484 |
-- $(CC) $(CCFLAGS) cdhit-est.c++ -c |
485 |
-+ $(CXX) $(CXXFLAGS) cdhit-est.c++ -c |
486 |
- |
487 |
- cdhit-est-2d.o: cdhit-est-2d.c++ cdhit-utility.h |
488 |
-- $(CC) $(CCFLAGS) cdhit-est-2d.c++ -c |
489 |
-+ $(CXX) $(CXXFLAGS) cdhit-est-2d.c++ -c |
490 |
- |
491 |
- cdhit-div.o: cdhit-div.c++ cdhit-common.h |
492 |
-- $(CC) $(CCFLAGS) cdhit-div.c++ -c |
493 |
-+ $(CXX) $(CXXFLAGS) cdhit-div.c++ -c |
494 |
- |
495 |
- cdhit-454.o: cdhit-454.c++ cdhit-common.h |
496 |
-- $(CC) $(CCFLAGS) cdhit-454.c++ -c |
497 |
-+ $(CXX) $(CXXFLAGS) cdhit-454.c++ -c |
498 |
- |
499 |
- PREFIX ?= /usr/local/bin |
500 |
- |