From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5AF7C139345 for ; Fri, 2 Jul 2021 01:03:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BC5CE0878; Fri, 2 Jul 2021 01:03:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5192E0878 for ; Fri, 2 Jul 2021 01:03:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB75634092E for ; Fri, 2 Jul 2021 01:03:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AFD37BB for ; Fri, 2 Jul 2021 01:03:28 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1625186427.63782cd986f078b8b4bc05c0bb16cb922e6837dc.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild X-VCS-Directories: sci-mathematics/singular/ sci-mathematics/singular/files/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 63782cd986f078b8b4bc05c0bb16cb922e6837dc X-VCS-Branch: master Date: Fri, 2 Jul 2021 01:03:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3880a60f-2fb7-4658-84db-beeff56152fb X-Archives-Hash: 1ac72d71743c7fb9ae22d71eff2c531f commit: 63782cd986f078b8b4bc05c0bb16cb922e6837dc Author: François Bissey gmail com> AuthorDate: Thu Jun 24 10:40:13 2021 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jul 2 00:40:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63782cd9 sci-mathematics/singular: fix the doc-install patch Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Michael Orlitzky gentoo.org> .../files/singular-4.2.0-doc_install-v2.patch | 63 ++++++++++++++++++++++ .../singular/singular-4.2.0_p3-r1.ebuild | 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) 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 00000000000..5e485b14e0c --- /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 1fc167855af..dd0a6b83be0 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" )