Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/
Date: Tue, 16 Jan 2018 00:03:43
Message-Id: 1516061012.8f74772e20fb2992a0fd19ec5b08fe09c7418908.polynomial-c@gentoo
1 commit: 8f74772e20fb2992a0fd19ec5b08fe09c7418908
2 Author: Nelo-T. Wallus <nelo <AT> wallus <DOT> de>
3 AuthorDate: Mon Jan 15 20:00:51 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 16 00:03:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f74772e
7
8 x11-wm/i3: Use out-of-source eclass
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11 Closes: https://github.com/gentoo/gentoo/pull/6873
12
13 x11-wm/i3/i3-4.14.1.ebuild | 39 +++++++++------------------------------
14 1 file changed, 9 insertions(+), 30 deletions(-)
15
16 diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
17 index 1d884372499..73ad789867b 100644
18 --- a/x11-wm/i3/i3-4.14.1.ebuild
19 +++ b/x11-wm/i3/i3-4.14.1.ebuild
20 @@ -1,15 +1,16 @@
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
27 AEVER=0.17
28
29 -inherit autotools virtualx
30 +inherit autotools out-of-source
31
32 DESCRIPTION="An improved dynamic tiling window manager"
33 HOMEPAGE="https://i3wm.org/"
34 SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
35 +
36 LICENSE="BSD"
37 SLOT="0"
38 KEYWORDS="~amd64 ~arm64 ~x86"
39 @@ -53,29 +54,10 @@ RDEPEND="${CDEPEND}
40 # in type-punned pointers - which in turn causes test failures.
41 REQUIRED_USE="test? ( debug )"
42
43 -DOCS=(
44 - "RELEASE-NOTES-${PV}"
45 - docs
46 -)
47 PATCHES=(
48 "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
49 )
50
51 -# https://github.com/i3/i3/issues/3013
52 -RESTRICT="test"
53 -
54 -src_test() {
55 - emake -C "${CBUILD}" \
56 - test.commands_parser \
57 - test.config_parser \
58 - test.inject_randr15
59 -
60 - virtx perl \
61 - -I "${S}/testcases/lib" \
62 - -I "${CBUILD}/testcases/lib" \
63 - "${CBUILD}/testcases/complete-run.pl"
64 -}
65 -
66 src_prepare() {
67 default
68
69 @@ -87,22 +69,19 @@ src_prepare() {
70 eautoreconf
71 }
72
73 -src_configure() {
74 +my_src_configure() {
75 local myeconfargs=(
76 $(use_enable debug)
77 )
78 econf "${myeconfargs[@]}"
79 }
80
81 -src_compile() {
82 - emake -C "${CBUILD}"
83 -}
84 -
85 -src_install() {
86 - emake -C "${CBUILD}" DESTDIR="${D}" install
87 - doman "${S}"/man/*.1
88 +my_src_install() {
89 + emake install
90 + doman man/*.1
91
92 - use doc && einstalldocs
93 + einstalldocs
94 + use docs && dodoc -r docs "RELEASE-NOTES-${PV}"
95
96 exeinto /etc/X11/Sessions
97 doexe "${T}/i3wm"