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/sithwm/, x11-wm/sithwm/files/
Date: Tue, 24 Dec 2019 17:40:39
Message-Id: 1577209216.e2a842800c5113452638727e121b5e4d439290ab.soap@gentoo
1 commit: e2a842800c5113452638727e121b5e4d439290ab
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 24 17:40:16 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 24 17:40:16 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a84280
7
8 x11-wm/sithwm: Port to EAPI 7
9
10 Package-Manager: Portage-2.3.82, Repoman-2.3.20
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 x11-wm/sithwm/files/sithwm-1.2.3-install.patch | 11 +++++++++++
14 x11-wm/sithwm/sithwm-1.2.3.ebuild | 16 +++++++---------
15 2 files changed, 18 insertions(+), 9 deletions(-)
16
17 diff --git a/x11-wm/sithwm/files/sithwm-1.2.3-install.patch b/x11-wm/sithwm/files/sithwm-1.2.3-install.patch
18 new file mode 100644
19 index 00000000000..58d557c4360
20 --- /dev/null
21 +++ b/x11-wm/sithwm/files/sithwm-1.2.3-install.patch
22 @@ -0,0 +1,11 @@
23 +--- a/Makefile
24 ++++ b/Makefile
25 +@@ -64,7 +64,7 @@
26 + install: sithwm
27 + if [ -f sithwm.exe ]; then mv sithwm.exe sithwm; fi
28 + mkdir -p $(prefix)/bin $(prefix)/share/man/man1 $(confdir)
29 +- install -s sithwm $(prefix)/bin
30 ++ install sithwm $(prefix)/bin
31 + install sithwm.1 $(prefix)/share/man/man1
32 + install default.sithwmrc $(confdir)
33 + @if test -x /usr/bin/update-menus; then \
34
35 diff --git a/x11-wm/sithwm/sithwm-1.2.3.ebuild b/x11-wm/sithwm/sithwm-1.2.3.ebuild
36 index 74bd02edc37..caa3c5dbdb8 100644
37 --- a/x11-wm/sithwm/sithwm-1.2.3.ebuild
38 +++ b/x11-wm/sithwm/sithwm-1.2.3.ebuild
39 @@ -1,9 +1,9 @@
40 -# Copyright 1999-2012 Gentoo Foundation
41 +# Copyright 1999-2019 Gentoo Authors
42 # Distributed under the terms of the GNU General Public License v2
43
44 -EAPI=4
45 +EAPI=7
46
47 -inherit eutils toolchain-funcs
48 +inherit toolchain-funcs
49
50 DESCRIPTION="Minimalist Window Manager for X"
51 HOMEPAGE="http://sithwm.darkside.no/"
52 @@ -12,16 +12,14 @@ SRC_URI="http://sithwm.darkside.no/sn/sithwm-1.2.3.tgz"
53 LICENSE="GPL-2+ MIT 9wm"
54 SLOT="0"
55 KEYWORDS="~amd64 ~x86"
56 -IUSE=""
57
58 RDEPEND="x11-libs/libX11"
59 DEPEND="${RDEPEND}"
60
61 -src_prepare() {
62 - epatch "${FILESDIR}"/${P}-warnings.patch
63 - sed -e 's|install -s|install|g' \
64 - -i Makefile || die
65 -}
66 +PATCHES=(
67 + "${FILESDIR}"/${P}-warnings.patch
68 + "${FILESDIR}"/${P}-install.patch
69 +)
70
71 src_compile() {
72 emake CC="$(tc-getCC)"