1 |
commit: f12553dc4d9f7aaa62a11fbabf7a40e0cfab4be1 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 24 02:04:54 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 24 02:05:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12553dc |
7 |
|
8 |
x11-wm/i3: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
x11-wm/i3/Manifest | 5 - |
13 |
x11-wm/i3/files/i3-4.12-pango.patch | 181 ------------------------------------ |
14 |
x11-wm/i3/i3-4.10.4.ebuild | 72 -------------- |
15 |
x11-wm/i3/i3-4.11.ebuild | 72 -------------- |
16 |
x11-wm/i3/i3-4.12.ebuild | 85 ----------------- |
17 |
x11-wm/i3/i3-4.8.ebuild | 72 -------------- |
18 |
x11-wm/i3/i3-4.9.1.ebuild | 72 -------------- |
19 |
x11-wm/i3/metadata.xml | 1 - |
20 |
8 files changed, 560 deletions(-) |
21 |
|
22 |
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest |
23 |
index 9d7b49af5ca..71328505cda 100644 |
24 |
--- a/x11-wm/i3/Manifest |
25 |
+++ b/x11-wm/i3/Manifest |
26 |
@@ -1,6 +1 @@ |
27 |
-DIST i3-4.10.4.tar.bz2 940744 SHA256 dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e SHA512 e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18 WHIRLPOOL 5bfaeb74d8f1c3dc10719bcac56087d7716e0a7a6c251495db256af1d1342eea3baae4b5c4f6c8131efa89393016c0dd0a56b17ff1f7bd757185dbf4747e7441 |
28 |
-DIST i3-4.11.tar.bz2 972929 SHA256 78ce1e06fbd92fd63765bbe23faa7b8f929c17f99ed623f7abf2e568169d982f SHA512 76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df3dddd28f912ff49a4f WHIRLPOOL f3bff5c0386ad09c5cabb25c7ccb14033f1a7ba3ee19fcc832739cbc61a31f84d3a57418264db4728fbb406c24464a8c87cbfde1e651599a3b63d87eb0af11cb |
29 |
-DIST i3-4.12.tar.bz2 988084 SHA256 e19e1ce08c2549cba83e083cc768d487202c41760d5c283f67752e791f1d78b4 SHA512 966f62dbd82c6c70d1344cc61f14f154f3f649ce1b5a5b5168f00f50d598582ef26f5bd5496ea62e13213e45b1c7043f6209c94fcbefe2947fec63284445c1f5 WHIRLPOOL 7cf414de6d375029328edc8d824d2542ccae99ddf48eac9a563e81e0e86db5506f45f851d5af755ebfe8514e9afb5f8394d962fb191f4b0ab4268a81b8397395 |
30 |
DIST i3-4.13.tar.bz2 1121298 SHA256 94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512 1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c WHIRLPOOL c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371 |
31 |
-DIST i3-4.8.tar.bz2 939690 SHA256 502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e WHIRLPOOL 6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef |
32 |
-DIST i3-4.9.1.tar.bz2 939630 SHA256 b70deff027c7d05276c9646e53faeeeccdde706370b9b337a633bed85b16dc43 SHA512 7a8f71dd944faae426a2239b8bf12ea1cfc83a95c49fcb64ded8321ef302f3277af7d2ecd84d99cef47aba73e5a1091f94e37e9ed2af78c4722ffee507477c90 WHIRLPOOL 15cd2722beaeef642815edd44ff189ff0d003fefbff71c067b94a65dadb55cd15dd1a142a37499fa55cc80424dbdc74cb979c8998d740addcc492eaf025e467f |
33 |
|
34 |
diff --git a/x11-wm/i3/files/i3-4.12-pango.patch b/x11-wm/i3/files/i3-4.12-pango.patch |
35 |
deleted file mode 100644 |
36 |
index 6442796cae7..00000000000 |
37 |
--- a/x11-wm/i3/files/i3-4.12-pango.patch |
38 |
+++ /dev/null |
39 |
@@ -1,181 +0,0 @@ |
40 |
-Fixes builds with without pango/cairo |
41 |
- |
42 |
-https://github.com/i3/i3/pull/2243 |
43 |
-https://bugs.gentoo.org/show_bug.cgi?id=576664 |
44 |
- |
45 |
---- a/include/libi3.h |
46 |
-+++ b/include/libi3.h |
47 |
-@@ -20,7 +20,7 @@ |
48 |
- #if PANGO_SUPPORT |
49 |
- #include <pango/pango.h> |
50 |
- #endif |
51 |
--#ifdef CAIRO_SUPPORT |
52 |
-+#if CAIRO_SUPPORT |
53 |
- #include <cairo/cairo-xcb.h> |
54 |
- #endif |
55 |
- |
56 |
-@@ -518,7 +518,7 @@ typedef struct placeholder_t { |
57 |
- */ |
58 |
- char *format_placeholders(char *format, placeholder_t *placeholders, int num); |
59 |
- |
60 |
--#ifdef CAIRO_SUPPORT |
61 |
-+#if CAIRO_SUPPORT |
62 |
- /* We need to flush cairo surfaces twice to avoid an assertion bug. See #1989 |
63 |
- * and https://bugs.freedesktop.org/show_bug.cgi?id=92455. */ |
64 |
- #define CAIRO_SURFACE_FLUSH(surface) \ |
65 |
-@@ -542,7 +542,7 @@ typedef struct surface_t { |
66 |
- int width; |
67 |
- int height; |
68 |
- |
69 |
--#ifdef CAIRO_SUPPORT |
70 |
-+#if CAIRO_SUPPORT |
71 |
- /* A cairo surface representing the drawable. */ |
72 |
- cairo_surface_t *surface; |
73 |
- |
74 |
---- a/libi3/draw_util.c |
75 |
-+++ b/libi3/draw_util.c |
76 |
-@@ -11,7 +11,7 @@ |
77 |
- #include <string.h> |
78 |
- #include <xcb/xcb.h> |
79 |
- #include <xcb/xcb_aux.h> |
80 |
--#ifdef CAIRO_SUPPORT |
81 |
-+#if CAIRO_SUPPORT |
82 |
- #include <cairo/cairo-xcb.h> |
83 |
- #endif |
84 |
- |
85 |
-@@ -50,7 +50,7 @@ void draw_util_surface_init(xcb_connection_t *conn, surface_t *surface, xcb_draw |
86 |
- ELOG("Could not create graphical context. Error code: %d. Please report this bug.\n", error->error_code); |
87 |
- } |
88 |
- |
89 |
--#ifdef CAIRO_SUPPORT |
90 |
-+#if CAIRO_SUPPORT |
91 |
- surface->surface = cairo_xcb_surface_create(conn, surface->id, surface->visual_type, width, height); |
92 |
- surface->cr = cairo_create(surface->surface); |
93 |
- #endif |
94 |
-@@ -62,7 +62,7 @@ void draw_util_surface_init(xcb_connection_t *conn, surface_t *surface, xcb_draw |
95 |
- */ |
96 |
- void draw_util_surface_free(xcb_connection_t *conn, surface_t *surface) { |
97 |
- xcb_free_gc(conn, surface->gc); |
98 |
--#ifdef CAIRO_SUPPORT |
99 |
-+#if CAIRO_SUPPORT |
100 |
- cairo_surface_destroy(surface->surface); |
101 |
- cairo_destroy(surface->cr); |
102 |
- |
103 |
-@@ -81,7 +81,7 @@ void draw_util_surface_free(xcb_connection_t *conn, surface_t *surface) { |
104 |
- void draw_util_surface_set_size(surface_t *surface, int width, int height) { |
105 |
- surface->width = width; |
106 |
- surface->height = height; |
107 |
--#ifdef CAIRO_SUPPORT |
108 |
-+#if CAIRO_SUPPORT |
109 |
- cairo_xcb_surface_set_size(surface->surface, width, height); |
110 |
- #endif |
111 |
- } |
112 |
-@@ -121,7 +121,7 @@ color_t draw_util_hex_to_color(const char *color) { |
113 |
- static void draw_util_set_source_color(xcb_connection_t *conn, surface_t *surface, color_t color) { |
114 |
- RETURN_UNLESS_SURFACE_INITIALIZED(surface); |
115 |
- |
116 |
--#ifdef CAIRO_SUPPORT |
117 |
-+#if CAIRO_SUPPORT |
118 |
- cairo_set_source_rgba(surface->cr, color.red, color.green, color.blue, color.alpha); |
119 |
- #else |
120 |
- uint32_t colorpixel = color.colorpixel; |
121 |
-@@ -139,7 +139,7 @@ static void draw_util_set_source_color(xcb_connection_t *conn, surface_t *surfac |
122 |
- void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_t bg_color, int x, int y, int max_width) { |
123 |
- RETURN_UNLESS_SURFACE_INITIALIZED(surface); |
124 |
- |
125 |
--#ifdef CAIRO_SUPPORT |
126 |
-+#if CAIRO_SUPPORT |
127 |
- /* Flush any changes before we draw the text as this might use XCB directly. */ |
128 |
- CAIRO_SURFACE_FLUSH(surface->surface); |
129 |
- #endif |
130 |
-@@ -147,7 +147,7 @@ void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_ |
131 |
- set_font_colors(surface->gc, fg_color, bg_color); |
132 |
- draw_text(text, surface->id, surface->gc, surface->visual_type, x, y, max_width); |
133 |
- |
134 |
--#ifdef CAIRO_SUPPORT |
135 |
-+#if CAIRO_SUPPORT |
136 |
- /* Notify cairo that we (possibly) used another way to draw on the surface. */ |
137 |
- cairo_surface_mark_dirty(surface->surface); |
138 |
- #endif |
139 |
-@@ -162,7 +162,7 @@ void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_ |
140 |
- void draw_util_rectangle(xcb_connection_t *conn, surface_t *surface, color_t color, double x, double y, double w, double h) { |
141 |
- RETURN_UNLESS_SURFACE_INITIALIZED(surface); |
142 |
- |
143 |
--#ifdef CAIRO_SUPPORT |
144 |
-+#if CAIRO_SUPPORT |
145 |
- cairo_save(surface->cr); |
146 |
- |
147 |
- /* Using the SOURCE operator will copy both color and alpha information directly |
148 |
-@@ -194,7 +194,7 @@ void draw_util_rectangle(xcb_connection_t *conn, surface_t *surface, color_t col |
149 |
- void draw_util_clear_surface(xcb_connection_t *conn, surface_t *surface, color_t color) { |
150 |
- RETURN_UNLESS_SURFACE_INITIALIZED(surface); |
151 |
- |
152 |
--#ifdef CAIRO_SUPPORT |
153 |
-+#if CAIRO_SUPPORT |
154 |
- cairo_save(surface->cr); |
155 |
- |
156 |
- /* Using the SOURCE operator will copy both color and alpha information directly |
157 |
-@@ -227,7 +227,7 @@ void draw_util_copy_surface(xcb_connection_t *conn, surface_t *src, surface_t *d |
158 |
- RETURN_UNLESS_SURFACE_INITIALIZED(src); |
159 |
- RETURN_UNLESS_SURFACE_INITIALIZED(dest); |
160 |
- |
161 |
--#ifdef CAIRO_SUPPORT |
162 |
-+#if CAIRO_SUPPORT |
163 |
- cairo_save(dest->cr); |
164 |
- |
165 |
- /* Using the SOURCE operator will copy both color and alpha information directly |
166 |
---- a/libi3/font.c |
167 |
-+++ b/libi3/font.c |
168 |
-@@ -397,9 +397,11 @@ static void draw_text_xcb(const xcb_char2b_t *text, size_t text_len, xcb_drawabl |
169 |
- void draw_text(i3String *text, xcb_drawable_t drawable, xcb_gcontext_t gc, |
170 |
- xcb_visualtype_t *visual, int x, int y, int max_width) { |
171 |
- assert(savedFont != NULL); |
172 |
-+#if PANGO_SUPPORT |
173 |
- if (visual == NULL) { |
174 |
- visual = root_visual_type; |
175 |
- } |
176 |
-+#endif |
177 |
- |
178 |
- switch (savedFont->type) { |
179 |
- case FONT_TYPE_NONE: |
180 |
---- a/src/floating.c |
181 |
-+++ b/src/floating.c |
182 |
-@@ -11,6 +11,10 @@ |
183 |
- */ |
184 |
- #include "all.h" |
185 |
- |
186 |
-+#ifndef MAX |
187 |
-+#define MAX(x, y) ((x) > (y) ? (x) : (y)) |
188 |
-+#endif |
189 |
-+ |
190 |
- /* |
191 |
- * Calculates sum of heights and sum of widths of all currently active outputs |
192 |
- * |
193 |
---- a/src/util.c |
194 |
-+++ b/src/util.c |
195 |
-@@ -341,10 +341,12 @@ char *pango_escape_markup(char *input) { |
196 |
- if (!font_is_pango()) |
197 |
- return input; |
198 |
- |
199 |
-+#if PANGO_SUPPORT |
200 |
- char *escaped = g_markup_escape_text(input, -1); |
201 |
- FREE(input); |
202 |
- |
203 |
- return escaped; |
204 |
-+#endif |
205 |
- } |
206 |
- |
207 |
- /* |
208 |
---- a/src/x.c |
209 |
-+++ b/src/x.c |
210 |
-@@ -12,6 +12,10 @@ |
211 |
- */ |
212 |
- #include "all.h" |
213 |
- |
214 |
-+#ifndef MAX |
215 |
-+#define MAX(x, y) ((x) > (y) ? (x) : (y)) |
216 |
-+#endif |
217 |
-+ |
218 |
- xcb_window_t ewmh_window; |
219 |
- |
220 |
- /* Stores the X11 window ID of the currently focused window */ |
221 |
|
222 |
diff --git a/x11-wm/i3/i3-4.10.4.ebuild b/x11-wm/i3/i3-4.10.4.ebuild |
223 |
deleted file mode 100644 |
224 |
index 02f5a26265b..00000000000 |
225 |
--- a/x11-wm/i3/i3-4.10.4.ebuild |
226 |
+++ /dev/null |
227 |
@@ -1,72 +0,0 @@ |
228 |
-# Copyright 1999-2015 Gentoo Foundation |
229 |
-# Distributed under the terms of the GNU General Public License v2 |
230 |
- |
231 |
-EAPI=5 |
232 |
- |
233 |
-inherit eutils toolchain-funcs |
234 |
- |
235 |
-DESCRIPTION="An improved dynamic tiling window manager" |
236 |
-HOMEPAGE="http://i3wm.org/" |
237 |
-SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2" |
238 |
- |
239 |
-LICENSE="BSD" |
240 |
-SLOT="0" |
241 |
-KEYWORDS="amd64 ~arm x86" |
242 |
-IUSE="+pango" |
243 |
- |
244 |
-CDEPEND="dev-libs/libev |
245 |
- dev-libs/libpcre |
246 |
- >=dev-libs/yajl-2.0.3 |
247 |
- x11-libs/libxcb[xkb] |
248 |
- x11-libs/libxkbcommon[X] |
249 |
- x11-libs/startup-notification |
250 |
- x11-libs/xcb-util |
251 |
- x11-libs/xcb-util-cursor |
252 |
- x11-libs/xcb-util-keysyms |
253 |
- x11-libs/xcb-util-wm |
254 |
- pango? ( |
255 |
- >=x11-libs/pango-1.30.0[X] |
256 |
- >=x11-libs/cairo-1.12.2[X,xcb] |
257 |
- )" |
258 |
-DEPEND="${CDEPEND} |
259 |
- virtual/pkgconfig" |
260 |
-RDEPEND="${CDEPEND} |
261 |
- dev-lang/perl |
262 |
- dev-perl/AnyEvent-I3 |
263 |
- dev-perl/JSON-XS" |
264 |
- |
265 |
-DOCS=( RELEASE-NOTES-${PV} ) |
266 |
- |
267 |
-src_prepare() { |
268 |
- if ! use pango; then |
269 |
- sed -i common.mk -e '/PANGO/d' || die |
270 |
- fi |
271 |
- |
272 |
- cat <<- EOF > "${T}"/i3wm |
273 |
- #!/bin/sh |
274 |
- exec /usr/bin/i3 |
275 |
- EOF |
276 |
- sed -e 's/FALSE/false/' -i src/handlers.c || die #546444 |
277 |
- epatch_user #471716 |
278 |
-} |
279 |
- |
280 |
-src_compile() { |
281 |
- emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)" |
282 |
-} |
283 |
- |
284 |
-src_install() { |
285 |
- default |
286 |
- dohtml -r docs/* |
287 |
- doman man/*.1 |
288 |
- exeinto /etc/X11/Sessions |
289 |
- doexe "${T}"/i3wm |
290 |
-} |
291 |
- |
292 |
-pkg_postinst() { |
293 |
- einfo "There are several packages that you may find useful with ${PN} and" |
294 |
- einfo "their usage is suggested by the upstream maintainers, namely:" |
295 |
- einfo " x11-misc/dmenu" |
296 |
- einfo " x11-misc/i3status" |
297 |
- einfo " x11-misc/i3lock" |
298 |
- einfo "Please refer to their description for additional info." |
299 |
-} |
300 |
|
301 |
diff --git a/x11-wm/i3/i3-4.11.ebuild b/x11-wm/i3/i3-4.11.ebuild |
302 |
deleted file mode 100644 |
303 |
index 02a2eff9e73..00000000000 |
304 |
--- a/x11-wm/i3/i3-4.11.ebuild |
305 |
+++ /dev/null |
306 |
@@ -1,72 +0,0 @@ |
307 |
-# Copyright 1999-2015 Gentoo Foundation |
308 |
-# Distributed under the terms of the GNU General Public License v2 |
309 |
- |
310 |
-EAPI=5 |
311 |
- |
312 |
-inherit eutils toolchain-funcs |
313 |
- |
314 |
-DESCRIPTION="An improved dynamic tiling window manager" |
315 |
-HOMEPAGE="http://i3wm.org/" |
316 |
-SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2" |
317 |
- |
318 |
-LICENSE="BSD" |
319 |
-SLOT="0" |
320 |
-KEYWORDS="~amd64 ~arm ~x86" |
321 |
-IUSE="+pango" |
322 |
- |
323 |
-CDEPEND="dev-libs/libev |
324 |
- dev-libs/libpcre |
325 |
- >=dev-libs/yajl-2.0.3 |
326 |
- x11-libs/libxcb[xkb] |
327 |
- x11-libs/libxkbcommon[X] |
328 |
- x11-libs/startup-notification |
329 |
- x11-libs/xcb-util |
330 |
- x11-libs/xcb-util-cursor |
331 |
- x11-libs/xcb-util-keysyms |
332 |
- x11-libs/xcb-util-wm |
333 |
- pango? ( |
334 |
- >=x11-libs/pango-1.30.0[X] |
335 |
- >=x11-libs/cairo-1.12.2[X,xcb] |
336 |
- )" |
337 |
-DEPEND="${CDEPEND} |
338 |
- virtual/pkgconfig" |
339 |
-RDEPEND="${CDEPEND} |
340 |
- dev-lang/perl |
341 |
- dev-perl/AnyEvent-I3 |
342 |
- dev-perl/JSON-XS" |
343 |
- |
344 |
-DOCS=( RELEASE-NOTES-${PV} ) |
345 |
- |
346 |
-src_prepare() { |
347 |
- if ! use pango; then |
348 |
- sed -i common.mk -e '/PANGO/d' || die |
349 |
- fi |
350 |
- |
351 |
- cat <<- EOF > "${T}"/i3wm |
352 |
- #!/bin/sh |
353 |
- exec /usr/bin/i3 |
354 |
- EOF |
355 |
- sed -e 's/FALSE/false/' -i src/handlers.c || die #546444 |
356 |
- epatch_user #471716 |
357 |
-} |
358 |
- |
359 |
-src_compile() { |
360 |
- emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)" |
361 |
-} |
362 |
- |
363 |
-src_install() { |
364 |
- default |
365 |
- dohtml -r docs/* |
366 |
- doman man/*.1 |
367 |
- exeinto /etc/X11/Sessions |
368 |
- doexe "${T}"/i3wm |
369 |
-} |
370 |
- |
371 |
-pkg_postinst() { |
372 |
- einfo "There are several packages that you may find useful with ${PN} and" |
373 |
- einfo "their usage is suggested by the upstream maintainers, namely:" |
374 |
- einfo " x11-misc/dmenu" |
375 |
- einfo " x11-misc/i3status" |
376 |
- einfo " x11-misc/i3lock" |
377 |
- einfo "Please refer to their description for additional info." |
378 |
-} |
379 |
|
380 |
diff --git a/x11-wm/i3/i3-4.12.ebuild b/x11-wm/i3/i3-4.12.ebuild |
381 |
deleted file mode 100644 |
382 |
index f8101b21af6..00000000000 |
383 |
--- a/x11-wm/i3/i3-4.12.ebuild |
384 |
+++ /dev/null |
385 |
@@ -1,85 +0,0 @@ |
386 |
-# Copyright 1999-2016 Gentoo Foundation |
387 |
-# Distributed under the terms of the GNU General Public License v2 |
388 |
- |
389 |
-EAPI=5 |
390 |
- |
391 |
-inherit eutils toolchain-funcs |
392 |
- |
393 |
-DESCRIPTION="An improved dynamic tiling window manager" |
394 |
-HOMEPAGE="http://i3wm.org/" |
395 |
-SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2" |
396 |
- |
397 |
-LICENSE="BSD" |
398 |
-SLOT="0" |
399 |
-KEYWORDS="~amd64 ~arm ~x86" |
400 |
-IUSE="+cairo +pango" |
401 |
-REQUIRED_USE="pango? ( cairo )" |
402 |
- |
403 |
-CDEPEND="dev-libs/libev |
404 |
- dev-libs/libpcre |
405 |
- >=dev-libs/yajl-2.0.3 |
406 |
- x11-libs/libxcb[xkb] |
407 |
- x11-libs/libxkbcommon[X] |
408 |
- x11-libs/startup-notification |
409 |
- x11-libs/xcb-util |
410 |
- x11-libs/xcb-util-cursor |
411 |
- x11-libs/xcb-util-keysyms |
412 |
- x11-libs/xcb-util-wm |
413 |
- cairo? ( |
414 |
- >=x11-libs/cairo-1.14.4[X,xcb] |
415 |
- ) |
416 |
- pango? ( |
417 |
- >=x11-libs/pango-1.30.0[X] |
418 |
- )" |
419 |
-DEPEND="${CDEPEND} |
420 |
- virtual/pkgconfig" |
421 |
-RDEPEND="${CDEPEND} |
422 |
- dev-lang/perl |
423 |
- dev-perl/AnyEvent-I3 |
424 |
- dev-perl/JSON-XS" |
425 |
- |
426 |
-DOCS=( RELEASE-NOTES-${PV} ) |
427 |
- |
428 |
-src_prepare() { |
429 |
- epatch "${FILESDIR}"/${P}-pango.patch |
430 |
- |
431 |
- if ! use pango; then |
432 |
- sed -e '/^PANGO_.*pangocairo/d' \ |
433 |
- -e '/PANGO_SUPPORT/ s/1/0/g' \ |
434 |
- -i common.mk || die |
435 |
- fi |
436 |
- |
437 |
- if ! use cairo; then |
438 |
- sed -e '/^PANGO_.*cairo/d' \ |
439 |
- -e '/CAIRO_SUPPORT/ s/1/0/g' \ |
440 |
- -i common.mk || die |
441 |
- fi |
442 |
- |
443 |
- cat <<- EOF > "${T}"/i3wm |
444 |
- #!/bin/sh |
445 |
- exec /usr/bin/i3 |
446 |
- EOF |
447 |
- sed -e 's/FALSE/false/' -i src/handlers.c || die #546444 |
448 |
- epatch_user #471716 |
449 |
-} |
450 |
- |
451 |
-src_compile() { |
452 |
- emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)" |
453 |
-} |
454 |
- |
455 |
-src_install() { |
456 |
- default |
457 |
- dohtml -r docs/* |
458 |
- doman man/*.1 |
459 |
- exeinto /etc/X11/Sessions |
460 |
- doexe "${T}"/i3wm |
461 |
-} |
462 |
- |
463 |
-pkg_postinst() { |
464 |
- einfo "There are several packages that you may find useful with ${PN} and" |
465 |
- einfo "their usage is suggested by the upstream maintainers, namely:" |
466 |
- einfo " x11-misc/dmenu" |
467 |
- einfo " x11-misc/i3status" |
468 |
- einfo " x11-misc/i3lock" |
469 |
- einfo "Please refer to their description for additional info." |
470 |
-} |
471 |
|
472 |
diff --git a/x11-wm/i3/i3-4.8.ebuild b/x11-wm/i3/i3-4.8.ebuild |
473 |
deleted file mode 100644 |
474 |
index e4dc9e28665..00000000000 |
475 |
--- a/x11-wm/i3/i3-4.8.ebuild |
476 |
+++ /dev/null |
477 |
@@ -1,72 +0,0 @@ |
478 |
-# Copyright 1999-2015 Gentoo Foundation |
479 |
-# Distributed under the terms of the GNU General Public License v2 |
480 |
- |
481 |
-EAPI=5 |
482 |
- |
483 |
-inherit eutils toolchain-funcs |
484 |
- |
485 |
-DESCRIPTION="An improved dynamic tiling window manager" |
486 |
-HOMEPAGE="http://i3wm.org/" |
487 |
-SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2" |
488 |
- |
489 |
-LICENSE="BSD" |
490 |
-SLOT="0" |
491 |
-KEYWORDS="amd64 ~arm x86" |
492 |
-IUSE="+pango" |
493 |
- |
494 |
-CDEPEND="dev-libs/libev |
495 |
- dev-libs/libpcre |
496 |
- >=dev-libs/yajl-2.0.3 |
497 |
- x11-libs/libxcb[xkb] |
498 |
- x11-libs/libX11 |
499 |
- x11-libs/startup-notification |
500 |
- x11-libs/xcb-util |
501 |
- x11-libs/xcb-util-cursor |
502 |
- x11-libs/xcb-util-keysyms |
503 |
- x11-libs/xcb-util-wm |
504 |
- pango? ( |
505 |
- >=x11-libs/pango-1.30.0[X] |
506 |
- >=x11-libs/cairo-1.12.2[X,xcb] |
507 |
- )" |
508 |
-DEPEND="${CDEPEND} |
509 |
- virtual/pkgconfig" |
510 |
-RDEPEND="${CDEPEND} |
511 |
- dev-lang/perl |
512 |
- dev-perl/AnyEvent-I3 |
513 |
- dev-perl/JSON-XS" |
514 |
- |
515 |
-DOCS=( RELEASE-NOTES-${PV} ) |
516 |
- |
517 |
-src_prepare() { |
518 |
- if ! use pango; then |
519 |
- sed -i common.mk -e '/PANGO/d' || die |
520 |
- fi |
521 |
- |
522 |
- cat <<- EOF > "${T}"/i3wm |
523 |
- #!/bin/sh |
524 |
- exec /usr/bin/i3 |
525 |
- EOF |
526 |
- |
527 |
- epatch_user #471716 |
528 |
-} |
529 |
- |
530 |
-src_compile() { |
531 |
- emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)" |
532 |
-} |
533 |
- |
534 |
-src_install() { |
535 |
- default |
536 |
- dohtml -r docs/* |
537 |
- doman man/*.1 |
538 |
- exeinto /etc/X11/Sessions |
539 |
- doexe "${T}"/i3wm |
540 |
-} |
541 |
- |
542 |
-pkg_postinst() { |
543 |
- einfo "There are several packages that you may find useful with ${PN} and" |
544 |
- einfo "their usage is suggested by the upstream maintainers, namely:" |
545 |
- einfo " x11-misc/dmenu" |
546 |
- einfo " x11-misc/i3status" |
547 |
- einfo " x11-misc/i3lock" |
548 |
- einfo "Please refer to their description for additional info." |
549 |
-} |
550 |
|
551 |
diff --git a/x11-wm/i3/i3-4.9.1.ebuild b/x11-wm/i3/i3-4.9.1.ebuild |
552 |
deleted file mode 100644 |
553 |
index 96c8681a4c9..00000000000 |
554 |
--- a/x11-wm/i3/i3-4.9.1.ebuild |
555 |
+++ /dev/null |
556 |
@@ -1,72 +0,0 @@ |
557 |
-# Copyright 1999-2015 Gentoo Foundation |
558 |
-# Distributed under the terms of the GNU General Public License v2 |
559 |
- |
560 |
-EAPI=5 |
561 |
- |
562 |
-inherit eutils toolchain-funcs |
563 |
- |
564 |
-DESCRIPTION="An improved dynamic tiling window manager" |
565 |
-HOMEPAGE="http://i3wm.org/" |
566 |
-SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2" |
567 |
- |
568 |
-LICENSE="BSD" |
569 |
-SLOT="0" |
570 |
-KEYWORDS="~amd64 ~arm ~x86" |
571 |
-IUSE="+pango" |
572 |
- |
573 |
-CDEPEND="dev-libs/libev |
574 |
- dev-libs/libpcre |
575 |
- >=dev-libs/yajl-2.0.3 |
576 |
- x11-libs/libxcb[xkb] |
577 |
- x11-libs/libxkbcommon[X] |
578 |
- x11-libs/startup-notification |
579 |
- x11-libs/xcb-util |
580 |
- x11-libs/xcb-util-cursor |
581 |
- x11-libs/xcb-util-keysyms |
582 |
- x11-libs/xcb-util-wm |
583 |
- pango? ( |
584 |
- >=x11-libs/pango-1.30.0[X] |
585 |
- >=x11-libs/cairo-1.12.2[X,xcb] |
586 |
- )" |
587 |
-DEPEND="${CDEPEND} |
588 |
- virtual/pkgconfig" |
589 |
-RDEPEND="${CDEPEND} |
590 |
- dev-lang/perl |
591 |
- dev-perl/AnyEvent-I3 |
592 |
- dev-perl/JSON-XS" |
593 |
- |
594 |
-DOCS=( RELEASE-NOTES-${PV} ) |
595 |
- |
596 |
-src_prepare() { |
597 |
- if ! use pango; then |
598 |
- sed -i common.mk -e '/PANGO/d' || die |
599 |
- fi |
600 |
- |
601 |
- cat <<- EOF > "${T}"/i3wm |
602 |
- #!/bin/sh |
603 |
- exec /usr/bin/i3 |
604 |
- EOF |
605 |
- |
606 |
- epatch_user #471716 |
607 |
-} |
608 |
- |
609 |
-src_compile() { |
610 |
- emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)" |
611 |
-} |
612 |
- |
613 |
-src_install() { |
614 |
- default |
615 |
- dohtml -r docs/* |
616 |
- doman man/*.1 |
617 |
- exeinto /etc/X11/Sessions |
618 |
- doexe "${T}"/i3wm |
619 |
-} |
620 |
- |
621 |
-pkg_postinst() { |
622 |
- einfo "There are several packages that you may find useful with ${PN} and" |
623 |
- einfo "their usage is suggested by the upstream maintainers, namely:" |
624 |
- einfo " x11-misc/dmenu" |
625 |
- einfo " x11-misc/i3status" |
626 |
- einfo " x11-misc/i3lock" |
627 |
- einfo "Please refer to their description for additional info." |
628 |
-} |
629 |
|
630 |
diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml |
631 |
index b5e30d37607..8e610023efc 100644 |
632 |
--- a/x11-wm/i3/metadata.xml |
633 |
+++ b/x11-wm/i3/metadata.xml |
634 |
@@ -2,7 +2,6 @@ |
635 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
636 |
<pkgmetadata> |
637 |
<use> |
638 |
- <flag name="pango">Use <pkg>x11-libs/pango</pkg> to render text in order to support fonts which have more glyphs (e.g. Kanji). See RELEASE-NOTES for more information</flag> |
639 |
<flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag> |
640 |
</use> |
641 |
</pkgmetadata> |