commit:     9178bbd9f43529f0b31d24f0e1f581ea833826fe
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 15:54:43 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 18:22:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9178bbd9

app-portage/eclass-manpages: Do not include system paths in manpages

Replace the system paths in generated manpages with just the eclass
filename. This avoids depending on any particular system layout.

 app-portage/eclass-manpages/files/eclass-to-manpage.awk | 5 +----
 app-portage/eclass-manpages/files/eclass-to-manpage.sh  | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.awk 
b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
index 02eb4c82581..0b65162c04e 100644
--- a/app-portage/eclass-manpages/files/eclass-to-manpage.awk
+++ b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
@@ -370,7 +370,7 @@ function handle_footer() {
        print ".SH \"REPORTING BUGS\""
        print reporting_bugs
        print ".SH \"FILES\""
-       print ".BR " eclassdir "/" eclass
+       print ".BR " eclass
        print ".SH \"SEE ALSO\""
        print ".BR ebuild (5)"
        print pre_text(gensub("@ECLASS@", eclass, 1, vcs_url))
@@ -381,9 +381,6 @@ function handle_footer() {
 #
 BEGIN {
        state = "header"
-       if (ECLASSDIR == "")
-               ECLASSDIR = "/usr/portage/eclass"
-       eclassdir = ECLASSDIR
        reporting_bugs = "Please report bugs via http://bugs.gentoo.org/";
        vcs_url = 
"https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@";
 }

diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.sh 
b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
index 186a712e806..5f389390d60 100755
--- a/app-portage/eclass-manpages/files/eclass-to-manpage.sh
+++ b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
@@ -25,7 +25,6 @@ ret=0
 for e in "$@" ; do
        set -- \
        ${AWK} \
-               -vECLASSDIR="${ECLASSDIR}" \
                -f "${FILESDIR}"/eclass-to-manpage.awk \
                ${e}
        if [[ ${AWK} == "gawk" ]] ; then

Reply via email to