--- a/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch	Mon Mar 29 09:49:59 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 555b770..01025b9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,6 +13,7 @@ WITH_VIRTUAL_INPUT = YES
- OS != uname
- VERSION ?= "CURRENT"
- PREFIX ?= /usr/local
-+PKG_CONFIG ?= pkg-config
- ETC_PREFIX ?= ${PREFIX}
- 
- OBJS = \
-@@ -78,7 +79,7 @@ OBJS += \
- 	xwayland_view.o
- .endif
- 
--WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
-+WAYLAND_PROTOCOLS != ${PKG_CONFIG} --variable pkgdatadir wayland-protocols
- 
- .PHONY: distclean clean clean-doc doc dist install uninstall
- .PATH: src
-@@ -125,31 +126,31 @@ CFLAGS += -DHAVE_VIRTUAL_INPUT=1
- 
- CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
- 
--WLROOTS_CFLAGS != pkg-config --cflags wlroots
--WLROOTS_LIBS != pkg-config --libs wlroots
-+WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots
-+WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots
- 
- WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
- 
--PANGO_CFLAGS != pkg-config --cflags pangocairo
--PANGO_LIBS != pkg-config --libs pangocairo
-+PANGO_CFLAGS != ${PKG_CONFIG} --cflags pangocairo
-+PANGO_LIBS != ${PKG_CONFIG} --libs pangocairo
- 
--CAIRO_CFLAGS != pkg-config --cflags cairo
--CAIRO_LIBS != pkg-config --libs cairo
-+CAIRO_CFLAGS != ${PKG_CONFIG} --cflags cairo
-+CAIRO_LIBS != ${PKG_CONFIG} --libs cairo
- 
--PIXMAN_CFLAGS != pkg-config --cflags pixman-1
--PIXMAN_LIBS != pkg-config --libs pixman-1
-+PIXMAN_CFLAGS != ${PKG_CONFIG} --cflags pixman-1
-+PIXMAN_LIBS != ${PKG_CONFIG} --libs pixman-1
- 
--XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
--XKBCOMMON_LIBS != pkg-config --libs xkbcommon
-+XKBCOMMON_CFLAGS != ${PKG_CONFIG} --cflags xkbcommon
-+XKBCOMMON_LIBS != ${PKG_CONFIG} --libs xkbcommon
- 
--WAYLAND_CFLAGS != pkg-config --cflags wayland-server
--WAYLAND_LIBS != pkg-config --libs wayland-server
-+WAYLAND_CFLAGS != ${PKG_CONFIG} --cflags wayland-server
-+WAYLAND_LIBS != ${PKG_CONFIG} --libs wayland-server
- 
--LIBINPUT_CFLAGS != pkg-config --cflags libinput
--LIBINPUT_LIBS != pkg-config --libs libinput
-+LIBINPUT_CFLAGS != ${PKG_CONFIG} --cflags libinput
-+LIBINPUT_LIBS != ${PKG_CONFIG} --libs libinput
- 
--UCL_CFLAGS != pkg-config --cflags libucl
--UCL_LIBS != pkg-config --libs libucl
-+UCL_CFLAGS != ${PKG_CONFIG} --cflags libucl
-+UCL_LIBS != ${PKG_CONFIG} --libs libucl
- 
- CFLAGS += \
- 	${WLROOTS_CFLAGS} \
-@@ -192,7 +193,7 @@ wlr-layer-shell-unstable-v1-protocol.h:
- 	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
- 
- hikari-unlocker: hikari_unlocker.c
--	${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
-+	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o hikari-unlocker hikari_unlocker.c -lpam
- 
- clean-doc:
- 	@test -e _darcs && echo "cleaning manpage" ||:

--- a/gui-wm/hikari/hikari-2.2.2-r1.ebuild	Mon Mar 29 09:49:59 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/"
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gamma layershell screencopy suid virtual-io +X"
-
-DEPEND="
-	dev-libs/libinput:=
-	dev-libs/libucl
-	>=gui-libs/wlroots-0.11.0[X?]
-	media-libs/libglvnd
-	x11-libs/cairo[X?,svg]
-	x11-libs/libxkbcommon[X?]
-	x11-libs/pango[X?]
-	x11-libs/pixman
-	sys-libs/pam
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-misc/xkeyboard-config
-"
-
-# Needeed in DEPEND only (not BDEPEND as need to be right location etc)
-DEPEND+=" dev-libs/wayland-protocols"
-
-BDEPEND="
-	sys-devel/bmake
-	virtual/pkgconfig
-"
-
-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 `bamke` does not support load average
-	# We do this in a crude way until flag-o-matic supports MAKEOPTS
-	# bug 778191
-	export MAKE=bmake
-	MAKEOPTS=`echo $MAKEOPTS | sed 's/-l \?[\.0-9]\+//'`
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	emake \
-		VERSION="${PV}" \
-		CC="$(tc-getCC)" \
-		CFLAGS_EXTRA="${CFLAGS}" \
-		LDFLAGS_EXTRA="${LDFLAGS}" \
-		-DWITH_POSIX_C_SOURCE \
-		$(usex gamma -DWITH_GAMMACONTROL "") \
-		$(usex layershell -DWITH_LAYERSHELL "") \
-		$(usex screencopy -DWITH_SCREENCOPY "") \
-		$(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
-		$(usex X -DWITH_XWAYLAND "") \
-		all
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX=/usr \
-		ETC_PREFIX=/ \
-		$(usex suid "" -DWITHOUT_SUID) \
-		install
-
-	doman share/man/man1/hikari.1
-}