From 4cd2370bed609c118b6edfde5d3f116e5c35b897 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 3 Dec 2017 16:17:22 +0000
Subject: gentoo resync : 03.12.2017

---
 dev-libs/ntl/Manifest                         |  10 --
 dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch |  53 --------
 dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch  | 151 -----------------------
 dev-libs/ntl/files/ntl-5.5.2-shared.patch     | 166 --------------------------
 dev-libs/ntl/files/ntl-5.5.2-singular.patch   |  12 --
 dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch |  61 ----------
 dev-libs/ntl/files/ntl-6.0.0-singular.patch   |  12 --
 dev-libs/ntl/ntl-5.5.2.ebuild                 |  74 ------------
 dev-libs/ntl/ntl-6.1.0.ebuild                 |  74 ------------
 9 files changed, 613 deletions(-)
 delete mode 100644 dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch
 delete mode 100644 dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch
 delete mode 100644 dev-libs/ntl/files/ntl-5.5.2-shared.patch
 delete mode 100644 dev-libs/ntl/files/ntl-5.5.2-singular.patch
 delete mode 100644 dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch
 delete mode 100644 dev-libs/ntl/files/ntl-6.0.0-singular.patch
 delete mode 100644 dev-libs/ntl/ntl-5.5.2.ebuild
 delete mode 100644 dev-libs/ntl/ntl-6.1.0.ebuild

(limited to 'dev-libs/ntl')

diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 05d7c20b47a1..eef71014b9a4 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,20 +1,10 @@
-AUX ntl-5.5.2-sage-tools.patch 1411 BLAKE2B 677c48d28ab2973b1e01d71c32490baec02e522413ca8d48c4c4733370e371051b530ca74adaf254c676f68c70ccc03fe7c6404471fe27454d786d209536808c SHA512 cf1d19629061e4495f24b0726d7480aa7bb23e9c00d80e66f034f82831d19adfee9dce94412494a12c033144d016074126ec8b23064766b0c6dd478a6a74e00d
-AUX ntl-5.5.2-shared-r1.patch 4070 BLAKE2B ae5768d844e64ad2ce4a76846c00edb0a530b471d27772918b89d1ef7640627ab0e515c0de7d65d6456f4983e60bf7b31045bdb332956cf77b8edf2c0d156913 SHA512 7e692fc4ee66d0b6a3e542627e438018f067c3a512d19e241085da630fe7203d258d01e647b5a00d8e3f85abe95e5169a903a51795151b6fce41630a8856d23e
-AUX ntl-5.5.2-shared.patch 4343 BLAKE2B 5fa64ea5499fa3cd5ba52b7be2f7100fd103a0f43839936134bbbebbbc3829fa26a0d37be4b0bf4794a4e610a447d7ce19902c19f18b2ec5f8a3826bcdaab1f5 SHA512 e3f6c49a62c753e97f1606f90be13edfe997dcb1aec9df11ceb9efbfc14b7ec43d916f3f90ae687634b8672d16c9dad225ba7911ec8de761637d249d57611541
-AUX ntl-5.5.2-singular.patch 324 BLAKE2B 923f6946b2bfdf9f23b913b239a8fdaa8c8b9812b9c15de060df2e8c1851a4ff52c88ae3722cd274bb6e37864f8bdcc4dc26ab5d514ebf40b541c777be1fe4f4 SHA512 8b62628b352ca8b15e894461c70a14b4d8ac87781d7bffaa2953d2ae3acca4a9a223d51da40ac76e553d0ea9a2ee1ea1a7c8c221a5e009771774e0ce7a50da95
-AUX ntl-6.0.0-sage-tools.patch 1557 BLAKE2B 8232dcc3fc30ce747b1222159e27a3f787c54164369ec8ad7402e50ece6bf7ffc907f75168bbb0dcd6095a1eb7e7fa12493617e02effc86d84e0fbe3eb6b41f5 SHA512 5b028ef0b00d7ef0f82a260232bc130b300e175d31681b8f994e9037bc82d2d49491d8b495725388137cf3a2f73d17cdd6266592b3894189e11484159c70ce73
-AUX ntl-6.0.0-singular.patch 330 BLAKE2B 844c7766171dea95aa1c86f686c2f5b0f0b5b09a4262f80eb4e8c2cd0c70c5e2cfbdea3570353798f21d187fc728019dff84eeb44289d95059d93b76c8ef79e8 SHA512 ea8fa036a3032231435de13578f01ce038d89ca35d1ff6250a72b6129cdcae1da329b3d273c98e34ed40dc09ac2cc172a5f1614184d44325a35ddc10b59e5fe5
 AUX ntl-9.2.0-sanitize-makefile.patch 4324 BLAKE2B 43a2a1276d2743bfd8394c89419012a2d8278d12394ed12f9b2ab60bb1ec9deb621b9c8c5e0835d5c6740c46344a03fb1f50331b7f8509caf73a16c1d92b8e44 SHA512 d1b0d21fd136bf6548901486f6893d34c538b110bf50a9a8b4ca810f77a32bbd64d67962310bf7666afd935d380969fb832848d5779e1d1101a06691abedec80
 AUX ntl-9.2.0-singular.patch 391 BLAKE2B 2d4dbfcb45c7cc82d8358d7d7d7c0f50a4eb6b1c3ef11a3baa47223a8dd1c0d1fe2f38b656829fedcf172617dd0504317f901b2f3552128b86765327a56163e5 SHA512 ebb25e7755232ff72d75538213cbfa3a600e9b78af3943e73da4de1aab28d3c8dda43f84eec716bc52768d510f6a68c3f5c969c5dea2c6050b25023ba440fe04
 AUX ntl-9.6.4-sanitize-makefile.patch 4049 BLAKE2B a5ed15742628e3880ae4804672d198b83372272f89c8ddd8528f78e4030a4926d3fabe920a073ef22409d16273c9c9a1a87d4a3a554d84d34c7b10eaff3eac98 SHA512 1af6473c85d75299db28542e244bcc1bc37011bc4a1b85cacd9c21a44c77a578d6d32b1295c10e00a25a50de88be479282060a3ab93ecb9738cb9e6888a9165f
 DIST ntl-10.5.0.tar.gz 1278729 SHA256 b90b36c9dd8954c9bc54410b1d57c00be956ae1db5a062945822bbd7a86ab4d2 SHA512 b299dfc29005079470972c2a9ca02acd0ebdbc31ff8923df02f3627dbc66daa0f527226972cef032e1e488c4272554634a96456e94653fdf8b01356160319aa0 WHIRLPOOL 270f76a0088c79b506a1e0bfa12cbe06419bb5c0421e7cdb9fcc3ec2bd6b22b4f4c2468bbe73001090db623e8a662d185e181f4390475513b32a388ecca7c3cc
