Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/dwm/
Date: Fri, 07 Jan 2022 20:44:56
Message-Id: 1641588233.c743e47eb7c7f1c7de483f554728c5daaf9e4819.gyakovlev@gentoo
1 commit: c743e47eb7c7f1c7de483f554728c5daaf9e4819
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 7 19:37:10 2022 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 7 20:43:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c743e47e
7
8 x11-wm/dwm: sync live ebuild changes
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 x11-wm/dwm/dwm-9999.ebuild | 17 +++++++++++++----
13 1 file changed, 13 insertions(+), 4 deletions(-)
14
15 diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild
16 index 4b464a12ac2f..4ff4f401873f 100644
17 --- a/x11-wm/dwm/dwm-9999.ebuild
18 +++ b/x11-wm/dwm/dwm-9999.ebuild
19 @@ -1,16 +1,23 @@
20 -# Copyright 1999-2020 Gentoo Authors
21 +# Copyright 1999-2022 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=7
25 -inherit git-r3 savedconfig toolchain-funcs
26 +
27 +inherit savedconfig toolchain-funcs
28
29 DESCRIPTION="a dynamic window manager for X11"
30 HOMEPAGE="https://dwm.suckless.org/"
31 -EGIT_REPO_URI="https://git.suckless.org/dwm"
32 +
33 +if [[ ${PV} == 9999 ]]; then
34 + inherit git-r3
35 + EGIT_REPO_URI="https://git.suckless.org/dwm"
36 +else
37 + SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
38 + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
39 +fi
40
41 LICENSE="MIT"
42 SLOT="0"
43 -KEYWORDS=""
44 IUSE="xinerama"
45
46 RDEPEND="
47 @@ -30,6 +37,8 @@ src_prepare() {
48 sed -i \
49 -e "s/ -Os / /" \
50 -e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \
51 + -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
52 + -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
53 config.mk || die
54
55 restore_config config.h