Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/icewm/files/, x11-wm/icewm/
Date: Thu, 15 Feb 2018 09:39:02
Message-Id: 1518687530.debec6329f8f91365d12df7f7e8549225e94bcfc.polynomial-c@gentoo
1 commit: debec6329f8f91365d12df7f7e8549225e94bcfc
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 15 09:38:29 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 15 09:38:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debec632
7
8 x11-wm/icewm: Removed old.
9
10 Closes: https://bugs.gentoo.org/608274
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 x11-wm/icewm/Manifest | 3 -
14 x11-wm/icewm/files/IceWM.desktop | 8 --
15 x11-wm/icewm/files/icewm-1.3.7-dso.patch | 10 --
16 x11-wm/icewm/files/icewm-1.3.7-gcc44.patch | 13 ---
17 x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch | 73 ------------
18 x11-wm/icewm/files/icewm-1.3.7-thermal.patch | 41 -------
19 x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch | 113 ------------------
20 x11-wm/icewm/files/icewm-1.3.8-deprecated.patch | 12 --
21 x11-wm/icewm/files/icewm-1.3.8-menu.patch | 23 ----
22 x11-wm/icewm/files/icewm-defaults.patch | 13 ---
23 x11-wm/icewm/files/icewm-fribidi.patch | 83 --------------
24 x11-wm/icewm/files/icewm-keys.patch | 43 -------
25 x11-wm/icewm/files/icewm-startup | 4 -
26 x11-wm/icewm/files/icewm-toolbar.patch | 12 --
27 x11-wm/icewm/files/icewm-xdg-menu | 128 ---------------------
28 x11-wm/icewm/icewm-1.3.12-r1.ebuild | 121 --------------------
29 x11-wm/icewm/icewm-1.3.8.ebuild | 132 ----------------------
30 x11-wm/icewm/icewm-1.4.0.ebuild | 117 -------------------
31 18 files changed, 949 deletions(-)
32
33 diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
34 index e5e41e730a7..8401cced420 100644
35 --- a/x11-wm/icewm/Manifest
36 +++ b/x11-wm/icewm/Manifest
37 @@ -1,4 +1 @@
38 -DIST icewm-1.3.12.tar.gz 944617 BLAKE2B b95ab2bc77c3370f4da4f6a1f4b2c38a772f0e53d7613ad28244e37c460421f681c58f16e9e94533365d386a4be83de69303d9a0bd16caef18c4a655d2060514 SHA512 b2704ab69a1910cab6711ca11b79fa32f66747fe04468eff86813812fa855423ed43144ab0290e245221520a919755c0e153b60ff238ace60f9546af595063ee
39 -DIST icewm-1.3.8.tar.gz 905680 BLAKE2B dcb794ab6bd0a4b31240bb5506b2504d04a82ca267223d41c6b31f0447fa5e1541d58068776fba97aa33016567c66268937a6c3afafc7151bac4c1081ddc3db3 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72
40 -DIST icewm-1.4.0.tar.gz 1732329 BLAKE2B 2fec09fbea04b96fcd3ec5d26a4bac5ece153b6bab774804287bfb4b8757e92e04aecc7a8b6f9f3c11b1abc5106d39fd02b54e8e60c8146edab1d8b03e2d223a SHA512 ee0a80912bce5c94121f8c9b4e2f914e6a47dc810fe83528544f8644d9e5c4c61573c5a604d22af737be653fcfa1c64c10e0be0e663ce02cf982ba19dae7396e
41 DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
42
43 diff --git a/x11-wm/icewm/files/IceWM.desktop b/x11-wm/icewm/files/IceWM.desktop
44 deleted file mode 100644
45 index 087384ee130..00000000000
46 --- a/x11-wm/icewm/files/IceWM.desktop
47 +++ /dev/null
48 @@ -1,8 +0,0 @@
49 -[Desktop Entry]
50 -Name=IceWM
51 -Comment=This session logs you into IceWM
52 -Exec=icewm-session
53 -TryExec=icewm-session
54 -# no icon yet, only the top three are currently used
55 -Icon=
56 -Type=Application
57
58 diff --git a/x11-wm/icewm/files/icewm-1.3.7-dso.patch b/x11-wm/icewm/files/icewm-1.3.7-dso.patch
59 deleted file mode 100644
60 index 55100d5f62a..00000000000
61 --- a/x11-wm/icewm/files/icewm-1.3.7-dso.patch
62 +++ /dev/null
63 @@ -1,10 +0,0 @@
64 ---- configure.in.old 2011-11-23 15:44:52.121654867 +0200
65 -+++ configure.in 2011-11-23 15:47:09.514411391 +0200
66 -@@ -494,6 +494,7 @@
67 - AC_DEFINE(CONFIG_COREFONTS, 1, [Define to enable X11 core conts.])
68 - features="${features} corefonts"
69 - fi
70 -+ CORE_LIBS="${CORE_LIBS} -lfontconfig"
71 -
72 - dnl ============================================================= GUI Events ===
73 - dnl
74
75 diff --git a/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch b/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
76 deleted file mode 100644
77 index d500f64004b..00000000000
78 --- a/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
79 +++ /dev/null
80 @@ -1,13 +0,0 @@
81 -https://bugs.gentoo.org/show_bug.cgi?id=376451
82 -
83 ---- a/src/wmapp.cc
84 -+++ b/src/wmapp.cc
85 -@@ -337,7 +337,7 @@
86 - char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
87 -
88 - char ** newFontPath = new char *[ndirs + 1];
89 -- newFontPath[ndirs] = fontsdir;
90 -+ newFontPath[ndirs] = (char *)fontsdir;
91 -
92 - if (fontPath)
93 - memcpy(newFontPath, fontPath, ndirs * sizeof (char *));
94
95 diff --git a/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch b/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
96 deleted file mode 100644
97 index d051d5bc5f1..00000000000
98 --- a/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
99 +++ /dev/null
100 @@ -1,73 +0,0 @@
101 -diff -Naur icewm-1.3.7.bak/src/yicon.cc icewm-1.3.7/src/yicon.cc
102 ---- icewm-1.3.7.bak/src/yicon.cc 2010-10-31 15:09:36.000000000 +0100
103 -+++ icewm-1.3.7/src/yicon.cc 2011-11-07 19:41:52.841910531 +0100
104 -@@ -270,6 +270,10 @@
105 - iconCache.getItem(0)->removeFromCache();
106 - }
107 -
108 -+int YIcon::menuSize() {
109 -+ return menuIconSize;
110 -+}
111 -+
112 - int YIcon::smallSize() {
113 - return smallIconSize;
114 - }
115 -diff -Naur icewm-1.3.7.bak/src/yicon.h icewm-1.3.7/src/yicon.h
116 ---- icewm-1.3.7.bak/src/yicon.h 2010-10-31 15:09:36.000000000 +0100
117 -+++ icewm-1.3.7/src/yicon.h 2011-11-07 19:41:28.555296033 +0100
118 -@@ -25,6 +25,7 @@
119 - bool isCached() { return fCached; }
120 - void setCached(bool cached) { fCached = cached; }
121 -
122 -+ static int menuSize();
123 - static int smallSize();
124 - static int largeSize();
125 - static int hugeSize();
126 -diff -Naur icewm-1.3.7.bak/src/ymenu.cc icewm-1.3.7/src/ymenu.cc
127 ---- icewm-1.3.7.bak/src/ymenu.cc 2010-10-31 15:09:36.000000000 +0100
128 -+++ icewm-1.3.7/src/ymenu.cc 2011-11-07 19:42:40.498474049 +0100
129 -@@ -153,8 +153,8 @@
130 -
131 - #ifndef LITE
132 - if (getItem(selItem)->getIcon() != null &&
133 -- YIcon::smallSize() > h)
134 -- h = YIcon::smallSize();
135 -+ YIcon::menuSize() > h)
136 -+ h = YIcon::menuSize();
137 - #endif
138 -
139 - if (x <= int(width() - h - 4))
140 -@@ -1023,8 +1023,8 @@
141 - mitem->getIcon()->draw(g,
142 - l + 1 + delta, t + delta + top + pad +
143 - (eh - top - pad * 2 - bottom -
144 -- YIcon::smallSize()) / 2,
145 -- YIcon::smallSize());
146 -+ YIcon::menuSize()) / 2,
147 -+ YIcon::menuSize());
148 - #endif
149 - }
150 -
151 -diff -Naur icewm-1.3.7.bak/src/ymenuitem.cc icewm-1.3.7/src/ymenuitem.cc
152 ---- icewm-1.3.7.bak/src/ymenuitem.cc 2010-10-31 15:09:36.000000000 +0100
153 -+++ icewm-1.3.7/src/ymenuitem.cc 2011-11-07 19:50:04.458316916 +0100
154 -@@ -86,8 +86,8 @@
155 - int ih = fontHeight;
156 -
157 - #ifndef LITE
158 -- if (YIcon::smallSize() > ih)
159 -- ih = YIcon::smallSize();
160 -+ if (YIcon::menuSize() > ih)
161 -+ ih = YIcon::menuSize();
162 - #endif
163 -
164 - if (wmLook == lookWarp4 || wmLook == lookWin95) {
165 -@@ -123,7 +123,7 @@
166 - return 0;
167 - #else
168 - ref<YIcon> icon = getIcon();
169 -- return icon != null ? YIcon::smallSize(): 0;
170 -+ return icon != null ? YIcon::menuSize(): 0;
171 - #endif
172 - }
173 -
174
175 diff --git a/x11-wm/icewm/files/icewm-1.3.7-thermal.patch b/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
176 deleted file mode 100644
177 index f6b2cf71f0f..00000000000
178 --- a/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
179 +++ /dev/null
180 @@ -1,41 +0,0 @@
181 -diff -uprN a/src/acpustatus.cc b/src/acpustatus.cc
182 ---- a/src/acpustatus.cc 2010-10-31 15:09:36.000000000 +0100
183 -+++ b/src/acpustatus.cc 2013-01-17 21:12:19.085715083 +0100
184 -@@ -315,6 +315,37 @@ int CPUStatus::getAcpiTemp(char *tempbuf
185 - }
186 - closedir(dir);
187 - }
188 -+ else if ((dir = opendir("/sys/class/thermal")) != NULL) {
189 -+ struct dirent *de;
190 -+
191 -+ while ((de = readdir(dir)) != NULL) {
192 -+
193 -+ int fd, seglen;
194 -+
195 -+ if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
196 -+ continue;
197 -+
198 -+ sprintf(namebuf, "/sys/class/thermal/%s/temp", de->d_name);
199 -+ fd = open(namebuf, O_RDONLY);
200 -+ if (fd != -1) {
201 -+ int len = read(fd, buf, sizeof(buf) - 1);
202 -+ buf[len - 4] = '\0';
203 -+ seglen = strlen(buf) + 4;
204 -+ if (retbuflen + seglen >= buflen) {
205 -+ retbuflen = -retbuflen;
206 -+ close(fd);
207 -+ closedir(dir);
208 -+ break;
209 -+ }
210 -+ retbuflen += seglen;
211 -+ strcat(tempbuf, " ");
212 -+ strncat(tempbuf, buf, seglen);
213 -+ strcat(tempbuf, " C");
214 -+ close(fd);
215 -+ }
216 -+ }
217 -+ closedir(dir);
218 -+ }
219 - return retbuflen;
220 - }
221 -
222
223 diff --git a/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch b/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch
224 deleted file mode 100644
225 index cec27a79ad0..00000000000
226 --- a/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch
227 +++ /dev/null
228 @@ -1,113 +0,0 @@
229 ---- icewm-1.3.8/Makefile.in
230 -+++ icewm-1.3.8/Makefile.in
231 -@@ -35,7 +35,7 @@
232 -
233 - ################################################################################
234 -
235 --BINFILES = @BINFILES@ icewm-set-gnomewm
236 -+BINFILES = @BINFILES@ "$(srcdir)/icewm-set-gnomewm"
237 - LIBFILES = lib/preferences lib/winoptions lib/keys \
238 - lib/menu lib/toolbar # lib/programs
239 - DOCFILES = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
240 -@@ -83,21 +83,23 @@
241 - @echo ------------------------------------------
242 - @echo "Installing binaries in $(DESTDIR)$(BINDIR)"
243 - @$(INSTALLDIR) "$(DESTDIR)$(BINDIR)"
244 -+#generated files, relative to the build directory
245 - @for bin in $(BINFILES); do \
246 - $(INSTALLBIN) "$${bin}" "$(DESTDIR)$(BINDIR)"; \
247 - done
248 -
249 - @echo "Installing presets and icons in $(DESTDIR)$(LIBDIR)"
250 - @$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)"
251 -+# data files from the source directory
252 - #-@$(INSTALLDIR) "$(DESTDIR)$(CFGDIR)"
253 - @for lib in $(LIBFILES); do \
254 -- $(INSTALLLIB) "$${lib}" "$(DESTDIR)$(LIBDIR)"; \
255 -+ $(INSTALLLIB) "$(top_srcdir)/$${lib}" "$(DESTDIR)$(LIBDIR)"; \
256 - done
257 -
258 - @for xpmdir in $(XPMDIRS); do \
259 -- if test -d "lib/$${xpmdir}"; then \
260 -+ if test -d "$(top_srcdir)/lib/$${xpmdir}"; then \
261 - $(INSTALLDIR) "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
262 -- for pixmap in "lib/$${xpmdir}/"*.xpm; do \
263 -+ for pixmap in "$(top_srcdir)/lib/$${xpmdir}/"*.xpm; do \
264 - $(INSTALLLIB) "$${pixmap}" "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
265 - done; \
266 - fi; \
267 ---- icewm-1.3.8/po/Makefile.in
268 -+++ icewm-1.3.8/po/Makefile.in
269 -@@ -20,6 +20,7 @@
270 - XGETTEXT = @XGETTEXT@
271 - MSGMERGE = @MSGMERGE@
272 - MSGFMT = @MSGFMT@
273 -+VPATH = .:po:@srcdir@
274 -
275 - .SUFFIXES:
276 - .SUFFIXES: .po .mo
277 ---- icewm-1.3.8/src/Makefile.in
278 -+++ icewm-1.3.8/src/Makefile.in
279 -@@ -11,7 +11,7 @@
280 -
281 - CXX = @CXX@
282 - HOSTCXX = @HOSTCXX@
283 --LD = @CXX_LINK@
284 -+LD = gcc
285 - HOSTLD = @HOSTCXX_LINK@
286 - EXEEXT = @EXEEXT@
287 -
288 -@@ -32,12 +32,12 @@
289 - -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
290 - -DICESMEXE='"icewm-session$(EXEEXT)"' \
291 - -DICEHELPEXE='"icehelp$(EXEEXT)"' \
292 -- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
293 -+ -DICEHELPIDX='"$(DOCDIR)/icewm-common/icewm.html"'
294 -
295 - CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
296 - @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags`
297 - LFLAGS = @LDFLAGS@
298 --LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs`
299 -+LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig -lm -lsupc++
300 -
301 - CORE_LIBS = @CORE_LIBS@ `pkg-config fontconfig --libs`
302 - IMAGE_LIBS = @IMAGE_LIBS@
303 -@@ -188,6 +188,8 @@
304 - TESTCASES = @TESTCASES@
305 - OBJECTS = @BASEOBJS@ @TESTOBJS@
306 - BINARIES = @BASEBINS@ @TESTBINS@
307 -+BASEOBJS = @BASEOBJS@
308 -+VPATH = .:@srcdir@
309 -
310 - ################################################################################
311 -
312 -@@ -205,7 +207,8 @@
313 - @echo " CXX " $@
314 - @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
315 -
316 --$(BINARIES):
317 -+$(BINARIES): $(BASEOBJS)
318 -+# @$(MAKE) --no-print-directory build-dep DEPLIST="$($(@:$(EXEEXT)=)_OBJS)"
319 - @echo " LD " $@
320 - @$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
321 -
322 -@@ -217,6 +220,8 @@
323 - @echo " HOSTLD " $@
324 - @$(HOSTLD) -o $@ $(genpref_OBJS)
325 -
326 -+build-dep: $(DEPLIST)
327 -+
328 - ################################################################################
329 -
330 - gnome2.o: gnome2.cc
331 ---- icewm-1.3.8/src/WinMgr.h
332 -+++ icewm-1.3.8/src/WinMgr.h
333 -@@ -128,7 +128,7 @@
334 - * this where WIN_WORKSPACE_COUNT comes into play.
335 - */
336 -
337 --#define WinWorkspaceInvalid (-1L)
338 -+#define WinWorkspaceInvalid ((unsigned long)-1)
339 -
340 - /* workspaces */
341 - #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
342
343 diff --git a/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch b/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch
344 deleted file mode 100644
345 index b956180627b..00000000000
346 --- a/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch
347 +++ /dev/null
348 @@ -1,12 +0,0 @@
349 ---- icewm-1.3.8/src/base.h
350 -+++ icewm-1.3.8/src/base.h
351 -@@ -2,7 +2,9 @@
352 - #define __BASE_H
353 -
354 - #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
355 -+#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 7 ) || __GNUC__ > 3
356 - #define _icewm_deprecated __attribute__((deprecated))
357 -+#endif
358 - #else
359 - #define _icewm_deprecated
360 - #endif
361
362 diff --git a/x11-wm/icewm/files/icewm-1.3.8-menu.patch b/x11-wm/icewm/files/icewm-1.3.8-menu.patch
363 deleted file mode 100644
364 index e4bab5c5ffc..00000000000
365 --- a/x11-wm/icewm/files/icewm-1.3.8-menu.patch
366 +++ /dev/null
367 @@ -1,23 +0,0 @@
368 ---- icewm-1.3.8/lib/menu.in
369 -+++ icewm-1.3.8/lib/menu.in
370 -@@ -4,15 +4,9 @@
371 - # since modifications to this file will be discarded when you
372 - # (re)install icewm.
373 - #
374 --prog xterm xterm xterm
375 --prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
376 --prog fte fte fte
377 --prog NEdit nedit nedit
378 --prog Mozilla mozilla mozilla
379 --prog XChat xchat xchat
380 --prog Gimp gimp gimp
381 -+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
382 -+prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
383 - separator
384 --menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@
385 --menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@
386 --menufile Programs folder programs
387 --menufile Tool_bar folder toolbar
388 -+prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
389 -+separator
390 -+menufile Programs folder programs.autogen
391
392 diff --git a/x11-wm/icewm/files/icewm-defaults.patch b/x11-wm/icewm/files/icewm-defaults.patch
393 deleted file mode 100644
394 index 72e5410db4f..00000000000
395 --- a/x11-wm/icewm/files/icewm-defaults.patch
396 +++ /dev/null
397 @@ -1,13 +0,0 @@
398 ---- src/default.h.old 2011-11-23 18:04:22.429626938 +0200
399 -+++ src/default.h 2011-11-23 18:04:38.416824083 +0200
400 -@@ -161,8 +161,8 @@
401 - #endif
402 -
403 - XSV(const char *, mailBoxPath, 0)
404 --XSV(const char *, mailCommand, "xterm -name pine -title PINE -e pine")
405 --XSV(const char *, mailClassHint, "pine.XTerm")
406 -+XSV(const char *, mailCommand, "xterm -name alpine -title ALPINE -e alpine")
407 -+XSV(const char *, mailClassHint, "alpine.XTerm")
408 - XSV(const char *, newMailCommand, 0)
409 - XSV(const char *, lockCommand, 0)
410 - XSV(const char *, clockCommand, "xclock -name icewm -title Clock")
411
412 diff --git a/x11-wm/icewm/files/icewm-fribidi.patch b/x11-wm/icewm/files/icewm-fribidi.patch
413 deleted file mode 100644
414 index 66691d78a3f..00000000000
415 --- a/x11-wm/icewm/files/icewm-fribidi.patch
416 +++ /dev/null
417 @@ -1,83 +0,0 @@
418 ---- src/yfontxft.cc.old 2009-09-25 00:07:51.000000000 +0300
419 -+++ src/yfontxft.cc 2009-09-25 00:18:09.000000000 +0300
420 -@@ -6,6 +6,11 @@
421 - #include "ypaint.h"
422 - #include "yxapp.h"
423 - #include "intl.h"
424 -+#include <stdio.h>
425 -+
426 -+#ifdef CONFIG_FRIBIDI
427 -+ #include <fribidi/fribidi.h>
428 -+#endif
429 -
430 - /******************************************************************************/
431 -
432 -@@ -68,10 +73,45 @@
433 - char_t * str, size_t len)
434 - {
435 - XftColor *c = *g.color();
436 -+
437 -+#ifdef CONFIG_FRIBIDI
438 -+
439 -+#define STATIS_STRING_SIZE 256
440 -+
441 -+ // Based around upstream (1.3.2) patch with some optimization
442 -+ // on my end. (reduce unnecessary memory allocation)
443 -+ // - Gilboa
444 -+
445 -+ char_t static_str[STATIS_STRING_SIZE];
446 -+ char_t *vis_str = static_str;
447 -+
448 -+ if (len >= STATIS_STRING_SIZE)
449 -+ {
450 -+ vis_str = new char_t[len+1];
451 -+ if (!vis_str)
452 -+ return;
453 -+ }
454 -+
455 -+ FriBidiCharType pbase_dir = FRIBIDI_TYPE_N;
456 -+ fribidi_log2vis(str, len, &pbase_dir, //input
457 -+ vis_str, // output
458 -+ NULL, NULL, NULL // "statistics" that we don't need
459 -+ );
460 -+ str = vis_str;
461 -+#endif
462 -+
463 - XftDrawString(g.handleXft(), c, font,
464 - x - g.xorigin(),
465 - y - g.yorigin(),
466 - str, len);
467 -+
468 -+#ifdef CONFIG_FRIBIDI
469 -+
470 -+ if (vis_str != static_str)
471 -+ delete[] str;
472 -+
473 -+#endif
474 -+
475 - }
476 -
477 - static void textExtents(XftFont * font, char_t * str, size_t len,
478 ---- configure.in.old 2009-09-25 00:05:08.000000000 +0300
479 -+++ configure.in 2009-09-25 00:07:14.000000000 +0300
480 -@@ -307,6 +307,20 @@
481 - features="${features} i18n"
482 - fi
483 -
484 -+dnl =================================================== Right to left support ===
485 -+dnl
486 -+AC_ARG_ENABLE(fribidi,
487 -+ [ --disable-fribidi Disable right to left support])
488 -+
489 -+if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
490 -+ PKG_CHECK_MODULES(FRIBIDI, fribidi)
491 -+
492 -+ AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
493 -+
494 -+ CORE_CFLAGS="${CORE_CFLAGS} ${FRIBIDI_CFLAGS}"
495 -+ CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}"
496 -+fi
497 -+
498 - dnl ============================================================ NLS Support ===
499 - dnl
500 - AC_ARG_ENABLE(nls,
501
502 diff --git a/x11-wm/icewm/files/icewm-keys.patch b/x11-wm/icewm/files/icewm-keys.patch
503 deleted file mode 100644
504 index 7e136bb9328..00000000000
505 --- a/x11-wm/icewm/files/icewm-keys.patch
506 +++ /dev/null
507 @@ -1,43 +0,0 @@
508 ---- icewm-1.2.30/lib/keys.in.old 2007-01-18 13:55:20.000000000 +0200
509 -+++ icewm-1.2.30/lib/keys.in 2007-01-18 16:07:07.000000000 +0200
510 -@@ -9,28 +9,21 @@
511 - # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by
512 - # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper.
513 - #
514 --key "Alt+Ctrl+t" xterm
515 --key "Alt+Ctrl+f" fte
516 --key "Alt+Ctrl+e" nedit
517 --key "Alt+Ctrl+g" gimp
518 --key "Alt+Ctrl+n" netscape -noraise -remote openBrowser
519 --key "Alt+Ctrl+b" netscape -noraise -remote openBookmarks
520 --key "Alt+Ctrl+m" netscape -noraise -remote openURL(mailto:,new-window)
521 -+key "Alt+Ctrl+t" xterm
522 -+key "Alt+Ctrl+b" xdg-open about:blank
523 -+key "Alt+Ctrl+s" xdg-open http://www.google.com
524 -
525 --key "Alt+Ctrl+KP_Divide" aumix -v -5 # lower volume
526 --key "Alt+Ctrl+KP_Multiply" aumix -v +5 # raise volume
527 -+key "Super+KP_Subtract" amixer sset PCM 5%-
528 -+key "Super+KP_Add" amixer sset PCM 5%+
529 -
530 - # "Multimedia key" bindings for XFree86. Gather the keycodes of your
531 - # advanced function keys by watching the output of the xev command whilest
532 - # pressing those keys and map those symbols by using xmodmap.
533 -
534 --key "XF86Standby" killall -QUIT icewm
535 --key "XF86AudioLowerVolume" aumix -v -5
536 --key "XF86AudioRaiseVolume" aumix -v +5
537 --key "XF86AudioMute" aumix -v 0
538 --key "XF86AudioPlay" cdplay play 1
539 --key "XF86AudioStop" cdplay stop
540 --key "XF86HomePage" netscape -noraise -remote openHomepage
541 --key "XF86Mail" netscape -noraise -remote openURL(mailto:,new-window)
542 --key "XF86Search" netscape -noraise -remote openURL(http://www.google.com/)
543 --key "XF86Eject" eject
544 -+key "XF86Standby" killall -QUIT icewm
545 -+key "XF86AudioLowerVolume" amixer sset PCM 5%-
546 -+key "XF86AudioRaiseVolume" amixer sset PCM 5%+
547 -+key "XF86AudioMute" amixer sset PCM 0%
548 -+key "XF86HomePage" xdg-open about:blank
549 -+key "XF86Search" xdg-open http://www.google.com
550 -+key "XF86Eject" eject
551
552 diff --git a/x11-wm/icewm/files/icewm-startup b/x11-wm/icewm/files/icewm-startup
553 deleted file mode 100644
554 index 048ab593848..00000000000
555 --- a/x11-wm/icewm/files/icewm-startup
556 +++ /dev/null
557 @@ -1,4 +0,0 @@
558 -#!/bin/sh
559 -[ ! -d ~/.icewm ] && mkdir ~/.icewm
560 -XDG_MENU_PREFIX="gnome-" icewm-xdg-menu --entire-menu --with-theme-paths --icon-size 16 --theme gnome > ~/.icewm/programs.autogen
561 -
562
563 diff --git a/x11-wm/icewm/files/icewm-toolbar.patch b/x11-wm/icewm/files/icewm-toolbar.patch
564 deleted file mode 100644
565 index a6f0f15f52d..00000000000
566 --- a/x11-wm/icewm/files/icewm-toolbar.patch
567 +++ /dev/null
568 @@ -1,12 +0,0 @@
569 ---- icewm-1.2.30/lib/toolbar.in.old 2007-01-18 18:51:55.000000000 +0200
570 -+++ icewm-1.3.7/lib/toolbar.in 2012-06-10 09:36:00.000000000 +0200
571 -@@ -4,6 +4,6 @@
572 - # since modifications to this file will be discarded when you
573 - # (re)install icewm.
574 - #
575 --prog XTerm xterm xterm
576 --prog FTE fte fte
577 --prog Netscape netscape netscape
578 -+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
579 -+prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
580 -+
581
582 diff --git a/x11-wm/icewm/files/icewm-xdg-menu b/x11-wm/icewm/files/icewm-xdg-menu
583 deleted file mode 100644
584 index 529f9e2ab3b..00000000000
585 --- a/x11-wm/icewm/files/icewm-xdg-menu
586 +++ /dev/null
587 @@ -1,128 +0,0 @@
588 -#!/usr/bin/python2
589 -"""
590 -This script generates FreeDesktop application menu for IceWM window manager.
591 -
592 -Written by Konstantin Korikov <lostclus@××.fm>, put in the public domain
593 -
594 -Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/
595 -
596 -USAGE EXAMPLE
597 -
598 -Add to $HOME/.icewm/menu this line:
599 -
600 - menuprog Applications - icewm-xdg-menu
601 -
602 -and restart IceWM.
603 -"""
604 -
605 -import sys
606 -import locale
607 -import getopt
608 -import re
609 -import xdg.Menu
610 -import xdg.DesktopEntry
611 -import xdg.IconTheme
612 -import xdg.Config
613 -
614 -version = "0.3"
615 -
616 -def print_usage(exit_code = 1):
617 - print """Usage: %s [options]
618 -Options:
619 - --locale=locale set output languege and encoding
620 - --root-folder folder folder to generate (for example: /Games)
621 - --terminal command set terminal emulator command (default: xterm -e %%s)
622 - --default-folder-icon icon icon for folders that not provide Icon option
623 - --default-entry-icon icon icon for entries that not provide Icon option
624 - --with-theme-paths convert icon base names to icon absolute paths
625 - using icon theme
626 - --entire-menu print entire menu
627 - --icon-size set default icon size
628 - --theme theme set icon theme
629 - --help print this help and exit
630 - --version print version and exit
631 -""" % sys.argv[0]
632 - sys.exit(exit_code)
633 -
634 -def print_version():
635 - print "%s version %s" % (
636 - os.path.basename(sys.argv[0]), version)
637 - sys.exit(0)
638 -
639 -root_folder = ""
640 -terminal = "xterm -e %s"
641 -default_folder_icon = "folder"
642 -default_entry_icon = "-"
643 -entire_menu = False
644 -with_theme_paths = False
645 -icon_size = 16
646 -
647 -exec_clean1_re = re.compile(r'%[a-zA-Z]')
648 -exec_clean2_re = re.compile(r'%%')
649 -encoding = None
650 -locale_str = None
651 -
652 -def find_icon(entry):
653 - icon = entry.getIcon()
654 - if icon and with_theme_paths:
655 - icon = xdg.IconTheme.getIconPath(icon, icon_size) or icon
656 - return icon
657 -
658 -def process_menu(menu):
659 - for entry in menu.getEntries():
660 - if isinstance(entry, xdg.Menu.Menu):
661 - name = entry.getName() or entry.DesktopFileID
662 - icon = find_icon(entry) or default_folder_icon
663 -
664 - if entire_menu:
665 - print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding)
666 - process_menu(entry)
667 - print "}".encode(encoding)
668 - else:
669 - print (("menuprog \"%s\" \"%s\" %s" % (name, icon, sys.argv[0])) +
670 - (" --root-folder \"%s\"" % entry.getPath(org=True)) +
671 - (" --terminal \"%s\"" % terminal) +
672 - (" --default-folder-icon \"%s\"" % default_folder_icon) +
673 - (" --default-entry-icon \"%s\"" % default_entry_icon) +
674 - (" --theme \"%s\"" % xdg.Config.icon_theme) +
675 - (" --icon-size \"%d\"" % icon_size) +
676 - (with_theme_paths and " --with-theme-paths" or "")).encode(encoding),
677 - if locale_str:
678 - print (" --locale \"%s\"" % locale_str).encode(encoding),
679 - print
680 - elif isinstance(entry, xdg.Menu.MenuEntry):
681 - de = entry.DesktopEntry
682 - name = de.getName() or entry.DesktopFileID
683 - icon = find_icon(de) or default_entry_icon
684 - execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec()))
685 - if de.getTerminal(): execute = terminal % execute
686 - print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding)
687 -
688 -try: opts, args = getopt.getopt(sys.argv[1:], "",
689 - ("help", "version", "locale=",
690 - "root-folder=", "terminal=", "default-folder-icon=",
691 - "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths",
692 - "icon-size="))
693 -except getopt.GetoptError: print_usage()
694 -
695 -locale.setlocale(locale.LC_ALL, "")
696 -
697 -for o, v in opts:
698 - if o == "--locale":
699 - locale_str = v
700 - locale.setlocale(locale.LC_ALL, locale_str)
701 - if o == "--root-folder": root_folder = v
702 - elif o == "--terminal": terminal = v
703 - elif o == "--default-folder-icon": default_folder_icon = v
704 - elif o == "--default-entry-icon": default_entry_icon = v
705 - elif o == "--entire-menu" : entire_menu = True
706 - elif o == "--with-theme-paths" : with_theme_paths = True
707 - elif o == "--icon-size": icon_size = int(v)
708 - elif o == "--theme" : xdg.Config.setIconTheme(v)
709 - elif o in ("-h", "-?", "--help"): print_usage(0)
710 - elif o in ("-v", "--version"): print_version()
711 -
712 -encoding = locale.getlocale()[1] or 'UTF-8'
713 -menu = xdg.Menu.parse()
714 -if root_folder: menu = menu.getMenu(root_folder)
715 -process_menu(menu)
716
717 diff --git a/x11-wm/icewm/icewm-1.3.12-r1.ebuild b/x11-wm/icewm/icewm-1.3.12-r1.ebuild
718 deleted file mode 100644
719 index 37e3971bb7e..00000000000
720 --- a/x11-wm/icewm/icewm-1.3.12-r1.ebuild
721 +++ /dev/null
722 @@ -1,121 +0,0 @@
723 -# Copyright 1999-2017 Gentoo Foundation
724 -# Distributed under the terms of the GNU General Public License v2
725 -
726 -EAPI=6
727 -
728 -inherit autotools eutils
729 -
730 -DESCRIPTION="Ice Window Manager with Themes"
731 -HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
732 -LICENSE="GPL-2"
733 -SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
734 -
735 -SLOT="0"
736 -KEYWORDS="amd64 ppc x86"
737 -IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
738 -
739 -# Tests broken in all versions, patches welcome, bug #323907, #389533
740 -RESTRICT="test"
741 -
742 -#fix for icewm preversion package names
743 -S="${WORKDIR}/${P/_}"
744 -
745 -RDEPEND="
746 - media-libs/fontconfig
747 - x11-libs/gdk-pixbuf:2[X]
748 - x11-libs/libICE
749 - x11-libs/libSM
750 - x11-libs/libX11
751 - x11-libs/libXext
752 - x11-libs/libXft
753 - x11-libs/libXpm
754 - x11-libs/libXrandr
755 - x11-libs/libXrender
756 - bidi? ( dev-libs/fribidi )
757 - xinerama? ( x11-libs/libXinerama )
758 -"
759 -DEPEND="
760 - ${RDEPEND}
761 - >=sys-apps/sed-4
762 - x11-proto/xextproto
763 - x11-proto/xproto
764 - doc? ( app-text/linuxdoc-tools )
765 - nls? ( >=sys-devel/gettext-0.19.6 )
766 - truetype? ( >=media-libs/freetype-2.0.9 )
767 - xinerama? ( x11-proto/xineramaproto )
768 -"
769 -
770 -pkg_setup() {
771 - if use truetype && use minimal ; then
772 - ewarn "You have both 'truetype' and 'minimal' use flags enabled."
773 - ewarn "If you really want a minimal install, you will have to turn off"
774 - ewarn "the truetype flag for this package."
775 - fi
776 -}
777 -
778 -PATCHES=(
779 - "${FILESDIR}"/${PN}-1.3.10-menu.patch
780 -)
781 -
782 -src_prepare() {
783 - # Fix bug #486710
784 - use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
785 -
786 - default
787 -
788 - if ! use doc ; then
789 - sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
790 - fi
791 -
792 - eautoreconf
793 -}
794 -
795 -src_configure() {
796 - local myconf=()
797 - if use truetype ; then
798 - myconf=(
799 - --enable-gradients
800 - --enable-shape
801 - --enable-shaped-decorations
802 - )
803 - else
804 - myconf=(
805 - --disable-xfreetype
806 - --enable-corefonts
807 - $(use_enable minimal lite)
808 - )
809 - fi
810 -
811 - myconf+=(
812 - --disable-menus-gnome2
813 - --with-libdir=/usr/share/icewm
814 - --with-cfgdir=/etc/icewm
815 - --with-docdir=/usr/share/doc/${PF}/html
816 - $(use_enable bidi fribidi)
817 - $(use_enable debug)
818 - $(use_enable nls i18n)
819 - $(use_enable nls)
820 - $(use_enable xinerama)
821 - )
822 -
823 - CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
824 -
825 - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
826 - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
827 -}
828 -
829 -src_install(){
830 - local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
831 -
832 - default
833 -
834 - if ! use doc ; then
835 - docinto html
836 - dodoc doc/*.sgml
837 - cp doc/${PN}.man "${T}"/${PN}.1 || die
838 - doman "${T}"/${PN}.1
839 - fi
840 -
841 - exeinto /etc/X11/Sessions
842 - doexe "${FILESDIR}/icewm"
843 -}
844
845 diff --git a/x11-wm/icewm/icewm-1.3.8.ebuild b/x11-wm/icewm/icewm-1.3.8.ebuild
846 deleted file mode 100644
847 index 4d76d35485f..00000000000
848 --- a/x11-wm/icewm/icewm-1.3.8.ebuild
849 +++ /dev/null
850 @@ -1,132 +0,0 @@
851 -# Copyright 1999-2015 Gentoo Foundation
852 -# Distributed under the terms of the GNU General Public License v2
853 -
854 -EAPI=5
855 -PYTHON_COMPAT=( python2_7 )
856 -
857 -inherit autotools eutils python-single-r1
858 -
859 -DESCRIPTION="Ice Window Manager with Themes"
860 -HOMEPAGE="http://www.icewm.org/"
861 -LICENSE="GPL-2"
862 -SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
863 -
864 -SLOT="0"
865 -KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
866 -IUSE="bidi debug gnome minimal nls truetype uclibc xinerama"
867 -REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
868 -
869 -# Tests broken in all versions, patches welcome, bug #323907, #389533
870 -RESTRICT="test"
871 -
872 -#fix for icewm preversion package names
873 -S=${WORKDIR}/${P/_}
874 -
875 -RDEPEND="
876 - x11-libs/gdk-pixbuf:2[X]
877 - x11-libs/libX11
878 - x11-libs/libXrandr
879 - x11-libs/libXext
880 - x11-libs/libXpm
881 - x11-libs/libXrender
882 - x11-libs/libXft
883 - x11-libs/libSM
884 - x11-libs/libICE
885 - xinerama? ( x11-libs/libXinerama )
886 - bidi? ( dev-libs/fribidi )
887 - gnome? (
888 - ${PYTHON_DEPS}
889 - dev-python/pyxdg
890 - gnome-base/gnome-desktop:2
891 - gnome-base/gnome-menus
892 - gnome-base/libgnomeui )
893 - nls? ( sys-devel/gettext )
894 - truetype? ( >=media-libs/freetype-2.0.9 )
895 - media-libs/giflib
896 -"
897 -DEPEND="${RDEPEND}
898 - x11-proto/xproto
899 - x11-proto/xextproto
900 - xinerama? ( x11-proto/xineramaproto )
901 - >=sys-apps/sed-4
902 -"
903 -
904 -pkg_setup() {
905 - if use truetype && use minimal; then
906 - ewarn "You have both 'truetype' and 'minimal' use flags enabled."
907 - ewarn "If you really want a minimal install, you will have to turn off"
908 - ewarn "the truetype flag for this package."
909 - fi
910 -}
911 -
912 -src_prepare() {
913 - # Fedora patches
914 - epatch "${FILESDIR}"/${PN}-1.3.8-menu.patch
915 - epatch "${FILESDIR}"/${PN}-toolbar.patch
916 - epatch "${FILESDIR}"/${PN}-keys.patch
917 - epatch "${FILESDIR}"/${PN}-fribidi.patch
918 - epatch "${FILESDIR}"/${PN}-1.3.7-dso.patch
919 - epatch "${FILESDIR}"/${PN}-defaults.patch
920 - epatch "${FILESDIR}"/${PN}-1.3.7-menuiconsize.patch
921 - epatch "${FILESDIR}"/${PN}-1.3.8-deprecated.patch
922 -
923 - epatch "${FILESDIR}"/${PN}-1.3.7-gcc44.patch
924 -
925 - # Get thermal info from proper locations, bug #452730
926 - epatch "${FILESDIR}"/${PN}-1.3.7-thermal.patch
927 -
928 - # Debian patch fixing multiple build issues, like bug #470148
929 - epatch "${FILESDIR}"/${PN}-1.3.8-build-fixes.patch
930 -
931 - # Fix bug #486710
932 - use uclibc && epatch "${FILESDIR}/${P}-uclibc.patch"
933 -
934 - eautoreconf
935 -}
936 -
937 -src_configure() {
938 - if use truetype
939 - then
940 - myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
941 - else
942 - myconf="${myconf} --disable-xfreetype --enable-corefonts
943 - $(use_enable minimal lite)"
944 - fi
945 -
946 - myconf="${myconf}
947 - --with-libdir=/usr/share/icewm
948 - --with-cfgdir=/etc/icewm
949 - --with-docdir=/usr/share/doc/${PF}/html
950 - $(use_enable bidi fribidi)
951 - $(use_enable debug)
952 - $(use_enable gnome menus-gnome2)
953 - $(use_enable nls i18n)
954 - $(use_enable nls)
955 - $(use_enable x86 x86-asm)
956 - $(use_enable xinerama)
957 - --without-esd-config"
958 -
959 - CXXFLAGS="${CXXFLAGS}" econf ${myconf}
960 -
961 - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
962 - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
963 -}
964 -
965 -src_install(){
966 - default
967 -
968 - if use gnome; then
969 - dobin "${FILESDIR}"/icewm-xdg-menu
970 - exeinto /usr/share/icewm/
971 - newexe "${FILESDIR}"/icewm-startup startup
972 - fi
973 -
974 - dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
975 - dohtml -a html,sgml doc/*
976 -
977 - exeinto /etc/X11/Sessions
978 - doexe "${FILESDIR}/icewm"
979 -
980 - insinto /usr/share/xsessions
981 - doins "${FILESDIR}/IceWM.desktop"
982 -}
983
984 diff --git a/x11-wm/icewm/icewm-1.4.0.ebuild b/x11-wm/icewm/icewm-1.4.0.ebuild
985 deleted file mode 100644
986 index 6ccb181652d..00000000000
987 --- a/x11-wm/icewm/icewm-1.4.0.ebuild
988 +++ /dev/null
989 @@ -1,117 +0,0 @@
990 -# Copyright 1999-2017 Gentoo Foundation
991 -# Distributed under the terms of the GNU General Public License v2
992 -
993 -EAPI=6
994 -
995 -inherit autotools eutils
996 -
997 -DESCRIPTION="Ice Window Manager with Themes"
998 -HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
999 -LICENSE="GPL-2"
1000 -SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
1001 -
1002 -SLOT="0"
1003 -KEYWORDS="~amd64 ~ppc ~x86"
1004 -IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
1005 -
1006 -# Tests broken in all versions, patches welcome, bug #323907, #389533
1007 -RESTRICT="test"
1008 -
1009 -#fix for icewm preversion package names
1010 -S="${WORKDIR}/${P/_}"
1011 -
1012 -RDEPEND="
1013 - media-libs/fontconfig
1014 - x11-libs/gdk-pixbuf:2[X]
1015 - x11-libs/libICE
1016 - x11-libs/libSM
1017 - x11-libs/libX11
1018 - x11-libs/libXext
1019 - x11-libs/libXft
1020 - x11-libs/libXpm
1021 - x11-libs/libXrandr
1022 - x11-libs/libXrender
1023 - bidi? ( dev-libs/fribidi )
1024 - xinerama? ( x11-libs/libXinerama )
1025 -"
1026 -DEPEND="
1027 - ${RDEPEND}
1028 - >=sys-apps/sed-4
1029 - x11-proto/xextproto
1030 - x11-proto/xproto
1031 - doc? ( app-text/linuxdoc-tools )
1032 - nls? ( >=sys-devel/gettext-0.19.6 )
1033 - truetype? ( >=media-libs/freetype-2.0.9 )
1034 - xinerama? ( x11-proto/xineramaproto )
1035 -"
1036 -
1037 -pkg_setup() {
1038 - if use truetype && use minimal ; then
1039 - ewarn "You have both 'truetype' and 'minimal' use flags enabled."
1040 - ewarn "If you really want a minimal install, you will have to turn off"
1041 - ewarn "the truetype flag for this package."
1042 - fi
1043 -}
1044 -
1045 -PATCHES=(
1046 - "${FILESDIR}"/${PN}-1.3.10-menu.patch
1047 -)
1048 -
1049 -src_prepare() {
1050 - # Fix bug #486710
1051 - use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
1052 -
1053 - default
1054 -
1055 - if ! use doc ; then
1056 - sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
1057 - fi
1058 -
1059 - eautoreconf
1060 -}
1061 -
1062 -src_configure() {
1063 - local myconf=(
1064 - --disable-menus-gnome2
1065 - --with-libdir=/usr/share/icewm
1066 - --with-cfgdir=/etc/icewm
1067 - --with-docdir=/usr/share/doc/${PF}/html
1068 - $(use_enable bidi fribidi)
1069 - $(use_enable debug)
1070 - $(use_enable nls i18n)
1071 - $(use_enable nls)
1072 - $(use_enable xinerama)
1073 - )
1074 - if use truetype ; then
1075 - myconf+=(
1076 - --enable-gradients
1077 - --enable-shape
1078 - --enable-shaped-decorations
1079 - )
1080 - else
1081 - myconf+=(
1082 - --disable-xfreetype
1083 - --enable-corefonts
1084 - $(use_enable minimal lite)
1085 - )
1086 - fi
1087 -
1088 - CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
1089 -
1090 - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
1091 - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
1092 -}
1093 -
1094 -src_install(){
1095 - local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
1096 -
1097 - default
1098 -
1099 - if ! use doc ; then
1100 - cp doc/${PN}.man "${T}"/${PN}.1 || die
1101 - doman "${T}"/${PN}.1
1102 - fi
1103 -
1104 - exeinto /etc/X11/Sessions
1105 - doexe "${FILESDIR}/icewm"
1106 -}