Gentoo Archives: gentoo-commits

From: "Maciej Barć" <xgqt@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/, dev-scheme/kawa/files/
Date: Thu, 02 Dec 2021 19:50:36
Message-Id: 1638474622.b038d5d13795841d2f163d5f8ee011b02392b971.xgqt@gentoo
1 commit: b038d5d13795841d2f163d5f8ee011b02392b971
2 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 2 19:47:31 2021 +0000
4 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 2 19:50:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b038d5d1
7
8 dev-scheme/kawa: fix calls to AM_INIT_AUTOMAKE
9
10 Closes: https://bugs.gentoo.org/827973
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
13
14 ...awa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch | 17 +++++++++++++++++
15 dev-scheme/kawa/kawa-3.1.1.ebuild | 2 ++
16 2 files changed, 19 insertions(+)
17
18 diff --git a/dev-scheme/kawa/files/kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch b/dev-scheme/kawa/files/kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch
19 new file mode 100644
20 index 000000000000..d7ecb85434f1
21 --- /dev/null
22 +++ b/dev-scheme/kawa/files/kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch
23 @@ -0,0 +1,17 @@
24 +Repeated calls to AM_INIT_AUTOMAKE made fatal in 1.16.5:
25 +https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f4a3a70f69e1dbccb6578f39ef47835098a04624.
26 +
27 +https://bugs.gentoo.org/818094
28 +https://bugs.gentoo.org/827973
29 +
30 +--- a/bin/configure.ac
31 ++++ b/bin/configure.ac
32 +@@ -4,8 +4,6 @@ AM_INIT_AUTOMAKE([foreign])
33 + AM_MAINTAINER_MODE
34 + AC_CANONICAL_HOST
35 +
36 +-AM_INIT_AUTOMAKE
37 +-
38 + AC_EXEEXT
39 + AC_OBJEXT
40 +
41
42 diff --git a/dev-scheme/kawa/kawa-3.1.1.ebuild b/dev-scheme/kawa/kawa-3.1.1.ebuild
43 index 1328d51f6836..3efe3ba8f69b 100644
44 --- a/dev-scheme/kawa/kawa-3.1.1.ebuild
45 +++ b/dev-scheme/kawa/kawa-3.1.1.ebuild
46 @@ -32,6 +32,8 @@ RDEPEND="
47 >=virtual/jre-1.8
48 "
49
50 +PATCHES=( "${FILESDIR}"/${PN}-${PV}-configure.ac-single_AM_INIT_AUTOMAKE.patch )
51 +
52 src_prepare() {
53 default