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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA9FB1382C5 for ; Thu, 25 Mar 2021 15:56:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43599E076B; Thu, 25 Mar 2021 15:56:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D043E076B for ; Thu, 25 Mar 2021 15:56:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 295EE335DC1 for ; Thu, 25 Mar 2021 15:56:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC8C04A8 for ; Thu, 25 Mar 2021 15:56:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1616687798.893ef30a570d5d1e202e6b9e007eda4bec663b67.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/hikari/hikari-2.2.2-r1.ebuild X-VCS-Directories: gui-wm/hikari/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 893ef30a570d5d1e202e6b9e007eda4bec663b67 X-VCS-Branch: master Date: Thu, 25 Mar 2021 15:56:46 +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: fd884e76-bc10-4d4d-9eb7-9b69ff8c5229 X-Archives-Hash: 664355233b6541a86b2591bb26b2c7c0 commit: 893ef30a570d5d1e202e6b9e007eda4bec663b67 Author: Sam James gentoo org> AuthorDate: Thu Mar 25 15:53:23 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Mar 25 15:56:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893ef30a gui-wm/hikari: use emake instead of (b)make directly PMS guarantees [0] that 'emake' respects ${MAKE}, so let's use that to ensure that e.g. ${MAKEFLAGS} from the user is respected. [0] https://dev.gentoo.org/~ulm/pms/head/pms.html#x1-12800012.3.8 Signed-off-by: Sam James gentoo.org> gui-wm/hikari/hikari-2.2.2-r1.ebuild | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gui-wm/hikari/hikari-2.2.2-r1.ebuild b/gui-wm/hikari/hikari-2.2.2-r1.ebuild index a9bbaec4c52..249a1164a1e 100644 --- a/gui-wm/hikari/hikari-2.2.2-r1.ebuild +++ b/gui-wm/hikari/hikari-2.2.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multiprocessing toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Wayland compositor inspired by CWM" HOMEPAGE="https://hikari.acmelabs.space/" @@ -45,7 +45,8 @@ pkg_setup() { } src_compile() { - ${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \ + emake \ + VERSION="{PV}" \ CC="$(tc-getCC)" \ CFLAGS_EXTRA="${CFLAGS}" \ LDFLAGS_EXTRA="${LDFLAGS}" \ @@ -55,12 +56,16 @@ src_compile() { $(usex screencopy -DWITH_SCREENCOPY "") \ $(usex virtual-io -DWITH_VIRTUAL_INPUT "") \ $(usex X -DWITH_XWAYLAND "") \ - all || die + all } src_install() { - ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ \ - $(usex suid "" -DWITHOUT_SUID) \ - install || die + emake \ + DESTDIR="${D}" \ + PREFIX=/usr \ + ETC_PREFIX=/ \ + $(usex suid "" -DWITHOUT_SUID) \ + install + doman share/man/man1/hikari.1 }