1 |
commit: 8861bc8d50b8d7d8e090414be4334b7f31594ff6 |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Dec 1 15:52:03 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 2 13:03:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8861bc8d |
7 |
|
8 |
dev-libs/ntl: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
11 |
|
12 |
dev-libs/ntl/Manifest | 2 - |
13 |
dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch | 53 -------- |
14 |
dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch | 151 ----------------------- |
15 |
dev-libs/ntl/files/ntl-5.5.2-shared.patch | 166 -------------------------- |
16 |
dev-libs/ntl/files/ntl-5.5.2-singular.patch | 12 -- |
17 |
dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch | 61 ---------- |
18 |
dev-libs/ntl/files/ntl-6.0.0-singular.patch | 12 -- |
19 |
dev-libs/ntl/ntl-5.5.2.ebuild | 74 ------------ |
20 |
dev-libs/ntl/ntl-6.1.0.ebuild | 74 ------------ |
21 |
9 files changed, 605 deletions(-) |
22 |
|
23 |
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest |
24 |
index 4e3d253ab81..67c718d474d 100644 |
25 |
--- a/dev-libs/ntl/Manifest |
26 |
+++ b/dev-libs/ntl/Manifest |
27 |
@@ -1,5 +1,3 @@ |
28 |
DIST ntl-10.5.0.tar.gz 1278729 SHA256 b90b36c9dd8954c9bc54410b1d57c00be956ae1db5a062945822bbd7a86ab4d2 SHA512 b299dfc29005079470972c2a9ca02acd0ebdbc31ff8923df02f3627dbc66daa0f527226972cef032e1e488c4272554634a96456e94653fdf8b01356160319aa0 WHIRLPOOL 270f76a0088c79b506a1e0bfa12cbe06419bb5c0421e7cdb9fcc3ec2bd6b22b4f4c2468bbe73001090db623e8a662d185e181f4390475513b32a388ecca7c3cc |
29 |
-DIST ntl-5.5.2.tar.gz 707247 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56 SHA512 44892e00051ca743b1184c9ae30e62c8e2605edaa394358979ff990a535993a6f282d882871ca9ebb3c632971f806c41d9b8024c8fb2cc6fa0d22bc26c66db06 WHIRLPOOL 4587463c4b52be721a7feb164fab73341af97c6f451c0bb2fbf675503c8a5262a5d7615d628e97f082dde23ce49db0f0b314c625dae0526bb1abdfc88732896f |
30 |
-DIST ntl-6.1.0.tar.gz 715439 SHA256 e16c30ceef1d47e94b8a37a8c4a1fb58729b8f8449c648e2a96280a3eecf9b6f SHA512 8c013bd4a250c8e29d57864585492be1f392c84356959d8100d5c45b420e411e5cd677524e2d50bbe265dda4c364185395780ba5d8490f6ac46da73c6a9728de WHIRLPOOL cf2a48cfe33cb58d8bda35d4a18d57a20ae23f2ba53f0f757d1bacc58ffa0bfdfd38363db38996e2e4069f5e3f2ad6a3ae9a859437a93404308512652190c765 |
31 |
DIST ntl-9.3.0.tar.gz 888710 SHA256 8f31508a9176b3fc843f08468b1632017f2450677bfd5147ead5136e0f24b68f SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d WHIRLPOOL a1f7cf573d49a277f0b2f1d50d18e66ef83a54430c517fd5d3c75e800216b706e8b5ff10e6ed2dc02b6eb4f9290671b249c67f1937cced96ac987055aaa3ab99 |
32 |
DIST ntl-9.6.4.tar.gz 915256 SHA256 c4a1f015a879b4a20f6b76a98eb6033a7936b0ff3b3f3ca6159d7e7b2afd89eb SHA512 ec8a4deb6996b31140edff978e07844ea8e30327491a6777d3982bffec01599b0cb5cc5dca297c8610ecb7ac9a4eae3407a59736fed840a2415a52a159370868 WHIRLPOOL 31ab69dc19b206868d1a9ac4f3d1cb52180980e751fe1431b738921b3816998797cf33a0ea9db8e1017e4face98efa897a4e42aa5be58365d1bc12e320a34354 |
33 |
|
34 |
diff --git a/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch b/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch |
35 |
deleted file mode 100644 |
36 |
index fafa97356cd..00000000000 |
37 |
--- a/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch |
38 |
+++ /dev/null |
39 |
@@ -1,53 +0,0 @@ |
40 |
---- include/NTL/tools.h.orig 2008-05-06 22:14:06.000000000 +1200 |
41 |
-+++ include/NTL/tools.h 2008-05-06 22:14:23.000000000 +1200 |
42 |
-@@ -249,6 +249,12 @@ |
43 |
- char IntValToChar(long a); |
44 |
- |
45 |
- |
46 |
-+/* |
47 |
-+ This function is not present in vanilla NTL |
48 |
-+ See tools.c for documentation. |
49 |
-+ */ |
50 |
-+void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context); |
51 |
-+ |
52 |
- |
53 |
- void Error(const char *s); |
54 |
- |
55 |
---- src/tools.c.orig 2008-05-06 22:15:32.000000000 +1200 |
56 |
-+++ src/tools.c 2008-05-06 22:15:45.000000000 +1200 |
57 |
-@@ -8,8 +8,35 @@ |
58 |
- NTL_START_IMPL |
59 |
- |
60 |
- |
61 |
-+/* |
62 |
-+ The following code differs from vanilla NTL |
63 |
-+ |
64 |
-+ We add a SetErrorCallbackFunction(). This sets a global callback function _function_, |
65 |
-+ which gets called with parameter _context_ and an error message string whenever Error() |
66 |
-+ gets called. |
67 |
-+ |
68 |
-+ Note that if the custom error handler *returns*, then NTL will dump the error message |
69 |
-+ back to stderr and abort() as it habitually does. |
70 |
-+ |
71 |
-+ -- David Harvey (2008-04-12) |
72 |
-+*/ |
73 |
-+ |
74 |
-+void (*ErrorCallbackFunction)(const char*, void*) = NULL; |
75 |
-+void *ErrorCallbackContext = NULL; |
76 |
-+ |
77 |
-+ |
78 |
-+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context) |
79 |
-+{ |
80 |
-+ ErrorCallbackFunction = function; |
81 |
-+ ErrorCallbackContext = context; |
82 |
-+} |
83 |
-+ |
84 |
-+ |
85 |
- void Error(const char *s) |
86 |
- { |
87 |
-+ if (ErrorCallbackFunction != NULL) |
88 |
-+ ErrorCallbackFunction(s, ErrorCallbackContext); |
89 |
-+ |
90 |
- cerr << s << "\n"; |
91 |
- abort(); |
92 |
- } |
93 |
|
94 |
diff --git a/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch b/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch |
95 |
deleted file mode 100644 |
96 |
index 1420f55f328..00000000000 |
97 |
--- a/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch |
98 |
+++ /dev/null |
99 |
@@ -1,151 +0,0 @@ |
100 |
---- src/DoConfig.orig 2009-05-05 07:46:39.000000000 +0100 |
101 |
-+++ src/DoConfig 2009-08-10 19:24:43.000000000 +0100 |
102 |
-@@ -25,14 +25,16 @@ |
103 |
- 'LDFLAGS_CXX' => '$(LDFLAGS)', |
104 |
- 'LDLIBS' => '-lm', |
105 |
- 'LDLIBS_CXX' => '$(LDLIBS)', |
106 |
-+'PICFLAG' => '-fPIC', |
107 |
- 'CPPFLAGS' => '', |
108 |
- |
109 |
--'DEF_PREFIX' => '/usr/local', |
110 |
-+'DEF_PREFIX' => '/usr', |
111 |
- |
112 |
- 'PREFIX' => '$(DEF_PREFIX)', |
113 |
- 'LIBDIR' => '$(PREFIX)/lib', |
114 |
- 'INCLUDEDIR' => '$(PREFIX)/include', |
115 |
- 'DOCDIR' => '$(PREFIX)/share/doc', |
116 |
-+'SHMAKE' => 'non-gld', |
117 |
- |
118 |
- 'GMP_PREFIX' => '$(DEF_PREFIX)', |
119 |
- 'GMP_INCDIR' => '$(GMP_PREFIX)/include', |
120 |
---- src/mfile.orig 2009-05-05 07:46:39.000000000 +0100 |
121 |
-+++ src/mfile 2009-08-10 20:31:36.000000000 +0100 |
122 |
-@@ -141,6 +146,16 @@ |
123 |
- WIZARD=@{WIZARD} |
124 |
- # Set to off if you want to bypass the wizard; otherwise, set to on. |
125 |
- |
126 |
-+############################################################### |
127 |
-+# |
128 |
-+# New addition for shared library building. With gcc you need to |
129 |
-+# choose the Position Indepent Code flag. You have a choice of |
130 |
-+# -fpic better code but in rare case not available (ppc) |
131 |
-+# -fPIC slightly slower code but guaranted to work anywhere. |
132 |
-+# |
133 |
-+############################################################### |
134 |
-+ |
135 |
-+PICFLAG=@{PICFLAG} |
136 |
- |
137 |
- ################################################################# |
138 |
- # |
139 |
-@@ -173,6 +188,8 @@ |
140 |
- |
141 |
- OBJ=$(O19) |
142 |
- |
143 |
-+SHOBJ=$(subst .o,.lo,$(OBJ)) |
144 |
-+ |
145 |
- # library source files |
146 |
- |
147 |
- |
148 |
-@@ -320,7 +356,7 @@ |
149 |
- LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) |
150 |
- LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX) |
151 |
- |
152 |
-- |
153 |
-+.SUFFIXES: .lo |
154 |
- |
155 |
- # 'make all' does a complete make, including all setup. |
156 |
- # It also creates the file 'all', which means you should |
157 |
-@@ -328,11 +364,11 @@ |
158 |
- # again. |
159 |
- |
160 |
- all: |
161 |
-- make setup1 |
162 |
-- make setup2 |
163 |
-- make setup3 |
164 |
-- make setup4 |
165 |
-- make ntl.a |
166 |
-+ $(MAKE) setup1 |
167 |
-+ $(MAKE) setup2 |
168 |
-+ $(MAKE) setup3 |
169 |
-+ $(MAKE) setup4 |
170 |
-+ $(MAKE) ntl.a |
171 |
- touch all |
172 |
- |
173 |
- |
174 |
-@@ -378,18 +414,31 @@ |
175 |
- lip.o: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h |
176 |
- $(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c |
177 |
- |
178 |
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h |
179 |
-+ $(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo |
180 |
-+ |
181 |
-+ |
182 |
-+ |
183 |
- ctools.o: ctools.c |
184 |
- $(LCOMP) $(COMPILE) ctools.c |
185 |
- |
186 |
-+ctools.lo: ctools.c |
187 |
-+ $(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo |
188 |
-+ |
189 |
- |
190 |
- GetTime.o: GetTime.c |
191 |
- $(LCOMP) $(COMPILE) GetTime.c |
192 |
- |
193 |
-- |
194 |
-+GetTime.lo: GetTime.c |
195 |
-+ $(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo |
196 |
- |
197 |
- .c.o: |
198 |
- $(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $< |
199 |
- |
200 |
-+.c.lo: |
201 |
-+ $(LCOMP) $(COMPILE_CXX) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $< |
202 |
-+ |
203 |
-+ |
204 |
- .c: |
205 |
- @{LSTAT} $(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT |
206 |
- @{LSHAR} $(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR |
207 |
-@@ -403,7 +452,7 @@ |
208 |
- |
209 |
- check: |
210 |
- sh RemoveProg $(PROGS) |
211 |
-- make QuickTest |
212 |
-+ $(MAKE) QuickTest |
213 |
- ./QuickTest |
214 |
- sh RemoveProg QuickTest |
215 |
- sh TestScript |
216 |
-@@ -460,19 +509,18 @@ |
217 |
- # |
218 |
- ################################################################# |
219 |
- |
220 |
--clobber: |
221 |
-+clobber: clean |
222 |
- rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c |
223 |
- rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h |
224 |
-- sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux |
225 |
-- rm -f *.o |
226 |
-- rm -rf small |
227 |
-+ sh RemoveProg $(PROGS) |
228 |
-+ rm -f libntl*.so* |
229 |
- rm -f cfileout mfileout |
230 |
- rm -rf .libs *.lo libntl.la |
231 |
- rm -f all |
232 |
- |
233 |
- clean: |
234 |
- sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux |
235 |
-- rm -f *.o |
236 |
-+ rm -f *.o *.lo |
237 |
- rm -rf small |
238 |
- @{LSHAR} - $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR |
239 |
- |
240 |
-@@ -549,3 +597,10 @@ |
241 |
- |
242 |
- |
243 |
- |
244 |
-+sharedso: DIRNAME $(SHOBJ) |
245 |
-+ $(LINK_CXX) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) |
246 |
-+ ln -s lib`cat DIRNAME`.so libntl.so |
247 |
-+ |
248 |
-+shareddylib: DIRNAME $(SHOBJ) |
249 |
-+ $(LINK_CXX) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) |
250 |
-+ ln -s lib`cat DIRNAME`.dylib libntl.dylib |
251 |
|
252 |
diff --git a/dev-libs/ntl/files/ntl-5.5.2-shared.patch b/dev-libs/ntl/files/ntl-5.5.2-shared.patch |
253 |
deleted file mode 100644 |
254 |
index 1ddd74507cf..00000000000 |
255 |
--- a/dev-libs/ntl/files/ntl-5.5.2-shared.patch |
256 |
+++ /dev/null |
257 |
@@ -1,166 +0,0 @@ |
258 |
---- src/DoConfig.orig 2009-05-05 07:46:39.000000000 +0100 |
259 |
-+++ src/DoConfig 2009-08-10 19:24:43.000000000 +0100 |
260 |
-@@ -25,14 +25,16 @@ |
261 |
- 'LDFLAGS_CXX' => '$(LDFLAGS)', |
262 |
- 'LDLIBS' => '-lm', |
263 |
- 'LDLIBS_CXX' => '$(LDLIBS)', |
264 |
-+'PICFLAG' => '-fPIC', |
265 |
- 'CPPFLAGS' => '', |
266 |
- |
267 |
--'DEF_PREFIX' => '/usr/local', |
268 |
-+'DEF_PREFIX' => '/usr', |
269 |
- |
270 |
- 'PREFIX' => '$(DEF_PREFIX)', |
271 |
- 'LIBDIR' => '$(PREFIX)/lib', |
272 |
- 'INCLUDEDIR' => '$(PREFIX)/include', |
273 |
- 'DOCDIR' => '$(PREFIX)/share/doc', |
274 |
-+'SHMAKE' => 'non-gld', |
275 |
- |
276 |
- 'GMP_PREFIX' => '$(DEF_PREFIX)', |
277 |
- 'GMP_INCDIR' => '$(GMP_PREFIX)/include', |
278 |
-@@ -87,11 +89,6 @@ |
279 |
- |
280 |
- foreach $arg (@ARGV) { |
281 |
- |
282 |
-- if ($arg =~ '-h|help|-help|--help') { |
283 |
-- system("more ../doc/config.txt"); |
284 |
-- exit; |
285 |
-- } |
286 |
-- |
287 |
- if (($name, $val) = ($arg =~ /(.*?)=(.*)/)) { |
288 |
- |
289 |
- if (exists($MakeFlag{$name}) && ($val =~ 'on|off')) { |
290 |
- |
291 |
- |
292 |
- |
293 |
---- src/mfile.orig 2009-05-05 07:46:39.000000000 +0100 |
294 |
-+++ src/mfile 2009-08-10 20:31:36.000000000 +0100 |
295 |
-@@ -141,6 +146,16 @@ |
296 |
- WIZARD=@{WIZARD} |
297 |
- # Set to off if you want to bypass the wizard; otherwise, set to on. |
298 |
- |
299 |
-+############################################################### |
300 |
-+# |
301 |
-+# New addition for shared library building. With gcc you need to |
302 |
-+# choose the Position Indepent Code flag. You have a choice of |
303 |
-+# -fpic better code but in rare case not available (ppc) |
304 |
-+# -fPIC slightly slower code but guaranted to work anywhere. |
305 |
-+# |
306 |
-+############################################################### |
307 |
-+ |
308 |
-+PICFLAG=@{PICFLAG} |
309 |
- |
310 |
- ################################################################# |
311 |
- # |
312 |
-@@ -173,6 +188,8 @@ |
313 |
- |
314 |
- OBJ=$(O19) |
315 |
- |
316 |
-+SHOBJ=$(subst .o,.lo,$(OBJ)) |
317 |
-+ |
318 |
- # library source files |
319 |
- |
320 |
- |
321 |
-@@ -320,7 +356,7 @@ |
322 |
- LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) |
323 |
- LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX) |
324 |
- |
325 |
-- |
326 |
-+.SUFFIXES: .lo |
327 |
- |
328 |
- # 'make all' does a complete make, including all setup. |
329 |
- # It also creates the file 'all', which means you should |
330 |
-@@ -328,11 +364,11 @@ |
331 |
- # again. |
332 |
- |
333 |
- all: |
334 |
-- make setup1 |
335 |
-- make setup2 |
336 |
-- make setup3 |
337 |
-- make setup4 |
338 |
-- make ntl.a |
339 |
-+ $(MAKE) setup1 |
340 |
-+ $(MAKE) setup2 |
341 |
-+ $(MAKE) setup3 |
342 |
-+ $(MAKE) setup4 |
343 |
-+ $(MAKE) ntl.a |
344 |
- touch all |
345 |
- |
346 |
- |
347 |
-@@ -378,18 +414,31 @@ |
348 |
- lip.o: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h |
349 |
- $(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c |
350 |
- |
351 |
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h |
352 |
-+ $(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo |
353 |
-+ |
354 |
-+ |
355 |
-+ |
356 |
- ctools.o: ctools.c |
357 |
- $(LCOMP) $(COMPILE) ctools.c |
358 |
- |
359 |
-+ctools.lo: ctools.c |
360 |
-+ $(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo |
361 |
-+ |
362 |
- |
363 |
- GetTime.o: GetTime.c |
364 |
- $(LCOMP) $(COMPILE) GetTime.c |
365 |
- |
366 |
-- |
367 |
-+GetTime.lo: GetTime.c |
368 |
-+ $(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo |
369 |
- |
370 |
- .c.o: |
371 |
- $(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $< |
372 |
- |
373 |
-+.c.lo: |
374 |
-+ $(LCOMP) $(COMPILE_CXX) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $< |
375 |
-+ |
376 |
-+ |
377 |
- .c: |
378 |
- @{LSTAT} $(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT |
379 |
- @{LSHAR} $(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR |
380 |
-@@ -403,7 +452,7 @@ |
381 |
- |
382 |
- check: |
383 |
- sh RemoveProg $(PROGS) |
384 |
-- make QuickTest |
385 |
-+ $(MAKE) QuickTest |
386 |
- ./QuickTest |
387 |
- sh RemoveProg QuickTest |
388 |
- sh TestScript |
389 |
-@@ -460,19 +509,18 @@ |
390 |
- # |
391 |
- ################################################################# |
392 |
- |
393 |
--clobber: |
394 |
-+clobber: clean |
395 |
- rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c |
396 |
- rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h |
397 |
-- sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux |
398 |
-- rm -f *.o |
399 |
-- rm -rf small |
400 |
-+ sh RemoveProg $(PROGS) |
401 |
-+ rm -f libntl*.so* |
402 |
- rm -f cfileout mfileout |
403 |
- rm -rf .libs *.lo libntl.la |
404 |
- rm -f all |
405 |
- |
406 |
- clean: |
407 |
- sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux |
408 |
-- rm -f *.o |
409 |
-+ rm -f *.o *.lo |
410 |
- rm -rf small |
411 |
- @{LSHAR} - $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR |
412 |
- |
413 |
-@@ -549,3 +597,10 @@ |
414 |
- |
415 |
- |
416 |
- |
417 |
-+sharedso: DIRNAME $(SHOBJ) |
418 |
-+ $(LINK_CXX) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) |
419 |
-+ ln -s lib`cat DIRNAME`.so libntl.so |
420 |
-+ |
421 |
-+shareddylib: DIRNAME $(SHOBJ) |
422 |
-+ $(LINK_CXX) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) |
423 |
-+ ln -s lib`cat DIRNAME`.dylib libntl.dylib |
424 |
|
425 |
diff --git a/dev-libs/ntl/files/ntl-5.5.2-singular.patch b/dev-libs/ntl/files/ntl-5.5.2-singular.patch |
426 |
deleted file mode 100644 |
427 |
index 9f0d13140ce..00000000000 |
428 |
--- a/dev-libs/ntl/files/ntl-5.5.2-singular.patch |
429 |
+++ /dev/null |
430 |
@@ -1,12 +0,0 @@ |
431 |
---- include/NTL/new.h.orig 2008-05-06 21:56:16.000000000 +1200 |
432 |
-+++ include/NTL/new.h 2008-05-06 21:56:33.000000000 +1200 |
433 |
-@@ -12,7 +12,8 @@ |
434 |
- |
435 |
- #include <new> |
436 |
- |
437 |
--#define NTL_NEW_OP new (std::nothrow) |
438 |
-+// uncommenting std::nothrow makes this ntl work properly with Singular |
439 |
-+#define NTL_NEW_OP new //(std::nothrow) |
440 |
- |
441 |
- |
442 |
- #else |
443 |
|
444 |
diff --git a/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch b/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch |
445 |
deleted file mode 100644 |
446 |
index e79731fc2fc..00000000000 |
447 |
--- a/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch |
448 |
+++ /dev/null |
449 |
@@ -1,61 +0,0 @@ |
450 |
---- src.orig/src/tools.c 2012-08-06 11:54:53.652334400 +0200 |
451 |
-+++ src/src/tools.c 2012-08-06 11:59:18.183993600 +0200 |
452 |
-@@ -18,8 +18,35 @@ |
453 |
- void (*ErrorCallback)() = 0; |
454 |
- |
455 |
- |
456 |
-+/* |
457 |
-+ The following code differs from vanilla NTL. |
458 |
-+ |
459 |
-+ We add a SetErrorCallbackFunction(). This sets a global callback function _function_, |
460 |
-+ which gets called with parameter _context_ and an error message string whenever Error() |
461 |
-+ gets called. |
462 |
-+ |
463 |
-+ Note that if the custom error handler *returns*, then NTL will dump the error message |
464 |
-+ back to stderr and abort() as it habitually does. |
465 |
-+ |
466 |
-+ -- David Harvey (2008-04-12) |
467 |
-+*/ |
468 |
-+ |
469 |
-+void (*ErrorCallbackFunction)(const char*, void*) = NULL; |
470 |
-+void *ErrorCallbackContext = NULL; |
471 |
-+ |
472 |
-+ |
473 |
-+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context) |
474 |
-+{ |
475 |
-+ ErrorCallbackFunction = function; |
476 |
-+ ErrorCallbackContext = context; |
477 |
-+} |
478 |
-+ |
479 |
-+ |
480 |
- void Error(const char *s) |
481 |
- { |
482 |
-+ if (ErrorCallbackFunction != NULL) |
483 |
-+ ErrorCallbackFunction(s, ErrorCallbackContext); |
484 |
-+ |
485 |
- cerr << s << "\n"; |
486 |
- _ntl_abort(); |
487 |
- } |
488 |
---- src.orig/include/NTL/tools.h 2012-08-06 11:54:52.830333000 +0200 |
489 |
-+++ src/include/NTL/tools.h 2012-08-06 11:59:18.143993600 +0200 |
490 |
-@@ -10,6 +10,7 @@ |
491 |
- |
492 |
- #include <cstdlib> |
493 |
- #include <cmath> |
494 |
-+#include <cstdio> |
495 |
- #include <iostream> |
496 |
- |
497 |
- #else |
498 |
-@@ -252,6 +253,12 @@ |
499 |
- char IntValToChar(long a); |
500 |
- |
501 |
- |
502 |
-+/* |
503 |
-+ This function is not present in vanilla NTL. |
504 |
-+ See tools.c for documentation. |
505 |
-+ */ |
506 |
-+void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context); |
507 |
-+ |
508 |
- |
509 |
- void Error(const char *s); |
510 |
- |
511 |
|
512 |
diff --git a/dev-libs/ntl/files/ntl-6.0.0-singular.patch b/dev-libs/ntl/files/ntl-6.0.0-singular.patch |
513 |
deleted file mode 100644 |
514 |
index c172386f310..00000000000 |
515 |
--- a/dev-libs/ntl/files/ntl-6.0.0-singular.patch |
516 |
+++ /dev/null |
517 |
@@ -1,12 +0,0 @@ |
518 |
---- src.orig/include/NTL/new.h 2012-08-06 17:12:25.658913083 +0200 |
519 |
-+++ src/include/NTL/new.h 2012-08-06 17:11:15.002915713 +0200 |
520 |
-@@ -12,7 +12,8 @@ |
521 |
- |
522 |
- #include <new> |
523 |
- |
524 |
--#define NTL_NEW_OP new (std::nothrow) |
525 |
-+// commenting std::nothrow makes this ntl work properly with Singular |
526 |
-+#define NTL_NEW_OP new //(std::nothrow) |
527 |
- |
528 |
- |
529 |
- #else |
530 |
|
531 |
diff --git a/dev-libs/ntl/ntl-5.5.2.ebuild b/dev-libs/ntl/ntl-5.5.2.ebuild |
532 |
deleted file mode 100644 |
533 |
index c51e4b8d11d..00000000000 |
534 |
--- a/dev-libs/ntl/ntl-5.5.2.ebuild |
535 |
+++ /dev/null |
536 |
@@ -1,74 +0,0 @@ |
537 |
-# Copyright 1999-2011 Gentoo Foundation |
538 |
-# Distributed under the terms of the GNU General Public License v2 |
539 |
- |
540 |
-EAPI=3 |
541 |
-inherit toolchain-funcs eutils multilib flag-o-matic |
542 |
- |
543 |
-DESCRIPTION="High-performance and portable Number Theory C++ library" |
544 |
-HOMEPAGE="http://shoup.net/ntl/" |
545 |
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz" |
546 |
- |
547 |
-LICENSE="GPL-2" |
548 |
-SLOT="0" |
549 |
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
550 |
-IUSE="doc static-libs test" |
551 |
- |
552 |
-RDEPEND=">=dev-libs/gmp-4.3 |
553 |
- >=dev-libs/gf2x-0.9" |
554 |
-DEPEND="${RDEPEND} |
555 |
- dev-lang/perl" |
556 |
- |
557 |
-S="${WORKDIR}/${P}/src" |
558 |
- |
559 |
-src_prepare() { |
560 |
- # fix parallel make |
561 |
- sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die |
562 |
- cd .. |
563 |
- # enable compatibility with singular |
564 |
- epatch "$FILESDIR/${P}-singular.patch" |
565 |
- # implement a call back framework (submitted upstream) |
566 |
- epatch "$FILESDIR/${P}-sage-tools.patch" |
567 |
- # sanitize the makefile and allow the building of shared library |
568 |
- epatch "$FILESDIR/${P}-shared.patch" |
569 |
- replace-flags -O[3-9] -O2 |
570 |
-} |
571 |
- |
572 |
-src_configure() { |
573 |
- perl DoConfig \ |
574 |
- PREFIX="${EPREFIX}"/usr \ |
575 |
- CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ |
576 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ |
577 |
- AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \ |
578 |
- NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \ |
579 |
- || die "DoConfig failed" |
580 |
-} |
581 |
- |
582 |
-src_compile() { |
583 |
- # split the targets to allow parallel make to run properly |
584 |
- emake setup1 setup2 || die "emake setup failed" |
585 |
- emake setup3 || die "emake setup failed" |
586 |
- sh Wizard on || die "Tuning wizard failed" |
587 |
- if use static-libs || use test; then |
588 |
- emake ntl.a || die "emake static failed" |
589 |
- fi |
590 |
- local trg=so |
591 |
- [[ ${CHOST} == *-darwin* ]] && trg=dylib |
592 |
- emake shared${trg} || die "emake shared failed" |
593 |
-} |
594 |
- |
595 |
-src_install() { |
596 |
- if use static-libs; then |
597 |
- newlib.a ntl.a libntl.a || die "installation of static library failed" |
598 |
- fi |
599 |
- dolib.so lib*$(get_libname) || die "installation of shared library failed" |
600 |
- |
601 |
- cd .. |
602 |
- insinto /usr/include |
603 |
- doins -r include/NTL || die "installation of the headers failed" |
604 |
- |
605 |
- dodoc README |
606 |
- if use doc ; then |
607 |
- dodoc doc/*.txt || die |
608 |
- dohtml doc/* || die |
609 |
- fi |
610 |
-} |
611 |
|
612 |
diff --git a/dev-libs/ntl/ntl-6.1.0.ebuild b/dev-libs/ntl/ntl-6.1.0.ebuild |
613 |
deleted file mode 100644 |
614 |
index d09a697040f..00000000000 |
615 |
--- a/dev-libs/ntl/ntl-6.1.0.ebuild |
616 |
+++ /dev/null |
617 |
@@ -1,74 +0,0 @@ |
618 |
-# Copyright 1999-2014 Gentoo Foundation |
619 |
-# Distributed under the terms of the GNU General Public License v2 |
620 |
- |
621 |
-EAPI=5 |
622 |
-inherit toolchain-funcs eutils multilib flag-o-matic |
623 |
- |
624 |
-DESCRIPTION="High-performance and portable Number Theory C++ library" |
625 |
-HOMEPAGE="http://shoup.net/ntl/" |
626 |
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz" |
627 |
- |
628 |
-LICENSE="GPL-2" |
629 |
-SLOT="0" |
630 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos" |
631 |
-IUSE="doc static-libs test" |
632 |
- |
633 |
-RDEPEND=">=dev-libs/gmp-4.3 |
634 |
- >=dev-libs/gf2x-0.9" |
635 |
-DEPEND="${RDEPEND} |
636 |
- dev-lang/perl" |
637 |
- |
638 |
-S="${WORKDIR}/${P}/src" |
639 |
- |
640 |
-src_prepare() { |
641 |
- # fix parallel make |
642 |
- sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die |
643 |
- cd .. |
644 |
- # enable compatibility with singular |
645 |
- epatch "$FILESDIR/${PN}-6.0.0-singular.patch" |
646 |
- # implement a call back framework (submitted upstream) |
647 |
- epatch "$FILESDIR/${PN}-6.0.0-sage-tools.patch" |
648 |
- # sanitize the makefile and allow the building of shared library |
649 |
- epatch "$FILESDIR/${PN}-5.5.2-shared-r1.patch" |
650 |
- replace-flags -O[3-9] -O2 |
651 |
-} |
652 |
- |
653 |
-src_configure() { |
654 |
- perl DoConfig \ |
655 |
- PREFIX="${EPREFIX}"/usr \ |
656 |
- CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ |
657 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ |
658 |
- AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \ |
659 |
- NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \ |
660 |
- || die "DoConfig failed" |
661 |
-} |
662 |
- |
663 |
-src_compile() { |
664 |
- # split the targets to allow parallel make to run properly |
665 |
- emake setup1 setup2 || die "emake setup failed" |
666 |
- emake setup3 || die "emake setup failed" |
667 |
- sh Wizard on || die "Tuning wizard failed" |
668 |
- if use static-libs || use test; then |
669 |
- emake ntl.a || die "emake static failed" |
670 |
- fi |
671 |
- local trg=so |
672 |
- [[ ${CHOST} == *-darwin* ]] && trg=dylib |
673 |
- emake shared${trg} || die "emake shared failed" |
674 |
-} |
675 |
- |
676 |
-src_install() { |
677 |
- if use static-libs; then |
678 |
- newlib.a ntl.a libntl.a || die "installation of static library failed" |
679 |
- fi |
680 |
- dolib.so lib*$(get_libname) || die "installation of shared library failed" |
681 |
- |
682 |
- cd .. |
683 |
- insinto /usr/include |
684 |
- doins -r include/NTL || die "installation of the headers failed" |
685 |
- |
686 |
- dodoc README |
687 |
- if use doc ; then |
688 |
- dodoc doc/*.txt || die |
689 |
- dohtml doc/* || die |
690 |
- fi |
691 |
-} |