1 |
Convert the usage of eblits in sys-devel/autoconf into an equivalent |
2 |
eclass. This makes the ebuilds more readable, more predictable and fixes |
3 |
compliance with stricter versions of the package manager (i.e. a future |
4 |
release of Portage). |
5 |
--- |
6 |
eclass/toolchain-autoconf.eclass | 70 ++++++++++++++++++++++ |
7 |
sys-devel/autoconf/autoconf-2.13.ebuild | 10 +--- |
8 |
sys-devel/autoconf/autoconf-2.59-r7.ebuild | 11 +--- |
9 |
sys-devel/autoconf/autoconf-2.61-r2.ebuild | 11 +--- |
10 |
sys-devel/autoconf/autoconf-2.62-r1.ebuild | 11 +--- |
11 |
sys-devel/autoconf/autoconf-2.63-r1.ebuild | 11 +--- |
12 |
sys-devel/autoconf/autoconf-2.64.ebuild | 11 +--- |
13 |
sys-devel/autoconf/autoconf-2.65-r1.ebuild | 11 +--- |
14 |
sys-devel/autoconf/autoconf-2.67.ebuild | 11 +--- |
15 |
sys-devel/autoconf/autoconf-2.68.ebuild | 11 +--- |
16 |
sys-devel/autoconf/autoconf-2.69-r2.ebuild | 11 +--- |
17 |
sys-devel/autoconf/autoconf-9999.ebuild | 15 ++--- |
18 |
sys-devel/autoconf/files/eblits/main.eblit | 47 --------------- |
19 |
.../autoconf/files/eblits/src_configure.eblit | 11 ---- |
20 |
sys-devel/autoconf/files/eblits/src_install.eblit | 38 ------------ |
21 |
sys-devel/autoconf/files/eblits/src_prepare.eblit | 8 --- |
22 |
16 files changed, 100 insertions(+), 198 deletions(-) |
23 |
create mode 100644 eclass/toolchain-autoconf.eclass |
24 |
delete mode 100644 sys-devel/autoconf/files/eblits/main.eblit |
25 |
delete mode 100644 sys-devel/autoconf/files/eblits/src_configure.eblit |
26 |
delete mode 100644 sys-devel/autoconf/files/eblits/src_install.eblit |
27 |
delete mode 100644 sys-devel/autoconf/files/eblits/src_prepare.eblit |
28 |
|
29 |
diff --git a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass |
30 |
new file mode 100644 |
31 |
index 000000000000..59057b8d6ebb |
32 |
--- /dev/null |
33 |
+++ b/eclass/toolchain-autoconf.eclass |
34 |
@@ -0,0 +1,70 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+# @ECLASS: toolchain-autoconf.eclass |
39 |
+# @MAINTAINER: |
40 |
+# <base-system@g.o> |
41 |
+# @BLURB: Common code for sys-devel/autoconf ebuilds |
42 |
+# @DESCRIPTION: |
43 |
+# This eclass contains the common phase functions migrated from |
44 |
+# sys-devel/autoconf eblits. |
45 |
+ |
46 |
+if [[ -z ${_TOOLCHAIN_AUTOCONF_ECLASS} ]]; then |
47 |
+ |
48 |
+inherit eutils |
49 |
+ |
50 |
+EXPORT_FUNCTIONS src_prepare src_configure src_install |
51 |
+ |
52 |
+toolchain-autoconf_src_prepare() { |
53 |
+ find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + || die |
54 |
+ |
55 |
+ [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}" |
56 |
+} |
57 |
+ |
58 |
+toolchain-autoconf_src_configure() { |
59 |
+ # Disable Emacs in the build system since it is in a separate package. |
60 |
+ export EMACS=no |
61 |
+ econf --program-suffix="-${PV}" || die |
62 |
+ # econf updates config.{sub,guess} which forces the manpages |
63 |
+ # to be regenerated which we dont want to do #146621 |
64 |
+ touch man/*.1 |
65 |
+} |
66 |
+ |
67 |
+# slot the info pages. do this w/out munging the source so we don't have |
68 |
+# to depend on texinfo to regen things. #464146 (among others) |
69 |
+slot_info_pages() { |
70 |
+ [[ ${SLOT} == "0" ]] && return |
71 |
+ |
72 |
+ pushd "${ED}"/usr/share/info >/dev/null || die |
73 |
+ rm -f dir || die |
74 |
+ |
75 |
+ # Rewrite all the references to other pages. |
76 |
+ # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. |
77 |
+ # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. |
78 |
+ local p pages=( *.info ) args=() |
79 |
+ for p in "${pages[@]/%.info}" ; do |
80 |
+ args+=( |
81 |
+ -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" |
82 |
+ -e "s:(${p}):(${p}-${SLOT}):g" |
83 |
+ ) |
84 |
+ done |
85 |
+ sed -i "${args[@]}" * || die |
86 |
+ |
87 |
+ # Rewrite all the file references, and rename them in the process. |
88 |
+ local f d |
89 |
+ for f in * ; do |
90 |
+ d=${f/.info/-${SLOT}.info} |
91 |
+ mv "${f}" "${d}" || die |
92 |
+ sed -i -e "s:${f}:${d}:g" * || die |
93 |
+ done |
94 |
+ |
95 |
+ popd >/dev/null || die |
96 |
+} |
97 |
+ |
98 |
+toolchain-autoconf_src_install() { |
99 |
+ default |
100 |
+ slot_info_pages |
101 |
+} |
102 |
+ |
103 |
+_TOOLCHAIN_AUTOCONF_ECLASS=1 |
104 |
+fi |
105 |
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13.ebuild |
106 |
index 60f3ef570bb6..e5ea4f482989 100644 |
107 |
--- a/sys-devel/autoconf/autoconf-2.13.ebuild |
108 |
+++ b/sys-devel/autoconf/autoconf-2.13.ebuild |
109 |
@@ -1,9 +1,9 @@ |
110 |
-# Copyright 1999-2016 Gentoo Foundation |
111 |
+# Copyright 1999-2017 Gentoo Foundation |
112 |
# Distributed under the terms of the GNU General Public License v2 |
113 |
|
114 |
EAPI="5" |
115 |
|
116 |
-inherit eutils |
117 |
+inherit toolchain-autoconf |
118 |
|
119 |
DESCRIPTION="Used to create autoconfiguration files" |
120 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
121 |
@@ -26,12 +26,6 @@ PATCHES=( |
122 |
"${FILESDIR}"/${P}-test-fixes.patch #146592 |
123 |
) |
124 |
|
125 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
126 |
- source "${FILESDIR}"/eblits/main.eblit || die |
127 |
-fi |
128 |
-src_prepare() { eblit-run src_prepare ; } |
129 |
-src_install() { eblit-run src_install ; } |
130 |
- |
131 |
src_configure() { |
132 |
touch configure # make sure configure is newer than configure.in |
133 |
|
134 |
diff --git a/sys-devel/autoconf/autoconf-2.59-r7.ebuild b/sys-devel/autoconf/autoconf-2.59-r7.ebuild |
135 |
index dbcbdf9ef005..7eade8183517 100644 |
136 |
--- a/sys-devel/autoconf/autoconf-2.59-r7.ebuild |
137 |
+++ b/sys-devel/autoconf/autoconf-2.59-r7.ebuild |
138 |
@@ -1,9 +1,9 @@ |
139 |
-# Copyright 1999-2015 Gentoo Foundation |
140 |
+# Copyright 1999-2017 Gentoo Foundation |
141 |
# Distributed under the terms of the GNU General Public License v2 |
142 |
|
143 |
EAPI="5" |
144 |
|
145 |
-inherit eutils |
146 |
+inherit toolchain-autoconf |
147 |
|
148 |
DESCRIPTION="Used to create autoconfiguration files" |
149 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
150 |
@@ -23,10 +23,3 @@ RDEPEND="${DEPEND} |
151 |
PATCHES=( |
152 |
"${FILESDIR}"/${P}-more-quotes.patch |
153 |
) |
154 |
- |
155 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
156 |
- source "${FILESDIR}"/eblits/main.eblit || die |
157 |
-fi |
158 |
-src_prepare() { eblit-run src_prepare ; } |
159 |
-src_configure() { eblit-run src_configure ; } |
160 |
-src_install() { eblit-run src_install ; } |
161 |
diff --git a/sys-devel/autoconf/autoconf-2.61-r2.ebuild b/sys-devel/autoconf/autoconf-2.61-r2.ebuild |
162 |
index 7af545f918e9..e1fedced3204 100644 |
163 |
--- a/sys-devel/autoconf/autoconf-2.61-r2.ebuild |
164 |
+++ b/sys-devel/autoconf/autoconf-2.61-r2.ebuild |
165 |
@@ -1,9 +1,9 @@ |
166 |
-# Copyright 1999-2015 Gentoo Foundation |
167 |
+# Copyright 1999-2017 Gentoo Foundation |
168 |
# Distributed under the terms of the GNU General Public License v2 |
169 |
|
170 |
EAPI="5" |
171 |
|
172 |
-inherit eutils |
173 |
+inherit toolchain-autoconf |
174 |
|
175 |
DESCRIPTION="Used to create autoconfiguration files" |
176 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
177 |
@@ -24,13 +24,6 @@ PATCHES=( |
178 |
"${FILESDIR}"/${P}-GETMNTENT.patch |
179 |
) |
180 |
|
181 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
182 |
- source "${FILESDIR}"/eblits/main.eblit || die |
183 |
-fi |
184 |
-src_prepare() { eblit-run src_prepare ; } |
185 |
-src_configure() { eblit-run src_configure ; } |
186 |
-src_install() { eblit-run src_install ; } |
187 |
- |
188 |
src_compile() { |
189 |
# From configure output: |
190 |
# Parallel builds via `make -jN' do not work. |
191 |
diff --git a/sys-devel/autoconf/autoconf-2.62-r1.ebuild b/sys-devel/autoconf/autoconf-2.62-r1.ebuild |
192 |
index 30cec8f13d42..574a0af6ce74 100644 |
193 |
--- a/sys-devel/autoconf/autoconf-2.62-r1.ebuild |
194 |
+++ b/sys-devel/autoconf/autoconf-2.62-r1.ebuild |
195 |
@@ -1,9 +1,9 @@ |
196 |
-# Copyright 1999-2015 Gentoo Foundation |
197 |
+# Copyright 1999-2017 Gentoo Foundation |
198 |
# Distributed under the terms of the GNU General Public License v2 |
199 |
|
200 |
EAPI="5" |
201 |
|
202 |
-inherit eutils |
203 |
+inherit toolchain-autoconf |
204 |
|
205 |
DESCRIPTION="Used to create autoconfiguration files" |
206 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
207 |
@@ -25,10 +25,3 @@ PATCHES=( |
208 |
"${FILESDIR}"/${P}-at-keywords.patch |
209 |
"${FILESDIR}"/${P}-fix-multiline-string.patch #217976 |
210 |
) |
211 |
- |
212 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
213 |
- source "${FILESDIR}"/eblits/main.eblit || die |
214 |
-fi |
215 |
-src_prepare() { eblit-run src_prepare ; } |
216 |
-src_configure() { eblit-run src_configure ; } |
217 |
-src_install() { eblit-run src_install ; } |
218 |
diff --git a/sys-devel/autoconf/autoconf-2.63-r1.ebuild b/sys-devel/autoconf/autoconf-2.63-r1.ebuild |
219 |
index 62d7a8200fc5..0df070c98765 100644 |
220 |
--- a/sys-devel/autoconf/autoconf-2.63-r1.ebuild |
221 |
+++ b/sys-devel/autoconf/autoconf-2.63-r1.ebuild |
222 |
@@ -1,9 +1,9 @@ |
223 |
-# Copyright 1999-2015 Gentoo Foundation |
224 |
+# Copyright 1999-2017 Gentoo Foundation |
225 |
# Distributed under the terms of the GNU General Public License v2 |
226 |
|
227 |
EAPI="5" |
228 |
|
229 |
-inherit eutils |
230 |
+inherit toolchain-autoconf |
231 |
|
232 |
DESCRIPTION="Used to create autoconfiguration files" |
233 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
234 |
@@ -23,10 +23,3 @@ RDEPEND="${DEPEND} |
235 |
PATCHES=( |
236 |
"${FILESDIR}"/${P}-sh.patch #264303 |
237 |
) |
238 |
- |
239 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
240 |
- source "${FILESDIR}"/eblits/main.eblit || die |
241 |
-fi |
242 |
-src_prepare() { eblit-run src_prepare ; } |
243 |
-src_configure() { eblit-run src_configure ; } |
244 |
-src_install() { eblit-run src_install ; } |
245 |
diff --git a/sys-devel/autoconf/autoconf-2.64.ebuild b/sys-devel/autoconf/autoconf-2.64.ebuild |
246 |
index d08d4440b413..572f9e3322af 100644 |
247 |
--- a/sys-devel/autoconf/autoconf-2.64.ebuild |
248 |
+++ b/sys-devel/autoconf/autoconf-2.64.ebuild |
249 |
@@ -1,8 +1,10 @@ |
250 |
-# Copyright 1999-2015 Gentoo Foundation |
251 |
+# Copyright 1999-2017 Gentoo Foundation |
252 |
# Distributed under the terms of the GNU General Public License v2 |
253 |
|
254 |
EAPI="5" |
255 |
|
256 |
+inherit toolchain-autoconf |
257 |
+ |
258 |
DESCRIPTION="Used to create autoconfiguration files" |
259 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
260 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
261 |
@@ -17,10 +19,3 @@ DEPEND=">=sys-devel/m4-1.4.6 |
262 |
RDEPEND="${DEPEND} |
263 |
!~sys-devel/${P}:2.5 |
264 |
>=sys-devel/autoconf-wrapper-13" |
265 |
- |
266 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
267 |
- source "${FILESDIR}"/eblits/main.eblit || die |
268 |
-fi |
269 |
-src_prepare() { eblit-run src_prepare ; } |
270 |
-src_configure() { eblit-run src_configure ; } |
271 |
-src_install() { eblit-run src_install ; } |
272 |
diff --git a/sys-devel/autoconf/autoconf-2.65-r1.ebuild b/sys-devel/autoconf/autoconf-2.65-r1.ebuild |
273 |
index ad91592374e2..1354433f9d33 100644 |
274 |
--- a/sys-devel/autoconf/autoconf-2.65-r1.ebuild |
275 |
+++ b/sys-devel/autoconf/autoconf-2.65-r1.ebuild |
276 |
@@ -1,9 +1,9 @@ |
277 |
-# Copyright 1999-2015 Gentoo Foundation |
278 |
+# Copyright 1999-2017 Gentoo Foundation |
279 |
# Distributed under the terms of the GNU General Public License v2 |
280 |
|
281 |
EAPI="5" |
282 |
|
283 |
-inherit eutils |
284 |
+inherit toolchain-autoconf |
285 |
|
286 |
DESCRIPTION="Used to create autoconfiguration files" |
287 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
288 |
@@ -23,10 +23,3 @@ RDEPEND="${DEPEND} |
289 |
PATCHES=( |
290 |
"${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649 |
291 |
) |
292 |
- |
293 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
294 |
- source "${FILESDIR}"/eblits/main.eblit || die |
295 |
-fi |
296 |
-src_prepare() { eblit-run src_prepare ; } |
297 |
-src_configure() { eblit-run src_configure ; } |
298 |
-src_install() { eblit-run src_install ; } |
299 |
diff --git a/sys-devel/autoconf/autoconf-2.67.ebuild b/sys-devel/autoconf/autoconf-2.67.ebuild |
300 |
index 0bfcaee59fb8..4290fee75751 100644 |
301 |
--- a/sys-devel/autoconf/autoconf-2.67.ebuild |
302 |
+++ b/sys-devel/autoconf/autoconf-2.67.ebuild |
303 |
@@ -1,8 +1,10 @@ |
304 |
-# Copyright 1999-2015 Gentoo Foundation |
305 |
+# Copyright 1999-2017 Gentoo Foundation |
306 |
# Distributed under the terms of the GNU General Public License v2 |
307 |
|
308 |
EAPI="5" |
309 |
|
310 |
+inherit toolchain-autoconf |
311 |
+ |
312 |
DESCRIPTION="Used to create autoconfiguration files" |
313 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
314 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
315 |
@@ -17,10 +19,3 @@ DEPEND=">=sys-devel/m4-1.4.6 |
316 |
RDEPEND="${DEPEND} |
317 |
!~sys-devel/${P}:2.5 |
318 |
>=sys-devel/autoconf-wrapper-13" |
319 |
- |
320 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
321 |
- source "${FILESDIR}"/eblits/main.eblit || die |
322 |
-fi |
323 |
-src_prepare() { eblit-run src_prepare ; } |
324 |
-src_configure() { eblit-run src_configure ; } |
325 |
-src_install() { eblit-run src_install ; } |
326 |
diff --git a/sys-devel/autoconf/autoconf-2.68.ebuild b/sys-devel/autoconf/autoconf-2.68.ebuild |
327 |
index 0bfcaee59fb8..4290fee75751 100644 |
328 |
--- a/sys-devel/autoconf/autoconf-2.68.ebuild |
329 |
+++ b/sys-devel/autoconf/autoconf-2.68.ebuild |
330 |
@@ -1,8 +1,10 @@ |
331 |
-# Copyright 1999-2015 Gentoo Foundation |
332 |
+# Copyright 1999-2017 Gentoo Foundation |
333 |
# Distributed under the terms of the GNU General Public License v2 |
334 |
|
335 |
EAPI="5" |
336 |
|
337 |
+inherit toolchain-autoconf |
338 |
+ |
339 |
DESCRIPTION="Used to create autoconfiguration files" |
340 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
341 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
342 |
@@ -17,10 +19,3 @@ DEPEND=">=sys-devel/m4-1.4.6 |
343 |
RDEPEND="${DEPEND} |
344 |
!~sys-devel/${P}:2.5 |
345 |
>=sys-devel/autoconf-wrapper-13" |
346 |
- |
347 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
348 |
- source "${FILESDIR}"/eblits/main.eblit || die |
349 |
-fi |
350 |
-src_prepare() { eblit-run src_prepare ; } |
351 |
-src_configure() { eblit-run src_configure ; } |
352 |
-src_install() { eblit-run src_install ; } |
353 |
diff --git a/sys-devel/autoconf/autoconf-2.69-r2.ebuild b/sys-devel/autoconf/autoconf-2.69-r2.ebuild |
354 |
index 593e8a0454d5..9d09ace0dc31 100644 |
355 |
--- a/sys-devel/autoconf/autoconf-2.69-r2.ebuild |
356 |
+++ b/sys-devel/autoconf/autoconf-2.69-r2.ebuild |
357 |
@@ -1,4 +1,4 @@ |
358 |
-# Copyright 1999-2016 Gentoo Foundation |
359 |
+# Copyright 1999-2017 Gentoo Foundation |
360 |
# Distributed under the terms of the GNU General Public License v2 |
361 |
|
362 |
EAPI="5" |
363 |
@@ -15,6 +15,8 @@ else |
364 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" |
365 |
fi |
366 |
|
367 |
+inherit toolchain-autoconf |
368 |
+ |
369 |
DESCRIPTION="Used to create autoconfiguration files" |
370 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
371 |
|
372 |
@@ -29,10 +31,3 @@ RDEPEND="${DEPEND} |
373 |
>=sys-devel/autoconf-wrapper-13" |
374 |
[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3" |
375 |
PDEPEND="emacs? ( app-emacs/autoconf-mode )" |
376 |
- |
377 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
378 |
- source "${FILESDIR}"/eblits/main.eblit || die |
379 |
-fi |
380 |
-src_prepare() { eblit-run src_prepare ; } |
381 |
-src_configure() { eblit-run src_configure ; } |
382 |
-src_install() { eblit-run src_install ; } |
383 |
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild |
384 |
index e54426475c8d..d8ac1b8201ad 100644 |
385 |
--- a/sys-devel/autoconf/autoconf-9999.ebuild |
386 |
+++ b/sys-devel/autoconf/autoconf-9999.ebuild |
387 |
@@ -1,4 +1,4 @@ |
388 |
-# Copyright 1999-2015 Gentoo Foundation |
389 |
+# Copyright 1999-2017 Gentoo Foundation |
390 |
# Distributed under the terms of the GNU General Public License v2 |
391 |
|
392 |
EAPI="5" |
393 |
@@ -15,6 +15,8 @@ else |
394 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" |
395 |
fi |
396 |
|
397 |
+inherit toolchain-autoconf |
398 |
+ |
399 |
DESCRIPTION="Used to create autoconfiguration files" |
400 |
HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" |
401 |
|
402 |
@@ -30,18 +32,13 @@ RDEPEND="${DEPEND} |
403 |
[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3" |
404 |
PDEPEND="emacs? ( app-emacs/autoconf-mode )" |
405 |
|
406 |
-if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then |
407 |
- source "${FILESDIR}"/eblits/main.eblit || die |
408 |
-fi |
409 |
-src_prepare() { eblit-run src_prepare ; } |
410 |
-src_configure() { eblit-run src_configure ; } |
411 |
-src_install() { eblit-run src_install ; } |
412 |
- |
413 |
-eblit-src_prepare-pre() { |
414 |
+src_prepare() { |
415 |
# Avoid the "dirty" suffix in the git version by generating it |
416 |
# before we run later stages which might modify source files. |
417 |
local ver=$(./build-aux/git-version-gen .tarball-version) |
418 |
echo "${ver}" > .tarball-version |
419 |
|
420 |
autoreconf -f -i || die |
421 |
+ |
422 |
+ autotools-autoconf_src_prepare |
423 |
} |
424 |
diff --git a/sys-devel/autoconf/files/eblits/main.eblit b/sys-devel/autoconf/files/eblits/main.eblit |
425 |
deleted file mode 100644 |
426 |
index 66b1fe2fa87a..000000000000 |
427 |
--- a/sys-devel/autoconf/files/eblits/main.eblit |
428 |
+++ /dev/null |
429 |
@@ -1,47 +0,0 @@ |
430 |
-# Copyright 1999-2015 Gentoo Foundation |
431 |
-# Distributed under the terms of the GNU General Public License v2 |
432 |
- |
433 |
-__EBLITS__="locked-and-loaded" |
434 |
- |
435 |
-# eblit-include [--skip] <function> [version] |
436 |
-eblit-include() { |
437 |
- local skipable=false |
438 |
- [[ $1 == "--skip" ]] && skipable=true && shift |
439 |
- [[ $1 == pkg_* ]] && skipable=true |
440 |
- |
441 |
- local e v func=$1 ver=$2 |
442 |
- [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" |
443 |
- for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do |
444 |
- e="${FILESDIR}/eblits/${func}${v}.eblit" |
445 |
- if [[ -e ${e} ]] ; then |
446 |
- source "${e}" |
447 |
- return 0 |
448 |
- fi |
449 |
- done |
450 |
- ${skipable} && return 0 |
451 |
- die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" |
452 |
-} |
453 |
- |
454 |
-# eblit-run-maybe <function> |
455 |
-# run the specified function if it is defined |
456 |
-eblit-run-maybe() { |
457 |
- [[ $(type -t "$@") == "function" ]] && "$@" |
458 |
-} |
459 |
- |
460 |
-# eblit-run <function> [version] |
461 |
-# aka: src_unpack() { eblit-run src_unpack ; } |
462 |
-eblit-run() { |
463 |
- eblit-include --skip common "${*:2}" |
464 |
- eblit-include "$@" |
465 |
- eblit-run-maybe eblit-$1-pre |
466 |
- eblit-${PN}-$1 |
467 |
- eblit-run-maybe eblit-$1-post |
468 |
-} |
469 |
- |
470 |
-# Copy these into the ebuilds. |
471 |
-#src_unpack() { eblit-run src_unpack ; } |
472 |
-#src_prepare() { eblit-run src_prepare ; } |
473 |
-#src_configure() { eblit-run src_configure ; } |
474 |
-#src_compile() { eblit-run src_compile ; } |
475 |
-#src_test() { eblit-run src_test ; } |
476 |
-#src_install() { eblit-run src_install ; } |
477 |
diff --git a/sys-devel/autoconf/files/eblits/src_configure.eblit b/sys-devel/autoconf/files/eblits/src_configure.eblit |
478 |
deleted file mode 100644 |
479 |
index 680a38f74a1d..000000000000 |
480 |
--- a/sys-devel/autoconf/files/eblits/src_configure.eblit |
481 |
+++ /dev/null |
482 |
@@ -1,11 +0,0 @@ |
483 |
-# Copyright 1999-2015 Gentoo Foundation |
484 |
-# Distributed under the terms of the GNU General Public License v2 |
485 |
- |
486 |
-eblit-autoconf-src_configure() { |
487 |
- # Disable Emacs in the build system since it is in a separate package. |
488 |
- export EMACS=no |
489 |
- econf --program-suffix="-${PV}" || die |
490 |
- # econf updates config.{sub,guess} which forces the manpages |
491 |
- # to be regenerated which we dont want to do #146621 |
492 |
- touch man/*.1 |
493 |
-} |
494 |
diff --git a/sys-devel/autoconf/files/eblits/src_install.eblit b/sys-devel/autoconf/files/eblits/src_install.eblit |
495 |
deleted file mode 100644 |
496 |
index b64381ca1f6d..000000000000 |
497 |
--- a/sys-devel/autoconf/files/eblits/src_install.eblit |
498 |
+++ /dev/null |
499 |
@@ -1,38 +0,0 @@ |
500 |
-# Copyright 1999-2015 Gentoo Foundation |
501 |
-# Distributed under the terms of the GNU General Public License v2 |
502 |
- |
503 |
-# slot the info pages. do this w/out munging the source so we don't have |
504 |
-# to depend on texinfo to regen things. #464146 (among others) |
505 |
-slot_info_pages() { |
506 |
- [[ ${SLOT} == "0" ]] && return |
507 |
- |
508 |
- pushd "${ED}"/usr/share/info >/dev/null |
509 |
- rm -f dir |
510 |
- |
511 |
- # Rewrite all the references to other pages. |
512 |
- # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. |
513 |
- # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. |
514 |
- local p pages=( *.info ) args=() |
515 |
- for p in "${pages[@]/%.info}" ; do |
516 |
- args+=( |
517 |
- -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" |
518 |
- -e "s:(${p}):(${p}-${SLOT}):g" |
519 |
- ) |
520 |
- done |
521 |
- sed -i "${args[@]}" * || die |
522 |
- |
523 |
- # Rewrite all the file references, and rename them in the process. |
524 |
- local f d |
525 |
- for f in * ; do |
526 |
- d=${f/.info/-${SLOT}.info} |
527 |
- mv "${f}" "${d}" || die |
528 |
- sed -i -e "s:${f}:${d}:g" * || die |
529 |
- done |
530 |
- |
531 |
- popd >/dev/null |
532 |
-} |
533 |
- |
534 |
-eblit-autoconf-src_install() { |
535 |
- default |
536 |
- slot_info_pages |
537 |
-} |
538 |
diff --git a/sys-devel/autoconf/files/eblits/src_prepare.eblit b/sys-devel/autoconf/files/eblits/src_prepare.eblit |
539 |
deleted file mode 100644 |
540 |
index b34fbfc56dd4..000000000000 |
541 |
--- a/sys-devel/autoconf/files/eblits/src_prepare.eblit |
542 |
+++ /dev/null |
543 |
@@ -1,8 +0,0 @@ |
544 |
-# Copyright 1999-2015 Gentoo Foundation |
545 |
-# Distributed under the terms of the GNU General Public License v2 |
546 |
- |
547 |
-eblit-autoconf-src_prepare() { |
548 |
- find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + |
549 |
- |
550 |
- [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}" |
551 |
-} |
552 |
-- |
553 |
2.12.0 |