gentoo resync : 15.12.2019

8 files changed, 0 insertions, 254 deletions

diff --git a/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
deleted file mode 100644
index 5884b6cd2d60..000000000000
--- a/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Singular-3-0-4/IntegerProgramming/Makefile.in Singular-3-0-4.new/IntegerProgramming/Makefile.in
---- Singular-3-0-4/IntegerProgramming/Makefile.in	2008-07-09 07:55:13.000000000 -0400
-+++ Singular-3-0-4.new/IntegerProgramming/Makefile.in	2008-10-19 22:40:41.000000000 -0400
-@@ -21,7 +21,7 @@
- endif
- 
- INSTALL		= @INSTALL@
--INSTALL_PROGRAM	= @INSTALL_PROGRAM@  -s
-+INSTALL_PROGRAM	= @INSTALL_PROGRAM@ 
- MKINSTALLDIRS   = ../mkinstalldirs
- 
- ##
diff --git a/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch b/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch
deleted file mode 100644
index 3f4f3c76203c..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur Singular-3-1-0/emacs/singular.el Singular-3-1-0.new/emacs/singular.el
---- Singular-3-1-0/emacs/singular.el	2008-11-03 09:16:38.000000000 -0500
-+++ Singular-3-1-0.new/emacs/singular.el	2009-08-20 22:16:57.000000000 -0400
-@@ -865,7 +865,8 @@
-   (add-hook 'singular-post-output-filter-functions 'singular-prompt-remove-filter nil t)
- 
-   ;; some relict from Comint mode
--  (setq comint-prompt-regexp singular-comint-prompt-regexp))
-+  (setq comint-prompt-regexp singular-comint-prompt-regexp)
-+  (setq comint-use-prompt-regexp-instead-of-fields 1))
-   ;; required to use prompt-regexp
-   (setq comint-use-prompt-regexp t)
- ;;}}}
diff --git a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
deleted file mode 100644
index ebb402289386..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- kernel/feResource.cc.orig	2010-04-30 10:20:14.000000000 +0000
-+++ kernel/feResource.cc	2010-10-11 09:19:01.431179334 +0000
-@@ -41,7 +41,7 @@
- #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
- #endif
- #else // ! defined(MAKE_DISTRIBUTION)
--#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
-+#define SINGULAR_DEFAULT_DIR "@GENTOO_PORTAGE_EPREFIX@/usr"
- #endif // defined(MAKE_DISTRIBUTION)
- 
- /*****************************************************************
-@@ -73,33 +73,31 @@
- {
-   {"SearchPath",    's', feResPath,  NULL,
-    "$SINGULARPATH;"
--   "%b/LIB;"
--   "%b/MOD;"
-+   "%r/share/singular/MOD;"
-    "%r/LIB;"
--   "%r/../LIB;"
-+   "%r/share/singular/LIB;"
-    "%d/LIB;"
--   "%d/../LIB"
-    ""},
--  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",(char *)""},
--  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME,           (char *)""},
--  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
-+  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/bin/Singular",(char *)""},
-+  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/bin",           (char *)""},
-+  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%d",                (char *)""},
-   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
--  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", (char *)""},
--  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  (char *)""},
--  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/html",              (char *)""},
-+  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/share/info/singular.info.bz2", (char *)""},
-+  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/share/singular/singular.idx",  (char *)""},
-+  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/share/doc/PFSUBST/html",              (char *)""},
- #ifdef ix86_Win
-   {"HtmlHelpFile",'C',  feResFile,  "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",    (char *)""},
- #endif
-   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"S_VERSION1,    (char *)""},
--  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
-+  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples",          (char *)""},
-   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
- 
- #ifdef ESINGULAR
-   {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs",             (char *)""},
-   {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs",            (char *)""},
-   {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
--  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
--  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/emacs",             (char *)""},
-+  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%r/share/emacs/site-lisp/singular/.emacs-singular",   (char *)""},
-+  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/share/emacs/site-lisp/singular",             (char *)""},
- #elif defined(TSINGULAR)
-   {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
- #ifdef ix86_Win
-@@ -108,7 +106,7 @@
-   {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             (char *)""},
- #endif
- #else
--  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             (char *)""},
-+  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/share/emacs/site-lisp/singular",             (char *)""},
- #endif
-   {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
- };
---- kernel/mod_raw.cc.orig	2009-11-02 10:12:22.000000000 +0000
-+++ kernel/mod_raw.cc	2010-10-11 09:19:01.432179264 +0000
-@@ -109,11 +109,11 @@
- void* dynl_open_binary_warn(const char* binary_name, const char* msg)
- {
-   void* handle = NULL;
--  const char* bin_dir = feGetResource('b');
-+  const char* bin_dir = feGetResource('r');
-   if (bin_dir != NULL)
-   {
-     char path_name[MAXPATHLEN];
--    sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name,
-+    sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name,
-             DL_TAIL);
-     handle = dynl_open(path_name);
-     if (handle == NULL && ! warn_handle)
diff --git a/sci-mathematics/singular/files/singular-3.1.3.2-python.patch b/sci-mathematics/singular/files/singular-3.1.3.2-python.patch
deleted file mode 100644
index 2cc29c9a553b..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.3.2-python.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- Singular/pyobject.cc.orig	2011-01-31 15:03:16.000000000 +0100
-+++ Singular/pyobject.cc	2011-08-24 17:22:57.000000000 +0200
-@@ -14,7 +14,7 @@
- 
- 
- 
--
-+#include <Python.h>
- 
- #include <Singular/mod2.h>
- 
-@@ -27,7 +27,7 @@
- 
- #include <Singular/lists.h>
- 
--#include <Python.h>
-+
- #include <iterator>             // std::distance
- #include <stdio.h>
- 
-@@ -592,11 +592,12 @@
-   long len = newElts.size();
-   for (long idx = 0; idx < len; ++idx)
-   {
--    char* name = newElts[idx][0].str();
-+    PythonObject current (newElts[idx]);
-+    char* name = current.operator[](0).str();
-     if (name && (*name != '\0') && (*name != '_'))
-     {
-       Py_XDECREF(get_current_definition(name));
--      newElts[idx][1].import_as(name);
-+      newElts[idx].operator[](1).import_as(name);
-     }
- 
-   }
---- Singular/pyobject_setup.cc.orig	2011-02-10 19:15:30.000000000 +0100
-+++ Singular/pyobject_setup.cc		2011-08-24 17:23:55.000000000 +0200
-@@ -12,6 +12,7 @@
- **/
- //*****************************************************************************
- 
-+#include <Python.h>
- #include <Singular/mod2.h>
- #include <kernel/febase.h>
- #include "static.h"
diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch b/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch
deleted file mode 100644
index 1d03e61ae308..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Singular/Minor.h	2010-02-02 08:22:24.000000000 -0500
-+++ patches/Minor.h	2011-06-28 13:26:01.000000000 -0400
-@@ -2,6 +2,7 @@
- #define MINOR_H
- 
- #include <assert.h>
-+#include <time.h>
- #include <iostream>
- #include <string>
- 
diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch b/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch
deleted file mode 100644
index 6a7826c390f6..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- kernel/Makefile.in.orig	2011-10-13 23:36:54.000000000 +0200
-+++ kernel/Makefile.in	2011-10-13 23:37:46.000000000 +0200
-@@ -267,7 +267,7 @@
- 	-rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
- 
- p_Procs_%.so: p_Procs_Lib_%.dl_o
--	$(LD) ${SLDFLAGS} -o $@ $^
-+	$(LD) ${SLDFLAGS} -install_name @GENTOO_PORTAGE_EPREFIX@/usr/lib/singular/$@ -o $@ $^
- 
- ##
- ## install targets
-
---- Singular/Makefile.in.orig	2011-10-14 23:59:07.000000000 +0200
-+++ Singular/Makefile.in	2011-10-14 23:58:34.000000000 +0200
-@@ -492,7 +492,7 @@
- 	$(LD) ${SLDFLAGS} -o $@ $^ -L${libdir} ${MP_LIBS} ${GLIBC_DYN_FIX}
- 
- dbmsr.so: $(DBMSR_SOURCES:.cc=.dl_o)
--	$(LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
-+	$(LD) ${SLDFLAGS} -install_name @GENTOO_PORTAGE_EPREFIX@/usr/lib/singular/$@ -o $@ $^ ${GLIBC_DYN_FIX}
- 
- # dynamic module for python bject support
- pyobject.${MODULE_SUFFIX}: pyobject.dl_o
diff --git a/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch b/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch
deleted file mode 100644
index edf764a758eb..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libfac/factor/tmpl_inst.cc b/libfac/factor/tmpl_inst.cc
-index bda287a..2f5ba49 100644
-Index: libfac/factor/tmpl_inst.cc
-===================================================================
---- a/libfac/factor/tmpl_inst.cc
-+++ b/libfac/factor/tmpl_inst.cc
-@@ -3,7 +3,7 @@
- ////////////////////////////////////////////////////////////
- 
- 
--//#include <templates/ftmpl_array.cc>
-+#include <factory/templates/ftmpl_array.cc>
- //#include <templates/ftmpl_factor.cc>
- #include <templates/ftmpl_list.h>
- #include <factory/templates/ftmpl_list.cc>
-@@ -75,8 +75,8 @@ template OSTREAM & operator << ( OSTREAM &, const List<Variable> & );
- template OSTREAM & operator << ( OSTREAM &, const Array<int> & );
- #endif
- 
--template class Array<int>;
--template class Array<Variable>;
-+//template class Array<int>;
-+//template class Array<Variable>;
- //template class Array<REvaluation>;
- 
- // for database
diff --git a/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch b/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch
deleted file mode 100644
index b0330ccdfc86..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
-index 0fa6109..553afa5 100644
-Index: Singular/claptmpl.cc
-===================================================================
---- a/Singular/claptmpl.cc
-+++ b/Singular/claptmpl.cc
-@@ -123,3 +123,37 @@ template class std::list<PolyMinorValue>;
- template class Cache<MinorKey, IntMinorValue>;
- template class Cache<MinorKey, PolyMinorValue>;
- 
-+#ifdef HAVE_NTL
-+#include<NTL/version.h>
-+#if NTL_MAJOR_VERSION == 6
-+
-+#include<NTL/tools.h>
-+#include<NTL/lzz_pE.h>
-+#include<NTL/lzz_pEX.h>
-+#include<NTL/lzz_p.h>
-+#include<NTL/vector.h>
-+#include<NTL/pair.h>
-+#include<NTL/GF2X.h>
-+#include<NTL/GF2EX.h>
-+#include<NTL/ZZ.h>
-+#include<NTL/ZZX.h>
-+#include<NTL/ZZ_pX.h>
-+#ifdef NTL_CLIENT               // in <NTL/tools.h>: using of name space NTL
-+NTL_CLIENT
-+#endif
-+template class Vec<zz_p>;
-+template class Vec<zz_pE>;
-+template class Mat<zz_p>;
-+template class Mat<zz_pE>;
-+template class Mat<ZZ>;
-+template class Vec<Pair<zz_pEX, long> >;
-+template class Vec<Pair<GF2EX, long> >;
-+template class Vec<Pair<ZZX, long> >;
-+template class Vec<Pair<ZZ_pX, long> >;
-+template class Vec<Pair<GF2X, long> >;
-+template void swap<zz_pE>(Vec<zz_pE>&, Vec<zz_pE>&);
-+template long operator==<zz_p>(Vec<zz_p> const&, Vec<zz_p> const&);
-+template Vec<Pair<zz_pX, long> >& Vec<Pair<zz_pX, long> >::operator=(const Vec<Pair<zz_pX, long> >&);
-+#endif
-+
-+#endif