Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/eclass-manpages/files/, app-portage/eclass-manpages/
Date: Mon, 22 Feb 2016 14:24:58
Message-Id: 1456151083.94ad5a632c48bb339e74c0ceb942765eb475c1c3.jlec@gentoo
1 commit: 94ad5a632c48bb339e74c0ceb942765eb475c1c3
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 22 14:24:43 2016 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 22 14:24:43 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ad5a63
7
8 app-portage/eclass-manpages: Correct path in FILES inside man-pages
9
10 Package-Manager: portage-2.2.27
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 app-portage/eclass-manpages/files/eclass-to-manpage.awk | 6 +++---
14 app-portage/eclass-manpages/files/eclass-to-manpage.sh | 1 +
15 app-portage/eclass-manpages/metadata.xml | 2 +-
16 3 files changed, 5 insertions(+), 4 deletions(-)
17
18 diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
19 index cc21a73..78dd0a6 100644
20 --- a/app-portage/eclass-manpages/files/eclass-to-manpage.awk
21 +++ b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
22 @@ -379,9 +379,9 @@ function handle_footer() {
23 #
24 BEGIN {
25 state = "header"
26 - if (PORTDIR == "")
27 - PORTDIR = "/usr/portage"
28 - eclassdir = PORTDIR "/eclass"
29 + if (ECLASSDIR == "")
30 + ECLASSDIR = "/usr/portage/eclass"
31 + eclassdir = ECLASSDIR
32 reporting_bugs = "Please report bugs via http://bugs.gentoo.org/"
33 vcs_url = "https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@"
34 }
35
36 diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.sh b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
37 index d41de42..7706afa 100755
38 --- a/app-portage/eclass-manpages/files/eclass-to-manpage.sh
39 +++ b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
40 @@ -26,6 +26,7 @@ ret=0
41 for e in "$@" ; do
42 set -- \
43 ${AWK} \
44 + -vECLASSDIR="${ECLASSDIR}" \
45 -vPORTDIR="${PORTDIR}" \
46 -f "${FILESDIR}"/eclass-to-manpage.awk \
47 ${e}
48
49 diff --git a/app-portage/eclass-manpages/metadata.xml b/app-portage/eclass-manpages/metadata.xml
50 index 40f2050..5b81642 100644
51 --- a/app-portage/eclass-manpages/metadata.xml
52 +++ b/app-portage/eclass-manpages/metadata.xml
53 @@ -4,7 +4,7 @@
54 <maintainer type="person">
55 <email>vapier@g.o</email>
56 </maintainer>
57 -<maintainer type="project">
58 + <maintainer type="project">
59 <email>tools-portage@g.o</email>
60 <name>Gentoo Portage tools team</name>
61 </maintainer>