Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/
Date: Wed, 29 Nov 2017 23:19:59
Message-Id: 1511997560.62be9e67719c6dc4fc651edcb2b9486f69e86874.asturm@gentoo
1 commit: 62be9e67719c6dc4fc651edcb2b9486f69e86874
2 Author: Mykyta Holubakha <hilobakho <AT> gmail <DOT> com>
3 AuthorDate: Sun Nov 19 23:48:44 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 29 23:19:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62be9e67
7
8 app-editors/kakoune: update live ebuild
9
10 drop depend on dev-libs/boost
11 Closes: https://github.com/gentoo/gentoo/pull/6244
12
13 app-editors/kakoune/kakoune-9999.ebuild | 12 +++++++-----
14 1 file changed, 7 insertions(+), 5 deletions(-)
15
16 diff --git a/app-editors/kakoune/kakoune-9999.ebuild b/app-editors/kakoune/kakoune-9999.ebuild
17 index bd460c7c574..f083c66b5e3 100644
18 --- a/app-editors/kakoune/kakoune-9999.ebuild
19 +++ b/app-editors/kakoune/kakoune-9999.ebuild
20 @@ -16,7 +16,6 @@ IUSE="debug static"
21
22 RDEPEND="
23 sys-libs/ncurses:0=[unicode]
24 - dev-libs/boost:=
25 "
26 DEPEND="
27 app-text/asciidoc
28 @@ -24,8 +23,6 @@ DEPEND="
29 ${RDEPEND}
30 "
31
32 -PATCHES=( "${FILESDIR}/${PN}-0_pre20170523-makefile.patch" )
33 -
34 pkg_setup() {
35 if [[ ${MERGE_TYPE} != binary ]]; then
36 if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
37 @@ -34,9 +31,14 @@ pkg_setup() {
38 fi
39 }
40
41 +src_prepare() {
42 + default
43 +
44 + sed -i -e '/CXXFLAGS += -O3/d' src/Makefile || \
45 + die "Failed to patch makefile"
46 +}
47 +
48 src_configure() {
49 - append-cppflags $($(tc-getPKG_CONFIG) --cflags ncursesw)
50 - append-libs $($(tc-getPKG_CONFIG) --libs ncursesw)
51 tc-export CXX
52 export debug=$(usex debug)
53 export static=$(usex static)