gentoo resync : 27.03.2021

3 files changed, 21 insertions, 9 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 5503d9951c01..3cb1e60d09a8 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 3fb7a010cd70..fc91a8102824 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,4 +1,4 @@
 AUX hikari-2.2.1-pkgconfig.patch 2675 BLAKE2B c5313156b4c9fb2871d3c5ee7b0b4532235c9ccf36747d5b6f2b519f1cd9f9fc65b366f404c4c30842286c3656ee75a59ebf214c6b06f4ad3be188d312f9b371 SHA512 d9e782c9bc7038e452a2a2956dd7e812484d8e8cbbd73018dff45a91522594ebd9cfa3e8737b66c143ab7a8cfd04e360b41b9cf4f037a8f215e1986745467378
 DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
-EBUILD hikari-2.2.2-r1.ebuild 1399 BLAKE2B 962fe480625acf9879a27af92d198cbd950eabfaa612511b70b28f02a4b28b2dbe08d7bf499625f0dd6bb990c5712b3a3e5e6bb65bde66714f0ee6bf05ae1735 SHA512 1a4b733158710d2eb623288c72f26f2895456bf149e5dbda44cfa515440dac3694b52a263b59d07b04e3cd5117579da9744c1d88ecd7ae9955399e3749a0ee26
+EBUILD hikari-2.2.2-r1.ebuild 1721 BLAKE2B 752691578c78743032d04b5773e6165a384fa83fb2945d8d0b95177cf36605a2e482df839b23fed74a29ee5071bb15b8aff773f45e3de45e765cf49a9296b6f1 SHA512 684e98f99c7a12034bf02b178d75fe0b6086517c1d7b1876036931cb162f52de5fec39e82bff9ba17041abd6b7566fae06e1510094bc81cbb35f56e1c90501be
 MISC metadata.xml 1045 BLAKE2B fcfd7999c8a58b0608cda077a5b0c6e3fe8ed49cd51dc57f22b007bb90b90966f301d846d0ebc97941a9d41a51ddaa0a79d051ec40ccd8a074c516b1a67e281c SHA512 502cc69aa55feee8b926f4848a5aa8291975ed7c33b3f3f1404e9a1768c512cc87c73b25ab402cd023e06034e2e0c4608287252305038119f82325a5d5fde398
diff --git a/gui-wm/hikari/hikari-2.2.2-r1.ebuild b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
index a9bbaec4c529..5db53df9ccd5 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/"
@@ -31,8 +31,10 @@ RDEPEND="
 	x11-misc/xkeyboard-config
 "
 
+# Needeed in DEPEND only (not BDEPEND as need to be right location etc)
+DEPEND+=" dev-libs/wayland-protocols"
+
 BDEPEND="
-	dev-libs/wayland-protocols
 	sys-devel/bmake
 	virtual/pkgconfig
 "
@@ -40,12 +42,18 @@ BDEPEND="
 PATCHES=( "${FILESDIR}"/${PN}-2.2.1-pkgconfig.patch )
 
 pkg_setup() {
+	# We set `bmake` and we also have to remove any reference to -l in MAKEOPTS
+	# as `bmake` does not support load average
+	# We do this in a crude way until flag-o-matic supports MAKEOPTS
+	# bug 778191
 	export MAKE=bmake
+	export MAKEOPTS=$(echo ${MAKEOPTS} | sed 's/-l \?[\.0-9]\+//' || die)
 	tc-export CC PKG_CONFIG
 }
 
 src_compile() {
-	${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
+	emake \
+		VERSION="${PV}" \
 		CC="$(tc-getCC)" \
 		CFLAGS_EXTRA="${CFLAGS}" \
 		LDFLAGS_EXTRA="${LDFLAGS}" \
@@ -55,12 +63,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
 }