-DIST ntl-5.5.2.tar.gz 707247 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56 SHA512 44892e00051ca743b1184c9ae30e62c8e2605edaa394358979ff990a535993a6f282d882871ca9ebb3c632971f806c41d9b8024c8fb2cc6fa0d22bc26c66db06 WHIRLPOOL 4587463c4b52be721a7feb164fab73341af97c6f451c0bb2fbf675503c8a5262a5d7615d628e97f082dde23ce49db0f0b314c625dae0526bb1abdfc88732896f
-DIST ntl-6.1.0.tar.gz 715439 SHA256 e16c30ceef1d47e94b8a37a8c4a1fb58729b8f8449c648e2a96280a3eecf9b6f SHA512 8c013bd4a250c8e29d57864585492be1f392c84356959d8100d5c45b420e411e5cd677524e2d50bbe265dda4c364185395780ba5d8490f6ac46da73c6a9728de WHIRLPOOL cf2a48cfe33cb58d8bda35d4a18d57a20ae23f2ba53f0f757d1bacc58ffa0bfdfd38363db38996e2e4069f5e3f2ad6a3ae9a859437a93404308512652190c765
 DIST ntl-9.3.0.tar.gz 888710 SHA256 8f31508a9176b3fc843f08468b1632017f2450677bfd5147ead5136e0f24b68f SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d WHIRLPOOL a1f7cf573d49a277f0b2f1d50d18e66ef83a54430c517fd5d3c75e800216b706e8b5ff10e6ed2dc02b6eb4f9290671b249c67f1937cced96ac987055aaa3ab99
 DIST ntl-9.6.4.tar.gz 915256 SHA256 c4a1f015a879b4a20f6b76a98eb6033a7936b0ff3b3f3ca6159d7e7b2afd89eb SHA512 ec8a4deb6996b31140edff978e07844ea8e30327491a6777d3982bffec01599b0cb5cc5dca297c8610ecb7ac9a4eae3407a59736fed840a2415a52a159370868 WHIRLPOOL 31ab69dc19b206868d1a9ac4f3d1cb52180980e751fe1431b738921b3816998797cf33a0ea9db8e1017e4face98efa897a4e42aa5be58365d1bc12e320a34354
 EBUILD ntl-10.5.0.ebuild 1445 BLAKE2B 522b14c8b09cdd96ad0a9a9ae7440df24d19484c25b434cdbdd70d65e95459dbb9182c2258afcccbcc454625e1700276bdb389367951cc58b196b7b633de5906 SHA512 03d0f3b39d728b86c372d95d55d36dc3bf7c2c7f4a21f856d9dfb1f5162fd42f232465b737c47b9cf3c7f3d4903f5c893a226063449e07b977d55b1202c0b3ba
