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/, sys-devel/autoconf/files/
Date: Tue, 01 Dec 2020 17:19:25
Message-Id: 1606843156.d52505d7ed450c7292d5528602e70a9bbb64ac0b.polynomial-c@gentoo
1 commit: d52505d7ed450c7292d5528602e70a9bbb64ac0b
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 1 17:16:23 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 1 17:19:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52505d7
7
8 sys-devel/autoconf: Bump to version 2.70_beta3. Removed old
9
10 This is called autoconf-2.69e by upstream
11
12 Bug: https://bugs.gentoo.org/732648
13 Package-Manager: Portage-3.0.11, Repoman-3.0.2
14 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
15
16 sys-devel/autoconf/Manifest | 2 +-
17 ..._beta3-r1.ebuild => autoconf-2.70_beta4.ebuild} | 7 +-
18 ...onf-2.70_beta3-build-aux_avoid_autoreconf.patch | 272 ---------------------
19 ...nf-2.70_beta3-build-aux_no_transform_name.patch | 55 -----
20 4 files changed, 2 insertions(+), 334 deletions(-)
21
22 diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
23 index 32abaa96df9..af16f06d7dd 100644
24 --- a/sys-devel/autoconf/Manifest
25 +++ b/sys-devel/autoconf/Manifest
26 @@ -2,4 +2,4 @@ DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b07
27 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
28 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
29 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
30 -DIST autoconf-2.70_beta3.tar.xz 1321512 BLAKE2B 92dca4fbd6c247a3b3383289e1a2d6c127f5a333969b8a7051f98adfbe080e702c90b3001dde4759a84c89d5e7ccd7991e509492533a8753fd299aaa46080f1a SHA512 d825d9ce7501f0dfa667ad220339a1668c9472f0601a0ec7dac109af994cacfc2ce49dd01c478a47c7c25f98ba3726c735f1e7002e7b4da71451799f742a2eb1
31 +DIST autoconf-2.70_beta4.tar.xz 1338832 BLAKE2B 20c801e67d5aa811f0ae18dd0b5f90b843f017a584387a655541215e29f65b2c1e0145d3f436f9a9b9a5f5e35c94e52ed865e0db5b3b0c36c0e6f312e504b6e5 SHA512 e4de63c8be4736a3f864c75d3175b190067a543013935d1be1448060502c1f4c45258619dbf5d80ece96d8a0b5754a664ed084359234a427a3a08082ce12f1af
32
33 diff --git a/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild
34 similarity index 91%
35 rename from sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
36 rename to sys-devel/autoconf/autoconf-2.70_beta4.ebuild
37 index e4079a394a2..107821eaccb 100644
38 --- a/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
39 +++ b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild
40 @@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
41 EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
42 inherit git-r3
43 else
44 - MY_PV="2.69d"
45 + MY_PV="2.69e"
46 MY_P="${PN}-${MY_PV}"
47 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
48 https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
49 @@ -33,11 +33,6 @@ RDEPEND="${BDEPEND}
50 [[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
51 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
52
53 -PATCHES=(
54 - "${FILESDIR}/${P}-build-aux_no_transform_name.patch" #753023
55 - "${FILESDIR}/${P}-build-aux_avoid_autoreconf.patch"
56 -)
57 -
58 src_prepare() {
59 # usr/bin/libtool is provided by binutils-apple, need gnu libtool
60 if [[ ${CHOST} == *-darwin* ]] ; then
61
62 diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
63 deleted file mode 100644
64 index a884c503d16..00000000000
65 --- a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
66 +++ /dev/null
67 @@ -1,272 +0,0 @@
68 ---- autoconf-2.69d/Makefile.in
69 -+++ autoconf-2.69d/Makefile.in
70 -@@ -221,10 +221,10 @@
71 - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
72 - $(ACLOCAL_M4)
73 - DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
74 -- $(am__configure_deps) $(dist_buildaux_SCRIPTS) \
75 -- $(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \
76 -- $(dist_lisp_LISP) $(dist_autoconflib_DATA) \
77 -- $(dist_autotestlib_DATA) $(dist_m4sugarlib_DATA) \
78 -+ $(am__configure_deps) $(srcdir)/doc/version.texi \
79 -+ $(srcdir)/doc/stamp-vti $(dist_lisp_LISP) \
80 -+ $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
81 -+ $(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
82 - $(dist_perllib_DATA) $(am__DIST_COMMON)
83 - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
84 - configure.lineno config.status.lineno
85 -@@ -258,15 +258,15 @@
86 - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
87 - $(am__cd) "$$dir" && rm -f $$files; }; \
88 - }
89 --am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" \
90 -- "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" \
91 -- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" \
92 -- "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" \
93 -+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \
94 -+ "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" \
95 -+ "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" \
96 -+ "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" \
97 - "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" \
98 - "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" \
99 - "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" \
100 - "$(DESTDIR)$(pkgdatadir)"
101 --SCRIPTS = $(bin_SCRIPTS) $(dist_buildaux_SCRIPTS) $(noinst_SCRIPTS)
102 -+SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
103 - AM_V_P = $(am__v_P_@AM_V@)
104 - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
105 - am__v_P_0 = false
106 -@@ -341,10 +341,11 @@
107 - NROFF = nroff
108 - MANS = $(dist_man_MANS)
109 - DATA = $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
110 -- $(dist_m4sugarlib_DATA) $(dist_perllib_DATA) \
111 -- $(nodist_autoconflib_DATA) $(nodist_autoscanlib_DATA) \
112 -- $(nodist_autotestlib_DATA) $(nodist_m4sugarlib_DATA) \
113 -- $(nodist_pkgdata_DATA) $(pkgdata_DATA)
114 -+ $(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
115 -+ $(dist_perllib_DATA) $(nodist_autoconflib_DATA) \
116 -+ $(nodist_autoscanlib_DATA) $(nodist_autotestlib_DATA) \
117 -+ $(nodist_m4sugarlib_DATA) $(nodist_pkgdata_DATA) \
118 -+ $(pkgdata_DATA)
119 - am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
120 - # Read a list of newline-separated strings from the standard input,
121 - # and print each of them once, without duplicates. Input order is
122 -@@ -754,12 +755,23 @@
123 - lib/autotest/specific.m4
124 -
125 - nodist_autotestlib_DATA = lib/autotest/autotest.m4f
126 --buildauxdir = $(pkgdatadir)/build-aux
127 --dist_buildaux_SCRIPTS = \
128 -+
129 -+# These are declared as _DATA so that they are not subject to
130 -+# --program-transform-name; $(pkgdatadir) is sufficient to keep
131 -+# multiple installations separate, and autoreconf looks for them by
132 -+# their unadorned names. However, autoreconf copies the executable
133 -+# bit when it copies these files into a source tree, and _DATA items
134 -+# are installed as not-executable, so we have to make them executable
135 -+# in a hook rule.
136 -+AUXSCRIPTS = \
137 - build-aux/config.guess \
138 - build-aux/config.sub \
139 - build-aux/install-sh
140 -
141 -+buildauxdir = $(pkgdatadir)/build-aux
142 -+dist_buildaux_DATA = \
143 -+ $(AUXSCRIPTS)
144 -+
145 - dist_man_MANS = \
146 - man/autoconf.1 \
147 - man/autoheader.1 \
148 -@@ -994,56 +1006,6 @@
149 - else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
150 - done; \
151 - done; rm -f c$${pid}_.???; exit $$bad
152 --install-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
153 -- @$(NORMAL_INSTALL)
154 -- @list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || list=; \
155 -- if test -n "$$list"; then \
156 -- echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
157 -- $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
158 -- fi; \
159 -- for p in $$list; do \
160 -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
161 -- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
162 -- done | \
163 -- sed -e 'p;s,.*/,,;n' \
164 -- -e 'h;s|.*|.|' \
165 -- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
166 -- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
167 -- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
168 -- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
169 -- if (++n[d] == $(am__install_max)) { \
170 -- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
171 -- else { print "f", d "/" $$4, $$1 } } \
172 -- END { for (d in files) print "f", d, files[d] }' | \
173 -- while read type dir files; do \
174 -- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
175 -- test -z "$$files" || { \
176 -- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(buildauxdir)$$dir'"; \
177 -- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(buildauxdir)$$dir" || exit $$?; \
178 -- } \
179 -- ; done
180 --
181 --uninstall-dist_buildauxSCRIPTS:
182 -- @$(NORMAL_UNINSTALL)
183 -- @list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || exit 0; \
184 -- files=`for p in $$list; do echo "$$p"; done | \
185 -- sed -e 's,.*/,,;$(transform)'`; \
186 -- dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
187 --
188 --installcheck-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
189 -- bad=0; pid=$$$$; list="$(dist_buildaux_SCRIPTS)"; for p in $$list; do \
190 -- case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
191 -- *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
192 -- esac; \
193 -- f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
194 -- for opt in --help --version; do \
195 -- if "$(DESTDIR)$(buildauxdir)/$$f" $$opt >c$${pid}_.out \
196 -- 2>c$${pid}_.err </dev/null \
197 -- && test -n "`cat c$${pid}_.out`" \
198 -- && test -z "`cat c$${pid}_.err`"; then :; \
199 -- else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
200 -- done; \
201 -- done; rm -f c$${pid}_.???; exit $$bad
202 - doc/$(am__dirstamp):
203 - @$(MKDIR_P) doc
204 - @: > doc/$(am__dirstamp)
205 -@@ -1385,6 +1347,27 @@
206 - @list='$(dist_autotestlib_DATA)'; test -n "$(autotestlibdir)" || list=; \
207 - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
208 - dir='$(DESTDIR)$(autotestlibdir)'; $(am__uninstall_files_from_dir)
209 -+install-dist_buildauxDATA: $(dist_buildaux_DATA)
210 -+ @$(NORMAL_INSTALL)
211 -+ @list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
212 -+ if test -n "$$list"; then \
213 -+ echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
214 -+ $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
215 -+ fi; \
216 -+ for p in $$list; do \
217 -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
218 -+ echo "$$d$$p"; \
219 -+ done | $(am__base_list) | \
220 -+ while read files; do \
221 -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(buildauxdir)'"; \
222 -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(buildauxdir)" || exit $$?; \
223 -+ done
224 -+
225 -+uninstall-dist_buildauxDATA:
226 -+ @$(NORMAL_UNINSTALL)
227 -+ @list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
228 -+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
229 -+ dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
230 - install-dist_m4sugarlibDATA: $(dist_m4sugarlib_DATA)
231 - @$(NORMAL_INSTALL)
232 - @list='$(dist_m4sugarlib_DATA)'; test -n "$(m4sugarlibdir)" || list=; \
233 -@@ -1794,7 +1777,7 @@
234 - all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(LISP) $(ELCFILES) $(MANS) \
235 - $(DATA)
236 - installdirs:
237 -- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
238 -+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
239 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
240 - done
241 - install: $(BUILT_SOURCES)
242 -@@ -1858,13 +1841,14 @@
243 - info-am: $(INFO_DEPS)
244 -
245 - install-data-am: install-dist_autoconflibDATA \
246 -- install-dist_autotestlibDATA install-dist_buildauxSCRIPTS \
247 -+ install-dist_autotestlibDATA install-dist_buildauxDATA \
248 - install-dist_lispLISP install-dist_m4sugarlibDATA \
249 - install-dist_perllibDATA install-info-am install-man \
250 - install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
251 - install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
252 - install-nodist_pkgdataDATA install-pkgdataDATA
253 --
254 -+ @$(NORMAL_INSTALL)
255 -+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
256 - install-dvi: install-dvi-am
257 -
258 - install-dvi-am: $(DVIS)
259 -@@ -1980,8 +1964,7 @@
260 - while read files; do \
261 - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
262 - $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
263 --installcheck-am: installcheck-binSCRIPTS \
264 -- installcheck-dist_buildauxSCRIPTS installcheck-local
265 -+installcheck-am: installcheck-binSCRIPTS installcheck-local
266 -
267 - maintainer-clean: maintainer-clean-am
268 - -rm -f $(am__CONFIG_DISTCLEAN_FILES)
269 -@@ -2003,7 +1986,7 @@
270 - ps-am: $(PSS)
271 -
272 - uninstall-am: uninstall-binSCRIPTS uninstall-dist_autoconflibDATA \
273 -- uninstall-dist_autotestlibDATA uninstall-dist_buildauxSCRIPTS \
274 -+ uninstall-dist_autotestlibDATA uninstall-dist_buildauxDATA \
275 - uninstall-dist_lispLISP uninstall-dist_m4sugarlibDATA \
276 - uninstall-dist_perllibDATA uninstall-dvi-am uninstall-html-am \
277 - uninstall-info-am uninstall-man \
278 -@@ -2015,7 +1998,8 @@
279 -
280 - uninstall-man: uninstall-man1
281 -
282 --.MAKE: all check check-am install install-am install-strip
283 -+.MAKE: all check check-am install install-am install-data-am \
284 -+ install-strip
285 -
286 - .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am \
287 - check-local clean clean-aminfo clean-cscope clean-generic \
288 -@@ -2026,24 +2010,24 @@
289 - distclean-tags distcleancheck distdir distuninstallcheck dvi \
290 - dvi-am html html-am info info-am install install-am \
291 - install-binSCRIPTS install-data install-data-am \
292 -- install-dist_autoconflibDATA install-dist_autotestlibDATA \
293 -- install-dist_buildauxSCRIPTS install-dist_lispLISP \
294 -- install-dist_m4sugarlibDATA install-dist_perllibDATA \
295 -- install-dvi install-dvi-am install-exec install-exec-am \
296 -- install-html install-html-am install-info install-info-am \
297 -- install-man install-man1 install-nodist_autoconflibDATA \
298 -- install-nodist_autoscanlibDATA install-nodist_autotestlibDATA \
299 -- install-nodist_m4sugarlibDATA install-nodist_pkgdataDATA \
300 -- install-pdf install-pdf-am install-pkgdataDATA install-ps \
301 -- install-ps-am install-strip installcheck installcheck-am \
302 -- installcheck-binSCRIPTS installcheck-dist_buildauxSCRIPTS \
303 -+ install-data-hook install-dist_autoconflibDATA \
304 -+ install-dist_autotestlibDATA install-dist_buildauxDATA \
305 -+ install-dist_lispLISP install-dist_m4sugarlibDATA \
306 -+ install-dist_perllibDATA install-dvi install-dvi-am \
307 -+ install-exec install-exec-am install-html install-html-am \
308 -+ install-info install-info-am install-man install-man1 \
309 -+ install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
310 -+ install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
311 -+ install-nodist_pkgdataDATA install-pdf install-pdf-am \
312 -+ install-pkgdataDATA install-ps install-ps-am install-strip \
313 -+ installcheck installcheck-am installcheck-binSCRIPTS \
314 - installcheck-local installdirs maintainer-clean \
315 - maintainer-clean-aminfo maintainer-clean-generic \
316 - maintainer-clean-vti mostlyclean mostlyclean-aminfo \
317 - mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am tags \
318 - tags-am uninstall uninstall-am uninstall-binSCRIPTS \
319 - uninstall-dist_autoconflibDATA uninstall-dist_autotestlibDATA \
320 -- uninstall-dist_buildauxSCRIPTS uninstall-dist_lispLISP \
321 -+ uninstall-dist_buildauxDATA uninstall-dist_lispLISP \
322 - uninstall-dist_m4sugarlibDATA uninstall-dist_perllibDATA \
323 - uninstall-dvi-am uninstall-html-am uninstall-info-am \
324 - uninstall-man uninstall-man1 uninstall-nodist_autoconflibDATA \
325 -@@ -2200,6 +2184,14 @@
326 -
327 - lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
328 -
329 -+install-data-hook: install-data-hook-make-aux-scripts-executable
330 -+install-data-hook-make-aux-scripts-executable:
331 -+ for s in $(AUXSCRIPTS); do \
332 -+ chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
333 -+ done
334 -+
335 -+.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
336 -+
337 - man/autoconf.1: $(common_dep) man/autoconf.w man/autoconf.x $(binsrcdir)/autoconf.as
338 - man/autoheader.1: $(common_dep) man/autoheader.w man/autoheader.x $(binsrcdir)/autoheader.in
339 - man/autom4te.1: $(common_dep) man/autom4te.w man/autom4te.x $(binsrcdir)/autom4te.in
340
341 diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
342 deleted file mode 100644
343 index 079fa15306c..00000000000
344 --- a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
345 +++ /dev/null
346 @@ -1,55 +0,0 @@
347 -From 0f7e5a5477f97b8a105d563bc7590ebefaff854d Mon Sep 17 00:00:00 2001
348 -From: Zack Weinberg <zackw@×××××.com>
349 -Date: Thu, 5 Nov 2020 10:19:26 -0500
350 -Subject: Do not apply --program-transform-name to build-aux scripts.
351 -
352 -autoreconf expects to find $(pkgdatadir)/build-aux/config.sub etc
353 -under those names, not names modified by --program-transform-name.
354 -Placing them in $(pkgdatadir) is sufficient to keep parallel
355 -installations of autoconf separate: anyone doing that would need
356 -to adjust @PACKAGE@ anyway.
357 -
358 -* lib/local.mk: Use a _DATA rule, not a _SCRIPTS rule, to install
359 - config.guess, config.sub, and install-sh.
360 - (install-data-hook-make-aux-scripts-executable): New hook rule.
361 ----
362 - lib/local.mk | 23 +++++++++++++++++++++--
363 - 1 file changed, 21 insertions(+), 2 deletions(-)
364 -
365 -diff --git a/lib/local.mk b/lib/local.mk
366 -index d4ecf3cb..e380403f 100644
367 ---- a/lib/local.mk
368 -+++ b/lib/local.mk
369 -@@ -201,8 +201,27 @@ lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
370 - ## Install auxiliary scripts. ##
371 - ## --------------------------- ##
372 -
373 --buildauxdir = $(pkgdatadir)/build-aux
374 --dist_buildaux_SCRIPTS = \
375 -+# These are declared as _DATA so that they are not subject to
376 -+# --program-transform-name; $(pkgdatadir) is sufficient to keep
377 -+# multiple installations separate, and autoreconf looks for them by
378 -+# their unadorned names. However, autoreconf copies the executable
379 -+# bit when it copies these files into a source tree, and _DATA items
380 -+# are installed as not-executable, so we have to make them executable
381 -+# in a hook rule.
382 -+
383 -+AUXSCRIPTS = \
384 - build-aux/config.guess \
385 - build-aux/config.sub \
386 - build-aux/install-sh
387 -+
388 -+buildauxdir = $(pkgdatadir)/build-aux
389 -+dist_buildaux_DATA = \
390 -+ $(AUXSCRIPTS)
391 -+
392 -+install-data-hook: install-data-hook-make-aux-scripts-executable
393 -+install-data-hook-make-aux-scripts-executable:
394 -+ for s in $(AUXSCRIPTS); do \
395 -+ chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
396 -+ done
397 -+
398 -+.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
399 ---
400 -cgit v1.2.1
401 -