gentoo resync : 17.07.2021

2 files changed, 0 insertions, 80 deletions

diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index af8cd148f9cb..09e146dc18c6 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -2,7 +2,6 @@ AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91
 AUX singular-4.0.3-gfan_linking.patch 705 BLAKE2B 9ec4dafad75885132d4f6bea65f945a5f6f383e39f3d375a70e12a86db983cc3d64e14b148db07c9577a46d2a8f534f43988d264fdb43dc61b247843af5f438d SHA512 4c2ab45f449f9c3d79165e1c9a0634fb08a9cd34dbc898e0e172409f6914ccd6e1c4e1719ccf0b36e591b4840e8cba08576ac1b57fadd08f8344b45e1af40d89
 AUX singular-4.1.3-doc_install.patch 2834 BLAKE2B d8e35169534ed9087fc1faf6029a111819d2198d5fa61134ba083920604f93a346e6f274da02361b0c03ba05fea2c4f1b23fe2af8a46d8e6705cf4ccd025751a SHA512 36d3b6f2d90479ae508c7771d4fd7724ada5f5102ece78c4d5bc113c23848973706f19a9e1467de322ecee29712dc1d915f41b491bef23529a43380ff69d84ef
 AUX singular-4.2.0-doc_install-v2.patch 2918 BLAKE2B 9b844a51165425e696db1270dcbdf6343356c313e797cee04bf8c0bad3c0c659302a88866877b729d50ba2e5717b4a1ec209f8ff57c1f71509e551ccc780f4bf SHA512 fc3aaf5b330057b1283a877d1ee5c97e6088a2eadfeaa2d85667ca3f8c661f400d52f7e29eb27da94c6be7b9809f8aea88dc2e33affc4b3a29d334b3e5798e78
-AUX singular-4.2.0-doc_install.patch 3390 BLAKE2B 753101890dadfdbd5c0e53a7e2c94572a02d43f0370f861ea164b4db38daf010ec30c8b939f030998f3b18e49f397b4a379991ad91f9edc83c26bc06354fe53f SHA512 8a6e95ca94faada5b9d4c568e1e2f2fa67ff34b514eba7c9d9f8b0701a1e1eb56d26d7740818149f534b28e6c98c08205d429297efaa905549def320573c7a26
 AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae
 AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
diff --git a/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
deleted file mode 100644
index b0656d9fb676..000000000000
--- a/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 74ec250d3d89d0125c409b3340aca50a00b067ad Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 30 May 2021 08:28:41 -0400
-Subject: [PATCH 3/3] autotools: support docdir and htmldir.
-
-Instead of hard-coding the "doc" and "html" subdirectories,
-allow them to be ./configured.
----
- Makefile.am             | 8 ++++----
- configure.ac            | 5 +++++
- resources/configure.ac  | 4 ++++
- resources/feResource.cc | 2 +-
- 4 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index fbea51d..c5d78a7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,10 +16,10 @@ bin_SCRIPTS = libsingular-config
- 
- install-data-local:
- 	if test -e $(srcdir)/doc/doc.tbz2; then\
--	  (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
--	   mkdir $(DESTDIR)$(datadir)/info;\
--	   mkdir $(DESTDIR)$(datadir)/doc;\
--	   mv  $(DESTDIR)$(datadir)/singular/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
-+	   mkdir -p $(DESTDIR)$(docdir);\
-+	   (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(docdir); tar -jx --no-same-owner -f -));\
-+	   mv  $(DESTDIR)$(docdir)/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
-+	   @INSTALL_DATA@ doc/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
- 	fi
- 
- uninstall-local:
-diff --git a/configure.ac b/configure.ac
-index 490a45f..997db6c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -228,6 +228,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
- AC_SUBST(DATA_DIR, "$config_datadir")
- 
-+AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
-+AX_NORMALIZE_PATH([config_docdir],['/'])
-+AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
-+AC_SUBST(DOC_DIR, "$config_docdir")
-+
- SING_SHOW_FLAGS([Compiler/linker flags: ])
- 
- 
-diff --git a/resources/configure.ac b/resources/configure.ac
-index 0dc468f..da68144 100644
---- a/resources/configure.ac
-+++ b/resources/configure.ac
-@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
- AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
- 
-+AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
-+AX_NORMALIZE_PATH([config_htmldir],['/'])
-+AC_DEFINE_UNQUOTED([HTML_DIR],"$config_datadir",[htmldir])
-+
- AC_CONFIG_FILES([singular_resources.pc Makefile])
- AC_OUTPUT
-diff --git a/resources/feResource.cc b/resources/feResource.cc
-index 3d75bc9..7e4fc8c 100644
---- a/resources/feResource.cc
-+++ b/resources/feResource.cc
-@@ -85,7 +85,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
-   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
-   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%D/info/singular.hlp", (char *)""},
-   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%D/singular/singular.idx",  (char *)""},
--  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%D/singular/html",              (char *)""},
-+  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    HTML_DIR,              (char *)""},
-   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "https://www.singular.uni-kl.de/Manual/",    (char *)""},
-   {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
-   {"Path",      'p',    feResPath,  NULL,                   "%b;%P;$PATH",             (char *)""},
--- 
-2.31.1
-