Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/files/, sys-devel/autoconf/
Date: Thu, 04 Jan 2018 09:35:31
Message-Id: 1515058522.918e6be64b2778a8863deebec11d62b0ef377d50.polynomial-c@gentoo
1 commit: 918e6be64b2778a8863deebec11d62b0ef377d50
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 09:28:19 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 09:35:22 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918e6be6
7
8 sys-devel/autoconf: Removed masked versions.
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-devel/autoconf/Manifest | 7 -
13 sys-devel/autoconf/autoconf-2.59-r7.ebuild | 25 ---
14 sys-devel/autoconf/autoconf-2.61-r2.ebuild | 31 ---
15 sys-devel/autoconf/autoconf-2.62-r1.ebuild | 27 ---
16 sys-devel/autoconf/autoconf-2.63-r1.ebuild | 25 ---
17 sys-devel/autoconf/autoconf-2.65-r1.ebuild | 25 ---
18 sys-devel/autoconf/autoconf-2.67.ebuild | 21 --
19 sys-devel/autoconf/autoconf-2.68.ebuild | 21 --
20 .../autoconf/files/autoconf-2.59-more-quotes.patch | 34 ----
21 .../autoconf/files/autoconf-2.61-GETMNTENT.patch | 23 ---
22 .../autoconf/files/autoconf-2.62-at-keywords.patch | 81 --------
23 .../files/autoconf-2.62-fix-multiline-string.patch | 30 ---
24 .../autoconf-2.62-revert-AC_C_BIGENDIAN.patch | 214 ---------------------
25 sys-devel/autoconf/files/autoconf-2.63-sh.patch | 32 ---
26 .../files/autoconf-2.65-AC_TYPE_INT_T.patch | 49 -----
27 15 files changed, 645 deletions(-)
28
29 diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
30 index 5239b1e09ee..79a4bbc53c1 100644
31 --- a/sys-devel/autoconf/Manifest
32 +++ b/sys-devel/autoconf/Manifest
33 @@ -1,10 +1,3 @@
34 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
35 -DIST autoconf-2.59.tar.bz2 925073 BLAKE2B 32d006ec4e4cf5f8011560ef480dc2752321e6ddff2bceff282329c4c2161a76900bc6118c05a1087907f87fb905a46acec6be2a8035d3cb5ff9fb8057dc911f SHA512 0f57e57b94ef78d59e68476746e78de9c8d0c07bcfdbdb850c2e68b59cdbef7e6256a073d1ae8965abd30611f22c1dc451ecdf67aff43102f73ec118c51ab4d6
36 -DIST autoconf-2.61.tar.bz2 1042439 BLAKE2B 9c7d35c18df684bb539539ab1f1b28d4fbef382a01f769cb765fda932320d83760b962b3d3e9b0e4e9bf39f65aa3731fca9638e76adfcb0dc2ab1d3d7b228bf7 SHA512 f534c7dbc10fc871cc99b1cb68bd7f19d888677d9e2af47e904e91fe90420c20e7a270da2681da82e249ffb46c92165202cc73e125a9b14abd604458731b0026
37 -DIST autoconf-2.62.tar.bz2 1165951 BLAKE2B a4487cdcda6a8f9ed6cf3c182a7bbe1567d74739646004013df6545c5b7ede7ecd76dc4dc45da87ae4dbbaacf140d52fac089912ef6b9f2c3b35f53585b4fabe SHA512 98a2d903e8c43088ac60b880f58d7c35c547824c277dbeb14c48f846e40f29546c20e942f99127ffdc6f6607c334a6054328f20a9a2962972cc80570665ee7d7
38 -DIST autoconf-2.63.tar.bz2 1195259 BLAKE2B 2db806f45f01f33e7941e49e2f48d8f0b659b0b9cec0c1a7d5fff4cf6545734b6836bbc60ca39c664ed38e212261cb90a07a2c40f0095807af6fde813f2b9a85 SHA512 bd47527a1f6558953d21ac1d7a36d490d057a78cd612f82b6f31aa73f9c42f4a2d736a7d4e49d91df268bffa5a418d222c53e741bffc2c8843fe3b7ed37e09d6
39 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
40 -DIST autoconf-2.65.tar.xz 1132092 BLAKE2B 13f9d9d497013cf85b5aa7a7be688d93f8acdd7213c8490efd7b421e5e3d4730ad9c70920e3cb92a56ba1085b5f04de9857e59ae35767efbab97e518c8c685c5 SHA512 23473cde36ad02a9474286a144c751b222d7aecf8b271b49e6dae25706c96d5533c8d840d522ecf11df8c437961a2ac00aa050c929d5e06b381acf1bc34f2c4c
41 -DIST autoconf-2.67.tar.xz 1158000 BLAKE2B 69a85e473fe2895f397b3370623ccde1b461627026314c336b0350b0bc5d843ae381c4df2a84e29e9f582070d4e9088c3c2ee5c7b0e7745dabd065cf1622c41c SHA512 b9021a137da42512f6c4ce907b560ad54e27491083ce686039c32dca2602f3cb354d9e7d7493d6d531a0aa5766ff25e0d86aea6e8f61a79d93acf3ff6b56de80
42 -DIST autoconf-2.68.tar.xz 1167804 BLAKE2B 557fcabec4bf5332a443b2454fefc1a4abb8a22fc36b6f9bf91606c510ebefe8a13021676e6fe2205c56349d96d2cbb3f2d252639e5445639361360815b8ff98 SHA512 fd41b2d75a89bcc67f2cb0a3b335ca0d5e8f6d3f4ae844fea21c80c5ff7234efe8c299491e89d1d1124b0d4ec3072a21cf707e14b5ef186f1ab2d09f0fefa979
43 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
44
45 diff --git a/sys-devel/autoconf/autoconf-2.59-r7.ebuild b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
46 deleted file mode 100644
47 index 7eade818351..00000000000
48 --- a/sys-devel/autoconf/autoconf-2.59-r7.ebuild
49 +++ /dev/null
50 @@ -1,25 +0,0 @@
51 -# Copyright 1999-2017 Gentoo Foundation
52 -# Distributed under the terms of the GNU General Public License v2
53 -
54 -EAPI="5"
55 -
56 -inherit toolchain-autoconf
57 -
58 -DESCRIPTION="Used to create autoconfiguration files"
59 -HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
60 -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
61 -
62 -LICENSE="GPL-2"
63 -SLOT="${PV}"
64 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
65 -IUSE=""
66 -
67 -DEPEND="=sys-devel/m4-1.4*
68 - dev-lang/perl"
69 -RDEPEND="${DEPEND}
70 - !~sys-devel/${P}:2.5
71 - >=sys-devel/autoconf-wrapper-13"
72 -
73 -PATCHES=(
74 - "${FILESDIR}"/${P}-more-quotes.patch
75 -)
76
77 diff --git a/sys-devel/autoconf/autoconf-2.61-r2.ebuild b/sys-devel/autoconf/autoconf-2.61-r2.ebuild
78 deleted file mode 100644
79 index e1fedced320..00000000000
80 --- a/sys-devel/autoconf/autoconf-2.61-r2.ebuild
81 +++ /dev/null
82 @@ -1,31 +0,0 @@
83 -# Copyright 1999-2017 Gentoo Foundation
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI="5"
87 -
88 -inherit toolchain-autoconf
89 -
90 -DESCRIPTION="Used to create autoconfiguration files"
91 -HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
92 -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
93 -
94 -LICENSE="GPL-2"
95 -SLOT="${PV}"
96 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
97 -IUSE=""
98 -
99 -DEPEND=">=sys-devel/m4-1.4.6
100 - dev-lang/perl"
101 -RDEPEND="${DEPEND}
102 - !~sys-devel/${P}:2.5
103 - >=sys-devel/autoconf-wrapper-13"
104 -
105 -PATCHES=(
106 - "${FILESDIR}"/${P}-GETMNTENT.patch
107 -)
108 -
109 -src_compile() {
110 - # From configure output:
111 - # Parallel builds via `make -jN' do not work.
112 - emake -j1
113 -}
114
115 diff --git a/sys-devel/autoconf/autoconf-2.62-r1.ebuild b/sys-devel/autoconf/autoconf-2.62-r1.ebuild
116 deleted file mode 100644
117 index 574a0af6ce7..00000000000
118 --- a/sys-devel/autoconf/autoconf-2.62-r1.ebuild
119 +++ /dev/null
120 @@ -1,27 +0,0 @@
121 -# Copyright 1999-2017 Gentoo Foundation
122 -# Distributed under the terms of the GNU General Public License v2
123 -
124 -EAPI="5"
125 -
126 -inherit toolchain-autoconf
127 -
128 -DESCRIPTION="Used to create autoconfiguration files"
129 -HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
130 -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
131 -
132 -LICENSE="GPL-2"
133 -SLOT="${PV}"
134 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
135 -IUSE=""
136 -
137 -DEPEND=">=sys-devel/m4-1.4.6
138 - dev-lang/perl"
139 -RDEPEND="${DEPEND}
140 - !~sys-devel/${P}:2.5
141 - >=sys-devel/autoconf-wrapper-13"
142 -
143 -PATCHES=(
144 - "${FILESDIR}"/${P}-revert-AC_C_BIGENDIAN.patch #228825
145 - "${FILESDIR}"/${P}-at-keywords.patch
146 - "${FILESDIR}"/${P}-fix-multiline-string.patch #217976
147 -)
148
149 diff --git a/sys-devel/autoconf/autoconf-2.63-r1.ebuild b/sys-devel/autoconf/autoconf-2.63-r1.ebuild
150 deleted file mode 100644
151 index 0df070c9876..00000000000
152 --- a/sys-devel/autoconf/autoconf-2.63-r1.ebuild
153 +++ /dev/null
154 @@ -1,25 +0,0 @@
155 -# Copyright 1999-2017 Gentoo Foundation
156 -# Distributed under the terms of the GNU General Public License v2
157 -
158 -EAPI="5"
159 -
160 -inherit toolchain-autoconf
161 -
162 -DESCRIPTION="Used to create autoconfiguration files"
163 -HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
164 -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
165 -
166 -LICENSE="GPL-2"
167 -SLOT="${PV}"
168 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
169 -IUSE=""
170 -
171 -DEPEND=">=sys-devel/m4-1.4.6
172 - dev-lang/perl"
173 -RDEPEND="${DEPEND}
174 - !~sys-devel/${P}:2.5
175 - >=sys-devel/autoconf-wrapper-13"
176 -
177 -PATCHES=(
178 - "${FILESDIR}"/${P}-sh.patch #264303
179 -)
180
181 diff --git a/sys-devel/autoconf/autoconf-2.65-r1.ebuild b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
182 deleted file mode 100644
183 index 1354433f9d3..00000000000
184 --- a/sys-devel/autoconf/autoconf-2.65-r1.ebuild
185 +++ /dev/null
186 @@ -1,25 +0,0 @@
187 -# Copyright 1999-2017 Gentoo Foundation
188 -# Distributed under the terms of the GNU General Public License v2
189 -
190 -EAPI="5"
191 -
192 -inherit toolchain-autoconf
193 -
194 -DESCRIPTION="Used to create autoconfiguration files"
195 -HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
196 -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
197 -
198 -LICENSE="GPL-3"
199 -SLOT="${PV}"
200 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
201 -IUSE=""
202 -
203 -DEPEND=">=sys-devel/m4-1.4.6
204 - dev-lang/perl"
205 -RDEPEND="${DEPEND}
206 - !~sys-devel/${P}:2.5
207 - >=sys-devel/autoconf-wrapper-13"
208 -
209 -PATCHES=(
210 - "${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649
211 -)
212
213 diff --git a/sys-devel/autoconf/autoconf-2.67.ebuild b/sys-devel/autoconf/autoconf-2.67.ebuild
214 deleted file mode 100644
215 index 4290fee7575..00000000000
216 --- a/sys-devel/autoconf/autoconf-2.67.ebuild
217 +++ /dev/null
218 @@ -1,21 +0,0 @@
219 -# Copyright 1999-2017 Gentoo Foundation
220 -# Distributed under the terms of the GNU General Public License v2
221 -
222 -EAPI="5"
223 -
224 -inherit toolchain-autoconf
225 -
226 -DESCRIPTION="Used to create autoconfiguration files"
227 -HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
228 -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
229 -
230 -LICENSE="GPL-3"
231 -SLOT="${PV}"
232 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
233 -IUSE=""
234 -
235 -DEPEND=">=sys-devel/m4-1.4.6
236 - dev-lang/perl"
237 -RDEPEND="${DEPEND}
238 - !~sys-devel/${P}:2.5
239 - >=sys-devel/autoconf-wrapper-13"
240
241 diff --git a/sys-devel/autoconf/autoconf-2.68.ebuild b/sys-devel/autoconf/autoconf-2.68.ebuild
242 deleted file mode 100644
243 index 4290fee7575..00000000000
244 --- a/sys-devel/autoconf/autoconf-2.68.ebuild
245 +++ /dev/null
246 @@ -1,21 +0,0 @@
247 -# Copyright 1999-2017 Gentoo Foundation
248 -# Distributed under the terms of the GNU General Public License v2
249 -
250 -EAPI="5"
251 -
252 -inherit toolchain-autoconf
253 -
254 -DESCRIPTION="Used to create autoconfiguration files"
255 -HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
256 -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
257 -
258 -LICENSE="GPL-3"
259 -SLOT="${PV}"
260 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
261 -IUSE=""
262 -
263 -DEPEND=">=sys-devel/m4-1.4.6
264 - dev-lang/perl"
265 -RDEPEND="${DEPEND}
266 - !~sys-devel/${P}:2.5
267 - >=sys-devel/autoconf-wrapper-13"
268
269 diff --git a/sys-devel/autoconf/files/autoconf-2.59-more-quotes.patch b/sys-devel/autoconf/files/autoconf-2.59-more-quotes.patch
270 deleted file mode 100644
271 index eb2c8395fa9..00000000000
272 --- a/sys-devel/autoconf/files/autoconf-2.59-more-quotes.patch
273 +++ /dev/null
274 @@ -1,34 +0,0 @@
275 -http://bugs.gentoo.org/96882
276 -
277 -date: 2005/06/23 20:09:27; author: eggert; state: Exp; lines: +29 -34
278 -Fix some more shell quoting problems. Prompted by a bug report
279 -from Justace Clutter.
280 -* lib/autoconf/general.m4 (_AC_INIT_SRCDIR): Allow special
281 -characters in $ac_unique_file.
282 -
283 ---- lib/autoconf/general.m4
284 -+++ lib/autoconf/general.m4
285 -@@ -476,20 +476,20 @@
286 - # Try the directory containing this script, then its parent.
287 - ac_confdir=`AS_DIRNAME(["$[0]"])`
288 - srcdir=$ac_confdir
289 -- if test ! -r $srcdir/$ac_unique_file; then
290 -+ if test ! -r "$srcdir/$ac_unique_file"; then
291 - srcdir=..
292 - fi
293 - else
294 - ac_srcdir_defaulted=no
295 - fi
296 --if test ! -r $srcdir/$ac_unique_file; then
297 -+if test ! -r "$srcdir/$ac_unique_file"; then
298 - if test "$ac_srcdir_defaulted" = yes; then
299 - AC_MSG_ERROR([cannot find sources ($ac_unique_file) in $ac_confdir or ..])
300 - else
301 - AC_MSG_ERROR([cannot find sources ($ac_unique_file) in $srcdir])
302 - fi
303 - fi
304 --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
305 -+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
306 - AC_MSG_ERROR([sources are in $srcdir, but `cd $srcdir' does not work])
307 - dnl Double slashes in pathnames in object file debugging info
308 - dnl mess up M-x gdb in Emacs.
309
310 diff --git a/sys-devel/autoconf/files/autoconf-2.61-GETMNTENT.patch b/sys-devel/autoconf/files/autoconf-2.61-GETMNTENT.patch
311 deleted file mode 100644
312 index 7cdc425e039..00000000000
313 --- a/sys-devel/autoconf/files/autoconf-2.61-GETMNTENT.patch
314 +++ /dev/null
315 @@ -1,23 +0,0 @@
316 -From: Paul Eggert <eggert@×××××××.edu>
317 -Date: Sat, 16 Dec 2006 05:38:41 +0000 (+0000)
318 -Subject: * lib/autoconf/functions.m4 (AC_FUNC_GETMNTENT):
319 -X-Git-Tag: v2.62~386
320 -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff_plain;h=a152d401584cd901f7295647af0382948369de79
321 -
322 -* lib/autoconf/functions.m4 (AC_FUNC_GETMNTENT):
323 -Define HAVE_GETMNTENT to 1, not to the empty string.
324 -Problem originally reported by Jochen Friedrich in
325 -<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=403243>.
326 ----
327 -
328 ---- a/lib/autoconf/functions.m4
329 -+++ b/lib/autoconf/functions.m4
330 -@@ -798,7 +798,7 @@ AC_DEFUN([AC_FUNC_GETMNTENT],
331 - # -lseq on Dynix/PTX, -lgen on Unixware.
332 - AC_SEARCH_LIBS(getmntent, [sun seq gen],
333 - [ac_cv_func_getmntent=yes
334 -- AC_DEFINE([HAVE_GETMNTENT], [],
335 -+ AC_DEFINE([HAVE_GETMNTENT], 1,
336 - [Define to 1 if you have the `getmntent' function.])],
337 - [ac_cv_func_getmntent=no])
338 - ])
339
340 diff --git a/sys-devel/autoconf/files/autoconf-2.62-at-keywords.patch b/sys-devel/autoconf/files/autoconf-2.62-at-keywords.patch
341 deleted file mode 100644
342 index 04cd1807b8a..00000000000
343 --- a/sys-devel/autoconf/files/autoconf-2.62-at-keywords.patch
344 +++ /dev/null
345 @@ -1,81 +0,0 @@
346 -commit 3ac7ceb0c2dfd023e0e9e944da6825b6bd676568
347 -Author: Eric Blake <ebb9@×××.net>
348 -Date: Thu Jun 5 15:18:11 2008 -0600
349 -
350 - Fix regression in AT_KEYWORDS([Macro]), from 2007-10-18.
351 -
352 - * lib/autotest/general.m4 (AT_KEYWORDS): Expand argument prior to
353 - converting it to lower case.
354 - * tests/autotest.at (Keywords and ranges): Test this.
355 - * NEWS: Document the fix.
356 - * THANKS: Update.
357 - Reported by Karsten Hopp.
358 -
359 - Signed-off-by: Eric Blake <ebb9@×××.net>
360 -
361 -diff --git a/NEWS b/NEWS
362 -index 183d4f1..8b866ad 100644
363 ---- a/NEWS
364 -+++ b/NEWS
365 -@@ -9,6 +9,10 @@ GNU Autoconf NEWS - User visible changes.
366 - ** Two new quadrigraphs have been introduced: @{:@ for (, and @:}@ for ),
367 - allowing the output of unbalanced parantheses in more contexts.
368 -
369 -+** AT_KEYWORDS once again performs expansion on its argument, such that
370 -+ AT_KEYWORDS([m4_if([$1], [], [default])]) no longer complains about
371 -+ the possibly unexpanded m4_if [regression introduced in 2.62].
372 -+
373 -
374 - * Major changes in Autoconf 2.62 (2008-04-05) [stable]
375 - Released by Eric Blake, based on git versions 2.61a.*.
376 -diff --git a/THANKS b/THANKS
377 -index 5ec8921..224cdea 100644
378 ---- a/THANKS
379 -+++ b/THANKS
380 -@@ -177,6 +177,7 @@ Justace Clutter ?
381 - Jörn Rennecke amylaar@×××××××××.uk
382 - Karl Berry karl@××××××.edu
383 - Karl Heuer kwzh@×××.org
384 -+Karsten Hopp karsten@××××××.com
385 - Kate Hedstrom ?
386 - Kathryn Hargreaves kathryn@××××××××××××.edu
387 - Kaveh R. Ghazi ghazi@××××××××××××.edu
388 -diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
389 -index 88d10a3..993dd9f 100644
390 ---- a/lib/autotest/general.m4
391 -+++ b/lib/autotest/general.m4
392 -@@ -1476,9 +1476,10 @@ m4_case([$1],
393 - # AT_KEYWORDS(KEYWORDS)
394 - # ---------------------
395 - # Declare a list of keywords associated to the current test group.
396 --# The list is stored in lower case, since the -k option is case-insensitive.
397 -+# Since the -k option is case-insensitive, the list is stored in lower case
398 -+# to avoid duplicates that differ only by case.
399 - _AT_DEFINE_SETUP([AT_KEYWORDS],
400 --[m4_append_uniq_w([AT_keywords], m4_tolower([[$1]]))])
401 -+[m4_append_uniq_w([AT_keywords], m4_tolower(m4_dquote(m4_expand([$1]))))])
402 -
403 -
404 - # AT_CAPTURE_FILE(FILE)
405 -diff --git a/tests/autotest.at b/tests/autotest.at
406 -index dc3cfd5..c4c0eda 100644
407 ---- a/tests/autotest.at
408 -+++ b/tests/autotest.at
409 -@@ -690,7 +690,7 @@ AT_CHECK(:)
410 - AT_CLEANUP
411 - AT_SETUP(both) # 04
412 - AT_KEYWORDS([key1 key2])
413 --AT_KEYWORDS([key1])
414 -+AT_KEYWORDS([m4@&t@_echo([Key1])])
415 - AT_CHECK(:)
416 - AT_CLEANUP
417 - AT_SETUP(test5) # 05
418 -@@ -713,7 +713,7 @@ AT_CHECK(:)
419 - AT_CLEANUP
420 - ]])
421 - dnl check that AT_KEYWORDS does not duplicate words
422 --AT_CHECK([grep 'key1.*key1' k], [1])
423 -+AT_CHECK([grep -i 'key1.*key1' k], [1])
424 - dnl check that -k requires an argument
425 - AT_CHECK([$CONFIG_SHELL ./k -k], [1], [], [ignore])
426 -
427
428 diff --git a/sys-devel/autoconf/files/autoconf-2.62-fix-multiline-string.patch b/sys-devel/autoconf/files/autoconf-2.62-fix-multiline-string.patch
429 deleted file mode 100644
430 index cfd7b422879..00000000000
431 --- a/sys-devel/autoconf/files/autoconf-2.62-fix-multiline-string.patch
432 +++ /dev/null
433 @@ -1,30 +0,0 @@
434 -sniped from mandrivia:
435 -http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/autoconf/current/SOURCES/autoconf-2.62-fix-multiline-string.patch
436 -
437 -this may not be the correct fix, but it seems to get the job done until we can
438 -grab whatever upstream merges
439 -http://lists.gnu.org/archive/html/bug-autoconf/2008-04/msg00031.html
440 -
441 ---- autoconf-2.62/lib/autoconf/status.m4
442 -+++ autoconf-2.62/lib/autoconf/status.m4
443 -@@ -1360,16 +1360,16 @@ _ACEOF
444 - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
445 - # Files that config.status was made for.
446 - m4_ifdef([_AC_SEEN_CONFIG(FILES)],
447 --[config_files="$ac_config_files"
448 -+[config_files="`echo $ac_config_files`"
449 - ])dnl
450 - m4_ifdef([_AC_SEEN_CONFIG(HEADERS)],
451 --[config_headers="$ac_config_headers"
452 -+[config_headers="`echo $ac_config_headers`"
453 - ])dnl
454 - m4_ifdef([_AC_SEEN_CONFIG(LINKS)],
455 --[config_links="$ac_config_links"
456 -+[config_links="`echo $ac_config_links`"
457 - ])dnl
458 - m4_ifdef([_AC_SEEN_CONFIG(COMMANDS)],
459 --[config_commands="$ac_config_commands"
460 -+[config_commands="`echo $ac_config_commands`"
461 - ])dnl
462 -
463 - _ACEOF
464
465 diff --git a/sys-devel/autoconf/files/autoconf-2.62-revert-AC_C_BIGENDIAN.patch b/sys-devel/autoconf/files/autoconf-2.62-revert-AC_C_BIGENDIAN.patch
466 deleted file mode 100644
467 index 76db013cac5..00000000000
468 --- a/sys-devel/autoconf/files/autoconf-2.62-revert-AC_C_BIGENDIAN.patch
469 +++ /dev/null
470 @@ -1,214 +0,0 @@
471 -revert AC_C_BIGENDIAN to the version found in 2.61 since the version in 2.62 is
472 -known to be broken and the changes that it brings are not critical
473 -
474 -http://bugs.gentoo.org/228825
475 -
476 ---- autoconf-2.62/lib/autoconf/c.m4
477 -+++ autoconf-2.61/lib/autoconf/c.m4
478 -@@ -1393,140 +1351,74 @@
479 - ])# AC_C_CHAR_UNSIGNED
480 -
481 -
482 --# AC_C_BIGENDIAN ([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN],
483 --# [ACTION-IF-UNIVERSAL])
484 -+# AC_C_BIGENDIAN ([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN])
485 - # -------------------------------------------------------------------------
486 - AC_DEFUN([AC_C_BIGENDIAN],
487 --[AH_VERBATIM([WORDS_BIGENDIAN],
488 --[/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
489 -- significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
490 --#if defined __BIG_ENDIAN__
491 --# define WORDS_BIGENDIAN 1
492 --#elif ! defined __LITTLE_ENDIAN__
493 --# undef WORDS_BIGENDIAN
494 --#endif])dnl
495 -- AC_CACHE_CHECK([whether byte ordering is bigendian], [ac_cv_c_bigendian],
496 -- [ac_cv_c_bigendian=unknown
497 -- m4_ifval(m4_ifdef([AH_HEADER], 1)[$4],
498 -- [# See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
499 -- AC_COMPILE_IFELSE(
500 -- [AC_LANG_SOURCE(
501 -- [[#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
502 -- neither is defined;
503 -- #endif
504 -- typedef int dummy;
505 -- ]])],
506 -- [ac_cv_c_bigendian=universal])],
507 -- [AC_DIAGNOSE([obsolete], [AC_C_BIGENDIAN suggests AC_CONFIG_HEADERS])])
508 -- if test $ac_cv_c_bigendian = unknown; then
509 -- # See if sys/param.h defines the BYTE_ORDER macro.
510 -- AC_COMPILE_IFELSE(
511 -- [AC_LANG_PROGRAM(
512 -- [[#include <sys/types.h>
513 -- #include <sys/param.h>
514 -- ]],
515 -- [[#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
516 -- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
517 -- && LITTLE_ENDIAN)
518 -- bogus endian macros
519 -- #endif
520 -- ]])],
521 -- [# It does; now see whether it defined to BIG_ENDIAN or not.
522 -- AC_COMPILE_IFELSE(
523 -- [AC_LANG_PROGRAM(
524 -- [[#include <sys/types.h>
525 -- #include <sys/param.h>
526 -- ]],
527 -- [[#if BYTE_ORDER != BIG_ENDIAN
528 -- not big endian
529 -- #endif
530 -- ]])],
531 -- [ac_cv_c_bigendian=yes],
532 -- [ac_cv_c_bigendian=no])])
533 -- fi
534 -- if test $ac_cv_c_bigendian = unknown; then
535 -- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
536 -- AC_COMPILE_IFELSE(
537 -- [AC_LANG_PROGRAM(
538 -- [[#include <limits.h>
539 -- ]],
540 -- [[#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
541 -- bogus endian macros
542 -- #endif
543 -- ]])],
544 -- [# It does; now see whether it defined to _BIG_ENDIAN or not.
545 -- AC_COMPILE_IFELSE(
546 -- [AC_LANG_PROGRAM(
547 -- [[#include <limits.h>
548 -- ]],
549 -- [[#ifndef _BIG_ENDIAN
550 -- not big endian
551 -- #endif
552 -- ]])],
553 -- [ac_cv_c_bigendian=yes],
554 -- [ac_cv_c_bigendian=no])])
555 -- fi
556 -- if test $ac_cv_c_bigendian = unknown; then
557 -- # Compile a test program.
558 -- AC_RUN_IFELSE(
559 -- [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
560 -- [[
561 -- /* Are we little or big endian? From Harbison&Steele. */
562 -- union
563 -- {
564 -- long int l;
565 -- char c[sizeof (long int)];
566 -- } u;
567 -- u.l = 1;
568 -- return u.c[sizeof (long int) - 1] == 1;
569 -- ]])],
570 -- [ac_cv_c_bigendian=no],
571 -- [ac_cv_c_bigendian=yes],
572 -- [# Try to guess by grepping values from an object file.
573 -- AC_COMPILE_IFELSE(
574 -- [AC_LANG_PROGRAM(
575 -- [[short int ascii_mm[] =
576 -- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
577 -- short int ascii_ii[] =
578 -- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
579 -- int use_ascii (int i) {
580 -- return ascii_mm[i] + ascii_ii[i];
581 -- }
582 -- short int ebcdic_ii[] =
583 -- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
584 -- short int ebcdic_mm[] =
585 -- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
586 -- int use_ebcdic (int i) {
587 -- return ebcdic_mm[i] + ebcdic_ii[i];
588 -- }
589 -- extern int foo;
590 -- ]],
591 -- [[return use_ascii (foo) == use_ebcdic (foo);]])],
592 -- [if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
593 -- ac_cv_c_bigendian=yes
594 -- fi
595 -- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
596 -- if test "$ac_cv_c_bigendian" = unknown; then
597 -- ac_cv_c_bigendian=no
598 -- else
599 -- # finding both strings is unlikely to happen, but who knows?
600 -- ac_cv_c_bigendian=unknown
601 -- fi
602 -- fi])])
603 -- fi])
604 -- case $ac_cv_c_bigendian in #(
605 -- yes)
606 -- m4_default([$1],
607 -- [AC_DEFINE([WORDS_BIGENDIAN], 1)]);; #(
608 -- no)
609 -- $2 ;; #(
610 -- universal)
611 -- $4 ;; #(
612 -- *)
613 -- m4_default([$3],
614 -- [AC_MSG_ERROR([unknown endianness
615 -- presetting ac_cv_c_bigendian=no (or yes) will help])]) ;;
616 -- esac
617 -+[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
618 -+[# See if sys/param.h defines the BYTE_ORDER macro.
619 -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
620 -+#include <sys/param.h>
621 -+],
622 -+[#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
623 -+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
624 -+ bogus endian macros
625 -+#endif
626 -+])],
627 -+[# It does; now see whether it defined to BIG_ENDIAN or not.
628 -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
629 -+#include <sys/param.h>
630 -+], [#if BYTE_ORDER != BIG_ENDIAN
631 -+ not big endian
632 -+#endif
633 -+])], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=no])],
634 -+[# It does not; compile a test program.
635 -+AC_RUN_IFELSE(
636 -+[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], [[
637 -+ /* Are we little or big endian? From Harbison&Steele. */
638 -+ union
639 -+ {
640 -+ long int l;
641 -+ char c[sizeof (long int)];
642 -+ } u;
643 -+ u.l = 1;
644 -+ return u.c[sizeof (long int) - 1] == 1;
645 -+]])],
646 -+ [ac_cv_c_bigendian=no],
647 -+ [ac_cv_c_bigendian=yes],
648 -+[# try to guess the endianness by grepping values into an object file
649 -+ ac_cv_c_bigendian=unknown
650 -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
651 -+[[short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
652 -+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
653 -+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
654 -+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
655 -+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
656 -+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }]],
657 -+[[ _ascii (); _ebcdic (); ]])],
658 -+[if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
659 -+ ac_cv_c_bigendian=yes
660 -+fi
661 -+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
662 -+ if test "$ac_cv_c_bigendian" = unknown; then
663 -+ ac_cv_c_bigendian=no
664 -+ else
665 -+ # finding both strings is unlikely to happen, but who knows?
666 -+ ac_cv_c_bigendian=unknown
667 -+ fi
668 -+fi])])])])
669 -+case $ac_cv_c_bigendian in
670 -+ yes)
671 -+ m4_default([$1],
672 -+ [AC_DEFINE([WORDS_BIGENDIAN], 1,
673 -+ [Define to 1 if your processor stores words with the most significant
674 -+ byte first (like Motorola and SPARC, unlike Intel and VAX).])]) ;;
675 -+ no)
676 -+ $2 ;;
677 -+ *)
678 -+ m4_default([$3],
679 -+ [AC_MSG_ERROR([unknown endianness
680 -+presetting ac_cv_c_bigendian=no (or yes) will help])]) ;;
681 -+esac
682 - ])# AC_C_BIGENDIAN
683 -
684 -
685
686 diff --git a/sys-devel/autoconf/files/autoconf-2.63-sh.patch b/sys-devel/autoconf/files/autoconf-2.63-sh.patch
687 deleted file mode 100644
688 index 8008b32b602..00000000000
689 --- a/sys-devel/autoconf/files/autoconf-2.63-sh.patch
690 +++ /dev/null
691 @@ -1,32 +0,0 @@
692 -http://bugs.gentoo.org/264303
693 -http://lists.gnu.org/archive/html/bug-autoconf/2008-10/msg00040.html
694 -
695 -From: Chikama Masaki <masaki.chikama@×××××.com>
696 -Date: Fri, 24 Oct 2008 01:41:06 +0000 (-0600)
697 -Subject: For gfortran on sh, ignore -little.
698 -X-Git-Tag: v2.63b~206
699 -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff_plain;h=3f38aad
700 -
701 -For gfortran on sh, ignore -little.
702 -
703 -* lib/autoconf/fortran.m4 (_AC_FC_LIBRARY_LDFLAGS): Add -little to
704 -list of ignored arguments.
705 -* THANKS: Update.
706 -
707 -Signed-off-by: Eric Blake <ebb9@×××.net>
708 ----
709 -
710 -diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
711 -index 20d9e0c..ad0c2ee 100644
712 ---- a/lib/autoconf/fortran.m4
713 -+++ b/lib/autoconf/fortran.m4
714 -@@ -686,7 +686,8 @@ while test $[@%:@] != 1; do
715 - [_AC_LINKER_OPTION([$ac_arg], ac_cv_[]_AC_LANG_ABBREV[]_libs)])
716 - ;;
717 - # Ignore these flags.
718 -- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
719 -+ -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \
720 -+ |-LANG:=* | -LIST:* | -LNO:*)
721 - ;;
722 - -lkernel32)
723 - test x"$CYGWIN" != xyes && ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_arg"
724
725 diff --git a/sys-devel/autoconf/files/autoconf-2.65-AC_TYPE_INT_T.patch b/sys-devel/autoconf/files/autoconf-2.65-AC_TYPE_INT_T.patch
726 deleted file mode 100644
727 index cc81672e427..00000000000
728 --- a/sys-devel/autoconf/files/autoconf-2.65-AC_TYPE_INT_T.patch
729 +++ /dev/null
730 @@ -1,49 +0,0 @@
731 -https://bugs.gentoo.org/324649
732 -http://lists.gnu.org/archive/html/bug-autoconf/2009-12/msg00016.html
733 -
734 -From 83ee5bc460a1083ab29fd9d3a3044cbaefad6ac6 Mon Sep 17 00:00:00 2001
735 -From: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
736 -Date: Wed, 9 Dec 2009 07:20:16 +0100
737 -Subject: [PATCH] Fix 2.64 AC_TYPE_INT*_T macro body text regression.
738 -
739 -* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
740 -definition to prologue section, to avoid syntax error.
741 -* NEWS, THANKS: Update.
742 -Report by Pierre Ynard.
743 -
744 -Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
745 ----
746 - ChangeLog | 8 ++++++++
747 - NEWS | 3 +++
748 - THANKS | 1 +
749 - lib/autoconf/types.m4 | 12 ++++++------
750 - 4 files changed, 18 insertions(+), 6 deletions(-)
751 -
752 -diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
753 -index 7a73fc2..3829c4c 100644
754 ---- a/lib/autoconf/types.m4
755 -+++ b/lib/autoconf/types.m4
756 -@@ -635,14 +635,14 @@ m4_define([_AC_TYPE_INT_BODY],
757 - 'long long int' 'short int' 'signed char'; do
758 - AC_COMPILE_IFELSE(
759 - [AC_LANG_BOOL_COMPILE_TRY(
760 -- [AC_INCLUDES_DEFAULT],
761 -- [enum { N = $[]2 / 2 - 1 };
762 -- 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
763 -+ [AC_INCLUDES_DEFAULT
764 -+ enum { N = $[]2 / 2 - 1 };],
765 -+ [0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
766 - [AC_COMPILE_IFELSE(
767 - [AC_LANG_BOOL_COMPILE_TRY(
768 -- [AC_INCLUDES_DEFAULT],
769 -- [enum { N = $[]2 / 2 - 1 };
770 -- ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
771 -+ [AC_INCLUDES_DEFAULT
772 -+ enum { N = $[]2 / 2 - 1 };],
773 -+ [($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
774 - < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2)])],
775 - [],
776 - [AS_CASE([$ac_type], [int$[]2_t],
777 ---
778 -1.7.1
779 -