1 |
commit: 75dcb1f96d13c2207dac4fd7e976fa2c09e1fcee |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 10 12:21:27 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 10 12:40:17 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75dcb1f9 |
7 |
|
8 |
app-text/namazu: update to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
app-text/namazu/files/50namazu-gentoo.el | 3 -- |
13 |
app-text/namazu/namazu-2.0.21.ebuild | 34 +++++++++++++---------- |
14 |
app-text/namazu/namazu-2.0.22_p1.ebuild | 47 +++++++++++++++++++------------- |
15 |
3 files changed, 48 insertions(+), 36 deletions(-) |
16 |
|
17 |
diff --git a/app-text/namazu/files/50namazu-gentoo.el b/app-text/namazu/files/50namazu-gentoo.el |
18 |
index 56bbce50af8..e2f6e501241 100644 |
19 |
--- a/app-text/namazu/files/50namazu-gentoo.el |
20 |
+++ b/app-text/namazu/files/50namazu-gentoo.el |
21 |
@@ -1,5 +1,2 @@ |
22 |
- |
23 |
-;; namazu site-lisp configuration |
24 |
- |
25 |
(add-to-list 'load-path "@SITELISP@") |
26 |
(autoload 'namazu "namazu" nil t) |
27 |
|
28 |
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild |
29 |
index ac2d382288d..4e9e1946644 100644 |
30 |
--- a/app-text/namazu/namazu-2.0.21.ebuild |
31 |
+++ b/app-text/namazu/namazu-2.0.21.ebuild |
32 |
@@ -1,9 +1,9 @@ |
33 |
# Copyright 1999-2017 Gentoo Foundation |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
|
36 |
-EAPI="5" |
37 |
+EAPI="6" |
38 |
|
39 |
-inherit autotools eutils elisp-common |
40 |
+inherit autotools elisp-common ltprune |
41 |
|
42 |
DESCRIPTION="Namazu is a full-text search engine" |
43 |
HOMEPAGE="http://www.namazu.org/" |
44 |
@@ -12,9 +12,9 @@ SRC_URI="http://www.namazu.org/stable/${P}.tar.gz" |
45 |
LICENSE="GPL-2" |
46 |
SLOT="0" |
47 |
KEYWORDS="amd64 ~ppc ~ppc64 x86" |
48 |
-IUSE="emacs nls tk l10n_ja" |
49 |
+IUSE="emacs l10n_ja nls static-libs tk" |
50 |
|
51 |
-RDEPEND=">=dev-perl/File-MMagic-1.20 |
52 |
+RDEPEND="dev-perl/File-MMagic |
53 |
emacs? ( virtual/emacs ) |
54 |
l10n_ja? ( |
55 |
app-i18n/nkf |
56 |
@@ -33,9 +33,13 @@ RDEPEND=">=dev-perl/File-MMagic-1.20 |
57 |
DEPEND="${RDEPEND} |
58 |
nls? ( sys-devel/gettext )" |
59 |
|
60 |
+PATCHES=( |
61 |
+ "${FILESDIR}"/${PN}-gentoo.patch |
62 |
+ "${FILESDIR}"/${P}-memmove.patch |
63 |
+) |
64 |
+ |
65 |
src_prepare() { |
66 |
- epatch "${FILESDIR}"/${PN}-gentoo.patch |
67 |
- epatch "${FILESDIR}"/${P}-memmove.patch |
68 |
+ default |
69 |
|
70 |
mv configure.{in,ac} |
71 |
mv tk${PN}/configure.{in,ac} |
72 |
@@ -45,14 +49,13 @@ src_prepare() { |
73 |
src_configure() { |
74 |
local myconf=( |
75 |
$(use_enable nls) |
76 |
- $(use_enable tk tknamazu) |
77 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} |
78 |
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
79 |
+ $(use_enable static-libs static) |
80 |
+ $(use_enable tk tk${PN}) |
81 |
) |
82 |
use tk && myconf+=( |
83 |
- --with-namazu=/usr/bin/namazu |
84 |
- --with-mknmz=/usr/bin/mknmz |
85 |
- --with-indexdir=/var/lib/namazu/index |
86 |
+ --with-${PN}="${EPREFIX}"/usr/bin/${PN} |
87 |
+ --with-mknmz="${EPREFIX}"/usr/bin/mknmz |
88 |
+ --with-indexdir="${EPREFIX}"/var/lib/${PN}/index |
89 |
) |
90 |
|
91 |
econf "${myconf[@]}" |
92 |
@@ -63,7 +66,8 @@ src_compile() { |
93 |
|
94 |
if use emacs; then |
95 |
cd lisp |
96 |
- elisp-compile gnus-nmz-1.el namazu.el |
97 |
+ rm -f browse* |
98 |
+ elisp-compile *.el |
99 |
fi |
100 |
} |
101 |
|
102 |
@@ -71,12 +75,14 @@ src_install () { |
103 |
emake DESTDIR="${D}" install |
104 |
|
105 |
if use emacs; then |
106 |
- elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el* |
107 |
+ elisp-install ${PN} lisp/*.el* |
108 |
elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el |
109 |
|
110 |
docinto lisp |
111 |
dodoc lisp/ChangeLog* |
112 |
fi |
113 |
+ |
114 |
+ prune_libtool_files |
115 |
} |
116 |
|
117 |
pkg_postinst() { |
118 |
|
119 |
diff --git a/app-text/namazu/namazu-2.0.22_p1.ebuild b/app-text/namazu/namazu-2.0.22_p1.ebuild |
120 |
index ed4b7d27b3f..8889da50fc4 100644 |
121 |
--- a/app-text/namazu/namazu-2.0.22_p1.ebuild |
122 |
+++ b/app-text/namazu/namazu-2.0.22_p1.ebuild |
123 |
@@ -1,10 +1,9 @@ |
124 |
# Copyright 1999-2017 Gentoo Foundation |
125 |
# Distributed under the terms of the GNU General Public License v2 |
126 |
|
127 |
-EAPI="5" |
128 |
+EAPI="6" |
129 |
|
130 |
-AUTOTOOLS_AUTORECONF="1" |
131 |
-inherit autotools-utils eutils elisp-common |
132 |
+inherit autotools elisp-common ltprune |
133 |
|
134 |
DESCRIPTION="Namazu is a full-text search engine" |
135 |
HOMEPAGE="http://www.namazu.org/" |
136 |
@@ -13,9 +12,9 @@ SRC_URI="http://www.namazu.org/test/${P/_p/pre}.tar.gz" |
137 |
LICENSE="GPL-2" |
138 |
SLOT="0" |
139 |
KEYWORDS="" |
140 |
-IUSE="emacs nls tk l10n_ja" |
141 |
+IUSE="emacs l10n_ja nls static-libs tk" |
142 |
|
143 |
-RDEPEND=">=dev-perl/File-MMagic-1.20 |
144 |
+RDEPEND="dev-perl/File-MMagic |
145 |
emacs? ( virtual/emacs ) |
146 |
l10n_ja? ( |
147 |
app-i18n/nkf |
148 |
@@ -37,41 +36,51 @@ S="${WORKDIR}"/${P/_p/pre} |
149 |
|
150 |
PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch ) |
151 |
|
152 |
+src_prepare() { |
153 |
+ default |
154 |
+ |
155 |
+ mv configure.{in,ac} |
156 |
+ mv tk${PN}/configure.{in,ac} |
157 |
+ eautoreconf |
158 |
+} |
159 |
+ |
160 |
src_configure() { |
161 |
- local myeconfargs=( |
162 |
+ local myconf=( |
163 |
$(use_enable nls) |
164 |
- $(use_enable tk tknamazu) |
165 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} |
166 |
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
167 |
+ $(use_enable static-libs static) |
168 |
+ $(use_enable tk tk${PN}) |
169 |
) |
170 |
- |
171 |
- use tk && myeconfargs+=( |
172 |
- --with-namazu=/usr/bin/namazu |
173 |
- --with-mknmz=/usr/bin/mknmz |
174 |
- --with-indexdir=/var/lib/namazu/index |
175 |
+ use tk && myconf+=( |
176 |
+ --with-${PN}="${EPREFIX}"/usr/bin/${PN} |
177 |
+ --with-mknmz="${EPREFIX}"/usr/bin/mknmz |
178 |
+ --with-indexdir="${EPREFIX}"/var/lib/${PN}/index |
179 |
) |
180 |
- autotools-utils_src_configure |
181 |
+ |
182 |
+ econf "${myconf[@]}" |
183 |
} |
184 |
|
185 |
src_compile() { |
186 |
- autotools-utils_src_compile |
187 |
+ emake |
188 |
|
189 |
if use emacs; then |
190 |
cd lisp |
191 |
- elisp-compile gnus-nmz-1.el namazu.el |
192 |
+ rm -f browse* |
193 |
+ elisp-compile *.el |
194 |
fi |
195 |
} |
196 |
|
197 |
src_install () { |
198 |
- autotools-utils_src_install |
199 |
+ emake DESTDIR="${D}" install |
200 |
|
201 |
if use emacs; then |
202 |
- elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el* |
203 |
+ elisp-install ${PN} lisp/*.el* |
204 |
elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el |
205 |
|
206 |
docinto lisp |
207 |
dodoc lisp/ChangeLog* |
208 |
fi |
209 |
+ |
210 |
+ prune_libtool_files |
211 |
} |
212 |
|
213 |
pkg_postinst() { |