Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/, gui-wm/hikari/files/
Date: Tue, 29 Sep 2020 06:37:56
Message-Id: 1601360581.80ec48506be33390c0edf3aac540f9cad64036c8.juippis@gentoo
1 commit: 80ec48506be33390c0edf3aac540f9cad64036c8
2 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
3 AuthorDate: Wed Aug 26 03:56:27 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 29 06:23:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ec4850
7
8 gui-wm/hikari: drop old version
9
10 Package-Manager: Portage-3.0.2, Repoman-2.3.23
11 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 gui-wm/hikari/Manifest | 1 -
15 gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch | 315 ------------------------
16 gui-wm/hikari/hikari-1.2.0.ebuild | 55 -----
17 3 files changed, 371 deletions(-)
18
19 diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
20 index 75b789090ab..43a82764423 100644
21 --- a/gui-wm/hikari/Manifest
22 +++ b/gui-wm/hikari/Manifest
23 @@ -1,4 +1,3 @@
24 -DIST hikari-1.2.0.tar.gz 98941 BLAKE2B 0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d SHA512 2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328
25 DIST hikari-2.0.2.tar.gz 1003593 BLAKE2B 89a2ec29673e7ac371a7e4f179b3dc398fbacb3daf859a9f1a53cf74aac9dc36ca33f3dc1878360fdae80ef39315a0b06d0988d897c9ce58693404fd3099d6bf SHA512 12e6cf2f1f24a4c0b64e6c035c518bdc5dbfa094a220147c374f599df8b52a4ee4c1f3cdffe1080fe87c665841a6ca018de4a48ec65aaa5b60e9e968087d83d6
26 DIST hikari-2.1.1.tar.gz 1012598 BLAKE2B 189e7bd9271ed5af89f5039288334c16a33c049c504f57e05cfa11b20098650165bb655023d016a14f2b13ed94e819bece088ef8517b9114b80d6a5921000780 SHA512 6da547d957cc65ab040647209a865550b0cc2b3d79040fae507591c41e938826861e27034379c21a1b7ce18afa35dbb813e96e661f4bd1232eb932f032271dff
27 DIST hikari-2.1.2.tar.gz 1012670 BLAKE2B 9ce3dc08b3b9377458eba7299d5921466983c64ef7a9eb16194c4cf4dcb482af1313b9378bf733e38fd5bb0b8154553d7ab57a7e45db69932a2bb201ff29b041 SHA512 e4c1328414a2b99657fbce58139d5f6432580182ee277bc1fb8d3de1fa875675d78606dc8defd7997025caeac36f533ea9f34fca56c15a9a64dfa05c9c3e51b7
28
29 diff --git a/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch b/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch
30 deleted file mode 100644
31 index 01a9b87c4ce..00000000000
32 --- a/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch
33 +++ /dev/null
34 @@ -1,315 +0,0 @@
35 -explain steps to guide future me and other patchers
36 -(1) define common variables on top
37 -(2) remove conditions for doc and others to define VERSION
38 -(3) replace all ${*} by $(*)
39 -(4) replace pkg-config by $(PKG_CONFIG)
40 -(6) remove .PATH: src
41 -(5) remove main.c from OBJS because it is in different directory
42 - - we will define a separate target for it
43 -(6) add $(OBJS) target + main.o target and add then to the end
44 - of dependencies for hikari
45 -(7) add main.o to be cleaned-up
46 -(8) reorder the library orders in the $(CC) steps because gcc
47 -diff --git a/Makefile b/Makefile
48 -index 11fc449..d73c4e0 100644
49 ---- a/Makefile
50 -+++ b/Makefile
51 -@@ -1,24 +1,22 @@
52 --.ifmake doc || dist
53 --.ifndef VERSION
54 --.error please specify VERSION
55 --.endif
56 --.endif
57 --
58 --VERSION ?= "darcs"
59 --
60 --.ifmake install || uninstall
61 --.ifndef PREFIX
62 --.error please specify PREFIX
63 --.endif
64 -+TARGET = hikari
65 -+
66 -+DESTDIR ?=
67 -+
68 -+prefix ?= /usr/local
69 -+exec_prefix ?= $(prefix)
70 -+bindir ?= $(exec_prefix)/bin
71 -+sysconfdir ?= $(prefix)/etc
72 -+
73 -+PKG_CONFIG ?= pkg-config
74 -+
75 -+VERSION ?= "darcs"
76 -+
77 -+### Upstream variables
78 -+PREFIX ?= $(prefix)
79 -+ETC_PREFIX ?= $(sysconfdir)
80 -+
81 - OS != uname
82 - INSTALL_GROUP != id -gn
83 --.endif
84 --
85 --.ifmake install || uninstall
86 --.ifndef ETC_PREFIX
87 --.error please specify ETC_PREFIX
88 --.endif
89 --.endif
90 -
91 - OBJS = \
92 - action.o \
93 -@@ -45,7 +43,6 @@ OBJS = \
94 - layout.o \
95 - layout_config.o \
96 - layout_select_mode.o \
97 -- main.o \
98 - mark.o \
99 - mark_assign_mode.o \
100 - mark_select_mode.o \
101 -@@ -72,106 +69,117 @@ OBJS = \
102 - xwayland_unmanaged_view.o \
103 - xwayland_view.o
104 -
105 --WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
106 --
107 --.PHONY: distclean clean clean-doc doc dist install uninstall
108 --.PATH: src
109 -+WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable pkgdatadir wayland-protocols
110 -
111 --.ifdef DEBUG
112 --CFLAGS += -g -O0 -fsanitize=address
113 --.else
114 --CFLAGS += -DNDEBUG
115 --.endif
116 -+ifeq ($(DEBUG),1)
117 -+ CFLAGS += -g -O0 -fsanitize=address
118 -+else
119 -+ CFLAGS += -DNDEBUG
120 -+endif
121 -
122 --.ifdef WITH_POSIX_C_SOURCE
123 --CFLAGS += -D_POSIX_C_SOURCE=200809L
124 --.endif
125 -+ifeq ($(WITH_POSIX_C_SOURCE),1)
126 -+ CFLAGS += -D_POSIX_C_SOURCE=200809L
127 -+endif
128 -
129 --.ifdef WITH_XWAYLAND
130 --CFLAGS += -DHAVE_XWAYLAND=1
131 --.endif
132 -+ifeq ($(WITH_XWAYLAND),1)
133 -+ CFLAGS += -DHAVE_XWAYLAND=1
134 -+endif
135 -
136 --.ifdef WITH_GAMMACONTROL
137 --CFLAGS += -DHAVE_GAMMACONTROL=1
138 --.endif
139 -+ifeq ($(WITH_GAMMACONTROL),1)
140 -+ CFLAGS += -DHAVE_GAMMACONTROL=1
141 -+endif
142 -
143 --.ifdef WITH_SCREENCOPY
144 --CFLAGS += -DHAVE_SCREENCOPY=1
145 --.endif
146 -+ifeq ($(WITH_SCREENCOPY),1)
147 -+ CFLAGS += -DHAVE_SCREENCOPY=1
148 -+endif
149 -
150 --.ifdef WITH_LAYERSHELL
151 --CFLAGS += -DHAVE_LAYERSHELL=1
152 --.endif
153 -+ifeq ($(WITH_LAYERSHELL),1)
154 -+ CFLAGS += -DHAVE_LAYERSHELL=1
155 -+endif
156 -
157 - CFLAGS += -Wall -I. -Iinclude
158 -
159 --WLROOTS_CFLAGS != pkg-config --cflags wlroots
160 --WLROOTS_LIBS != pkg-config --libs wlroots
161 -+WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots
162 -+WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots
163 -
164 - WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
165 -
166 --PANGO_CFLAGS != pkg-config --cflags pangocairo
167 --PANGO_LIBS != pkg-config --libs pangocairo
168 -+PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo
169 -+PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo
170 -
171 --CAIRO_CFLAGS != pkg-config --cflags cairo
172 --CAIRO_LIBS != pkg-config --libs cairo
173 -+CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo
174 -+CAIRO_LIBS != $(PKG_CONFIG) --libs cairo
175 -
176 --GLIB_CFLAGS != pkg-config --cflags glib-2.0
177 --GLIB_LIBS != pkg-config --libs glib-2.0
178 -+GLIB_CFLAGS != $(PKG_CONFIG) --cflags glib-2.0
179 -+GLIB_LIBS != $(PKG_CONFIG) --libs glib-2.0
180 -
181 --PIXMAN_CFLAGS != pkg-config --cflags pixman-1
182 --PIXMAN_LIBS != pkg-config --libs pixman-1
183 -+PIXMAN_CFLAGS != $(PKG_CONFIG) --cflags pixman-1
184 -+PIXMAN_LIBS != $(PKG_CONFIG) --libs pixman-1
185 -
186 --XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
187 --XKBCOMMON_LIBS != pkg-config --libs xkbcommon
188 -+XKBCOMMON_CFLAGS != $(PKG_CONFIG) --cflags xkbcommon
189 -+XKBCOMMON_LIBS != $(PKG_CONFIG) --libs xkbcommon
190 -
191 --WAYLAND_CFLAGS != pkg-config --cflags wayland-server
192 --WAYLAND_LIBS != pkg-config --libs wayland-server
193 -+WAYLAND_CFLAGS != $(PKG_CONFIG) --cflags wayland-server
194 -+WAYLAND_LIBS != $(PKG_CONFIG) --libs wayland-server
195 -
196 --LIBINPUT_CFLAGS != pkg-config --cflags libinput
197 --LIBINPUT_LIBS != pkg-config --libs libinput
198 -+LIBINPUT_CFLAGS != $(PKG_CONFIG) --cflags libinput
199 -+LIBINPUT_LIBS != $(PKG_CONFIG) --libs libinput
200 -
201 --UCL_CFLAGS != pkg-config --cflags libucl
202 --UCL_LIBS != pkg-config --libs libucl
203 -+UCL_CFLAGS != $(PKG_CONFIG) --cflags libucl
204 -+UCL_LIBS != $(PKG_CONFIG) --libs libucl
205 -
206 - CFLAGS += \
207 -- ${WLROOTS_CFLAGS} \
208 -- ${PANGO_CFLAGS} \
209 -- ${CAIRO_CFLAGS} \
210 -- ${GLIB_CFLAGS} \
211 -- ${PIXMAN_CFLAGS} \
212 -- ${XKBCOMMON_CFLAGS} \
213 -- ${WAYLAND_CFLAGS} \
214 -- ${LIBINPUT_CFLAGS} \
215 -- ${UCL_CFLAGS}
216 -+ $(WLROOTS_CFLAGS) \
217 -+ $(PANGO_CFLAGS) \
218 -+ $(CAIRO_CFLAGS) \
219 -+ $(GLIB_CFLAGS) \
220 -+ $(PIXMAN_CFLAGS) \
221 -+ $(XKBCOMMON_CFLAGS) \
222 -+ $(WAYLAND_CFLAGS) \
223 -+ $(LIBINPUT_CFLAGS) \
224 -+ $(UCL_CFLAGS)
225 -
226 - LIBS = \
227 -- ${WLROOTS_LIBS} \
228 -- ${PANGO_LIBS} \
229 -- ${CAIRO_LIBS} \
230 -- ${GLIB_LIBS} \
231 -- ${PIXMAN_LIBS} \
232 -- ${XKBCOMMON_LIBS} \
233 -- ${WAYLAND_LIBS} \
234 -- ${LIBINPUT_LIBS} \
235 -- ${UCL_LIBS}
236 --
237 --all: hikari hikari-unlocker
238 -+ $(WLROOTS_LIBS) \
239 -+ $(PANGO_LIBS) \
240 -+ $(CAIRO_LIBS) \
241 -+ $(GLIB_LIBS) \
242 -+ $(PIXMAN_LIBS) \
243 -+ $(XKBCOMMON_LIBS) \
244 -+ $(WAYLAND_LIBS) \
245 -+ $(LIBINPUT_LIBS) \
246 -+ $(UCL_LIBS)
247 -+
248 -+.PHONY: distclean clean clean-doc doc dist install uninstall
249 -+
250 -+all: hikari hikari-unlocker doc
251 -
252 - version.h:
253 -- echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
254 -+ echo "#define HIKARI_VERSION \"$(VERSION)\"" >> version.h
255 -
256 --hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS}
257 -- ${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} ${LIBS} ${OBJS} -o ${.TARGET}
258 -+$(OBJS): %.o: src/%.c
259 -+ $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
260 -+
261 -+main.o:
262 -+ $(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
263 -
264 - xdg-shell-protocol.h:
265 -- wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
266 -+ wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
267 -
268 - wlr-layer-shell-unstable-v1-protocol.h:
269 -- wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
270 -+ wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
271 -+
272 -+hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
273 -+ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
274 -
275 - hikari-unlocker: hikari_unlocker.c
276 -- ${CC} -lpam hikari_unlocker.c -o hikari-unlocker
277 -+ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
278 -+
279 -+share/man/man1/hikari.1:
280 -+ pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
281 -+ --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
282 -+
283 -+doc: share/man/man1/hikari.1
284 -
285 - clean-doc:
286 - @test -e _darcs && echo "cleaning manpage" ||:
287 -@@ -183,20 +191,15 @@ clean: clean-doc
288 - @rm xdg-shell-protocol.h 2> /dev/null ||:
289 - @rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
290 - @echo "cleaning object files"
291 -- @rm ${OBJS} 2> /dev/null ||:
292 -+ @rm $(OBJS) 2> /dev/null ||:
293 -+ @rm main.o 2> /dev/null ||:
294 - @echo "cleaning executables"
295 - @rm hikari 2> /dev/null ||:
296 - @rm hikari-unlocker 2> /dev/null ||:
297 -
298 --share/man/man1/hikari.1:
299 -- pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
300 -- --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
301 --
302 --doc: share/man/man1/hikari.1
303 --
304 --hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
305 -+hikari-$(VERSION).tar.gz: version.h share/man/man1/hikari.1
306 - @darcs revert
307 -- @tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
308 -+ @tar -s "#^#hikari-$(VERSION)/#" -czf hikari-$(VERSION).tar.gz \
309 - version.h \
310 - main.c \
311 - hikari_unlocker.c \
312 -@@ -215,22 +218,22 @@ distclean: clean-doc
313 - @test -e _darcs && echo "cleaning version.h" ||:
314 - @test -e _darcs && rm version.h ||:
315 -
316 --dist: distclean hikari-${VERSION}.tar.gz
317 -+dist: distclean hikari-$(VERSION).tar.gz
318 -
319 - install: hikari hikari-unlocker share/man/man1/hikari.1
320 -- mkdir -p ${PREFIX}/bin
321 -- mkdir -p ${PREFIX}/share/man/man1
322 -- mkdir -p ${PREFIX}/share/examples/hikari
323 -- mkdir -p ${ETC_PREFIX}/pam.d
324 -- install -m 4555 -g ${INSTALL_GROUP} hikari hikari-unlocker ${PREFIX}/bin
325 -- install -m 644 -g ${INSTALL_GROUP} share/man/man1/hikari.1 ${PREFIX}/share/man/man1
326 -- install -m 644 -g ${INSTALL_GROUP} share/examples/hikari/hikari.conf ${PREFIX}/share/examples/hikari
327 -- install -m 644 -g ${INSTALL_GROUP} pam.d/hikari-unlocker.${OS} ${ETC_PREFIX}/pam.d/hikari-unlocker
328 -+ mkdir -p $(PREFIX)/bin
329 -+ mkdir -p $(PREFIX)/share/man/man1
330 -+ mkdir -p $(PREFIX)/share/examples/hikari
331 -+ mkdir -p $(ETC_PREFIX)/pam.d
332 -+ install -m 4555 -g $(INSTALL_GROUP) hikari hikari-unlocker $(PREFIX)/bin
333 -+ install -m 644 -g $(INSTALL_GROUP) share/man/man1/hikari.1 $(PREFIX)/share/man/man1
334 -+ install -m 644 -g $(INSTALL_GROUP) share/examples/hikari/hikari.conf $(PREFIX)/share/examples/hikari
335 -+ install -m 644 -g $(INSTALL_GROUP) pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/pam.d/hikari-unlocker
336 -
337 - uninstall:
338 -- -rm ${PREFIX}/bin/hikari
339 -- -rm ${PREFIX}/bin/hikari-unlocker
340 -- -rm ${PREFIX}/share/examples/hikari/hikari.conf
341 -- -rmdir ${PREFIX}/share/examples/hikari
342 -- -rm ${PREFIX}/share/man/man1/hikari.1
343 -- -rm ${ETC_PREFIX}/pam.d/hikari-unlocker
344 -+ -rm $(PREFIX)/bin/hikari
345 -+ -rm $(PREFIX)/bin/hikari-unlocker
346 -+ -rm $(PREFIX)/share/examples/hikari/hikari.conf
347 -+ -rmdir $(PREFIX)/share/examples/hikari
348 -+ -rm $(PREFIX)/share/man/man1/hikari.1
349 -+ -rm $(ETC_PREFIX)/pam.d/hikari-unlocker
350
351 diff --git a/gui-wm/hikari/hikari-1.2.0.ebuild b/gui-wm/hikari/hikari-1.2.0.ebuild
352 deleted file mode 100644
353 index 7297d36915d..00000000000
354 --- a/gui-wm/hikari/hikari-1.2.0.ebuild
355 +++ /dev/null
356 @@ -1,55 +0,0 @@
357 -# Copyright 2019-2020 Gentoo Authors
358 -# Distributed under the terms of the GNU General Public License v2
359 -
360 -EAPI=7
361 -
362 -DESCRIPTION="wayland compositor inspired by CWM"
363 -HOMEPAGE="https://hikari.acmelabs.space/"
364 -SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
365 -KEYWORDS="~amd64 ~x86"
366 -
367 -LICENSE="MIT"
368 -SLOT="0"
369 -IUSE="gamma layershell screencopy +X"
370 -
371 -DEPEND="
372 - dev-libs/glib
373 - dev-libs/libinput:=
374 - dev-libs/libucl
375 - gui-libs/wlroots
376 - x11-libs/cairo:=[X,svg]
377 - x11-libs/pango:=[X]
378 - x11-libs/pixman
379 - x11-libs/libxkbcommon:=[X]
380 -"
381 -
382 -RDEPEND="
383 - ${DEPEND}
384 - x11-misc/xkeyboard-config
385 -"
386 -
387 -BDEPEND="
388 - ${DEPEND}
389 - app-text/pandoc
390 - virtual/pkgconfig
391 - dev-libs/wayland-protocols
392 -"
393 -
394 -# keep this as others OS's are using this as reference
395 -PATCHES=(
396 - "${FILESDIR}/${P}-gnu-make.patch"
397 -)
398 -
399 -src_compile() {
400 - emake VERSION="{PV}" \
401 - WITH_POSIX_C_SOURCE=1 \
402 - WITH_GAMMACONTROL=$(usex gamma 1 0) \
403 - WITH_LAYERSHELL=$(usex layershell 1 0) \
404 - WITH_SCREENCOPY=$(usex screencopy 1 0) \
405 - WITH_XWAYLAND=$(usex X 1 0) \
406 - all
407 -}
408 -
409 -src_install() {
410 - emake PREFIX=${D}/usr ETC_PREFIX=${D}/etc install
411 -}