1 |
commit: 9d7fdec908dafa3fcfcf39fb60fa7e4eb335fff9 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 10 12:12:00 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 10 12:40:16 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7fdec9 |
7 |
|
8 |
app-text/namazu: update patches |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
app-text/namazu/files/namazu-2.0.19-gentoo.patch | 29 ------------ |
13 |
...21-search.patch => namazu-2.0.21-memmove.patch} | 4 +- |
14 |
app-text/namazu/files/namazu-gentoo.patch | 54 ++++++++++++++++++++++ |
15 |
app-text/namazu/metadata.xml | 2 +- |
16 |
app-text/namazu/namazu-2.0.21.ebuild | 36 +++++++++------ |
17 |
app-text/namazu/namazu-2.0.22_p1.ebuild | 14 +++--- |
18 |
6 files changed, 84 insertions(+), 55 deletions(-) |
19 |
|
20 |
diff --git a/app-text/namazu/files/namazu-2.0.19-gentoo.patch b/app-text/namazu/files/namazu-2.0.19-gentoo.patch |
21 |
deleted file mode 100644 |
22 |
index 6d7f649507b..00000000000 |
23 |
--- a/app-text/namazu/files/namazu-2.0.19-gentoo.patch |
24 |
+++ /dev/null |
25 |
@@ -1,29 +0,0 @@ |
26 |
-diff -Naur namazu-2.0.19.orig/filter/Makefile.am namazu-2.0.19/filter/Makefile.am |
27 |
---- namazu-2.0.19.orig/filter/Makefile.am 2008-05-03 02:07:03.000000000 +0900 |
28 |
-+++ namazu-2.0.19/filter/Makefile.am 2009-03-13 01:04:20.000000000 +0900 |
29 |
-@@ -51,9 +51,3 @@ |
30 |
- |
31 |
- ETAGS_ARGS = $(filter_DATA) --lang=perl |
32 |
- TAGS_DEPENDENCIES = $(filter_DATA) |
33 |
-- |
34 |
--# To remove Windows specific files installed by Namazu 2.0 and/or 2.0.1 |
35 |
--# and old gfilter.pl (Namazu 2.0.7 or earlier). |
36 |
--install-data-local: |
37 |
-- rm -f $(filterdir)/ole*.pl |
38 |
-- rm -f $(filterdir)/gfilter.pl |
39 |
-diff -Naur namazu-2.0.19.orig/filter/Makefile.in namazu-2.0.19/filter/Makefile.in |
40 |
---- namazu-2.0.19.orig/filter/Makefile.in 2009-03-12 23:24:48.000000000 +0900 |
41 |
-+++ namazu-2.0.19/filter/Makefile.in 2009-03-13 01:05:08.000000000 +0900 |
42 |
-@@ -455,12 +455,6 @@ |
43 |
- uninstall uninstall-am uninstall-filterDATA uninstall-info-am \ |
44 |
- uninstall-info-recursive uninstall-recursive |
45 |
- |
46 |
-- |
47 |
--# To remove Windows specific files installed by Namazu 2.0 and/or 2.0.1 |
48 |
--# and old gfilter.pl (Namazu 2.0.7 or earlier). |
49 |
--install-data-local: |
50 |
-- rm -f $(filterdir)/ole*.pl |
51 |
-- rm -f $(filterdir)/gfilter.pl |
52 |
- # Tell versions [3.59,3.63) of GNU make to not export all variables. |
53 |
- # Otherwise a system limit (for SysV at least) may be exceeded. |
54 |
- .NOEXPORT: |
55 |
|
56 |
diff --git a/app-text/namazu/files/namazu-2.0.21-search.patch b/app-text/namazu/files/namazu-2.0.21-memmove.patch |
57 |
similarity index 94% |
58 |
rename from app-text/namazu/files/namazu-2.0.21-search.patch |
59 |
rename to app-text/namazu/files/namazu-2.0.21-memmove.patch |
60 |
index 6a8e10e8e1a..30ad490e44f 100644 |
61 |
--- a/app-text/namazu/files/namazu-2.0.21-search.patch |
62 |
+++ b/app-text/namazu/files/namazu-2.0.21-memmove.patch |
63 |
@@ -1,5 +1,5 @@ |
64 |
---- a/nmz/search.c 2011-08-05 09:26:47.000000000 +0900 |
65 |
-+++ b/nmz/search.c 2011-08-05 09:32:25.000000000 +0900 |
66 |
+--- a/nmz/search.c |
67 |
++++ b/nmz/search.c |
68 |
@@ -572,7 +572,7 @@ |
69 |
{ |
70 |
if (*expr == '*' && expr[strlen(expr) - 1] != '*') { |
71 |
|
72 |
diff --git a/app-text/namazu/files/namazu-gentoo.patch b/app-text/namazu/files/namazu-gentoo.patch |
73 |
new file mode 100644 |
74 |
index 00000000000..027804e3fa7 |
75 |
--- /dev/null |
76 |
+++ b/app-text/namazu/files/namazu-gentoo.patch |
77 |
@@ -0,0 +1,54 @@ |
78 |
+--- a/Makefile.am |
79 |
++++ b/Makefile.am |
80 |
+@@ -19,9 +19,9 @@ |
81 |
+ |
82 |
+ bin_SCRIPTS = nmz-config |
83 |
+ |
84 |
+-etcdir = $(pkgdatadir)/etc |
85 |
+-etc_DATA = AUTHORS ChangeLog ChangeLog.1 CREDITS COPYING INSTALL \ |
86 |
+- INSTALL-ja README README-es README-ja NEWS THANKS TODO \ |
87 |
++etcdir = @docdir@ |
88 |
++etc_DATA = AUTHORS ChangeLog ChangeLog.1 CREDITS \ |
89 |
++ README README-es README-ja NEWS THANKS TODO \ |
90 |
+ HACKING HACKING-ja |
91 |
+ |
92 |
+ EXTRA_DIST = $(etc_DATA) maintMakefile namazu.spec namazu.spec.in \ |
93 |
+--- a/doc/Makefile.am |
94 |
++++ b/doc/Makefile.am |
95 |
+@@ -2,7 +2,7 @@ |
96 |
+ AUTOMAKE_OPTIONS = 1.4 no-dependencies |
97 |
+ SUBDIRS = en ja |
98 |
+ |
99 |
+-cssdir = $(pkgdatadir)/doc |
100 |
++cssdir = @htmldir@ |
101 |
+ |
102 |
+ css_DATA = namazu.css |
103 |
+ EXTRA_DIST = $(css_DATA) |
104 |
+--- a/doc/en/Makefile.am |
105 |
++++ b/doc/en/Makefile.am |
106 |
+@@ -1,4 +1,4 @@ |
107 |
+-htmldir = $(pkgdatadir)/doc/en |
108 |
++htmldir = @htmldir@/en |
109 |
+ |
110 |
+ html_DATA = manual.html nmz.html tutorial.html tips.html |
111 |
+ EXTRA_DIST = $(html_DATA) |
112 |
+--- a/doc/ja/Makefile.am |
113 |
++++ b/doc/ja/Makefile.am |
114 |
+@@ -1,4 +1,4 @@ |
115 |
+-htmldir = $(pkgdatadir)/doc/ja |
116 |
++htmldir = @htmldir@/ja |
117 |
+ |
118 |
+ html_DATA = manual.html nmz.html tips.html tutorial.html |
119 |
+ EXTRA_DIST = $(html_DATA) |
120 |
+--- a/filter/Makefile.am |
121 |
++++ b/filter/Makefile.am |
122 |
+@@ -51,9 +51,3 @@ |
123 |
+ |
124 |
+ ETAGS_ARGS = $(filter_DATA) --lang=perl |
125 |
+ TAGS_DEPENDENCIES = $(filter_DATA) |
126 |
+- |
127 |
+-# To remove Windows specific files installed by Namazu 2.0 and/or 2.0.1 |
128 |
+-# and old gfilter.pl (Namazu 2.0.7 or earlier). |
129 |
+-install-data-local: |
130 |
+- rm -f $(filterdir)/ole*.pl |
131 |
+- rm -f $(filterdir)/gfilter.pl |
132 |
|
133 |
diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml |
134 |
index d84b2e08fb4..3a5b4fa8acc 100644 |
135 |
--- a/app-text/namazu/metadata.xml |
136 |
+++ b/app-text/namazu/metadata.xml |
137 |
@@ -4,7 +4,7 @@ |
138 |
<maintainer type="person"> |
139 |
<email>hattya@g.o</email> |
140 |
</maintainer> |
141 |
-<maintainer type="project"> |
142 |
+ <maintainer type="project"> |
143 |
<email>cjk@g.o</email> |
144 |
<name>Cjk</name> |
145 |
</maintainer> |
146 |
|
147 |
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild |
148 |
index 4609a1dfba2..ac2d382288d 100644 |
149 |
--- a/app-text/namazu/namazu-2.0.21.ebuild |
150 |
+++ b/app-text/namazu/namazu-2.0.21.ebuild |
151 |
@@ -1,9 +1,9 @@ |
152 |
-# Copyright 1999-2016 Gentoo Foundation |
153 |
+# Copyright 1999-2017 Gentoo Foundation |
154 |
# Distributed under the terms of the GNU General Public License v2 |
155 |
|
156 |
EAPI="5" |
157 |
|
158 |
-inherit eutils elisp-common |
159 |
+inherit autotools eutils elisp-common |
160 |
|
161 |
DESCRIPTION="Namazu is a full-text search engine" |
162 |
HOMEPAGE="http://www.namazu.org/" |
163 |
@@ -34,20 +34,28 @@ DEPEND="${RDEPEND} |
164 |
nls? ( sys-devel/gettext )" |
165 |
|
166 |
src_prepare() { |
167 |
- epatch "${FILESDIR}/${PN}-2.0.19-gentoo.patch" |
168 |
- epatch "${FILESDIR}/${PN}-2.0.21-search.patch" |
169 |
+ epatch "${FILESDIR}"/${PN}-gentoo.patch |
170 |
+ epatch "${FILESDIR}"/${P}-memmove.patch |
171 |
+ |
172 |
+ mv configure.{in,ac} |
173 |
+ mv tk${PN}/configure.{in,ac} |
174 |
+ eautoreconf |
175 |
} |
176 |
|
177 |
src_configure() { |
178 |
- local myconf |
179 |
- use tk && myconf="--with-namazu=/usr/bin/namazu |
180 |
- --with-mknmz=/usr/bin/mknmz |
181 |
- --with-indexdir=/var/lib/namazu/index" |
182 |
- |
183 |
- econf \ |
184 |
- $(use_enable nls) \ |
185 |
- $(use_enable tk tknamazu) \ |
186 |
- ${myconf} |
187 |
+ local myconf=( |
188 |
+ $(use_enable nls) |
189 |
+ $(use_enable tk tknamazu) |
190 |
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} |
191 |
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
192 |
+ ) |
193 |
+ use tk && myconf+=( |
194 |
+ --with-namazu=/usr/bin/namazu |
195 |
+ --with-mknmz=/usr/bin/mknmz |
196 |
+ --with-indexdir=/var/lib/namazu/index |
197 |
+ ) |
198 |
+ |
199 |
+ econf "${myconf[@]}" |
200 |
} |
201 |
|
202 |
src_compile() { |
203 |
@@ -61,8 +69,6 @@ src_compile() { |
204 |
|
205 |
src_install () { |
206 |
emake DESTDIR="${D}" install |
207 |
- dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO etc/*.png |
208 |
- dohtml -r doc/* |
209 |
|
210 |
if use emacs; then |
211 |
elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el* |
212 |
|
213 |
diff --git a/app-text/namazu/namazu-2.0.22_p1.ebuild b/app-text/namazu/namazu-2.0.22_p1.ebuild |
214 |
index 213abbf2f80..ed4b7d27b3f 100644 |
215 |
--- a/app-text/namazu/namazu-2.0.22_p1.ebuild |
216 |
+++ b/app-text/namazu/namazu-2.0.22_p1.ebuild |
217 |
@@ -1,8 +1,9 @@ |
218 |
-# Copyright 1999-2016 Gentoo Foundation |
219 |
+# Copyright 1999-2017 Gentoo Foundation |
220 |
# Distributed under the terms of the GNU General Public License v2 |
221 |
|
222 |
EAPI="5" |
223 |
|
224 |
+AUTOTOOLS_AUTORECONF="1" |
225 |
inherit autotools-utils eutils elisp-common |
226 |
|
227 |
DESCRIPTION="Namazu is a full-text search engine" |
228 |
@@ -34,15 +35,14 @@ DEPEND="${RDEPEND} |
229 |
nls? ( sys-devel/gettext )" |
230 |
S="${WORKDIR}"/${P/_p/pre} |
231 |
|
232 |
-PATCHES=( |
233 |
- "${FILESDIR}/${PN}-2.0.19-gentoo.patch" |
234 |
-) |
235 |
-DOCS=(AUTHORS CREDITS NEWS THANKS TODO) |
236 |
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch ) |
237 |
|
238 |
src_configure() { |
239 |
local myeconfargs=( |
240 |
$(use_enable nls) |
241 |
$(use_enable tk tknamazu) |
242 |
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} |
243 |
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
244 |
) |
245 |
|
246 |
use tk && myeconfargs+=( |
247 |
@@ -64,9 +64,7 @@ src_compile() { |
248 |
|
249 |
src_install () { |
250 |
autotools-utils_src_install |
251 |
- dodoc ChangeLog* HACKING* README* etc/*.png |
252 |
- dohtml -r doc/* |
253 |
- rm -r "${ED}"/usr/share/namazu/doc || die |
254 |
+ |
255 |
if use emacs; then |
256 |
elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el* |
257 |
elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el |