--- a/gui-wm/hikari/Manifest	Thu Mar 25 16:07:41 2021 +0000
+++ b/gui-wm/hikari/Manifest	Thu Mar 25 16:16:18 2021 +0000
@@ -2,4 +2,4 @@
 AUX hikari.1 42248 BLAKE2B 694cad2fd65f394723ea22d06d294d085bdbef1d709dfabc85fcc5c09f39bc62fa64b5b99e373a9953291a0f4f947b57078e63fd3cdfe90213ab05e3a3385188 SHA512 f5e85cfb4969a4cc5f5d9a533b1b30b07c709fb895bbc025761584967f089df25b2bb818ecb9d983647d27a29c63d2fc567b0401f3450e0334096a70393049b3
 DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
 EBUILD hikari-2.2.2-r1.ebuild 1449 BLAKE2B ae7c5467ae12a2e1d2c7e121843dc225bb8be7c6234355586e5b9305341ca0f0db9c6b80836347cf8e846058d7a0dcfd8f2a847e6d39ebe2d7e074ea0749e249 SHA512 a67dc424124b8ea99f73d33dfd55b7a93cbcd8e72de6e3aed3038ed6734823846b9d2fda57edef2e9ac0555d04e97f4a9cc04d15e1ea75b6864119708ca6c0c0
-EBUILD hikari-9999.ebuild 1702 BLAKE2B 1aa8e78b41178e2450f57b6d0cfc8020b97f642681f575eeb01a4a3365e11815334749668f051c743c19326ad063b70ca162ce70188285cb29c8e67f84c67c54 SHA512 8eee3c787803c844092b5c2195e8aad1620ced54ede7cf186145daf383e9404b2c1ebeca90270e73b3952b418906a82036ccec7753374056fe231b0c97ef60d2
+EBUILD hikari-9999.ebuild 1765 BLAKE2B b629d0c464a9fddd44fef17701d57acd07d8c78dcc40b78433724377586306c6d3202409136c891f65c68155f3a0db3b5e3e5cb23d02957976523df2a9e6c343 SHA512 065411c505d5b93962bd3f6f76b1b6ec40e4dfc11928fb9bcf2d7c9da3c3a72a93fa7f41f892667033cb89c8217e320f7e9b758f72ca45b3e18d4d07c21772da

--- a/gui-wm/hikari/hikari-9999.ebuild	Thu Mar 25 16:07:41 2021 +0000
+++ b/gui-wm/hikari/hikari-9999.ebuild	Thu Mar 25 16:16:18 2021 +0000
@@ -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/"
@@ -37,8 +37,10 @@
 	x11-misc/xkeyboard-config
 "
 
+# Needed in DEPEND only, as it needs to be right location, whatever that means
+DEPEND+=" dev-libs/wayland-protocols"
+
 BDEPEND="
-	dev-libs/wayland-protocols
 	virtual/pkgconfig
 	sys-devel/bmake
 "
@@ -58,7 +60,8 @@
 }
 
 src_compile() {
-	${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
+	emake \
+		VERSION="${PV}" \
 		CC="$(tc-getCC)" \
 		CFLAGS_EXTRA="${CFLAGS}" \
 		LDFLAGS_EXTRA="${LDFLAGS}" \
@@ -69,10 +72,16 @@
 		$(usex suid -DWITH_SUID "") \
 		$(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
 		$(usex X -DWITH_XWAYLAND "") \
-		all || die
+		all
 }
 
 src_install() {
-	${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ $(usex suid -DWITH_SUID "") install || die
+	emake \
+		DESTDIR="${D}" \
+		PREFIX=/usr \
+		ETC_PREFIX=/ \
+		$(usex suid -DWITH_SUID "") \
+		install
+
 	doman share/man/man1/hikari.1
 }