1 |
commit: bc316728b62ba034c09ed3e08beb21e0e400d256 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 28 14:28:23 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 28 17:00:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc316728 |
7 |
|
8 |
gui-wm/hikari: drop 2.2.2-r1 |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
gui-wm/hikari/Manifest | 1 - |
13 |
gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch | 78 ------------------------ |
14 |
gui-wm/hikari/hikari-2.2.2-r1.ebuild | 78 ------------------------ |
15 |
gui-wm/hikari/metadata.xml | 4 -- |
16 |
4 files changed, 161 deletions(-) |
17 |
|
18 |
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest |
19 |
index f4f656fc45fd..3fc840736892 100644 |
20 |
--- a/gui-wm/hikari/Manifest |
21 |
+++ b/gui-wm/hikari/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1 |
24 |
DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B 8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e SHA512 b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954 |
25 |
|
26 |
diff --git a/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch b/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch |
27 |
deleted file mode 100644 |
28 |
index 472a9efa37df..000000000000 |
29 |
--- a/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch |
30 |
+++ /dev/null |
31 |
@@ -1,78 +0,0 @@ |
32 |
-diff --git a/Makefile b/Makefile |
33 |
-index 555b770..01025b9 100644 |
34 |
---- a/Makefile |
35 |
-+++ b/Makefile |
36 |
-@@ -13,6 +13,7 @@ WITH_VIRTUAL_INPUT = YES |
37 |
- OS != uname |
38 |
- VERSION ?= "CURRENT" |
39 |
- PREFIX ?= /usr/local |
40 |
-+PKG_CONFIG ?= pkg-config |
41 |
- ETC_PREFIX ?= ${PREFIX} |
42 |
- |
43 |
- OBJS = \ |
44 |
-@@ -78,7 +79,7 @@ OBJS += \ |
45 |
- xwayland_view.o |
46 |
- .endif |
47 |
- |
48 |
--WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols |
49 |
-+WAYLAND_PROTOCOLS != ${PKG_CONFIG} --variable pkgdatadir wayland-protocols |
50 |
- |
51 |
- .PHONY: distclean clean clean-doc doc dist install uninstall |
52 |
- .PATH: src |
53 |
-@@ -125,31 +126,31 @@ CFLAGS += -DHAVE_VIRTUAL_INPUT=1 |
54 |
- |
55 |
- CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX} |
56 |
- |
57 |
--WLROOTS_CFLAGS != pkg-config --cflags wlroots |
58 |
--WLROOTS_LIBS != pkg-config --libs wlroots |
59 |
-+WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots |
60 |
-+WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots |
61 |
- |
62 |
- WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1 |
63 |
- |
64 |
--PANGO_CFLAGS != pkg-config --cflags pangocairo |
65 |
--PANGO_LIBS != pkg-config --libs pangocairo |
66 |
-+PANGO_CFLAGS != ${PKG_CONFIG} --cflags pangocairo |
67 |
-+PANGO_LIBS != ${PKG_CONFIG} --libs pangocairo |
68 |
- |
69 |
--CAIRO_CFLAGS != pkg-config --cflags cairo |
70 |
--CAIRO_LIBS != pkg-config --libs cairo |
71 |
-+CAIRO_CFLAGS != ${PKG_CONFIG} --cflags cairo |
72 |
-+CAIRO_LIBS != ${PKG_CONFIG} --libs cairo |
73 |
- |
74 |
--PIXMAN_CFLAGS != pkg-config --cflags pixman-1 |
75 |
--PIXMAN_LIBS != pkg-config --libs pixman-1 |
76 |
-+PIXMAN_CFLAGS != ${PKG_CONFIG} --cflags pixman-1 |
77 |
-+PIXMAN_LIBS != ${PKG_CONFIG} --libs pixman-1 |
78 |
- |
79 |
--XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon |
80 |
--XKBCOMMON_LIBS != pkg-config --libs xkbcommon |
81 |
-+XKBCOMMON_CFLAGS != ${PKG_CONFIG} --cflags xkbcommon |
82 |
-+XKBCOMMON_LIBS != ${PKG_CONFIG} --libs xkbcommon |
83 |
- |
84 |
--WAYLAND_CFLAGS != pkg-config --cflags wayland-server |
85 |
--WAYLAND_LIBS != pkg-config --libs wayland-server |
86 |
-+WAYLAND_CFLAGS != ${PKG_CONFIG} --cflags wayland-server |
87 |
-+WAYLAND_LIBS != ${PKG_CONFIG} --libs wayland-server |
88 |
- |
89 |
--LIBINPUT_CFLAGS != pkg-config --cflags libinput |
90 |
--LIBINPUT_LIBS != pkg-config --libs libinput |
91 |
-+LIBINPUT_CFLAGS != ${PKG_CONFIG} --cflags libinput |
92 |
-+LIBINPUT_LIBS != ${PKG_CONFIG} --libs libinput |
93 |
- |
94 |
--UCL_CFLAGS != pkg-config --cflags libucl |
95 |
--UCL_LIBS != pkg-config --libs libucl |
96 |
-+UCL_CFLAGS != ${PKG_CONFIG} --cflags libucl |
97 |
-+UCL_LIBS != ${PKG_CONFIG} --libs libucl |
98 |
- |
99 |
- CFLAGS += \ |
100 |
- ${WLROOTS_CFLAGS} \ |
101 |
-@@ -192,7 +193,7 @@ wlr-layer-shell-unstable-v1-protocol.h: |
102 |
- wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET} |
103 |
- |
104 |
- hikari-unlocker: hikari_unlocker.c |
105 |
-- ${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam |
106 |
-+ ${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o hikari-unlocker hikari_unlocker.c -lpam |
107 |
- |
108 |
- clean-doc: |
109 |
- @test -e _darcs && echo "cleaning manpage" ||: |
110 |
|
111 |
diff --git a/gui-wm/hikari/hikari-2.2.2-r1.ebuild b/gui-wm/hikari/hikari-2.2.2-r1.ebuild |
112 |
deleted file mode 100644 |
113 |
index 5db53df9ccd5..000000000000 |
114 |
--- a/gui-wm/hikari/hikari-2.2.2-r1.ebuild |
115 |
+++ /dev/null |
116 |
@@ -1,78 +0,0 @@ |
117 |
-# Copyright 2019-2021 Gentoo Authors |
118 |
-# Distributed under the terms of the GNU General Public License v2 |
119 |
- |
120 |
-EAPI=7 |
121 |
- |
122 |
-inherit toolchain-funcs |
123 |
- |
124 |
-DESCRIPTION="Wayland compositor inspired by CWM" |
125 |
-HOMEPAGE="https://hikari.acmelabs.space/" |
126 |
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz" |
127 |
-KEYWORDS="~amd64 ~x86" |
128 |
- |
129 |
-LICENSE="MIT" |
130 |
-SLOT="0" |
131 |
-IUSE="gamma layershell screencopy suid virtual-io +X" |
132 |
- |
133 |
-DEPEND=" |
134 |
- dev-libs/libinput:= |
135 |
- dev-libs/libucl |
136 |
- >=gui-libs/wlroots-0.11.0[X?] |
137 |
- media-libs/libglvnd |
138 |
- x11-libs/cairo[X?,svg] |
139 |
- x11-libs/libxkbcommon[X?] |
140 |
- x11-libs/pango[X?] |
141 |
- x11-libs/pixman |
142 |
- sys-libs/pam |
143 |
-" |
144 |
- |
145 |
-RDEPEND=" |
146 |
- ${DEPEND} |
147 |
- x11-misc/xkeyboard-config |
148 |
-" |
149 |
- |
150 |
-# Needeed in DEPEND only (not BDEPEND as need to be right location etc) |
151 |
-DEPEND+=" dev-libs/wayland-protocols" |
152 |
- |
153 |
-BDEPEND=" |
154 |
- sys-devel/bmake |
155 |
- virtual/pkgconfig |
156 |
-" |
157 |
- |
158 |
-PATCHES=( "${FILESDIR}"/${PN}-2.2.1-pkgconfig.patch ) |
159 |
- |
160 |
-pkg_setup() { |
161 |
- # We set `bmake` and we also have to remove any reference to -l in MAKEOPTS |
162 |
- # as `bmake` does not support load average |
163 |
- # We do this in a crude way until flag-o-matic supports MAKEOPTS |
164 |
- # bug 778191 |
165 |
- export MAKE=bmake |
166 |
- export MAKEOPTS=$(echo ${MAKEOPTS} | sed 's/-l \?[\.0-9]\+//' || die) |
167 |
- tc-export CC PKG_CONFIG |
168 |
-} |
169 |
- |
170 |
-src_compile() { |
171 |
- emake \ |
172 |
- VERSION="${PV}" \ |
173 |
- CC="$(tc-getCC)" \ |
174 |
- CFLAGS_EXTRA="${CFLAGS}" \ |
175 |
- LDFLAGS_EXTRA="${LDFLAGS}" \ |
176 |
- -DWITH_POSIX_C_SOURCE \ |
177 |
- $(usex gamma -DWITH_GAMMACONTROL "") \ |
178 |
- $(usex layershell -DWITH_LAYERSHELL "") \ |
179 |
- $(usex screencopy -DWITH_SCREENCOPY "") \ |
180 |
- $(usex virtual-io -DWITH_VIRTUAL_INPUT "") \ |
181 |
- $(usex X -DWITH_XWAYLAND "") \ |
182 |
- all |
183 |
-} |
184 |
- |
185 |
-src_install() { |
186 |
- emake \ |
187 |
- DESTDIR="${D}" \ |
188 |
- PREFIX=/usr \ |
189 |
- ETC_PREFIX=/ \ |
190 |
- $(usex suid "" -DWITHOUT_SUID) \ |
191 |
- install |
192 |
- |
193 |
- doman share/man/man1/hikari.1 |
194 |
-} |
195 |
|
196 |
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml |
197 |
index 528433ed8065..ad8d6bb1c67c 100644 |
198 |
--- a/gui-wm/hikari/metadata.xml |
199 |
+++ b/gui-wm/hikari/metadata.xml |
200 |
@@ -10,9 +10,5 @@ |
201 |
</longdescription> |
202 |
<use> |
203 |
<flag name="X">Enable support for X11 applications (XWayland)</flag> |
204 |
- <flag name="gamma">add gamma control for redshift</flag> |
205 |
- <flag name="layershell">add support for wayland apps using layer shell</flag> |
206 |
- <flag name="screencopy">add support for screen grabbing</flag> |
207 |
- <flag name="virtual-io">enable virtual input/output support, needed for remote I/O in VNC</flag> |
208 |
</use> |
209 |
</pkgmetadata> |