Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/autogen/files/
Date: Thu, 21 May 2020 08:22:57
Message-Id: 1590049365.bdf2cbb9e87de588166e2c231ff5ed72861c9c45.slyfox@gentoo
1 commit: bdf2cbb9e87de588166e2c231ff5ed72861c9c45
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed May 20 15:35:28 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu May 21 08:22:45 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf2cbb9
7
8 sys-devel/autogen: remove unused patches
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 .../autogen/files/autogen-5.18.4-tmp-log.patch | 17 -----------
15 .../autogen-5.18.4_fix_format.test_for_dash.patch | 25 ----------------
16 sys-devel/autogen/files/autogen-guile-2.2.patch | 34 ----------------------
17 3 files changed, 76 deletions(-)
18
19 diff --git a/sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch b/sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch
20 deleted file mode 100644
21 index 89e0277ab0f..00000000000
22 --- a/sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch
23 +++ /dev/null
24 @@ -1,17 +0,0 @@
25 -https://bugs.gentoo.org/563352
26 -https://sourceforge.net/p/autogen/bugs/172/
27 -
28 -this is fixed upstream in commit f303a1d5d8d8e002974eb64818f74041325f2433
29 -
30 ---- a/pkg/libopts/mklibsrc.sh
31 -+++ b/pkg/libopts/mklibsrc.sh
32 -@@ -18,8 +18,7 @@
33 - ## You should have received a copy of the GNU General Public License along
34 - ## with this program. If not, see <http://www.gnu.org/licenses/>.
35 -
36 --set -ex
37 --exec 2> /tmp/mklibsrc-log.tx
38 -+set -e
39 -
40 - top_builddir=`cd $top_builddir ; pwd`
41 - top_srcdir=`cd $top_srcdir ; pwd`
42
43 diff --git a/sys-devel/autogen/files/autogen-5.18.4_fix_format.test_for_dash.patch b/sys-devel/autogen/files/autogen-5.18.4_fix_format.test_for_dash.patch
44 deleted file mode 100644
45 index 644df648f59..00000000000
46 --- a/sys-devel/autogen/files/autogen-5.18.4_fix_format.test_for_dash.patch
47 +++ /dev/null
48 @@ -1,25 +0,0 @@
49 -agen5/test/format.test: export AUTOGEN_DNE_DATE explicitly. DASH does
50 -not export when the assignment is on the same line as a shell function
51 -invocation.
52 -
53 -This is a backport of part of upstreams' commit 89f12c15.
54 -
55 -See: https://bugs.gentoo.org/show_bug.cgi?id=576674
56 -
57 ---- a/agen5/test/format.test
58 -+++ b/agen5/test/format.test
59 -@@ -79,12 +79,12 @@
60 - </script>
61 - _EOF_
62 -
63 --AUTOGEN_DNE_DATE=false \
64 -+export AUTOGEN_DNE_DATE=false
65 - run_ag x ${testname}.def || failure autogen failed
66 - cmp -s ${testname}.base ${testname}.test || \
67 - failure "`diff ${testname}.base ${testname}.test`"
68 -
69 --AUTOGEN_DNE_DATE=true \
70 -+AUTOGEN_DNE_DATE=true
71 - run_ag x ${testname}.def || failure autogen failed
72 - dte=`sed -n 's/.*It has been AutoGen-ed *//p' ${testname}.test`
73 - test "X${dte}" = "X" && \
74
75 diff --git a/sys-devel/autogen/files/autogen-guile-2.2.patch b/sys-devel/autogen/files/autogen-guile-2.2.patch
76 deleted file mode 100644
77 index 8ef904adb02..00000000000
78 --- a/sys-devel/autogen/files/autogen-guile-2.2.patch
79 +++ /dev/null
80 @@ -1,34 +0,0 @@
81 -https://raw.githubusercontent.com/Homebrew/formula-patches/master/autogen/allow-guile-2.2.diff
82 -
83 ---- a/agen5/guile-iface.h
84 -+++ b/agen5/guile-iface.h
85 -@@ -9,7 +9,7 @@
86 - # error AutoGen does not work with this version of Guile
87 - choke me.
88 -
89 --#elif GUILE_VERSION < 201000
90 -+#else
91 - # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p))
92 - # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l))
93 - # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p))
94 -@@ -24,9 +24,6 @@
95 - # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
96 - # define AG_SCM_VEC_P(_v) scm_is_vector(_v)
97 -
98 --#else
99 --# error unknown GUILE_VERSION
100 -- choke me.
101 - #endif
102 -
103 - #endif /* MUTATING_GUILE_IFACE_H_GUARD */
104 ---- a/configure
105 -+++ b/configure
106 -@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; }
107 - PKG_CONFIG=""
108 - fi
109 - fi
110 -- _guile_versions_to_search="2.0 1.8"
111 -+ _guile_versions_to_search="2.2 2.0 1.8"
112 - if test -n "$GUILE_EFFECTIVE_VERSION"; then
113 - _guile_tmp=""
114 - for v in $_guile_versions_to_search; do