gentoo resync : 15.12.2019

12 files changed, 11 insertions, 455 deletions

diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index f11cab2f5b13..400a8056bca1 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,23 +1,12 @@
 AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91d1a359e058fc654c6778456174d6cee9242f7fcaf81bf1464f47f43604b9e4eb298f051c6a4daba4630ca SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431
-AUX singular-3.0.4.4-nostrip.patch 453 BLAKE2B 63a75031410aaa40ef271c249cc20b515bf86ce6873acea630aff9586a423964e93d77217fef819ae2058a69bac417f58fab306fb22d8e2b2d3f223b84d9b588 SHA512 2fd31198c7c4e752976539a7ddc3b03bb4030efc52e66e5a2d34ce438af558d9d8b45aa088da6cf4eb1edf7f7239994f6eea040d0a8eb0c2c854b6275e7dde5f
-AUX singular-3.1.0-emacs-22.patch 637 BLAKE2B 0cf175eca1fac56d8fcf6fec49a7116381d57fdbdd6a8cc3b874fb9d3c90cf3a49fd4d583141685739377e27d4f91f0957c2a25772d95d76fa43d436ed057737 SHA512 19ef6b9252c42f468099b15911251c4b162ca552d86bcb1c90bb86a591b79e1c1d21463e21b14944820761df32d952e03276804a9125580179218b78226bbbdc
-AUX singular-3.1.0-gentoo.patch 4563 BLAKE2B 8617fe729dc5893a3d00eeafba9d56eeb678d119ba14ae538da6bacf25a789494d5f8a62608b0fb1acaf7f00e1f18ff2b89109e0626708b2c1572dc069210bf2 SHA512 f503ccc1a2501e7a990715e2403989dbc4ec33fd6e4f043379db4b4eb22d18df27acc750271c556dacff2b74a7b5154feb92f3fab2c66de6e464635ff86e86ff
-AUX singular-3.1.3.2-python.patch 1136 BLAKE2B 6951a3ba39fa2d69f69bf86bfedc99dc0220803209469b79abd8748c71555eaa9ca457c5ba6086b4e62ff2f19d160a0e74457255aeb6ceac7db9779fa523417d SHA512 76398bb6f679cba84b71fe7a5ecef6815cf314c87e15286726e4fa079dbefa65cfffd6934695ffe2cc18b6cefea75d960962908a24bfbf9cacbc3e3f74395370
-AUX singular-3.1.3.3-Minor.h.patch 234 BLAKE2B e0d9e6cc2ac6ef37492be18c65185e4e07ac0ab75ea67910fab8c3f64e7e9f377187e87a876e23f4dd49b935e39e5d5aa879a2849bd0587a4f0b7c6544da93ca SHA512 8748e8c76cb6b33f3d43b604c3dc713e033c7636367d9f3086beaf52428cc3e2cd1244d831d2e94cf29530ad0118c9148ffc1e5364df8680d069d0e3d00592d7
-AUX singular-3.1.3.3-install_name.patch 862 BLAKE2B 912b9ea4ef92929694398ce9ba4876601ca49d08ba3fe30790610931c8fba9580c52c1a659f3a90a026caa0e82137a94371dba08842455ab14298d83be274cee SHA512 9f641503a62f8de151e9774003b9b52634f27ad8b4355bb72b49239acf4086fc066a7688f1ba2df7a42b05aaf8c89c9fff6100706d7bf71043d931a049804497
-AUX singular-3.1.6-factory_template_instantiation.patch 900 BLAKE2B 9cf2772260c74cca3b55b93d5e417f6331fa024517290f0d95b49f8e81685101adb73557a80cf497a9c275563134a91ff89d7931cdf4663db6e2075da171d6ab SHA512 0a0d7a271fddf543de6d8d987322e4062997a6283ccbb90f55c8d70ed39a2e58a0d68e881c0d260ad9f4ceaf60352bcd78a48b6f707a7719369c0b4cbe47542f
-AUX singular-3.1.6-ntl6compat.patch 1401 BLAKE2B 8faa3f5367fa1ac5333a53345bc4d646862ebe38286f51dea327aa403319251f4d7bf6d13590a465730b5c4f481f65d1434aaea4c7679de1d025b4dc5459ed47 SHA512 5d6c4ec73b81cebcd8d24dc75efedb2f3da656fc5103701f25f7bba40355e995f116acddb7bb711b8832a89ec55a1b7fbbc7dd9215822f786e7a6012905b66be
 AUX singular-4.0.0-fix-omalloc-ar-detection.patch 484 BLAKE2B 801f773c434ad35a18f80be4453a70540438054fca6fe7e8ba58520d8e17c47da51669d951989c161049d451d111a57d2e6f365ef4ee523829e056fdc2c4c72f SHA512 4f74b1d436c17efa3872a6b24e56c691220813a3cc2debeb19caa5dd6bf0e3c39af32e43e3d7afb5af40f985ec56377128185b9138dfcf77a04618ba444ea619
 AUX singular-4.0.2-ntl8-compat.patch 1149 BLAKE2B ed7ca37745eb37dd6493dfc4b531c3b9dc7390bc246a5ac08480ab188746883f3320031b14f9fe542c5889a56fa6c5c93a4b3f23e581cfb11cc308caa4dfa868 SHA512 178f0130cd6a606d6c93f5cc42dfe92782a16cc6b3d0e2695ce16d2115f70e502f702e8e72fd5d3b61b1bb5b3f4038a4fbf6277418b3f0bf89cae7939d5ed606
 AUX singular-4.0.3-fix-destdir.patch 992 BLAKE2B ffde08cf18fe22214acee27877090d7a7e3f458fac2f6f928cc822995c77579e705acb87b3bac4a9f84806bb3ce84eacfe7b51db3b51c94121c92b5335e207bb SHA512 6b0496d1901c51da66d75fde1b980333df8b1e03572f49ecd56f3f3c67d3af1b08527c7b764aa3b62b0296b97aaaa861d257a97a4370b3600b2cd7ffb9580936
 AUX singular-4.0.3-fix-resources-name.patch 10175 BLAKE2B 54b576ab1d5db6a1d2aca507472e3eba0a4c02507c82de7dfd1d6ad069c5225c8c2957c9258f57f686b5fa845427d95cbb350bf4bb151ee13e5b4eaa8e900c17 SHA512 29c43d97598c647ac2754ed897411638f0141b60de590a53fc3f476cd1d627b270ecab29e16923b00757d8218d680c6b837070fa6899e4c770243bf71e86a09f
-DIST Singular-3-1-6-share.tar.gz 10620177 BLAKE2B 407f7936617d71e10779ae20548091a84be309a25c32e76b3a8277483ab288a8c6d47b7a8ba6c56dc6bba4f0b4395db3b997adbde5890189317fe1faaa7362ce SHA512 54bff29c5d64609583ec8b1c43005a1ff453c8f2cedfe9a26ac840888e9d306e3104e14aea5a3cc923fac916215c4285ecfe5ae7e1242aee0308b5e4c6e2d48d
-DIST Singular-3-1-6.tar.gz 25535111 BLAKE2B 915f25c00be5fc04056bba12b5f62b09d41d7367a8fecc732b7cbbf68a0536b998bf0d2b69cf4c6f4d0f8eed60132c225dced762b3f2b17ea326bfe4fb6d17ff SHA512 103a10dd474d93cceb678bcef1a4aae5ec693cb9e68c9d63a7536929b738a0127501ee145a79cc3b9ddfa4bd1ca0f05e640eeb3b0fbdb60de4f56aa5beacc213
 DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 357a68f68cc0508e4e197427c56232da60412a8380045ac594cbe313bf6a403068d1724f637d47de44e66baf34c74fa5c4ee622721c5bbd67764e65e66c8583a SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25
 DIST singular-4.0.2.tar.gz 8635172 BLAKE2B 5f565bf14677d8414300d7a5602aa96c8cef7e863fd858083fe4561742b545d74a5fc4de95ef0c63acf4f78c66405bac7ba77a954e42b2e87a6da608e4732bcd SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d
 DIST singular-4.0.3-share.tar.gz 6633256 BLAKE2B c137b72aaa0926eb006624e03fe938678acb94a41da525de1ca4f7711985d253926788b550d2d98b8def15fb0cb60b2527c1c04566a29a28135fcb1a70246025 SHA512 5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a
 DIST singular-4.0.3.tar.gz 12615042 BLAKE2B b3c63434974bb8b5fdef86cbcbe73b76a47503b28dcae6bfc6e4210e1ab1c14224ac0f6eeefa9d8004450f6d9a26843368a9b2ea16bca68bf1215ce33e83df0d SHA512 781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab
