1 |
commit: 6df1f8ebfe5ef3f6291c52a9003083e75f1e99c8 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Mar 16 11:36:26 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 25 18:28:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df1f8eb |
7 |
|
8 |
sys-devel/automake: remove unused patches |
9 |
|
10 |
.../automake-1.13-perl-escape-curly-bracket.patch | 37 ---------------------- |
11 |
.../files/automake-1.9.6-ignore-comments.patch | 29 ----------------- |
12 |
.../files/automake-1.9.6-include-dir-prefix.patch | 31 ------------------ |
13 |
.../files/automake-1.9.6-infopage-namechange.patch | 33 ------------------- |
14 |
4 files changed, 130 deletions(-) |
15 |
|
16 |
diff --git a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch |
17 |
deleted file mode 100644 |
18 |
index a113d09c58c..00000000000 |
19 |
--- a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch |
20 |
+++ /dev/null |
21 |
@@ -1,37 +0,0 @@ |
22 |
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 |
23 |
- |
24 |
-From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 |
25 |
-From: Pavel Raiskup <praiskup@××××××.com> |
26 |
-Date: Tue, 7 Jul 2015 10:54:24 +0200 |
27 |
-Subject: [PATCH] bin/automake: escape '{' in regexp pattern |
28 |
- |
29 |
-Based on perlre(1) documentation: |
30 |
-.. in Perl v5.26, literal uses of a curly bracket will be required |
31 |
-to be escaped, say by preceding them with a backslash ("\{" ) or |
32 |
-enclosing them within square brackets ("[{]") .. |
33 |
- |
34 |
-References: |
35 |
-https://bugzilla.redhat.com/1239379 |
36 |
- |
37 |
-* bin/automake.in (substitute_ac_subst_variables): Escape the |
38 |
-occurrence of '{' character. |
39 |
---- |
40 |
- bin/automake.in | 2 +- |
41 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
42 |
- |
43 |
-diff --git a/bin/automake.in b/bin/automake.in |
44 |
-index 0c29184..c294ced 100644 |
45 |
---- a/bin/automake.in |
46 |
-+++ b/bin/automake.in |
47 |
-@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker |
48 |
- sub substitute_ac_subst_variables ($) |
49 |
- { |
50 |
- my ($text) = @_; |
51 |
-- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; |
52 |
-+ $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; |
53 |
- return $text; |
54 |
- } |
55 |
- |
56 |
--- |
57 |
-2.1.0 |
58 |
- |
59 |
|
60 |
diff --git a/sys-devel/automake/files/automake-1.9.6-ignore-comments.patch b/sys-devel/automake/files/automake-1.9.6-ignore-comments.patch |
61 |
deleted file mode 100644 |
62 |
index f62987456cf..00000000000 |
63 |
--- a/sys-devel/automake/files/automake-1.9.6-ignore-comments.patch |
64 |
+++ /dev/null |
65 |
@@ -1,29 +0,0 @@ |
66 |
-http://bugs.gentoo.org/126388 |
67 |
- |
68 |
-2006-03-16 Mike Frysinger <vapier@g.o> |
69 |
- |
70 |
- * aclocal.in (scan_configure_dep): Ignore ## lines. |
71 |
- (scan_file): Remove dnl and # comments. |
72 |
- |
73 |
---- aclocal.in |
74 |
-+++ aclocal.in |
75 |
-@@ -227,6 +227,8 @@ |
76 |
- foreach (split ("\n", $contents)) |
77 |
- { |
78 |
- ++$line; |
79 |
-+ # Ignore `##' lines. |
80 |
-+ next if /^##/; |
81 |
- # Remove comments from current line. |
82 |
- s/\bdnl\b.*$//; |
83 |
- s/\#.*$//; |
84 |
-@@ -311,6 +313,10 @@ |
85 |
- |
86 |
- $contents .= $_; |
87 |
- |
88 |
-+ # Remove comments from current line. |
89 |
-+ s/\bdnl\b.*$//; |
90 |
-+ s/\#.*$//; |
91 |
-+ |
92 |
- while (/$ac_defun_rx/go) |
93 |
- { |
94 |
- if (! defined $1) |
95 |
|
96 |
diff --git a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch b/sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch |
97 |
deleted file mode 100644 |
98 |
index a1d62a78e11..00000000000 |
99 |
--- a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch |
100 |
+++ /dev/null |
101 |
@@ -1,31 +0,0 @@ |
102 |
-http://bugs.gentoo.org/107435 |
103 |
-http://lists.gnu.org/archive/html/automake/2005-09/msg00088.html |
104 |
- |
105 |
-2005-09-27 Stepan Kasal <address@hidden> |
106 |
- |
107 |
- * automake.in (handle_single_transform): Direct suffix rule preserves |
108 |
- the directory prefix, so the generated object name should contain |
109 |
- it, too. |
110 |
- |
111 |
---- automake.in 2005-09-17 15:05:39.000000000 +0200 |
112 |
-+++ automake.in 2005-09-27 17:10:47.000000000 +0200 |
113 |
-@@ -1755,6 +1755,10 @@ |
114 |
- # This is probably the result of a direct suffix rule. |
115 |
- # In this case we just accept the rewrite. |
116 |
- $object = "$base$extension"; |
117 |
-+ if ($directory ne '') |
118 |
-+ { |
119 |
-+ $object = $directory . '/' . $object; |
120 |
-+ } |
121 |
- $linker = ''; |
122 |
- } |
123 |
- else |
124 |
-@@ -1824,7 +1828,7 @@ |
125 |
- |
126 |
- # For Java, the way we're handling it right now, a |
127 |
- # `..' component doesn't make sense. |
128 |
-- if ($lang->name eq 'java' && $object =~ /(\/|^)\.\.\//) |
129 |
-+ if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//) |
130 |
- { |
131 |
- err_am "`$full' should not contain a `..' component"; |
132 |
- } |
133 |
|
134 |
diff --git a/sys-devel/automake/files/automake-1.9.6-infopage-namechange.patch b/sys-devel/automake/files/automake-1.9.6-infopage-namechange.patch |
135 |
deleted file mode 100644 |
136 |
index 7870f65e580..00000000000 |
137 |
--- a/sys-devel/automake/files/automake-1.9.6-infopage-namechange.patch |
138 |
+++ /dev/null |
139 |
@@ -1,33 +0,0 @@ |
140 |
---- doc/Makefile.in.orig 2005-07-11 00:39:31.000000000 -0400 |
141 |
-+++ doc/Makefile.in 2005-07-11 00:40:46.000000000 -0400 |
142 |
-@@ -187,26 +187,10 @@ |
143 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
144 |
- |
145 |
- .texi.info: |
146 |
-- restore=: && backupdir="$(am__leading_dot)am$$$$" && \ |
147 |
-- am__cwd=`pwd` && cd $(srcdir) && \ |
148 |
-- rm -rf $$backupdir && mkdir $$backupdir && \ |
149 |
-- if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ |
150 |
-- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ |
151 |
-- if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ |
152 |
-- done; \ |
153 |
-- else :; fi && \ |
154 |
-- cd "$$am__cwd"; \ |
155 |
-- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ |
156 |
-- -o $@ $<; \ |
157 |
-- then \ |
158 |
-- rc=0; \ |
159 |
-- cd $(srcdir); \ |
160 |
-- else \ |
161 |
-- rc=$$?; \ |
162 |
-- cd $(srcdir) && \ |
163 |
-- $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ |
164 |
-- fi; \ |
165 |
-- rm -rf $$backupdir; exit $$rc |
166 |
-+ @rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9] |
167 |
-+ cd $(srcdir) \ |
168 |
-+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ |
169 |
-+ `echo $< | sed 's,.*/,,'` |
170 |
- |
171 |
- .texi.dvi: |
172 |
- TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ |