Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/matwm2/
Date: Wed, 29 Jun 2022 09:07:26
Message-Id: 1656493632.f1a9b2784876f4e62ac2f79f00f44821921d2dcd.soap@gentoo
1 commit: f1a9b2784876f4e62ac2f79f00f44821921d2dcd
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 29 09:07:12 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 09:07:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1a9b278
7
8 x11-wm/matwm2: update EAPI 6 -> 8
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 ..._pre3-r1.ebuild => matwm2-0.1.2_pre3-r2.ebuild} | 35 +++++++++++-----------
13 1 file changed, 17 insertions(+), 18 deletions(-)
14
15 diff --git a/x11-wm/matwm2/matwm2-0.1.2_pre3-r1.ebuild b/x11-wm/matwm2/matwm2-0.1.2_pre3-r2.ebuild
16 similarity index 65%
17 rename from x11-wm/matwm2/matwm2-0.1.2_pre3-r1.ebuild
18 rename to x11-wm/matwm2/matwm2-0.1.2_pre3-r2.ebuild
19 index c6e017074c9d..468d8e602220 100644
20 --- a/x11-wm/matwm2/matwm2-0.1.2_pre3-r1.ebuild
21 +++ b/x11-wm/matwm2/matwm2-0.1.2_pre3-r2.ebuild
22 @@ -1,33 +1,31 @@
23 -# Copyright 1999-2017 Gentoo Foundation
24 +# Copyright 1999-2022 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI=6
28 -inherit toolchain-funcs
29 +EAPI=8
30 +
31 +inherit edo toolchain-funcs
32
33 MY_PV="${PV//_/}"
34
35 DESCRIPTION="Simple EWMH compatible window manager with titlebars and frames"
36 HOMEPAGE="https://github.com/segin/matwm2"
37 SRC_URI="https://github.com/segin/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
38 +S="${WORKDIR}/${PN}-${MY_PV}/${PN}"
39
40 LICENSE="MIT"
41 SLOT="0"
42 KEYWORDS="~amd64 ~x86"
43 IUSE="debug xft xinerama"
44 -S="${WORKDIR}/${PN}-${MY_PV}/${PN}"
45
46 RDEPEND="
47 x11-libs/libXext
48 x11-libs/libX11
49 xft? ( x11-libs/libXft )
50 - xinerama? ( x11-libs/libXinerama )
51 -"
52 -DEPEND="
53 - ${RDEPEND}
54 - virtual/pkgconfig
55 -"
56 + xinerama? ( x11-libs/libXinerama )"
57 +DEPEND="${RDEPEND}"
58 +BDEPEND="virtual/pkgconfig"
59
60 -PATCHES=( "${FILESDIR}/${P}-destdir-fix.patch" )
61 +PATCHES=( "${FILESDIR}"/${P}-destdir-fix.patch )
62
63 src_prepare() {
64 default
65 @@ -42,24 +40,25 @@ src_configure() {
66 --prefix="${EPREFIX}/usr"
67 --mandir="${EPREFIX}/usr/share/man"
68 --cc="$(tc-getCC)"
69 - $(usex debug "--enable-debug" "")
70 - $(usex xft "" "--disable-xft")
71 - $(usex xinerama "" "--disable-xinerama")
72 + $(usev debug --enable-debug)
73 + $(usev !xft --disable-xft)
74 + $(usev !xinerama --disable-xinerama)
75 )
76
77 - ./configure "${myconfigureargs[@]}" || die
78 + edo ./configure "${myconfigureargs[@]}"
79 }
80
81 src_install() {
82 default
83
84 - docompress -x "${EPREFIX}/usr/share/doc/${PF}"/default_matwmrc
85 + docompress -x /usr/share/doc/${PF}/default_matwmrc
86 dodoc default_matwmrc
87
88 insinto /usr/share/xsessions
89 doins "${FILESDIR}"/${PN}.desktop
90
91 - echo ${PN} > "${T}"/${PN} || die
92 exeinto /etc/X11/Sessions
93 - doexe "${T}"/${PN}
94 + newexe - matwm2 <<- _EOF_
95 + matwm2
96 + _EOF_
97 }