-EBUILD ntl-5.5.2.ebuild 2034 BLAKE2B 2e65099c4c75e59d1b38eee8309097400bf0a20d13a160d9886433dd020a6f57b3030be11d1973ab8d1b61024c43dbe15a1a8fea10493fafdedb0247664c29fa SHA512 b530990749bb914612630fb60ac706a21f0ec5f2e814d8c0937cc77950134d4551319a8907ab988ba5037a3f97547a79c2d27e0b2449520a9fb9a165f5849c2f
-EBUILD ntl-6.1.0.ebuild 2083 BLAKE2B 93673fe2c9b00bfb404f8a6d88893695151cbd73cac8e3d6c923b76744e19681be66e0ddd598f34de3e406bad397c500d4a13dc65c8f0c8b0c35fb6dba4d6577 SHA512 6e13c0155c26e40e44860c36355f4e8698a914dd193cecdb070e95551e7dfdf017ad80d657428ca09f4376274f34ffc2257ac9fc9a4a140a8839719ec5335070
 EBUILD ntl-9.3.0.ebuild 1778 BLAKE2B a11c61d452ae6643df2c3081baa389d92be3256eea634a4e0fdc50a4d1f3cef3843dfa12e780851e90b66756fce174edcf08a92ecf5bce6c98c0738106ee5e59 SHA512 4f7d415cdf3e94655983fe1795af856ef01a0f953a7b9b8eae9d10be0b691d0b49036cebf45afcad8e4ae097681912af6728e7e455ba0d306fd0a5c323515022
 EBUILD ntl-9.6.4.ebuild 1706 BLAKE2B 104e8b1887568681ee7cc67b17b18078fdcc5d05b266e5de2213a135df730f42ba9085ddd2ae5e2d6b8c3daf3bf8841fb698a0d13a48ae7c7c666333a220a93a SHA512 1aa1887d2665aaf3294b87404febbf941118be291a5111a92bbfce88ca163683661b396db358d2cacfed7ec63a72090ff96cc59b5723edd8bc56b1441fc0c857
 MISC metadata.xml 662 BLAKE2B c9ec72da996f6467ec456420af20dbd37e66e8884108d387a715da0578f939321c075ef95237e9d5c7a9ce1d5bbc555d2f48acba6bc2ff8e3ff8efea9cd1479b SHA512 d7501231f63b33bdf70ffbd0e218e91b394b2cac9c71fb361dd011839ce45c2b03705ad10274b4a78f935adc7383502191aee5616fa9f3e13720949767599893
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
deleted file mode 100644
index fafa97356cd8..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- include/NTL/tools.h.orig	2008-05-06 22:14:06.000000000 +1200
-+++ include/NTL/tools.h	2008-05-06 22:14:23.000000000 +1200
-@@ -249,6 +249,12 @@
- char IntValToChar(long a);
- 
- 
-+/*
-+  This function is not present in vanilla NTL
-+  See tools.c for documentation.
-+ */
-+void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context);
-+
- 
- void Error(const char *s);
- 
---- src/tools.c.orig	2008-05-06 22:15:32.000000000 +1200
-+++ src/tools.c	2008-05-06 22:15:45.000000000 +1200
-@@ -8,8 +8,35 @@
- NTL_START_IMPL
- 
- 
-+/*
-+   The following code differs from vanilla NTL
-+
-+   We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
-+   which gets called with parameter _context_ and an error message string whenever Error()
-+   gets called.
-+
-+   Note that if the custom error handler *returns*, then NTL will dump the error message
-+   back to stderr and abort() as it habitually does.
-+
-+   -- David Harvey (2008-04-12)
-+*/
-+
-+void (*ErrorCallbackFunction)(const char*, void*) = NULL;
-+void *ErrorCallbackContext = NULL;
-+
-+
-+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
-+{
-+   ErrorCallbackFunction = function;
-+   ErrorCallbackContext = context;
-+}
-+
-+
- void Error(const char *s)
- {
-+   if (ErrorCallbackFunction != NULL)
-+      ErrorCallbackFunction(s, ErrorCallbackContext);
-+
-    cerr << s << "\n";
-    abort();
- }
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
deleted file mode 100644
index 1420f55f3285..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- src/DoConfig.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/DoConfig	2009-08-10 19:24:43.000000000 +0100
-@@ -25,14 +25,16 @@
- 'LDFLAGS_CXX' => '$(LDFLAGS)',
- 'LDLIBS'      => '-lm',
- 'LDLIBS_CXX'  => '$(LDLIBS)',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
---- src/mfile.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/mfile	2009-08-10 20:31:36.000000000 +0100
-@@ -141,6 +146,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -173,6 +188,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -320,7 +356,7 @@
- LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
- LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
- 
--
-+.SUFFIXES: .lo
- 
- # 'make all' does a complete make, including all setup.
- # It also creates the file 'all', which means you should
-@@ -328,11 +364,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	$(MAKE) setup1
-+	$(MAKE) setup2
-+	$(MAKE) setup3
-+	$(MAKE) setup4
-+	$(MAKE) ntl.a
- 	touch all
- 
- 
-@@ -378,18 +414,31 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo
-+
-+
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo: 	 ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
--
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE_CXX) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
-+
- .c: 
- @{LSTAT}	$(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT
- @{LSHAR}	$(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR
-@@ -403,7 +452,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	$(MAKE) QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -460,19 +509,18 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c 
- 	rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
-+	rm -f libntl*.so*
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o  *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -549,3 +597,10 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	 $(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)
-+	 ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	 $(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)
-+	 ln -s lib`cat DIRNAME`.dylib libntl.dylib
diff --git a/dev-libs/ntl/files/ntl-5.5.2-shared.patch b/dev-libs/ntl/files/ntl-5.5.2-shared.patch
deleted file mode 100644
index 1ddd74507cf5..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-shared.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- src/DoConfig.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/DoConfig	2009-08-10 19:24:43.000000000 +0100
-@@ -25,14 +25,16 @@
- 'LDFLAGS_CXX' => '$(LDFLAGS)',
- 'LDLIBS'      => '-lm',
- 'LDLIBS_CXX'  => '$(LDLIBS)',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
-@@ -87,11 +89,6 @@
- 
- foreach $arg (@ARGV) {
- 
--   if ($arg =~ '-h|help|-help|--help') {
--      system("more ../doc/config.txt");
--      exit;
--   }
--
-    if (($name, $val) = ($arg =~ /(.*?)=(.*)/)) {
-       
-       if (exists($MakeFlag{$name}) && ($val =~ 'on|off')) {
-
-
-
---- src/mfile.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/mfile	2009-08-10 20:31:36.000000000 +0100
-@@ -141,6 +146,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -173,6 +188,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -320,7 +356,7 @@
- LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
- LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
- 
--
-+.SUFFIXES: .lo
- 
- # 'make all' does a complete make, including all setup.
- # It also creates the file 'all', which means you should
-@@ -328,11 +364,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	$(MAKE) setup1
-+	$(MAKE) setup2
-+	$(MAKE) setup3
-+	$(MAKE) setup4
-+	$(MAKE) ntl.a
- 	touch all
- 
- 
-@@ -378,18 +414,31 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo
-+
-+
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo: 	 ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
--
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE_CXX) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
-+
- .c: 
- @{LSTAT}	$(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT
- @{LSHAR}	$(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR
-@@ -403,7 +452,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	$(MAKE) QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -460,19 +509,18 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c 
- 	rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
-+	rm -f libntl*.so*
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o  *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -549,3 +597,10 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	 $(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)
-+	 ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	 $(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)
-+	 ln -s lib`cat DIRNAME`.dylib libntl.dylib
diff --git a/dev-libs/ntl/files/ntl-5.5.2-singular.patch b/dev-libs/ntl/files/ntl-5.5.2-singular.patch
deleted file mode 100644
index 9f0d13140cee..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-singular.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/NTL/new.h.orig	2008-05-06 21:56:16.000000000 +1200
-+++ include/NTL/new.h	2008-05-06 21:56:33.000000000 +1200
-@@ -12,7 +12,8 @@
- 
- #include <new>
- 
--#define NTL_NEW_OP new (std::nothrow)
-+// uncommenting std::nothrow makes this ntl work properly with Singular
-+#define NTL_NEW_OP new //(std::nothrow) 
- 
- 
- #else
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
deleted file mode 100644
index e79731fc2fce..000000000000
--- a/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- src.orig/src/tools.c	2012-08-06 11:54:53.652334400 +0200
-+++ src/src/tools.c	2012-08-06 11:59:18.183993600 +0200
-@@ -18,8 +18,35 @@
- void (*ErrorCallback)() = 0;
- 
- 
-+/*
-+   The following code differs from vanilla NTL.
-+
-+   We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
-+   which gets called with parameter _context_ and an error message string whenever Error()
-+   gets called.
-+
-+   Note that if the custom error handler *returns*, then NTL will dump the error message
-+   back to stderr and abort() as it habitually does.
-+
-+   -- David Harvey (2008-04-12)
-+*/
-+
-+void (*ErrorCallbackFunction)(const char*, void*) = NULL;
-+void *ErrorCallbackContext = NULL;
-+
-+
-+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
-+{
-+   ErrorCallbackFunction = function;
-+   ErrorCallbackContext = context;
-+}
-+
-+
- void Error(const char *s)
- {
-+   if (ErrorCallbackFunction != NULL)
-+      ErrorCallbackFunction(s, ErrorCallbackContext);
-+
-    cerr << s << "\n";
-    _ntl_abort();
- }
---- src.orig/include/NTL/tools.h	2012-08-06 11:54:52.830333000 +0200
-+++ src/include/NTL/tools.h	2012-08-06 11:59:18.143993600 +0200
-@@ -10,6 +10,7 @@
- 
- #include <cstdlib>
- #include <cmath>
-+#include <cstdio>
- #include <iostream>
- 
- #else
-@@ -252,6 +253,12 @@
- char IntValToChar(long a);
- 
- 
-+/*
-+  This function is not present in vanilla NTL.
-+  See tools.c for documentation.
-+ */
-+void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context);
-+
- 
- void Error(const char *s);
- 
diff --git a/dev-libs/ntl/files/ntl-6.0.0-singular.patch b/dev-libs/ntl/files/ntl-6.0.0-singular.patch
deleted file mode 100644
index c172386f3102..000000000000
--- a/dev-libs/ntl/files/ntl-6.0.0-singular.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src.orig/include/NTL/new.h	2012-08-06 17:12:25.658913083 +0200
-+++ src/include/NTL/new.h	2012-08-06 17:11:15.002915713 +0200
-@@ -12,7 +12,8 @@
- 
- #include <new>
- 
--#define NTL_NEW_OP new (std::nothrow)
-+// commenting std::nothrow makes this ntl work properly with Singular
-+#define NTL_NEW_OP new //(std::nothrow) 
- 
- 
- #else
diff --git a/dev-libs/ntl/ntl-5.5.2.ebuild b/dev-libs/ntl/ntl-5.5.2.ebuild
deleted file mode 100644
index c51e4b8d11db..000000000000
--- a/dev-libs/ntl/ntl-5.5.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${P}-singular.patch"
-	# implement a call back framework (submitted upstream)
-	epatch "$FILESDIR/${P}-sage-tools.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${P}-shared.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}
diff --git a/dev-libs/ntl/ntl-6.1.0.ebuild b/dev-libs/ntl/ntl-6.1.0.ebuild
deleted file mode 100644
index d09a697040fa..000000000000
--- a/dev-libs/ntl/ntl-6.1.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
-	# implement a call back framework (submitted upstream)
-	epatch "$FILESDIR/${PN}-6.0.0-sage-tools.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${PN}-5.5.2-shared-r1.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}
-- 
cgit v1.2.3