Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
Date: Thu, 14 Oct 2021 07:24:02
Message-Id: 1634196227.0e6288041fab5991deea8362cd5ddc0cdc9cb07b.sam@gentoo
1 commit: 0e6288041fab5991deea8362cd5ddc0cdc9cb07b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 14 07:23:24 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 14 07:23:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e628804
7
8 media-radio/xastir: fix autoreconf with newer automake
9
10 Closes: https://bugs.gentoo.org/816615
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch | 13 +++++++++++++
14 media-radio/xastir/xastir-2.1.6.ebuild | 7 +++++--
15 2 files changed, 18 insertions(+), 2 deletions(-)
16
17 diff --git a/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch b/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
18 new file mode 100644
19 index 00000000000..51d10a2c815
20 --- /dev/null
21 +++ b/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
22 @@ -0,0 +1,13 @@
23 +https://bugs.gentoo.org/816615
24 +https://github.com/Xastir/Xastir/pull/181
25 +
26 +--- a/configure.ac
27 ++++ b/configure.ac
28 +@@ -23,7 +23,6 @@
29 + # It should look something like this: ([xastir], [2.0.8], [xastir@××××××.org])
30 + # The revision number must contain at least one '.' and two digits.
31 + AC_INIT([xastir], [2.1.6], [xastir@××××××.org])
32 +-AM_INIT_AUTOMAKE
33 + #########################################################################
34 +
35 +
36
37 diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild
38 index 1da0b5592d8..fcd3f2a7f25 100644
39 --- a/media-radio/xastir/xastir-2.1.6.ebuild
40 +++ b/media-radio/xastir/xastir-2.1.6.ebuild
41 @@ -1,4 +1,4 @@
42 -# Copyright 1999-2020 Gentoo Authors
43 +# Copyright 1999-2021 Gentoo Authors
44 # Distributed under the terms of the GNU General Public License v2
45
46 EAPI=7
47 @@ -40,9 +40,12 @@ src_prepare() {
48 # fix script location (bug #407185)
49 eapply "${FILESDIR}"/${PN}-2.1.2-scripts.diff
50
51 - # do not filter duplicate flags (see bug 411095)
52 + # do not filter duplicate flags (see bug #411095)
53 eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
54
55 + # fix eautoreconf with >=sys-devel/automake-1.16.5 (see bug #816615)
56 + eapply "${FILESDIR}"/${PN}-2.1.6-automake-1.16.5.patch
57 +
58 eautoreconf
59 }