Gentoo Archives: gentoo-commits

From: "Göktürk Yüksek" <gokturk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/
Date: Thu, 01 Sep 2016 03:21:03
Message-Id: 1472700023.109b6322000fb7f86247ed2b6c9f6e30d99ccfe9.gokturk@gentoo
1 commit: 109b6322000fb7f86247ed2b6c9f6e30d99ccfe9
2 Author: Mykyta Holubakha <hilobakho <AT> gmail <DOT> com>
3 AuthorDate: Sat Aug 27 20:40:08 2016 +0000
4 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 1 03:20:23 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=109b6322
7
8 app-editors/kakoune-9999: add GCC version check
9
10 correct usage of pkg-config
11
12 app-editors/kakoune/kakoune-9999.ebuild | 16 ++++++++++++----
13 1 file changed, 12 insertions(+), 4 deletions(-)
14
15 diff --git a/app-editors/kakoune/kakoune-9999.ebuild b/app-editors/kakoune/kakoune-9999.ebuild
16 index aec9313..cee9215 100644
17 --- a/app-editors/kakoune/kakoune-9999.ebuild
18 +++ b/app-editors/kakoune/kakoune-9999.ebuild
19 @@ -4,7 +4,7 @@
20
21 EAPI=6
22
23 -inherit flag-o-matic toolchain-funcs git-r3
24 +inherit flag-o-matic toolchain-funcs git-r3 versionator
25
26 DESCRIPTION="Selection-oriented code editor inspired by vim"
27 HOMEPAGE="https://github.com/mawww/kakoune"
28 @@ -17,7 +17,7 @@ IUSE="debug"
29
30 RDEPEND="
31 sys-libs/ncurses:=[unicode]
32 - dev-libs/boost
33 + dev-libs/boost:=
34 "
35 DEPEND="
36 app-text/asciidoc
37 @@ -27,9 +27,17 @@ DEPEND="
38
39 PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
40
41 +pkg_pretend() {
42 + if [[ ${MERGE_TYPE} != binary ]]; then
43 + if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
44 + die "Clang or GCC >=5.0 is required to build this version"
45 + fi
46 + fi
47 +}
48 +
49 src_configure() {
50 - append-cppflags $(pkg-config --cflags ncursesw)
51 - append-libs $(pkg-config --libs ncursesw)
52 + append-cppflags $($(tc-getPKG_CONFIG) --cflags ncursesw)
53 + append-libs $($(tc-getPKG_CONFIG) --libs ncursesw)
54 export CXX=$(tc-getCXX)
55 export debug=$(usex debug)
56 S="${WORKDIR}/${P}/src"