Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/ecasound/, media-sound/ecasound/files/
Date: Fri, 02 Mar 2018 09:53:36
Message-Id: 1519984411.b3a7ba62e60163c5d63b376ec23711fd7626ecb0.jer@gentoo
1 commit: b3a7ba62e60163c5d63b376ec23711fd7626ecb0
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 2 09:52:54 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 2 09:53:31 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a7ba62
7
8 media-sound/ecasound: Fix building against sys-libs/ncurses[tinfo] (bug #609776).
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 media-sound/ecasound/ecasound-2.9.1-r1.ebuild | 9 ++++++---
13 .../ecasound/files/ecasound-2.9.1-tinfo.patch | 21 +++++++++++++++++++++
14 2 files changed, 27 insertions(+), 3 deletions(-)
15
16 diff --git a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
17 index 5485c1404a0..52575e945b5 100644
18 --- a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
19 +++ b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2017 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=6
26 @@ -34,14 +34,17 @@ RDEPEND="sys-libs/readline:0=
27 sndfile? ( media-libs/libsndfile:= )"
28 DEPEND="${RDEPEND}
29 virtual/pkgconfig"
30 +PATCHES=(
31 + "${FILESDIR}"/${PN}-2.8.1-ldflags.patch
32 + "${FILESDIR}"/${PN}-2.9.1-tinfo.patch
33 +)
34
35 pkg_setup() {
36 use python && python-single-r1_pkg_setup
37 }
38
39 src_prepare() {
40 - eapply "${FILESDIR}"/${PN}-2.8.1-ldflags.patch
41 - eapply_user
42 + default
43
44 # if use python ; then
45 # sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \
46
47 diff --git a/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch b/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch
48 new file mode 100644
49 index 00000000000..c4953420b18
50 --- /dev/null
51 +++ b/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch
52 @@ -0,0 +1,21 @@
53 +--- a/configure.ac
54 ++++ b/configure.ac
55 +@@ -810,7 +810,9 @@
56 + dnl switch to C for testing
57 + AC_LANG_C
58 +
59 +-AC_CHECK_LIB(ncurses, main, termcap_library=ncurses,
60 ++AC_CHECK_LIB(ncurses, main,
61 ++ [termcap_library=ncurses]
62 ++ AC_SEARCH_LIBS(tigetstr, tinfo),
63 + AC_CHECK_LIB(termcap, main, termcap_library=termcap,
64 + termcap_library=none))
65 +
66 +@@ -821,6 +823,7 @@
67 + y | yes)
68 + AC_MSG_RESULT(yes)
69 + termcap_library=ncurses
70 ++
71 + ;;
72 +
73 + n | no)