Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/
Date: Tue, 18 Sep 2018 19:43:03
Message-Id: 1537299772.cccb1ca7f6e9d63f53a9ed3bbe1b34c3c9945a6d.floppym@gentoo
1 commit: cccb1ca7f6e9d63f53a9ed3bbe1b34c3c9945a6d
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 18 19:31:15 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 18 19:42:52 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cccb1ca7
7
8 dev-util/ninja: bump to EAPI 7
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11 Package-Manager: Portage-2.3.49_p2, Repoman-2.3.10_p48
12
13 dev-util/ninja/ninja-9999.ebuild | 16 ++++++++--------
14 1 file changed, 8 insertions(+), 8 deletions(-)
15
16 diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
17 index 73fb8e30509..38f251adba3 100644
18 --- a/dev-util/ninja/ninja-9999.ebuild
19 +++ b/dev-util/ninja/ninja-9999.ebuild
20 @@ -1,7 +1,7 @@
21 # Copyright 1999-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=6
25 +EAPI=7
26
27 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
28
29 @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
30 EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
31 else
32 SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
33 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
34 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
35 fi
36
37 DESCRIPTION="A small build system similar to make"
38 @@ -23,7 +23,7 @@ SLOT="0"
39
40 IUSE="doc emacs test vim-syntax zsh-completion"
41
42 -DEPEND="
43 +BDEPEND="
44 ${PYTHON_DEPS}
45 dev-util/re2c
46 doc? (
47 @@ -64,7 +64,7 @@ src_compile() {
48
49 if tc-is-cross-compiler; then
50 mv ninja ninja-build || die
51 - "${PYTHON}" configure.py || die
52 + ${EPYTHON} configure.py || die
53 ./ninja-build -v ninja || die
54 else
55 ln ninja ninja-build || die
56 @@ -101,11 +101,11 @@ src_install() {
57
58 if use vim-syntax; then
59 insinto /usr/share/vim/vimfiles/syntax/
60 - doins misc/"${PN}".vim
61 + doins misc/ninja.vim
62
63 - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
64 + echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
65 insinto /usr/share/vim/vimfiles/ftdetect
66 - doins "${T}/${PN}.vim"
67 + doins "${T}/ninja.vim"
68 fi
69
70 if use zsh-completion; then
71 @@ -115,7 +115,7 @@ src_install() {
72
73 if use emacs; then
74 cd misc || die
75 - elisp-install ${PN} ninja-mode.el* || die
76 + elisp-install ninja ninja-mode.el* || die
77 fi
78 }