Diff i3-4.18.3 with a i3-4.19-r1

/usr/portage/x11-wm/i3/i3-4.19-r1.ebuild 2021-04-04 22:09:00.000000000 +0300
1
# Copyright 1999-2020 Gentoo Authors
1
# Copyright 1999-2021 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=7
5 5

  
6
inherit autotools out-of-source virtualx
6
inherit meson optfeature virtualx
7
if [[ "${PV}" = *9999 ]]; then
8
	inherit git-r3
9
fi
7 10

  
8 11
DESCRIPTION="An improved dynamic tiling window manager"
9 12
HOMEPAGE="https://i3wm.org/"
10
SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
13
if [[ "${PV}" = *9999 ]]; then
14
	EGIT_REPO_URI="https://github.com/i3/i3"
15
	EGIT_BRANCH="next"
16
else
17
	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
18
	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
19
fi
11 20

  
12 21
LICENSE="BSD"
13 22
SLOT="0"
14
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
15
IUSE="doc debug test"
23
IUSE="doc test"
16 24

  
17
CDEPEND="dev-libs/libev
25
COMMON_DEPEND="dev-libs/libev
18 26
	dev-libs/libpcre
19 27
	dev-libs/yajl
20 28
	x11-libs/libxcb[xkb]
......
28 36
	x11-misc/xkeyboard-config
29 37
	x11-libs/cairo[X,xcb(+)]
30 38
	x11-libs/pango[X]"
31
DEPEND="${CDEPEND}
39
DEPEND="${COMMON_DEPEND}
32 40
	test? (
33 41
		dev-perl/AnyEvent
34 42
		dev-perl/X11-XCB
......
40 48
		virtual/perl-Test-Simple
41 49
		x11-base/xorg-server[xephyr]
42 50
		x11-misc/xvfb-run
51
	)
52
	doc? (
53
		app-text/asciidoc
54
		app-text/xmlto
55
		dev-lang/perl
43 56
	)"
44
RDEPEND="${CDEPEND}
57
RDEPEND="${COMMON_DEPEND}
45 58
	dev-lang/perl
46 59
	dev-perl/AnyEvent-I3
47 60
	dev-perl/JSON-XS"
48 61
BDEPEND="virtual/pkgconfig"
49 62

  
50
# Test without debug will apply optimization levels, which results
51
# in type-punned pointers - which in turn causes test failures.
52
REQUIRED_USE="test? ( debug )"
53

  
54 63
PATCHES=(
55 64
	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
65
	"${FILESDIR}/i3-gaps-4.19-fix-docdir.patch"
56 66
)
57 67

  
58
# https://github.com/i3/i3/issues/3013
59
RESTRICT="test"
60

  
61 68
src_prepare() {
62 69
	default
63 70

  
......
65 72
		#!/bin/sh
66 73
		exec /usr/bin/i3
67 74
	EOF
68

  
69
	eautoreconf
70 75
}
71 76

  
72
my_src_configure() {
73
	local myeconfargs=(
74
		$(use_enable debug)
77
src_configure() {
78
	local emesonargs=(
79
		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
80
		$(meson_use doc docs)
81
		$(meson_use doc mans)
75 82
	)
76
	econf "${myeconfargs[@]}"
77
}
78 83

  
79
my_src_test() {
80
	emake check
84
	meson_src_configure
81 85
}
82 86

  
83
my_src_install_all() {
84
	doman man/*.1
85

  
86
	einstalldocs
87
	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
87
src_install() {
88
	meson_src_install
88 89

  
89 90
	exeinto /etc/X11/Sessions
90
	doexe "${T}/i3wm"
91
	doexe "${T}"/i3wm
92
}
93

  
94
src_test() {
95
	virtx meson_src_test
91 96
}
92 97

  
93 98
pkg_postinst() {
94
	# Only show the elog information on a new install
95
	if [[ ! ${REPLACING_VERSIONS} ]]; then
96
		elog "There are several packages that you may find useful with ${PN} and"
97
		elog "their usage is suggested by the upstream maintainers, namely:"
98
		elog "  x11-misc/dmenu"
99
		elog "  x11-misc/i3status"
100
		elog "  x11-misc/i3lock"
101
		elog "Please refer to their description for additional info."
102
	fi
99
	optfeature_header "There are several packages that may be useful with i3:"
100
	optfeature "application launcher" x11-misc/dmenu
101
	optfeature "simple screen locker" x11-misc/i3lock
102
	optfeature "status bar generator" x11-misc/i3status
103 103
}
Thank you!