Use Fedora patches to fix a lot if bugs, also menu handling. Fix thermal information handling (#452730 by Dag Bakke).

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

16 files changed, 634 insertions, 2 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 645505cdc289..8bf396597e2b 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-wm/icewm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.150 2012/10/07 10:25:13 xarthisius Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.151 2013/09/06 21:17:59 pacho Exp $
+
+*icewm-1.3.7-r1 (06 Sep 2013)
+
+  06 Sep 2013; Pacho Ramos <pacho@gentoo.org> +files/icewm,
+  +files/icewm-1.3.7-configurenotify.patch, +files/icewm-1.3.7-deprecated.patch,
+  +files/icewm-1.3.7-dso.patch, +files/icewm-1.3.7-menuiconsize.patch,
+  +files/icewm-1.3.7-thermal.patch, +files/icewm-defaults.patch,
+  +files/icewm-fribidi.patch, +files/icewm-keys.patch, +files/icewm-menu.patch,
+  +files/icewm-startup, +files/icewm-toolbar.patch, +files/icewm-wmclient.patch,
+  +files/icewm-xdg-menu, +icewm-1.3.7-r1.ebuild:
+  Use Fedora patches to fix a lot if bugs, also menu handling. Fix thermal
+  information handling (#452730 by Dag Bakke).
 
   07 Oct 2012; Kacper Kowalik <xarthisius@gentoo.org>
   +files/icewm-1.3.7-gcc47.patch, icewm-1.3.7.ebuild:
diff --git a/x11-wm/icewm/files/icewm b/x11-wm/icewm/files/icewm
new file mode 100755
index 000000000000..90905960d1a2
--- /dev/null
+++ b/x11-wm/icewm/files/icewm
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/icewm-session
diff --git a/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch b/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch
new file mode 100644
index 000000000000..07e7e1344ed3
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch
@@ -0,0 +1,19 @@
+--- icewm-1.3.7/src/decorate.cc.old	2012-06-10 10:59:22.496484163 +0300
++++ icewm-1.3.7/src/decorate.cc	2012-06-10 11:00:05.453078780 +0300
+@@ -320,6 +320,7 @@
+     YWindow::configure(r);
+ 
+     performLayout();
++	sendConfigure();
+ }
+ 
+ void YFrameWindow::performLayout()
+@@ -331,8 +332,6 @@
+     layoutShape();
+     if (affectsWorkArea())
+         manager->updateWorkArea();
+-
+-    sendConfigure();
+ }
+ 
+ void YFrameWindow::layoutTitleBar() {
diff --git a/x11-wm/icewm/files/icewm-1.3.7-deprecated.patch b/x11-wm/icewm/files/icewm-1.3.7-deprecated.patch
new file mode 100644
index 000000000000..a6be36009957
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-deprecated.patch
@@ -0,0 +1,14 @@
+--- icewm-1.3.7/src/base.h.old	2010-10-31 16:09:36.000000000 +0200
++++ icewm-1.3.7/src/base.h	2012-06-10 11:08:34.643875363 +0300
+@@ -2,7 +2,11 @@
+ #define __BASE_H
+ 
+ #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
++#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 7 ) || __GNUC__ > 3
++#define __icewm_deprecated __attribute__((deprecated))
++#else
+ #define deprecated __attribute__((deprecated))
++#endif
+ #else
+ #define deprecated
+ #endif
diff --git a/x11-wm/icewm/files/icewm-1.3.7-dso.patch b/x11-wm/icewm/files/icewm-1.3.7-dso.patch
new file mode 100644
index 000000000000..55100d5f62a6
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-dso.patch
@@ -0,0 +1,10 @@
+--- configure.in.old	2011-11-23 15:44:52.121654867 +0200
++++ configure.in	2011-11-23 15:47:09.514411391 +0200
+@@ -494,6 +494,7 @@
+     AC_DEFINE(CONFIG_COREFONTS, 1, [Define to enable X11 core conts.])
+     features="${features} corefonts"
+   fi
++  CORE_LIBS="${CORE_LIBS} -lfontconfig"
+ 
+ dnl ============================================================= GUI Events ===
+ dnl
diff --git a/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch b/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
new file mode 100644
index 000000000000..d051d5bc5f19
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
@@ -0,0 +1,73 @@
+diff -Naur icewm-1.3.7.bak/src/yicon.cc icewm-1.3.7/src/yicon.cc
+--- icewm-1.3.7.bak/src/yicon.cc	2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/yicon.cc	2011-11-07 19:41:52.841910531 +0100
+@@ -270,6 +270,10 @@
+         iconCache.getItem(0)->removeFromCache();
+ }
+ 
++int YIcon::menuSize() {
++    return menuIconSize;
++}
++
+ int YIcon::smallSize() {
+     return smallIconSize;
+ }
+diff -Naur icewm-1.3.7.bak/src/yicon.h icewm-1.3.7/src/yicon.h
+--- icewm-1.3.7.bak/src/yicon.h	2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/yicon.h	2011-11-07 19:41:28.555296033 +0100
+@@ -25,6 +25,7 @@
+     bool isCached() { return fCached; }
+     void setCached(bool cached) { fCached = cached; }
+ 
++    static int menuSize();
+     static int smallSize();
+     static int largeSize();
+     static int hugeSize();
+diff -Naur icewm-1.3.7.bak/src/ymenu.cc icewm-1.3.7/src/ymenu.cc
+--- icewm-1.3.7.bak/src/ymenu.cc	2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/ymenu.cc	2011-11-07 19:42:40.498474049 +0100
+@@ -153,8 +153,8 @@
+ 
+ #ifndef LITE
+         if (getItem(selItem)->getIcon() != null &&
+-            YIcon::smallSize() > h)
+-            h = YIcon::smallSize();
++            YIcon::menuSize() > h)
++            h = YIcon::menuSize();
+ #endif
+ 
+         if (x <= int(width() - h - 4))
+@@ -1023,8 +1023,8 @@
+                     mitem->getIcon()->draw(g,
+                                l + 1 + delta, t + delta + top + pad +
+                                (eh - top - pad * 2 - bottom -
+-                                YIcon::smallSize()) / 2,
+-                                YIcon::smallSize());
++                                YIcon::menuSize()) / 2,
++                                YIcon::menuSize());
+ #endif
+                 }
+ 
+diff -Naur icewm-1.3.7.bak/src/ymenuitem.cc icewm-1.3.7/src/ymenuitem.cc
+--- icewm-1.3.7.bak/src/ymenuitem.cc	2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/ymenuitem.cc	2011-11-07 19:50:04.458316916 +0100
+@@ -86,8 +86,8 @@
+         int ih = fontHeight;
+ 
+ #ifndef LITE
+-        if (YIcon::smallSize() > ih)
+-            ih = YIcon::smallSize();
++        if (YIcon::menuSize() > ih)
++            ih = YIcon::menuSize();
+ #endif
+ 
+         if (wmLook == lookWarp4 || wmLook == lookWin95) {
+@@ -123,7 +123,7 @@
+     return 0;
+ #else
+     ref<YIcon> icon = getIcon();
+-    return icon != null ? YIcon::smallSize(): 0;
++    return icon != null ? YIcon::menuSize(): 0;
+ #endif
+ }
+ 
diff --git a/x11-wm/icewm/files/icewm-1.3.7-thermal.patch b/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
new file mode 100644
index 000000000000..f6b2cf71f0f5
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
@@ -0,0 +1,41 @@
+diff -uprN a/src/acpustatus.cc b/src/acpustatus.cc
+--- a/src/acpustatus.cc	2010-10-31 15:09:36.000000000 +0100
++++ b/src/acpustatus.cc	2013-01-17 21:12:19.085715083 +0100
+@@ -315,6 +315,37 @@ int CPUStatus::getAcpiTemp(char *tempbuf
+         }
+         closedir(dir);
+     } 
++    else if ((dir = opendir("/sys/class/thermal")) != NULL) {
++        struct dirent *de;
++
++        while ((de = readdir(dir)) != NULL) {
++
++            int fd, seglen;
++
++            if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
++                continue;
++
++            sprintf(namebuf, "/sys/class/thermal/%s/temp", de->d_name);
++            fd = open(namebuf, O_RDONLY);
++            if (fd != -1) {
++                int len = read(fd, buf, sizeof(buf) - 1);
++                buf[len - 4] = '\0';
++                seglen = strlen(buf) + 4;
++                if (retbuflen + seglen >= buflen) {
++                    retbuflen = -retbuflen;
++                    close(fd);
++                    closedir(dir);
++                    break;
++                }
++                retbuflen += seglen;
++                strcat(tempbuf, "  ");
++                strncat(tempbuf, buf, seglen);
++                strcat(tempbuf, " C");
++                close(fd);
++            }
++        }
++        closedir(dir);
++    }
+     return retbuflen;
+ }
+ 
diff --git a/x11-wm/icewm/files/icewm-defaults.patch b/x11-wm/icewm/files/icewm-defaults.patch
new file mode 100644
index 000000000000..72e5410db4fe
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-defaults.patch
@@ -0,0 +1,13 @@
+--- src/default.h.old	2011-11-23 18:04:22.429626938 +0200
++++ src/default.h	2011-11-23 18:04:38.416824083 +0200
+@@ -161,8 +161,8 @@
+ #endif
+ 
+ XSV(const char *, mailBoxPath,                  0)
+-XSV(const char *, mailCommand,                  "xterm -name pine -title PINE -e pine")
+-XSV(const char *, mailClassHint,                "pine.XTerm")
++XSV(const char *, mailCommand,                  "xterm -name alpine -title ALPINE -e alpine")
++XSV(const char *, mailClassHint,                "alpine.XTerm")
+ XSV(const char *, newMailCommand,               0)
+ XSV(const char *, lockCommand,                  0)
+ XSV(const char *, clockCommand,                 "xclock -name icewm -title Clock")
diff --git a/x11-wm/icewm/files/icewm-fribidi.patch b/x11-wm/icewm/files/icewm-fribidi.patch
new file mode 100644
index 000000000000..66691d78a3ff
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-fribidi.patch
@@ -0,0 +1,83 @@
+--- src/yfontxft.cc.old	2009-09-25 00:07:51.000000000 +0300
++++ src/yfontxft.cc	2009-09-25 00:18:09.000000000 +0300
+@@ -6,6 +6,11 @@
+ #include "ypaint.h"
+ #include "yxapp.h"
+ #include "intl.h"
++#include <stdio.h>
++
++#ifdef CONFIG_FRIBIDI
++    #include <fribidi/fribidi.h>
++#endif
+ 
+ /******************************************************************************/
+ 
+@@ -68,10 +73,45 @@
+                            char_t * str, size_t len)
+     {
+         XftColor *c = *g.color();
++
++#ifdef CONFIG_FRIBIDI
++
++#define STATIS_STRING_SIZE	256
++
++		// Based around upstream (1.3.2) patch with some optimization
++		//   on my end. (reduce unnecessary memory allocation)
++		// - Gilboa
++
++		char_t static_str[STATIS_STRING_SIZE];
++		char_t *vis_str = static_str;
++
++		if (len >= STATIS_STRING_SIZE)
++		{
++			vis_str = new char_t[len+1];
++			if (!vis_str)
++				return;
++		}
++
++		FriBidiCharType pbase_dir = FRIBIDI_TYPE_N;
++		fribidi_log2vis(str, len, &pbase_dir, //input
++						vis_str, // output
++						NULL, NULL, NULL // "statistics" that we don't need
++						);
++		str = vis_str;
++#endif
++
+         XftDrawString(g.handleXft(), c, font,
+                       x - g.xorigin(),
+                       y - g.yorigin(),
+                       str, len);
++
++#ifdef CONFIG_FRIBIDI
++
++		if (vis_str != static_str)
++			delete[] str;
++
++#endif
++
+     }
+ 
+     static void textExtents(XftFont * font, char_t * str, size_t len,
+--- configure.in.old	2009-09-25 00:05:08.000000000 +0300
++++ configure.in	2009-09-25 00:07:14.000000000 +0300
+@@ -307,6 +307,20 @@
+       features="${features} i18n"
+ fi
+ 
++dnl =================================================== Right to left support ===
++dnl
++AC_ARG_ENABLE(fribidi,
++  [  --disable-fribidi       Disable right to left support])
++      
++if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
++  PKG_CHECK_MODULES(FRIBIDI, fribidi)
++
++  AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
++        
++  CORE_CFLAGS="${CORE_CFLAGS} ${FRIBIDI_CFLAGS}"
++  CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}"
++fi
++
+ dnl ============================================================ NLS Support ===
+ dnl
+ AC_ARG_ENABLE(nls,
diff --git a/x11-wm/icewm/files/icewm-keys.patch b/x11-wm/icewm/files/icewm-keys.patch
new file mode 100644
index 000000000000..7e136bb93288
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-keys.patch
@@ -0,0 +1,43 @@
+--- icewm-1.2.30/lib/keys.in.old	2007-01-18 13:55:20.000000000 +0200
++++ icewm-1.2.30/lib/keys.in	2007-01-18 16:07:07.000000000 +0200
+@@ -9,28 +9,21 @@
+ # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by
+ # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper.
+ #
+-key "Alt+Ctrl+t"		xterm
+-key "Alt+Ctrl+f"		fte
+-key "Alt+Ctrl+e"		nedit
+-key "Alt+Ctrl+g"		gimp
+-key "Alt+Ctrl+n"		netscape -noraise -remote openBrowser
+-key "Alt+Ctrl+b"		netscape -noraise -remote openBookmarks
+-key "Alt+Ctrl+m"		netscape -noraise -remote openURL(mailto:,new-window) 
++key "Alt+Ctrl+t"			xterm
++key "Alt+Ctrl+b"			xdg-open about:blank
++key "Alt+Ctrl+s"			xdg-open http://www.google.com
+ 
+-key "Alt+Ctrl+KP_Divide"	aumix -v -5		# lower volume
+-key "Alt+Ctrl+KP_Multiply"	aumix -v +5		# raise volume
++key "Super+KP_Subtract"		amixer sset PCM 5%-
++key "Super+KP_Add"			amixer sset PCM 5%+
+ 
+ # "Multimedia key" bindings for XFree86. Gather the keycodes of your
+ # advanced function keys by watching the output of the xev command whilest
+ # pressing those keys and map those symbols by using xmodmap.
+ 
+-key "XF86Standby"		killall -QUIT icewm
+-key "XF86AudioLowerVolume"	aumix -v -5
+-key "XF86AudioRaiseVolume"	aumix -v +5
+-key "XF86AudioMute"		aumix -v 0
+-key "XF86AudioPlay"		cdplay play 1
+-key "XF86AudioStop"		cdplay stop
+-key "XF86HomePage"		netscape -noraise -remote openHomepage
+-key "XF86Mail"			netscape -noraise -remote openURL(mailto:,new-window) 
+-key "XF86Search"		netscape -noraise -remote openURL(http://www.google.com/)
+-key "XF86Eject"			eject
++key "XF86Standby"			killall -QUIT icewm
++key "XF86AudioLowerVolume"	amixer sset PCM 5%-
++key "XF86AudioRaiseVolume"	amixer sset PCM 5%+
++key "XF86AudioMute"			amixer sset PCM 0%
++key "XF86HomePage"			xdg-open about:blank
++key "XF86Search"			xdg-open http://www.google.com
++key "XF86Eject"				eject
diff --git a/x11-wm/icewm/files/icewm-menu.patch b/x11-wm/icewm/files/icewm-menu.patch
new file mode 100644
index 000000000000..d706c635d143
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-menu.patch
@@ -0,0 +1,24 @@
+--- icewm-1.3.7/lib/menu.in.old	2012-06-10 08:59:34.000000000 +0300
++++ icewm-1.3.7/lib/menu.in	2012-06-10 09:00:16.000000000 +0300
+@@ -4,16 +4,9 @@
+ # since modifications to this file will be discarded when you
+ # (re)install icewm.
+ #
+-prog xterm xterm xterm
+-prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
+-prog fte fte fte
+-prog NEdit nedit nedit
+-prog Mozilla mozilla mozilla
+-prog XChat xchat xchat
+-prog Gimp gimp gimp
++prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
++prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
+ separator
+-menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@
+-menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@
+-menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@
+-menufile Programs folder programs
+-menufile Tool_bar folder toolbar
++prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
++separator
++menufile Programs folder programs.autogen
diff --git a/x11-wm/icewm/files/icewm-startup b/x11-wm/icewm/files/icewm-startup
new file mode 100644
index 000000000000..048ab5938486
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-startup
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ ! -d ~/.icewm ] && mkdir ~/.icewm
+XDG_MENU_PREFIX="gnome-" icewm-xdg-menu --entire-menu --with-theme-paths --icon-size 16 --theme gnome > ~/.icewm/programs.autogen
+
diff --git a/x11-wm/icewm/files/icewm-toolbar.patch b/x11-wm/icewm/files/icewm-toolbar.patch
new file mode 100644
index 000000000000..a6f0f15f52d3
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-toolbar.patch
@@ -0,0 +1,12 @@
+--- icewm-1.2.30/lib/toolbar.in.old	2007-01-18 18:51:55.000000000 +0200
++++ icewm-1.3.7/lib/toolbar.in	2012-06-10 09:36:00.000000000 +0200
+@@ -4,6 +4,6 @@
+ # since modifications to this file will be discarded when you
+ # (re)install icewm.
+ #
+-prog XTerm xterm xterm
+-prog FTE fte fte
+-prog Netscape netscape netscape
++prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
++prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
++
diff --git a/x11-wm/icewm/files/icewm-wmclient.patch b/x11-wm/icewm/files/icewm-wmclient.patch
new file mode 100644
index 000000000000..fbc9649689fe
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-wmclient.patch
@@ -0,0 +1,24 @@
+--- src/wmclient.cc.orig	2011-11-15 13:49:31.557650930 +0100
++++ src/wmclient.cc	2011-11-15 13:50:11.167899273 +0100
+@@ -1044,20 +1044,11 @@
+         while (XGetWindowProperty(display, handle,
+                                propAtom, (itemCount * itemSize) / 32, 1024*32, False, AnyPropertyType,
+                                &r_type, &r_format, &nitems, &bytes_remain,
+-                               &prop) == Success && prop && bytes_remain == 0)
++                               &prop) == Success && prop)
+         {
+             if (r_format == itemSize1 && nitems > 0) {
+                 data = realloc(data, (itemCount + nitems) * itemSize / 8);
+ 
+-                // access to memory beyound 256MiB causes crashes! But anyhow, size
+-                // >>2MiB looks suspicious. Detect this case ASAP. However, if
+-                // the usable icon is somewhere in the beginning, it's okay to
+-                // return truncated data.
+-                if (itemCount * itemSize / 8 >= 2097152) {
+-                     XFree(prop);
+-                     break;
+-                }
+-
+                 memcpy((char *)data + itemCount * itemSize / 8, prop, nitems * itemSize / 8);
+                 itemCount += nitems;
+                 XFree(prop);
diff --git a/x11-wm/icewm/files/icewm-xdg-menu b/x11-wm/icewm/files/icewm-xdg-menu
new file mode 100644
index 000000000000..529f9e2ab3b4
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-xdg-menu
@@ -0,0 +1,128 @@
+#!/usr/bin/python2
+"""
+This script generates FreeDesktop application menu for IceWM window manager.
+
+Written by Konstantin Korikov <lostclus@ua.fm>, put in the public domain
+
+Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/
+
+USAGE EXAMPLE
+
+Add to $HOME/.icewm/menu this line:
+
+	menuprog Applications - icewm-xdg-menu
+
+and restart IceWM.
+"""
+
+import sys
+import locale
+import getopt
+import re
+import xdg.Menu
+import xdg.DesktopEntry
+import xdg.IconTheme
+import xdg.Config
+
+version = "0.3"
+
+def print_usage(exit_code = 1):
+  print """Usage: %s [options]
+Options:
+  --locale=locale               set output languege and encoding
+  --root-folder folder          folder to generate (for example: /Games)
+  --terminal command            set terminal emulator command (default: xterm -e %%s)
+  --default-folder-icon icon    icon for folders that not provide Icon option
+  --default-entry-icon icon     icon for entries that not provide Icon option
+  --with-theme-paths            convert icon base names to icon absolute paths
+                                using icon theme
+  --entire-menu                 print entire menu
+  --icon-size                   set default icon size
+  --theme theme                 set icon theme
+  --help                        print this help and exit
+  --version                     print version and exit
+""" % sys.argv[0]
+  sys.exit(exit_code)
+  
+def print_version():
+  print "%s version %s" % (
+    os.path.basename(sys.argv[0]), version)
+  sys.exit(0)
+
+root_folder = ""
+terminal = "xterm -e %s"
+default_folder_icon = "folder"
+default_entry_icon = "-"
+entire_menu = False
+with_theme_paths = False
+icon_size = 16
+
+exec_clean1_re = re.compile(r'%[a-zA-Z]')
+exec_clean2_re = re.compile(r'%%')
+encoding = None
+locale_str = None
+
+def find_icon(entry):
+  icon = entry.getIcon()
+  if icon and with_theme_paths:
+    icon = xdg.IconTheme.getIconPath(icon, icon_size) or icon
+  return icon
+
+def process_menu(menu):
+  for entry in menu.getEntries():
+    if isinstance(entry, xdg.Menu.Menu):
+      name = entry.getName() or entry.DesktopFileID
+      icon = find_icon(entry) or default_folder_icon
+
+      if entire_menu:
+        print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding)
+        process_menu(entry)
+        print "}".encode(encoding)
+      else:
+        print (("menuprog \"%s\" \"%s\" %s" % (name, icon, sys.argv[0])) +
+            (" --root-folder \"%s\"" % entry.getPath(org=True)) +
+            (" --terminal \"%s\"" % terminal) +
+            (" --default-folder-icon \"%s\"" % default_folder_icon) +
+            (" --default-entry-icon \"%s\"" % default_entry_icon) +
+            (" --theme \"%s\"" % xdg.Config.icon_theme) +
+            (" --icon-size \"%d\"" % icon_size) +
+            (with_theme_paths and " --with-theme-paths" or "")).encode(encoding),
+        if locale_str:
+          print (" --locale \"%s\"" % locale_str).encode(encoding),
+        print
+    elif isinstance(entry, xdg.Menu.MenuEntry):
+      de = entry.DesktopEntry
+      name = de.getName() or entry.DesktopFileID
+      icon = find_icon(de) or default_entry_icon
+      execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec()))
+      if de.getTerminal(): execute = terminal % execute      
+      print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding)
+
+try: opts, args = getopt.getopt(sys.argv[1:], "", 
+  ("help", "version", "locale=",
+   "root-folder=", "terminal=", "default-folder-icon=", 
+   "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths",
+   "icon-size="))
+except getopt.GetoptError: print_usage()
+
+locale.setlocale(locale.LC_ALL, "")
+
+for o, v in opts:
+  if o == "--locale":
+    locale_str = v
+    locale.setlocale(locale.LC_ALL, locale_str)
+  if o == "--root-folder": root_folder = v
+  elif o == "--terminal": terminal = v
+  elif o == "--default-folder-icon": default_folder_icon = v
+  elif o == "--default-entry-icon": default_entry_icon = v
+  elif o == "--entire-menu" : entire_menu = True
+  elif o == "--with-theme-paths" : with_theme_paths = True
+  elif o == "--icon-size": icon_size = int(v)
+  elif o == "--theme" : xdg.Config.setIconTheme(v)
+  elif o in ("-h", "-?", "--help"): print_usage(0)
+  elif o in ("-v", "--version"): print_version()
+
+encoding = locale.getlocale()[1] or 'UTF-8'
+menu = xdg.Menu.parse()
+if root_folder: menu = menu.getMenu(root_folder)
+process_menu(menu)
diff --git a/x11-wm/icewm/icewm-1.3.7-r1.ebuild b/x11-wm/icewm/icewm-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..adcd40ab212d
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.3.7-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7-r1.ebuild,v 1.1 2013/09/06 21:17:59 pacho Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="http://www.icewm.org/"
+LICENSE="GPL-2"
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnome minimal nls truetype uclibc xinerama"
+REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+#fix for icewm preversion package names
+S=${WORKDIR}/${P/_}
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXft
+	x11-libs/libSM
+	x11-libs/libICE
+	xinerama? ( x11-libs/libXinerama )
+	gnome? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg
+		gnome-base/gnome-desktop:2
+		gnome-base/gnome-menus
+		gnome-base/libgnomeui )
+	nls? ( sys-devel/gettext )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+	media-libs/giflib
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+	>=sys-apps/sed-4
+"
+
+pkg_setup() {
+	if use truetype && use minimal; then
+		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
+		ewarn "If you really want a minimal install, you will have to turn off"
+		ewarn "the truetype flag for this package."
+	fi
+}
+
+src_prepare() {
+	# Fedora patches
+	epatch "${FILESDIR}"/${PN}-menu.patch
+	epatch "${FILESDIR}"/${PN}-toolbar.patch
+	epatch "${FILESDIR}"/${PN}-keys.patch
+	epatch "${FILESDIR}"/${PN}-fribidi.patch
+	epatch "${FILESDIR}"/${PN}-1.3.7-dso.patch
+	epatch "${FILESDIR}"/${PN}-defaults.patch
+	epatch "${FILESDIR}"/${PN}-wmclient.patch
+	epatch "${FILESDIR}"/${PN}-1.3.7-menuiconsize.patch
+	epatch "${FILESDIR}"/${PN}-1.3.7-configurenotify.patch
+	epatch "${FILESDIR}"/${PN}-1.3.7-deprecated.patch
+
+	epatch "${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+
+	# Get thermal info from proper locations, bug #452730
+	epatch "${FILESDIR}"/${PN}-1.3.7-thermal.patch
+
+	cd "${S}/src"
+	use uclibc && epatch "${FILESDIR}/${PN}-uclibc.patch"
+
+	cd "${S}"/ && eautoreconf
+}
+
+src_configure() {
+	if use truetype
+	then
+		myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
+	else
+		myconf="${myconf} --disable-xfreetype --enable-corefonts
+			$(use_enable minimal lite)"
+	fi
+
+	myconf="${myconf}
+		--with-libdir=/usr/share/icewm
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		$(use_enable debug)
+		$(use_enable gnome menus-gnome2)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable x86 x86-asm)
+		$(use_enable xinerama)
+		--without-esd-config"
+
+	CXXFLAGS="${CXXFLAGS}" econf ${myconf}
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
+	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+}
+
+src_install(){
+	default
+
+	if use gnome; then
+		dobin "${FILESDIR}"/icewm-xdg-menu
+		exeinto /usr/share/icewm/
+		newexe "${FILESDIR}"/icewm-startup startup
+	fi
+
+	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
+	dohtml -a html,sgml doc/*
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/IceWM.desktop"
+}