-EBUILD singular-3.1.6.ebuild 4724 BLAKE2B 047b1af903467103abba488ba0f6effa6c6f59b7f541e643ada481164e741e4e6a77fece0b791f0b086acfac329a433dc9b27c158a2f9cb5ecfc1265f901197a SHA512 eb18e7a69b110d71b02a7f1d239c9b9b281f535463105c28687eae1e49d303843e0e71f573bbdfbe051f3efb675f7128f0c9e253f1a43dd3fc9d6c9b91acae6e
-EBUILD singular-4.0.2.ebuild 3979 BLAKE2B b2f34c4afaa7335dc3ba14b95f611948303bd299cde00ce287f108d7c1167edfed60b45f4f5861485b6b56f1aa1c769b241fb76589199546bfa0c19e225425ca SHA512 41450e6f7da47c2505c9e889487c52b35701cba8394ad2dfa0cbfbbe55dbeb9d72685ee1d0a584488c3022b75e34f9c5b0ed6d26612a8d31499f02abec1176fd
-EBUILD singular-4.0.3.ebuild 2625 BLAKE2B 7a4e85030fcd92e19e804d2e0dd780db7ae85730a7b15097d4334656fff0e6e1272d78c638de35a645eabddd5ad326b69b943aee034bb3041e25b0c753673c4c SHA512 077b88bbbd4b72247979196cbe32410f9c8012591f12a3df689838da4ac9515664e3fd45c66f31a4444c637ecd7eda829a722027966a2271edc057edf8dc83bd
+EBUILD singular-4.0.2.ebuild 3685 BLAKE2B 434a1dbac875bb0cfdf4dc3df105529fb5cfcc74e2bc0cff2c2047f8ee68660aca8bf073e8a386c8d5447b04decbcaf8efc4d494e14e4915b2bd07f53325eefc SHA512 c29ac1e417f559ca1f81d3f0c8b0f887c40be8f8060a97aaba32c2583ab8117948a66cb329dab08adbd536465c736f61a5222517169f26122ac4042b7523d91d
+EBUILD singular-4.0.3.ebuild 2603 BLAKE2B c6d59b1c2d7d6885a390d09cd08abac12d6b3ce3ea099fd902656cfb86269b8d6d213bca3a917124c6cae929646605f5e0f105a41cfe70310f557f690d181518 SHA512 91cbb0906f0a3f99da2ffeb8c053c3b2a45ce4c33545dc3be54e1774e34852f7670b5702f165387d9b9f0884ca442292f46b80c6650321f504728f162ca040cf
 MISC metadata.xml 389 BLAKE2B dcba16dd34ab572d58d76ea55f528ee1a4bb4c0c37ca272c9a11afdb8117f6982e5109a4a4783d1efc6cb31fe273f07bf79f720f178fea635af29574007c93f9 SHA512 3c5aea925276639c81a03a2a8d05ecaa48edac510f144d92e173402721dbc253638341ac8afdfbc17098ac35d2f4f47b41e5d56427c8ecaa788dc28fbb0977ae
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
diff --git a/sci-mathematics/singular/singular-3.1.6.ebuild b/sci-mathematics/singular/singular-3.1.6.ebuild
deleted file mode 100644
index 1aaa72907608..000000000000
--- a/sci-mathematics/singular/singular-3.1.6.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils elisp-common flag-o-matic multilib prefix python-single-r1 versionator
-
-MY_PN=Singular
-MY_PV=$(replace_all_version_separators -)
-MY_DIR=$(get_version_component_range 1-3 ${MY_PV})
-# Note: Upstream's share tarball may not get updated on every release
-MY_SHARE_DIR="3-1-6"
-MY_PV_SHARE="${MY_PV}"
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-
-SRC_COM="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/"
-SRC_URI="${SRC_COM}${MY_DIR}/${MY_PN}-${MY_PV}.tar.gz
-		 ${SRC_COM}${MY_SHARE_DIR}/${MY_PN}-${MY_PV_SHARE}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="boost doc emacs examples python readline test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/ntl:0=
-	emacs? ( >=virtual/emacs-22 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	boost? ( dev-libs/boost:0= )"
-
-# Upstream does not care about tests
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${MY_DIR}"
-
-pkg_setup() {
-	append-flags -fPIC
-	append-ldflags -fPIC
-	tc-export CC CPP CXX
-	use emacs && elisp-need-emacs 22
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare () {
-	epatch \
-		"${FILESDIR}"/${PN}-3.1.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-3.1.0-emacs-22.patch \
-		"${FILESDIR}"/${PN}-3.0.4.4-nostrip.patch \
-		"${FILESDIR}"/${PN}-3.1.3.3-Minor.h.patch \
-		"${FILESDIR}"/${PN}-3.1.6-ntl6compat.patch \
-		"${FILESDIR}"/${PN}-3.1.6-factory_template_instantiation.patch
-	use python && epatch "${FILESDIR}"/${PN}-3.1.3.2-python.patch
-
-	if  [[ ${CHOST} == *-darwin* ]] ; then
-		epatch "${FILESDIR}"/${PN}-3.1.3.3-install_name.patch
-		eprefixify kernel/Makefile.in
-		eprefixify Singular/Makefile.in
-	fi
-
-	eprefixify kernel/feResource.cc
-
-	# The SLDFLAGS mangling prevents passing raw LDLAGS to gcc (see e.g. bug 414709)
-	sed -i \
-		-e "/CXXFLAGS/ s/--no-exceptions//g" \
-		-e "s/SLDFLAGS=-shared/SLDFLAGS=\"$(raw-ldflags) -shared\"\n\t  \tSLDFLAGS2=\"${LDFLAGS} -shared\"/" \
-		-e "s/  SLDFLAGS=/  SLDFLAGS=\n  SLDFLAGS2=/" \
-		-e "s/AC_SUBST(SLDFLAGS)/AC_SUBST(SLDFLAGS)\nAC_SUBST(SLDFLAGS2)/" \
-		"${S}"/Singular/configure.in || die
-
-	sed -i \
-		-e "s/@SLDFLAGS@/@SLDFLAGS@\nSLDFLAGS2\t= @SLDFLAGS2@/" \
-		-e "/\$(CXX).*SLDFLAGS/s/SLDFLAGS/SLDFLAGS2/" \
-		"${S}"/Singular/Makefile.in || die
-
-	# remove ntl sources for safety.
-	rm -r ntl || die
-
-	cd "${S}"/Singular || die "failed to cd into Singular/"
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--prefix="${S}"/build \
-		--exec-prefix="${S}"/build \
-		--bindir="${S}"/build/bin \
-		--libdir="${S}"/build/lib \
-		--libexecdir="${S}"/build/lib \
-		--includedir="${S}"/build/include \
-		--with-apint=gmp \
-		--with-NTL \
-		--disable-doc \
-		--without-MP \
-		--without-flint \
-		--enable-factory \
-		--enable-libfac \
-		--enable-IntegerProgramming \
-		--enable-Singular \
-		--with-malloc=system \
-		$(use_with python python embed) \
-		$(use_with boost Boost) \
-		$(use_enable emacs) \
-		$(use_with readline)
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}/emacs/
-		elisp-compile *.el
-	fi
-}
-
-src_test() {
-	# Tests fail to link -lsingular, upstream ticket #243
-	emake test
-}
-
-src_install () {
-	dodoc README
-	# execs and libraries
-	cd "${S}"/build/bin
-	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.so
-
-	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN}
-	dosym ${MY_PN}-${MY_DIR} /usr/bin/${PN}
-
-	# stuff from the share tar ball
-	cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
-	insinto /usr/share/${PN}
-	doins -r LIB
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	if use doc; then
-		dohtml -r html/*
-		insinto /usr/share/${PN}
-		doins doc/singular.idx
-		cp info/${PN}.hlp info/${PN}.info &&
-		doinfo info/${PN}.info
-	fi
-	if use emacs; then
-		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs*
-		elisp-site-file-install "${FILESDIR}"/60${PN}-gentoo.el
-	fi
-}
-
-pkg_postinst() {
-	einfo "The authors ask you to register as a SINGULAR user."
-	einfo "Please check the license file for details."
-	if use emacs; then
-		echo
-		ewarn "Please note that the ESingular emacs wrapper has been"
-		ewarn "removed in favor of full fledged singular support within"
-		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
-		ewarn "and you should be good to go! See bug #193411 for more info."
-		echo
-	fi
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
index fd44a959ad62..114d83fd0a31 100644
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -80,7 +80,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if use emacs; then
 		cd "${MY_SHARE_DIR}"singular/emacs/
@@ -92,26 +92,24 @@ src_compile() {
 # 	dodoc README
 # 	# execs and libraries
 # 	cd "${S}"/build/bin
-# 	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL \
-# 		|| die "failed to install binaries"
+# 	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL
 # 	insinto /usr/$(get_libdir)/${PN}
-# 	doins *.so || die "failed to install libraries"
+# 	doins *.so
 #
-# 	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN} \
-# 		|| die "failed to create symbolic link"
+# 	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN}
 #
 # 	# stuff from the share tar ball
 # 	cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
 # 	insinto /usr/share/${PN}
-# 	doins -r LIB  || die "failed to install lib files"
+# 	doins -r LIB
 # 	if use examples; then
 # 		insinto /usr/share/doc/${PF}
-# 		doins -r examples || die "failed to install examples"
+# 		doins -r examples
 # 	fi
 # 	if use doc; then
-# 		dohtml -r html/* || die "failed to install html docs"
+# 		dohtml -r html/*
 # 		insinto /usr/share/${PN}
-# 		doins doc/singular.idx || die "failed to install idx file"
+# 		doins doc/singular.idx
 # 		cp info/${PN}.hlp info/${PN}.info &&
 # 		doinfo info/${PN}.info \
 # 			|| die "failed to install info files"
diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild
index 819a33a186cc..6d898b9c9fcb 100644
--- a/sci-mathematics/singular/singular-4.0.3.ebuild
+++ b/sci-mathematics/singular/singular-4.0.3.ebuild
@@ -74,7 +74,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if use emacs; then
 		cd "${S}"/emacs/