summaryrefslogtreecommitdiff
path: root/gui-wm/hikari
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
commitd934827bf44b7cfcf6711964418148fa60877668 (patch)
tree0625f358789b5e015e49db139cc1dbc9be00428f /gui-wm/hikari
parent2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
gentoo resync : 25.11.2020
Diffstat (limited to 'gui-wm/hikari')
-rw-r--r--gui-wm/hikari/Manifest8
-rw-r--r--gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch332
-rw-r--r--gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch78
-rw-r--r--gui-wm/hikari/hikari-2.1.1.ebuild57
-rw-r--r--gui-wm/hikari/hikari-2.2.2.ebuild (renamed from gui-wm/hikari/hikari-2.1.2.ebuild)9
5 files changed, 89 insertions, 395 deletions
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 4fdcebf9057e..79f92cc0849d 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,6 +1,4 @@
-AUX hikari-2.1.1-gnu-make.patch 10450 BLAKE2B a956a4c49d95d99d84147a083f56e23a2e6a995fdeb79994c556eca4df364167fae58bddb824ceef1ff952442f9591e198effaf9daffc997a11f7ae8dc7e903b SHA512 033d6a3b200eaa1bdedbe6b7cb110207046e535dd43a0ac6628c2dadf7f23e3ce9d63c7101cbf5d217ac43483f31baaeb459464a69a92d120963c96a290caa5f
-DIST hikari-2.1.1.tar.gz 1012598 BLAKE2B 189e7bd9271ed5af89f5039288334c16a33c049c504f57e05cfa11b20098650165bb655023d016a14f2b13ed94e819bece088ef8517b9114b80d6a5921000780 SHA512 6da547d957cc65ab040647209a865550b0cc2b3d79040fae507591c41e938826861e27034379c21a1b7ce18afa35dbb813e96e661f4bd1232eb932f032271dff
-DIST hikari-2.1.2.tar.gz 1012670 BLAKE2B 9ce3dc08b3b9377458eba7299d5921466983c64ef7a9eb16194c4cf4dcb482af1313b9378bf733e38fd5bb0b8154553d7ab57a7e45db69932a2bb201ff29b041 SHA512 e4c1328414a2b99657fbce58139d5f6432580182ee277bc1fb8d3de1fa875675d78606dc8defd7997025caeac36f533ea9f34fca56c15a9a64dfa05c9c3e51b7
-EBUILD hikari-2.1.1.ebuild 1243 BLAKE2B a7661734f9a46267934ad187a1bed2d028f23044b681c5cac6318f1674c2e8745c26c43edcc6f0f40e3a2ce8c1cd2be0b8aa2e65b7605b8bd63da9a45feb36a1 SHA512 048270c859405fc622772444eb84d1b06a781c80b9c4d454bdcaefb41d2537bdee991753bcf1c6151b9ee2012ad9391bb3098b7b949ec03ea07ab3e0439f4062
-EBUILD hikari-2.1.2.ebuild 1217 BLAKE2B fa3af4a381bb04eeb41069c54a37752c56d0938925c7b2b45b09f4caa81358346d8181626a8857d273fcc0ec2d913a4569b269e71fa29f1d2a1f1ed934b8e36f SHA512 9bc1adad3cebd4905a21bbda269d755a9c545e4a4fe747d2a99bd32e2c88f07942e35daa371d3b065585139c1d626fea4c929974907308859638f36d9fd28ead
+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.ebuild 1395 BLAKE2B 89adb4ea6468cb0404858b1da7dfebeb5fdbe19392282b3a69a3cb55e779bd0c806da0dcbaef114b34d88930cbf5cd1ed92c5d782f7942578c4f00a73b8485fe SHA512 c02f303b6c6bfb0e9fca846aa75b606241c15956fd57e7fd1b173c98380e2c58fbab2be815ba0546f3ab74ff90420e54a38bf354d7bf3d0effc5a36abb92f35e
MISC metadata.xml 1015 BLAKE2B cf0b1938d20d91676068e3fe8d5556da68afc6c3d5c1f56da1a8b18b60d3ed932c43b084cd2fd99cf5c0f713f6684da5b907a650f7f37d671d12b15de894624a SHA512 fe3983cb19d30846c315db699947be49e5ca046a320ecd56dbde122ebd5380d896210ea3fbbb860f164bc4140e7199d0cc26b067dfcab6f492932b31fdaf593c
diff --git a/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch b/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch
deleted file mode 100644
index 4fd6d468d481..000000000000
--- a/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-explain steps to guide future me and other patchers
-(1) define common variables on top
-(2) remove conditions for doc and others to define VERSION
-(3) replace all ${*} by $(*)
-(4) replace pkg-config by $(PKG_CONFIG)
-(6) remove .PATH: src
-(5) remove main.c from OBJS because it is in different directory
- - we will define a separate target for it
-(6) add $(OBJS) target + main.o target and add then to the end
- of dependencies for hikari
-(7) add main.o to be cleaned-up
-(8) reorder the library orders in the $(CC) steps because gcc
-diff --git a/Makefile b/Makefile
-index cab013a..b72e74c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,22 @@
-+TARGET = hikari
-+
-+DESTDIR ?=
-+
-+prefix ?= /usr/local
-+exec_prefix ?= $(prefix)
-+bindir ?= $(exec_prefix)/bin
-+sysconfdir ?= $(prefix)/etc
-+
-+PKG_CONFIG ?= pkg-config
-+
-+VERSION ?= "CURRENT"
-+
-+### Upstream variables
-+PREFIX ?= $(DESTDIR)$(prefix)
-+ETC_PREFIX ?= $(DESTDIR)$(sysconfdir)
-+
- OS != uname
--VERSION ?= "CURRENT"
--PREFIX ?= /usr/local
--ETC_PREFIX ?= ${PREFIX}
-+INSTALL_GROUP != id -gn
-
- OBJS = \
- action.o \
-@@ -33,7 +48,6 @@ OBJS = \
- layout_select_mode.o \
- lock_indicator.o \
- lock_mode.o \
-- main.o \
- mark.o \
- mark_assign_mode.o \
- mark_select_mode.o \
-@@ -64,109 +78,124 @@ OBJS = \
-
- WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
-
--.PHONY: distclean clean clean-doc doc dist install uninstall
--.PATH: src
--
- # Allow specification of /extra/ CFLAGS and LDFLAGS
--CFLAGS += ${CFLAGS_EXTRA}
--LDFLAGS += ${LDFLAGS_EXTRA}
-+CFLAGS += $(CFLAGS_EXTRA)
-+LDFLAGS += $(LDFLAGS_EXTRA)
-
--.ifdef DEBUG
-+ifeq ($(DEBUG),1)
- CFLAGS += -g -O0 -fsanitize=address
--.else
-+else
- CFLAGS += -DNDEBUG
--.endif
-+endif
-
--.ifdef WITH_POSIX_C_SOURCE
-+ifeq ($(WITH_POSIX_C_SOURCE),1)
- CFLAGS += -D_POSIX_C_SOURCE=200809L
--.endif
-+endif
-
--.ifdef WITH_XWAYLAND
-+ifeq ($(WITH_XWAYLAND),1)
- CFLAGS += -DHAVE_XWAYLAND=1
--.endif
-+endif
-
--.ifdef WITH_GAMMACONTROL
-+ifeq ($(WITH_GAMMACONTROL),1)
- CFLAGS += -DHAVE_GAMMACONTROL=1
--.endif
-+endif
-
--.ifdef WITH_SCREENCOPY
-+ifeq ($(WITH_SCREENCOPY),1)
- CFLAGS += -DHAVE_SCREENCOPY=1
--.endif
-+endif
-
--.ifdef WITH_LAYERSHELL
-+ifeq ($(WITH_LAYERSHELL),1)
- CFLAGS += -DHAVE_LAYERSHELL=1
--.endif
-+endif
-+
-+ifeq ($(WITH_VIRTUAL_INPUT),1)
-+CFLAGS += -DHAVE_VIRTUAL_INPUT=1
-+endif
-
--.ifdef WITHOUT_SUID
-+ifeq ($(WITHOUT_SUID),1)
- PERMS = 555
--.else
-+else
- PERMS = 4555
--.endif
-+endif
-
--CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
-+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} \
-- ${PANGO_CFLAGS} \
-- ${CAIRO_CFLAGS} \
-- ${PIXMAN_CFLAGS} \
-- ${XKBCOMMON_CFLAGS} \
-- ${WAYLAND_CFLAGS} \
-- ${LIBINPUT_CFLAGS} \
-- ${UCL_CFLAGS}
-+ $(WLROOTS_CFLAGS) \
-+ $(PANGO_CFLAGS) \
-+ $(CAIRO_CFLAGS) \
-+ $(PIXMAN_CFLAGS) \
-+ $(XKBCOMMON_CFLAGS) \
-+ $(WAYLAND_CFLAGS) \
-+ $(LIBINPUT_CFLAGS) \
-+ $(UCL_CFLAGS)
-
- LIBS = \
-- ${WLROOTS_LIBS} \
-- ${PANGO_LIBS} \
-- ${CAIRO_LIBS} \
-- ${PIXMAN_LIBS} \
-- ${XKBCOMMON_LIBS} \
-- ${WAYLAND_LIBS} \
-- ${LIBINPUT_LIBS} \
-- ${UCL_LIBS}
-+ $(WLROOTS_LIBS) \
-+ $(PANGO_LIBS) \
-+ $(CAIRO_LIBS) \
-+ $(PIXMAN_LIBS) \
-+ $(XKBCOMMON_LIBS) \
-+ $(WAYLAND_LIBS) \
-+ $(LIBINPUT_LIBS) \
-+ $(UCL_LIBS)
-
--all: hikari hikari-unlocker
-+.PHONY: distclean clean clean-doc doc dist install uninstall
-
- version.h:
-- echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
-+ echo "#define HIKARI_VERSION \"$(VERSION)\"" >> version.h
-
--hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS}
-- ${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o ${.TARGET} ${OBJS} ${LIBS}
-+$(OBJS): %.o: src/%.c
-+ $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-+
-+main.o:
-+ $(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
-
- xdg-shell-protocol.h:
-- wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
-+ wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
-
- wlr-layer-shell-unstable-v1-protocol.h:
-- wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
-+ wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
-+
-+hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
-+ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
-
- hikari-unlocker: hikari_unlocker.c
-- ${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
-+ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
-+
-+share/man/man1/hikari.1:
-+ pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
-+ --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
-+
-+doc: share/man/man1/hikari.1
-+
-+all: hikari hikari-unlocker
-
- clean-doc:
- @test -e _darcs && echo "cleaning manpage" ||:
-@@ -178,66 +207,38 @@ clean: clean-doc
- @rm xdg-shell-protocol.h 2> /dev/null ||:
- @rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
- @echo "cleaning object files"
-- @rm ${OBJS} 2> /dev/null ||:
-+ @rm $(OBJS) 2> /dev/null ||:
-+ @rm main.o 2> /dev/null ||:
- @echo "cleaning executables"
- @rm hikari 2> /dev/null ||:
- @rm hikari-unlocker 2> /dev/null ||:
-
--share/man/man1/hikari.1:
-- pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
-- --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
--
--doc: share/man/man1/hikari.1
--
--hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
-- @darcs revert
-- @tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
-- version.h \
-- main.c \
-- hikari_unlocker.c \
-- include/hikari/*.h \
-- src/*.c \
-- protocol/*.xml \
-- Makefile \
-- LICENSE \
-- README.md \
-- CHANGELOG.md \
-- share/man/man1/hikari.md \
-- share/man/man1/hikari.1 \
-- share/backgrounds/hikari/hikari_wallpaper.png \
-- share/wayland-sessions/hikari.desktop \
-- etc/hikari/hikari.conf \
-- etc/pam.d/hikari-unlocker.*
--
--distclean: clean-doc
-- @test -e _darcs && echo "cleaning version.h" ||:
-- @test -e _darcs && rm version.h ||:
--
--dist: distclean hikari-${VERSION}.tar.gz
--
--install: hikari hikari-unlocker share/man/man1/hikari.1
-- mkdir -p ${DESTDIR}/${PREFIX}/bin
-- mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
-- mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
-- mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
-- mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
-- mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
-- sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
-- chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
-- install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
-- install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
-- install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
-- install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
-- install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
-- install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
-+install-doc:
-+ install -m 644 share/man/man1/hikari.1 $(PREFIX)/share/man/man1
-+
-+install:
-+ mkdir -p $(PREFIX)/bin
-+ mkdir -p $(PREFIX)/share/man/man1
-+ mkdir -p $(PREFIX)/share/backgrounds/hikari
-+ mkdir -p $(PREFIX)/share/wayland-sessions
-+ mkdir -p $(ETC_PREFIX)/etc/hikari
-+ mkdir -p $(ETC_PREFIX)/etc/pam.d
-+ sed "s,PREFIX,$(prefix)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf
-+ chmod 644 $(ETC_PREFIX)/etc/hikari/hikari.conf
-+ install -m $(PERMS) hikari $(PREFIX)/bin
-+ install -m 4555 hikari-unlocker $(PREFIX)/bin
-+ install -m 644 share/backgrounds/hikari/hikari_wallpaper.png $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+ install -m 644 share/wayland-sessions/hikari.desktop $(PREFIX)/share/wayland-sessions/hikari.desktop
-+ install -m 644 etc/pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
-
- uninstall:
-- -rm ${DESTDIR}/${PREFIX}/bin/hikari
-- -rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker
-- -rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1
-- -rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
-- -rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
-- -rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
-- -rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
-- -rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari
-- -rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
-+ -rm $(PREFIX)/bin/hikari
-+ -rm $(PREFIX)/bin/hikari-unlocker
-+ -rm $(PREFIX)/share/man/man1/hikari.1
-+ -rm $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+ -rm $(PREFIX)/share/wayland-sessions/hikari.desktop
-+ -rm $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
-+ -rm $(ETC_PREFIX)/etc/hikari/hikari.conf
-+ -rmdir $(ETC_PREFIX)/etc/hikari
-+ -rmdir $(PREFIX)/share/backgrounds/hikari
-+
diff --git a/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch b/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
new file mode 100644
index 000000000000..472a9efa37df
--- /dev/null
+++ b/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
@@ -0,0 +1,78 @@
+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" ||:
diff --git a/gui-wm/hikari/hikari-2.1.1.ebuild b/gui-wm/hikari/hikari-2.1.1.ebuild
deleted file mode 100644
index b8ef028dff7f..000000000000
--- a/gui-wm/hikari/hikari-2.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
- 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
-"
-
-BDEPEND="
- dev-libs/wayland-protocols
- virtual/pkgconfig
-"
-
-# keep this as others OS's are using this as reference
-PATCHES=(
- "${FILESDIR}/${P}-gnu-make.patch"
-)
-
-src_compile() {
- emake VERSION="{PV}" \
- WITH_POSIX_C_SOURCE=1 \
- WITH_GAMMACONTROL=$(usex gamma 1 0) \
- WITH_LAYERSHELL=$(usex layershell 1 0) \
- WITH_SCREENCOPY=$(usex screencopy 1 0) \
- WITH_SUID=$(usex suid 1 0) \
- WITH_VIRTUAL_INPUT=$(usex virtual-io 1 0) \
- WITH_XWAYLAND=$(usex X 1 0) \
- all
-}
-
-src_install() {
- emake PREFIX="${D}/usr" ETC_PREFIX="${D}" prefix="${SYSROOT}/usr" install install-doc
- doman share/man/man1/hikari.1
-}
diff --git a/gui-wm/hikari/hikari-2.1.2.ebuild b/gui-wm/hikari/hikari-2.2.2.ebuild
index 54f522c053ac..2d87cfd595d1 100644
--- a/gui-wm/hikari/hikari-2.1.2.ebuild
+++ b/gui-wm/hikari/hikari-2.2.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit multiprocessing
+inherit multiprocessing toolchain-funcs
DESCRIPTION="Wayland compositor inspired by CWM"
HOMEPAGE="https://hikari.acmelabs.space/"
@@ -37,12 +37,19 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}"/${PN}-2.2.1-pkgconfig.patch )
+
pkg_setup() {
export MAKE=bmake
+ tc-export CC PKG_CONFIG
}
src_compile() {
+
${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
+ CC="$(tc-getCC)" \
+ CFLAGS_EXTRA="${CFLAGS}" \
+ LDFLAGS_EXTRA="${LDFLAGS}" \
-DWITH_POSIX_C_SOURCE \
$(usex gamma -DWITH_GAMMACONTROL "") \
$(usex layershell -DWITH_LAYERSHELL "") \