Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 676646 - app-text/docbook-xsl-stylesheets hardcodes path to /usr
Summary: app-text/docbook-xsl-stylesheets hardcodes path to /usr
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: No maintainer - Look at https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers if you want to take care of it
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2019-01-28 17:54 UTC by James R Larrowe
Modified: 2019-03-01 11:22 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Patch (0001-Fix-docbook-xsl-installation-directory-on-Prefix.patch,1.46 KB, patch)
2019-01-28 17:55 UTC, James R Larrowe
Details | Diff
proposed patch (docbook-xsl-stylesheets-1.79.1-r2-prefix.diff,1011 bytes, patch)
2019-02-28 07:24 UTC, Michael Haubenwallner (RETIRED)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description James R Larrowe 2019-01-28 17:54:58 UTC
The current ebuild hardcodes the path of `/usr`. This patch
prefixes ${EPREFIX} to that.
Comment 1 James R Larrowe 2019-01-28 17:55:30 UTC
Created attachment 563078 [details, diff]
Patch
Comment 2 James R Larrowe 2019-01-29 00:54:33 UTC
For now, though, can you merge the patch? It's blocking a lot of things that use Docbook.
Comment 3 Larry the Git Cow gentoo-dev 2019-02-24 10:53:30 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394c6f7dd050f36515200846bd597284a7a3f0cd

commit 394c6f7dd050f36515200846bd597284a7a3f0cd
Author:     Pacho Ramos <pacho@gentoo.org>
AuthorDate: 2019-02-24 09:37:22 +0000
Commit:     Pacho Ramos <pacho@gentoo.org>
CommitDate: 2019-02-24 10:52:59 +0000

    app-text/docbook-xsl-stylesheets: Fix prefix support
    
    Thanks-to: James R Larrowe
    Closes: https://bugs.gentoo.org/676646
    Package-Manager: Portage-2.3.62, Repoman-2.3.12
    Signed-off-by: Pacho Ramos <pacho@gentoo.org>

 .../docbook-xsl-stylesheets-1.79.1-r2.ebuild            | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
Comment 4 Burak Arslan 2019-02-27 09:31:05 UTC
This broke the builds for me with double prefix error.

Removing $EPREFIX from DOCBOOKDIR fixes this.

-DOCBOOKDIR="${EPREFIX}/usr/share/sgml/${PN/-//}"
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"

Apparently doins already handles EPREFIX.

Relevant excerpt from build log:

 * Skipping make test/check due to ebuild restriction.
 * Final size of build directory: 27388 KiB (26.7 MiB)
 * Final size of installed tree:  25524 KiB (24.9 MiB)
 * ERROR: app-text/docbook-xsl-stylesheets-1.79.1-r2::gentoo failed:
 *   Aborting due to QA concerns: double prefix files installed

<list of all files in $DOCBOOKDIR>

 * Call stack:
 *   misc-functions.sh, line 586:  Called install_qa_check
 *   misc-functions.sh, line 132:  Called source 'install_symlink_html_docs'
 *            05prefix, line 114:  Called install_qa_check_prefix
 *            05prefix, line  19:  Called die
 * The specific snippet of code:
 *   		die "Aborting due to QA concerns: double prefix files installed"
 *
Comment 5 James R Larrowe 2019-02-27 20:44:57 UTC
Yeah. My original patch fixed this, but the modified one pushed to the Gentoo tree doesn't.
Comment 6 James R Larrowe 2019-02-27 20:47:29 UTC
I realized the mistake I made.. Sorry. I'll post another patch as soon as I can.
Comment 7 Michael Haubenwallner (RETIRED) gentoo-dev 2019-02-28 07:24:07 UTC
Created attachment 566874 [details, diff]
proposed patch

This still isn't fixed, reopening...
Comment 8 Larry the Git Cow gentoo-dev 2019-03-01 11:22:06 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed4c125236c13c1af4725a26a5ba590c4ddb77c

commit 5ed4c125236c13c1af4725a26a5ba590c4ddb77c
Author:     Michael Haubenwallner <haubi@gentoo.org>
AuthorDate: 2019-03-01 10:18:53 +0000
Commit:     Michael Haubenwallner <haubi@gentoo.org>
CommitDate: 2019-03-01 11:21:26 +0000

    app-text/docbook-xsl-stylesheets: really fix prefix support
    
    Closes: https://bugs.gentoo.org/676646
    Package-Manager: Portage-2.3.51, Repoman-2.3.11
    Signed-off-by: Michael Haubenwallner <haubi@gentoo.org>

 .../docbook-xsl-stylesheets-1.79.1-r2.ebuild                      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)