Miscellaneous bugfixes provided by user in bug #45446

2 files changed, 106 insertions, 0 deletions

diff --git a/app-sci/singular/files/digest-singular-2.0.5-r1 b/app-sci/singular/files/digest-singular-2.0.5-r1
new file mode 100644
index 000000000000..168e24b6c043
--- /dev/null
+++ b/app-sci/singular/files/digest-singular-2.0.5-r1
@@ -0,0 +1,12 @@
+MD5 7dade3cbf4b3297e13067bf136b47dd5 Singular-doc-2-0-5.tar.gz 658275
+MD5 25490dbf52e0c3f3ff9d32a5c0773db9 Singular-emacs-2-0-5.tar.gz 62596
+MD5 ccb98926a93b0fc90711730790c56ac5 Singular-factory-2-0-5.tar.gz 479277
+MD5 001d7a818b0f4d149bc02d6c226874f8 Singular-IntProg-2-0-4a.tar.gz 85619
+MD5 2cc39a94e1e1c555cbbdfea2a825286e Singular-kernel-2-0-5.tar.gz 2688358
+MD5 149cd0f1249388e58138a6b1de17dd7c Singular-libfac-2-0-5.tar.gz 86640
+MD5 e88a57eab4c719f97a2cec19a8429f74 Singular-main-2-0-5.tar.gz 54627
+MD5 8d7b33130501acf7d74cbd9e02b8a26a Singular-MP-2-0-5.tar.gz 365390
+MD5 5304918a83976e0d1c58ea40e795cfa7 Singular-NTL-5.3.1.tar.gz 655942
+MD5 69ed8eb72f97f0940b0df4b5907faeb6 Singular-NTL-generic.tar.gz 7429
+MD5 7dc82f3822f35268c47c86edb9822e6f Singular-omalloc-2-0-5.tar.gz 237140
+MD5 a9fbca50eb2e0c6b468c572edcf737b6 Singular-Tst-2-0-5.tar.gz 4181732
diff --git a/app-sci/singular/files/singular-2.0.5-r1-gentoo.diff b/app-sci/singular/files/singular-2.0.5-r1-gentoo.diff
new file mode 100644
index 000000000000..49079d08a006
--- /dev/null
+++ b/app-sci/singular/files/singular-2.0.5-r1-gentoo.diff
@@ -0,0 +1,94 @@
+--- singuname.sh	2003-08-07 12:48:09.000000000 +0200
++++ singuname.sh.new	2003-08-07 12:50:14.000000000 +0200
+@@ -168,6 +168,18 @@
+         echo ${prefix}-Unknown
+         exit 1
+     fi
++# PowerPC Linux ########################################################
++elif (echo $uname_a | $egrep " ppc " > $devnull)
++then
++    prefix=ppc
++    if (echo $uname_a | $egrep "Linux" > $devnull)
++    then
++        echo ${prefix}-Linux
++        exit 0
++    else
++        echo ${prefix}-Unknown
++        exit 1
++    fi
+ else # Unknown ########################################################
+     echo Unknown
+     exit 2
+--- Singular/mod_raw.cc	2003-08-22 12:53:30.000000000 +0200
++++ Singular/mod_raw.cc.new	2004-03-12 10:07:14.000000000 +0100
+@@ -40,7 +40,7 @@
+ void* dynl_open_binary_warn(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];
+@@ -104,6 +104,10 @@
+ #define HAVE_ELF_SYSTEM
+ #endif
+ 
++#if defined(ppc_Linux)
++#define HAVE_ELF_SYSTEM
++#endif
++
+ #if defined(HAVE_ELF_SYSTEM)
+ #include <dlfcn.h>
+ 
+--- Singular/feResource.cc.orig	2004-03-03 12:26:07.000000000 +0100
++++ Singular/feResource.cc	2004-03-22 21:19:24.005384472 +0100
+@@ -45,7 +45,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 "/usr"
+ #endif // defined(MAKE_DISTRIBUTION)
+ 
+ #ifdef ix86_Win
+@@ -83,15 +83,12 @@
+ {
+   {"SearchPath",    's',     feResPath,  NULL,
+    "$SINGULARPATH;"
+-   "%b/LIB;"
+-   "%r/LIB;"
+-   "%r/../LIB;"
++   "%r/share/singular/LIB;"
+    "%d/LIB;"
+-   "%d/../LIB"
+    ""},
+-  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular"EXT,""},
+-  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME            ""},
+-  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                ""},
++  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/bin/Singular"EXT,""},
++  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/bin",""},
++  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%d",                ""},
+   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  ""},
+   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", ""},
+   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  ""},
+@@ -105,7 +102,7 @@
+ #ifdef ix86_Win
+   {"rxvt",     'X',    feResBinary,"RXVT",                "%b/rxvt.exe",             ""},
+ #else
+-  {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             ""},
++  {"xterm",     'X',    feResBinary,"XTERM",                "%d/X11R6/bin/xterm",             ""},
+ #endif
+   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",         ""},
+ #endif // ! defined(macintosh)
+--- Singular/mod_raw.cc.orig	2004-03-22 23:20:46.424288520 +0100
++++ Singular/mod_raw.cc	2004-03-22 23:22:11.975282792 +0100
+@@ -44,7 +44,7 @@
+   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)