diff options
| author |   François Bissey <frp.bissey@gmail.com> | 2021-06-24 22:40:13 +1200 |
|---|---|---|
| committer |   Michael Orlitzky <mjo@gentoo.org> | 2021-07-01 20:40:27 -0400 |
| commit | 63782cd986f078b8b4bc05c0bb16cb922e6837dc (patch) | |
| tree | 972ee621754f22cc87609bcd3e40752deb776a40 /sci-mathematics/singular | |
| parent | sci-mathematics/singular: Fix QA issues in 4.2.0_p3 (diff) | |
| download | gentoo-63782cd986f078b8b4bc05c0bb16cb922e6837dc.tar.gz gentoo-63782cd986f078b8b4bc05c0bb16cb922e6837dc.tar.bz2 gentoo-63782cd986f078b8b4bc05c0bb16cb922e6837dc.zip | |
sci-mathematics/singular: fix the doc-install patch
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
Diffstat (limited to 'sci-mathematics/singular')
| -rw-r--r-- | sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch | 63 | ||||
| -rw-r--r-- | sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild | 2 |
2 files changed, 64 insertions, 1 deletions
diff --git a/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch new file mode 100644 index 000000000000..5e485b14e0cb --- /dev/null +++ b/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch @@ -0,0 +1,63 @@ +diff --git a/Makefile.am b/Makefile.am +index fbea51d..e9365ab 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -16,10 +16,11 @@ 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);\ ++ mkdir -p $(DESTDIR)$(datadir)/info;\ ++ (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 *)""}, diff --git a/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild b/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild index 1fc167855af9..dd0a6b83be08 100644 --- a/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild +++ b/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild @@ -36,7 +36,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}" PATCHES=( "${FILESDIR}/${PN}-4.2.0-gfan_linking.patch" - "${FILESDIR}/${PN}-4.2.0-doc_install.patch" + "${FILESDIR}/${PN}-4.2.0-doc_install-v2.patch" "${FILESDIR}/${PN}-4.2.0-no-static.patch" ) |