From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59004158086 for ; Fri, 7 Jan 2022 20:44:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D47D22BC031; Fri, 7 Jan 2022 20:44:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B80772BC031 for ; Fri, 7 Jan 2022 20:44:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7A0C342C5F for ; Fri, 7 Jan 2022 20:44:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EDEF268 for ; Fri, 7 Jan 2022 20:44:52 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1641588233.c743e47eb7c7f1c7de483f554728c5daaf9e4819.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/dwm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/dwm/dwm-9999.ebuild X-VCS-Directories: x11-wm/dwm/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: c743e47eb7c7f1c7de483f554728c5daaf9e4819 X-VCS-Branch: master Date: Fri, 7 Jan 2022 20:44:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d7dc1886-6fa6-40b0-82fd-f33a2ccbda99 X-Archives-Hash: 6c3868dc6b9682429a557a64c5ab51a4 commit: c743e47eb7c7f1c7de483f554728c5daaf9e4819 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Jan 7 19:37:10 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Jan 7 20:43:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c743e47e x11-wm/dwm: sync live ebuild changes Signed-off-by: Georgy Yakovlev gentoo.org> x11-wm/dwm/dwm-9999.ebuild | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild index 4b464a12ac2f..4ff4f401873f 100644 --- a/x11-wm/dwm/dwm-9999.ebuild +++ b/x11-wm/dwm/dwm-9999.ebuild @@ -1,16 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 savedconfig toolchain-funcs + +inherit savedconfig toolchain-funcs DESCRIPTION="a dynamic window manager for X11" HOMEPAGE="https://dwm.suckless.org/" -EGIT_REPO_URI="https://git.suckless.org/dwm" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.suckless.org/dwm" +else + SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="" IUSE="xinerama" RDEPEND=" @@ -30,6 +37,8 @@ src_prepare() { sed -i \ -e "s/ -Os / /" \ -e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \ + -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \ + -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \ config.mk || die restore_config config.h