1 |
commit: da22c73077692206f5bd2b79355d73add559644e |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 20 11:48:48 2018 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 20 12:16:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da22c730 |
7 |
|
8 |
dev-vcs/guilt: Fix help system (#642584 by Terra) |
9 |
|
10 |
Closes: https://bugs.gentoo.org/642584 |
11 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
13 |
|
14 |
dev-vcs/guilt/files/guilt-0.36-fix-help.patch | 41 +++++++++++++++++++++ |
15 |
dev-vcs/guilt/guilt-0.36-r1.ebuild | 53 +++++++++++++++++++++++++++ |
16 |
2 files changed, 94 insertions(+) |
17 |
|
18 |
diff --git a/dev-vcs/guilt/files/guilt-0.36-fix-help.patch b/dev-vcs/guilt/files/guilt-0.36-fix-help.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..31e81bdb90e |
21 |
--- /dev/null |
22 |
+++ b/dev-vcs/guilt/files/guilt-0.36-fix-help.patch |
23 |
@@ -0,0 +1,41 @@ |
24 |
+From 53db96dd0c37b2fd299a26a00ba9b6f53cf6224e Mon Sep 17 00:00:00 2001 |
25 |
+Date: Thu, 28 Dec 2017 20:01:08 -0500 |
26 |
+Subject: [PATCH] Fix broken guilt help system |
27 |
+ |
28 |
+ https://bugs.gentoo.org/642584 |
29 |
+--- |
30 |
+ guilt | 4 ++-- |
31 |
+ guilt-help | 2 +- |
32 |
+ 2 files changed, 3 insertions(+), 3 deletions(-) |
33 |
+ |
34 |
+diff --git a/guilt b/guilt |
35 |
+index 35177b9..498dfb6 100755 |
36 |
+--- a/guilt |
37 |
++++ b/guilt |
38 |
+@@ -73,8 +73,8 @@ GUILT_PATH="$(dirname "$0")" |
39 |
+ |
40 |
+ guilt_commands() |
41 |
+ { |
42 |
+- find "$GUILT_PATH/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f -perm +111 2> /dev/null | sed -e "s/.*\\/$GUILT-//" |
43 |
+- find "$GUILT_PATH" -maxdepth 1 -name "guilt-*" -type f -perm +111 | sed -e "s/.*\\/$GUILT-//" |
44 |
++ find "$GUILT_PATH/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f -executable 2> /dev/null | sed -e "s/.*\\/$GUILT-//" |
45 |
++ find "$GUILT_PATH" -maxdepth 1 -name "guilt-*" -type f -executable | sed -e "s/.*\\/$GUILT-//" |
46 |
+ } |
47 |
+ |
48 |
+ # by default, we shouldn't fail |
49 |
+diff --git a/guilt-help b/guilt-help |
50 |
+index 93442a3..b29e059 100755 |
51 |
+--- a/guilt-help |
52 |
++++ b/guilt-help |
53 |
+@@ -34,7 +34,7 @@ case $# in |
54 |
+ ;; |
55 |
+ esac |
56 |
+ |
57 |
+-MANDIR=`dirname $0`/../man |
58 |
++MANDIR=`dirname $0`/../share/man |
59 |
+ MANDIR=`(cd "$MANDIR"; pwd)` |
60 |
+ exec man -M "$MANDIR" "$page" |
61 |
+ |
62 |
+-- |
63 |
+2.13.5 |
64 |
+ |
65 |
|
66 |
diff --git a/dev-vcs/guilt/guilt-0.36-r1.ebuild b/dev-vcs/guilt/guilt-0.36-r1.ebuild |
67 |
new file mode 100644 |
68 |
index 00000000000..ab2b064429e |
69 |
--- /dev/null |
70 |
+++ b/dev-vcs/guilt/guilt-0.36-r1.ebuild |
71 |
@@ -0,0 +1,53 @@ |
72 |
+# Copyright 1999-2018 Gentoo Authors |
73 |
+# Distributed under the terms of the GNU General Public License v2 |
74 |
+ |
75 |
+EAPI=7 |
76 |
+ |
77 |
+DESCRIPTION="A series of bash scripts which add a quilt-like interface to git" |
78 |
+HOMEPAGE="http://repo.or.cz/w/guilt.git" |
79 |
+SRC_URI="${HOMEPAGE}/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> ${P}.tar.gz" |
80 |
+ |
81 |
+LICENSE="GPL-2" |
82 |
+SLOT="0" |
83 |
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" |
84 |
+IUSE="" |
85 |
+ |
86 |
+# Since we need to build the man pages anyway, I don't think it makes |
87 |
+# much sense to hide the HTML docs behind USE=doc. |
88 |
+RDEPEND="dev-vcs/git" |
89 |
+DEPEND="${RDEPEND} |
90 |
+ app-text/asciidoc |
91 |
+ app-text/xmlto |
92 |
+ dev-lang/perl |
93 |
+" |
94 |
+ |
95 |
+RESTRICT="test" |
96 |
+ |
97 |
+S="${WORKDIR}/${PN}-22d785d" |
98 |
+ |
99 |
+src_prepare() { |
100 |
+ default |
101 |
+ |
102 |
+ eapply "${FILESDIR}"/${P}-fix-help.patch |
103 |
+ |
104 |
+ # The doc makefile tries to shell out to `git` for the version. |
105 |
+ sed -i Documentation/Makefile \ |
106 |
+ -e "s/VERSION=.*/VERSION=${PV}/" \ |
107 |
+ || die 'failed to set VERSION in Documentation/Makefile' |
108 |
+} |
109 |
+ |
110 |
+src_compile() { |
111 |
+ emake -C Documentation all |
112 |
+} |
113 |
+ |
114 |
+src_install() { |
115 |
+ emake DESTDIR="${D}" PREFIX=/usr install |
116 |
+ |
117 |
+ dodoc Documentation/{Contributing,Features,HOWTO,Requirements} |
118 |
+ emake -C Documentation \ |
119 |
+ DESTDIR="${D}" \ |
120 |
+ PREFIX=/usr \ |
121 |
+ mandir=/usr/share/man \ |
122 |
+ htmldir="/usr/share/doc/${PF}/html" \ |
123 |
+ install install-html |
124 |
+} |