Version bump (bug #525212). Removed old (bug #525022)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

14 files changed, 124 insertions, 609 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 612103d306b5..3ec10ea080fa 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.166 2014/10/29 09:38:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.167 2014/11/02 19:13:45 polynomial-c Exp $
+
+*icewm-1.3.9 (02 Nov 2014)
+
+  02 Nov 2014; Lars Wendler <polynomial-c@gentoo.org> -icewm-1.2.37.ebuild,
+  -icewm-1.3.7-r1.ebuild, +icewm-1.3.9.ebuild,
+  -files/icewm-1.2.37-gnome2.patch,
+  -files/icewm-1.2.37-libX11-1.5.0-deprecated.patch,
+  -files/icewm-1.3.7-build-fixes.patch,
+  -files/icewm-1.3.7-configurenotify.patch,
+  -files/icewm-1.3.7-deprecated.patch, -files/icewm-1.3.7-gcc47.patch,
+  -files/icewm-1.3.7-uclibc.patch, +files/icewm-1.3.9-fribidi.patch,
+  -files/icewm-menu.patch, -files/icewm-uclibc.patch,
+  -files/icewm-wmclient.patch:
+  Version bump (bug #525212). Removed old (bug #525022).
 
   29 Oct 2014; Agostino Sarubbo <ago@gentoo.org> icewm-1.3.8.ebuild:
   Stable for sparc, wrt bug #506828
diff --git a/x11-wm/icewm/files/icewm-1.2.37-gnome2.patch b/x11-wm/icewm/files/icewm-1.2.37-gnome2.patch
deleted file mode 100644
index 5da3fbd84882..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.37-gnome2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -NrU5 icewm-1.2.37.original/configure.in icewm-1.2.37/configure.in
---- icewm-1.2.37.original/configure.in	2009-11-16 15:16:24.000000000 -0600
-+++ icewm-1.2.37/configure.in	2009-11-16 16:15:13.000000000 -0600
-@@ -818,19 +818,19 @@
-   [ if test "${enable_menus_gnome2}" = "yes"; then
-       AC_PATH_PROG(PKG_CONFIG, pkg-config)
-     
-       if test "${PKG_CONFIG}" != ""; then
- 	GNOME_VER=2
--	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
--	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
-+	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
-+	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
- 
- 	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
- 
- 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
- 	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
- 	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
--	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
-+	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/"
-       fi
- 
-       if test "${GNOME2_CFLAGS}" = ""; then
- 	AC_MSG_ERROR([gnome 2 can not be found via pkg-config.
- *** Install the GNOME´s development packages.])
diff --git a/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch b/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch
deleted file mode 100644
index 3533d31e34ac..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Don't use "deprecated" as identifier, will FTBFS if another
- library defines functions as deprecated.
-Author: Andreas Moog <amoog@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
-Forwarded: Yes
-
---- icewm-1.3.7.orig/src/base.h
-+++ icewm-1.3.7/src/base.h
-@@ -2,9 +2,9 @@
- #define __BASE_H
- 
- #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
--#define deprecated __attribute__((deprecated))
-+#define ICEWM_deprecated __attribute__((deprecated))
- #else
--#define deprecated
-+#define ICEWM_deprecated
- #endif
- 
- /*** Atomar Data Types ********************************************************/
diff --git a/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch b/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch
deleted file mode 100755
index 0dd4b6dc0e76..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-Index: icewm-1.3.7/po/Makefile.in
-===================================================================
---- icewm-1.3.7.orig/po/Makefile.in	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/po/Makefile.in	2013-06-28 18:46:58.940864492 +0200
-@@ -20,6 +20,7 @@
- XGETTEXT =	@XGETTEXT@
- MSGMERGE =	@MSGMERGE@
- MSGFMT =	@MSGFMT@
-+VPATH = .:po:@srcdir@
- 
- .SUFFIXES:
- .SUFFIXES: .po .mo
-Index: icewm-1.3.7/src/WinMgr.h
-===================================================================
---- icewm-1.3.7.orig/src/WinMgr.h	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/src/WinMgr.h	2013-06-28 18:46:58.940864492 +0200
-@@ -128,7 +128,7 @@
-  * this where WIN_WORKSPACE_COUNT comes into play.
-  */
- 
--#define WinWorkspaceInvalid    (-1L)
-+#define WinWorkspaceInvalid    ((unsigned long)-1)
- 
- /* workspaces */
- #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
-Index: icewm-1.3.7/src/yfont.cc
-===================================================================
---- icewm-1.3.7.orig/src/yfont.cc	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/src/yfont.cc	2013-06-28 18:46:58.940864492 +0200
-@@ -12,7 +12,7 @@
- 
- extern ref<YFont> getXftFont(ustring name, bool antialias);
- extern ref<YFont> getXftFontXlfd(ustring name, bool antialias);
--extern ref<YFont> getCoreFont(ustring name);
-+extern ref<YFont> getCoreFont(const char*);
- 
- #ifdef CONFIG_XFREETYPE
- ref<YFont> YFont::getFont(ustring name, ustring xftFont, bool antialias) {
-@@ -46,7 +46,9 @@
- #endif
- 
- #ifdef CONFIG_COREFONTS
--    return getCoreFont(name);
-+    char tmp[4096]; // XXX: such things should go into getCoreFont directly
-+    name.copy(tmp, sizeof(tmp));
-+    return getCoreFont(tmp);
- #else
-     return null;
- #endif
-Index: icewm-1.3.7/src/yapp.cc
-===================================================================
---- icewm-1.3.7.orig/src/yapp.cc	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/src/yapp.cc	2013-06-28 18:46:58.944864245 +0200
-@@ -269,7 +269,7 @@
-         }
- #endif
- 
--        {
-+        if(measure_latency) {
-             struct timeval difftime;
-             struct timeval curtime;
-             gettimeofday(&curtime, 0);
-Index: icewm-1.3.7/src/Makefile.in
-===================================================================
---- icewm-1.3.7.orig/src/Makefile.in	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/src/Makefile.in	2013-06-28 18:46:58.944864245 +0200
-@@ -11,7 +11,7 @@
- 
- CXX =           @CXX@
- HOSTCXX =       @HOSTCXX@
--LD =            @CXX_LINK@
-+LD =            gcc
- HOSTLD =        @HOSTCXX_LINK@
- EXEEXT =        @EXEEXT@
- 
-@@ -32,12 +32,12 @@
-                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
-                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
-                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
--                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(DOCDIR)/icewm-common/icewm.html"'
- 
- CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
--	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
-+	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ -I. # `fc-config --cflags`
- LFLAGS =	@LDFLAGS@ 
--LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` 
-+LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig -lm -lsupc++
- 
- CORE_LIBS =     @CORE_LIBS@ # `fc-config --libs`
- IMAGE_LIBS =    @IMAGE_LIBS@
-@@ -192,6 +192,8 @@
- TESTCASES = @TESTCASES@
- OBJECTS = @BASEOBJS@ @TESTOBJS@
- BINARIES = @BASEBINS@ @TESTBINS@
-+BASEOBJS = @BASEOBJS@
-+VPATH = .:@srcdir@
- 
- ################################################################################
- 
-@@ -209,7 +211,8 @@
- 	@echo "  CXX     " $@
- 	@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
- 
--$(BINARIES):
-+$(BINARIES): $(BASEOBJS)
-+#	@$(MAKE) --no-print-directory build-dep DEPLIST="$($(@:$(EXEEXT)=)_OBJS)"
- 	@echo "  LD      " $@
- 	@$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
- 
-@@ -245,6 +248,8 @@
- 
- genpref$(EXEEXT): $(genpref_OBJS)
- 
-+build-dep: $(DEPLIST)
-+
- ################################################################################
- 
- check:	all tests
-Index: icewm-1.3.7/Makefile.in
-===================================================================
---- icewm-1.3.7.orig/Makefile.in	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/Makefile.in	2013-06-28 18:46:58.944864245 +0200
-@@ -4,6 +4,8 @@
- # Please run 'configure' first (generate it with autogen.sh)
- ################################################################################
- 
-+SHELL=/bin/bash
-+
- srcdir     = @srcdir@
- top_srcdir = @top_srcdir@
- 
-@@ -33,7 +35,7 @@
- 
- ################################################################################
- 
--BINFILES    = @BINFILES@ icewm-set-gnomewm
-+BINFILES    = @BINFILES@ "$(srcdir)/icewm-set-gnomewm"
- LIBFILES    = lib/preferences lib/winoptions lib/keys \
-               lib/menu lib/toolbar # lib/programs
- DOCFILES    = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
-@@ -46,21 +48,22 @@
- install:	@TARGETS_INSTALL@
- 
- base icesound icehelp:
--	@cd src; $(MAKE) $@
-+	@cd src && $(MAKE) $@
- 
- docs:
--	@cd doc; $(MAKE) all
-+	@cd doc && $(MAKE) all
- 
- nls:
--	@cd po; $(MAKE) all
-+	@cd po && $(MAKE) all
- 
- srcclean:
--	@cd src; $(MAKE) clean
-+	@cd src && $(MAKE) clean
- 
- clean:  srcclean
--	@cd doc; $(MAKE) clean
-+	@cd doc && $(MAKE) clean
- 
--distclean: clean
-+distclean:
-+	@-$(MAKE) clean
- 	rm -f *~ config.cache config.log config.status install.inc \
- 	sysdep.inc src/config.h \
- 	lib/preferences \
-@@ -68,10 +71,10 @@
- 
- maintainer-clean: distclean
- 	rm -f icewm.spec icewm.lsm Makefile configure src/config.h.in
--	@cd doc; $(MAKE) maintainer-clean
-+	@cd doc && $(MAKE) maintainer-clean
- 
- check:
--	@cd src ; $(MAKE) check >/dev/null
-+	@cd src && $(MAKE) check >/dev/null
- 
- dist:	distclean docs configure
- 
-@@ -80,21 +83,23 @@
- 	@echo ------------------------------------------
- 	@echo "Installing binaries in $(DESTDIR)$(BINDIR)"
- 	@$(INSTALLDIR) "$(DESTDIR)$(BINDIR)"
-+#generated files, relative to the build directory
- 	@for bin in $(BINFILES); do \
-              $(INSTALLBIN) "$${bin}" "$(DESTDIR)$(BINDIR)"; \
-          done
- 	
- 	@echo "Installing presets and icons in $(DESTDIR)$(LIBDIR)"
- 	@$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)"
-+# data files from the source directory
- 	#-@$(INSTALLDIR) "$(DESTDIR)$(CFGDIR)"
- 	@for lib in $(LIBFILES); do \
--             $(INSTALLLIB) "$${lib}" "$(DESTDIR)$(LIBDIR)"; \
-+             $(INSTALLLIB) "$(top_srcdir)/$${lib}" "$(DESTDIR)$(LIBDIR)"; \
-          done
- 
- 	@for xpmdir in $(XPMDIRS); do \
--	     if test -d "lib/$${xpmdir}"; then \
-+	     if test -d "$(top_srcdir)/lib/$${xpmdir}"; then \
- 		$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
--		for pixmap in "lib/$${xpmdir}/"*.xpm; do \
-+		for pixmap in "$(top_srcdir)/lib/$${xpmdir}/"*.xpm; do \
- 		    $(INSTALLLIB) "$${pixmap}" "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
- 		done; \
- 	    fi; \
-@@ -126,7 +131,7 @@
- 
- install-nls: nls
- 	@echo ------------------------------------------
--	@cd po; $(MAKE) install
-+	@cd po && $(MAKE) install
- 	@echo ------------------------------------------
- 
- install-man:
diff --git a/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch b/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch
deleted file mode 100644
index 07e7e1344ed3..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index a6be36009957..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-deprecated.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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-gcc47.patch b/x11-wm/icewm/files/icewm-1.3.7-gcc47.patch
deleted file mode 100644
index c33adda1e982..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-gcc47.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=424888
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672089#24
-
---- a/src/yarray.h
-+++ b/src/yarray.h
-@@ -152,7 +152,7 @@ public:
-     }
- 
-     virtual void remove(const typename YArray<DataType *>::SizeType index) {
--        if (index < YArray<DataType *>::getCount()) delete getItem(index);
-+        if (index < YArray<DataType *>::getCount()) delete this->getItem(index);
-         YArray<DataType *>::remove(index);
-     }
-     
diff --git a/x11-wm/icewm/files/icewm-1.3.7-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.7-uclibc.patch
deleted file mode 100644
index e790842faed8..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-uclibc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur icewm-1.3.7.orig/configure.in icewm-1.3.7/configure.in
---- icewm-1.3.7.orig/configure.in	2010-10-31 10:09:37.000000000 -0400
-+++ icewm-1.3.7/configure.in	2013-10-19 06:20:22.947520430 -0400
-@@ -113,6 +113,7 @@
- AC_CHECK_HEADERS(libgen.h)	dnl --  basename() for FreeBSD
- AC_CHECK_HEADERS(machine/apmvar.h)
- AC_CHECK_HEADERS(machine/apm_bios.h)
-+AC_CHECK_HEADERS(execinfo.h)
- 
- AC_CHECK_HEADERS(kstat.h,
-   [ CORE_LIBS="${CORE_LIBS} -lkstat"
-diff -Naur icewm-1.3.7.orig/src/acpustatus.cc icewm-1.3.7/src/acpustatus.cc
---- icewm-1.3.7.orig/src/acpustatus.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/acpustatus.cc	2013-10-19 06:20:18.355519888 -0400
-@@ -25,17 +25,12 @@
- #include "sysdep.h"
- #include "default.h"
- 
--#if defined(linux)
--//#include <linux/kernel.h>
--#include <sys/sysinfo.h>
--#endif
- #if defined(sun) && defined(SVR4)
- #include <sys/loadavg.h>
- #endif
- #ifdef HAVE_KSTAT_H
- #include <sys/resource.h>
- #include <kstat.h>
--#include <sys/sysinfo.h>
- #endif
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -56,6 +51,10 @@
- #include <dirent.h>
- #include "intl.h"
- 
-+#if defined(linux) || defined(HAVE_KSTAT_H)
-+#include <sys/sysinfo.h>
-+#endif
-+
- #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
- 
- extern ref<YPixmap> taskbackPixmap;
-diff -Naur icewm-1.3.7.orig/src/misc.cc icewm-1.3.7/src/misc.cc
---- icewm-1.3.7.orig/src/misc.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/misc.cc	2013-10-19 06:20:22.947520430 -0400
-@@ -15,7 +15,7 @@
- #include <libgen.h>
- #endif
- 
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
- #include <execinfo.h>
- #endif
- 
-@@ -503,7 +503,7 @@
- }
- 
- void show_backtrace() {
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
-     const char head[] = "\nbacktrace:\n";
-     const char tail[] = "end\n";
-     void *array[20];
diff --git a/x11-wm/icewm/files/icewm-1.3.9-fribidi.patch b/x11-wm/icewm/files/icewm-1.3.9-fribidi.patch
new file mode 100644
index 000000000000..20fd29f96046
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.9-fribidi.patch
@@ -0,0 +1,80 @@
+--- icewm-1.3.9/configure.ac
++++ icewm-1.3.9/configure.ac
+@@ -53,6 +53,17 @@
+     features="$features i18n"
+ fi
+ 
++AC_ARG_ENABLE([fribidi],
++    AC_HELP_STRING([--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
++
+ AC_ARG_WITH([unicode-set],
+     AC_HELP_STRING([--with-unicode-set=CODESET],[Your iconv unicode set in
+ 	machine endian encoding (e.g. WCHAR_T, UCS-4-INTERNAL, UCS-4LE,
+--- icewm-1.3.9/src/yfontxft.cc
++++ icewm-1.3.9/src/yfontxft.cc
+@@ -6,6 +6,11 @@
+ #include "ypaint.h"
+ #include "yxapp.h"
+ #include "intl.h"
++#include <stdio.h>
++
++#ifdef CONFIG_FRIBIDI
++    #include <fribidi/fribidi.h>
++#endif
+ 
+ /******************************************************************************/
+ 
+@@ -69,10 +74,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,
diff --git a/x11-wm/icewm/files/icewm-menu.patch b/x11-wm/icewm/files/icewm-menu.patch
deleted file mode 100644
index d706c635d143..000000000000
--- a/x11-wm/icewm/files/icewm-menu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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-uclibc.patch b/x11-wm/icewm/files/icewm-uclibc.patch
deleted file mode 100644
index e7b273a6c397..000000000000
--- a/x11-wm/icewm/files/icewm-uclibc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- orig/icewm-1.2.21/src/acpustatus.cc	2005-05-31 14:23:48 -0500
-+++ work/icewm-1.2.21/src/acpustatus.cc	2005-08-03 18:29:29 -0500
-@@ -25,17 +25,12 @@
- #include "sysdep.h"
- #include "default.h"
- 
--#if defined(linux)
--//#include <linux/kernel.h>
--#include <sys/sysinfo.h>
--#endif
- #if defined(sun) && defined(SVR4)
- #include <sys/loadavg.h>
- #endif
- #ifdef HAVE_KSTAT_H
- #include <sys/resource.h>
- #include <kstat.h>
--#include <sys/sysinfo.h>
- #endif
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -54,6 +49,10 @@
- #include <sched.h>
- #endif
- 
-+#if defined(linux) || defined(HAVE_KSTAT_H)
-+#include <sys/sysinfo.h>
-+#endif
-+
- #include "intl.h"
- 
- #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
diff --git a/x11-wm/icewm/files/icewm-wmclient.patch b/x11-wm/icewm/files/icewm-wmclient.patch
deleted file mode 100644
index fbc9649689fe..000000000000
--- a/x11-wm/icewm/files/icewm-wmclient.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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/icewm-1.2.37.ebuild b/x11-wm/icewm/icewm-1.2.37.ebuild
deleted file mode 100644
index 81b0b1de00b1..000000000000
--- a/x11-wm/icewm/icewm-1.2.37.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.37.ebuild,v 1.11 2012/06/16 13:26:14 chithanh Exp $
-
-EAPI=1
-
-inherit eutils autotools
-
-DESCRIPTION="Ice Window Manager with Themes"
-
-HOMEPAGE="http://www.icewm.org/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-
-IUSE="gnome imlib nls truetype xinerama minimal debug uclibc"
-
-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? ( gnome-base/gnome-desktop:2
-		gnome-base/libgnomeui )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	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_unpack() {
-	unpack ${A}
-	cd "${S}/src"
-
-	use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
-
-	echo "#!/bin/sh" > "$T/icewm"
-	echo "/usr/bin/icewm-session" >> "$T/icewm"
-
-	cd "${S}"
-	#Fixing gnome2 support
-	epatch "${FILESDIR}/${P}-gnome2.patch"
-	# build fix for libX11-1.5.0, bug 420773
-	epatch "${FILESDIR}"/${PN}-1.2.37-libX11-1.5.0-deprecated.patch
-
-	eautoreconf
-}
-
-src_compile() {
-
-	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
-		--without-esd-config
-		$(use_enable gnome menus-gnome2)
-		$(use_enable nls)
-		$(use_enable nls i18n)
-		$(use_with imlib)
-		$(use_enable x86 x86-asm)
-		$(use_enable xinerama)
-		$(use_enable debug)"
-
-	CXXFLAGS="${CXXFLAGS}" econf ${myconf} || die "configure failed"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-
-	emake || die "emake failed"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe "$T/icewm"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/IceWM.desktop"
-}
-
-pkg_postinst() {
-	if use gnome; then
-		elog "You have enabled gnome USE flag which provides icewm-menu-gnome2 ."
-		elog "It is used internally and generates IceWM program menus from"
-		elog "FreeDesktop .desktop files"
-	fi
-}
diff --git a/x11-wm/icewm/icewm-1.3.7-r1.ebuild b/x11-wm/icewm/icewm-1.3.9.ebuild
index a453546eac3f..107e2ee226c3 100644
--- a/x11-wm/icewm/icewm-1.3.7-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.3.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.9 2013/12/13 08:04:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.9.ebuild,v 1.1 2014/11/02 19:13:45 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -8,13 +8,13 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 inherit autotools eutils python-single-r1
 
 DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/"
+HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
 LICENSE="GPL-2"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
+SRC_URI="http://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-IUSE="bidi debug gnome minimal nls truetype uclibc xinerama"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bidi debug doc gnome minimal nls truetype uclibc xinerama"
 REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
@@ -46,6 +46,7 @@ RDEPEND="
 	media-libs/giflib
 "
 DEPEND="${RDEPEND}
+	doc? ( app-text/linuxdoc-tools )
 	x11-proto/xproto
 	x11-proto/xextproto
 	xinerama? ( x11-proto/xineramaproto )
@@ -60,30 +61,26 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
+PATCHES=(
 	# 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
+	"${FILESDIR}"/${PN}-1.3.8-menu.patch
+	"${FILESDIR}"/${PN}-1.3.9-fribidi.patch
+	#"${FILESDIR}"/${PN}-1.3.7-dso.patch
+	"${FILESDIR}"/${PN}-1.3.8-deprecated.patch
 
 	# Debian patch fixing multiple build issues, like bug #470148
-	epatch "${FILESDIR}"/${PN}-1.3.7-build-fixes.patch
+	#"${FILESDIR}"/${PN}-1.3.8-build-fixes.patch
+)
+
+src_prepare() {
+	epatch ${PATCHES[@]}
 
 	# Fix bug #486710
-	use uclibc && epatch "${FILESDIR}/${P}-uclibc.patch"
+	use uclibc && epatch "${FILESDIR}/${PN}-1.3.8-uclibc.patch"
+
+	if ! use doc ; then
+		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
+	fi
 
 	eautoreconf
 }
@@ -106,9 +103,7 @@ src_configure() {
 		$(use_enable gnome menus-gnome2)
 		$(use_enable nls i18n)
 		$(use_enable nls)
-		$(use_enable x86 x86-asm)
-		$(use_enable xinerama)
-		--without-esd-config"
+		$(use_enable xinerama)"
 
 	CXXFLAGS="${CXXFLAGS}" econf ${myconf}
 
@@ -126,7 +121,12 @@ src_install(){
 	fi
 
 	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
+
+	if ! use doc ; then
+		dohtml -a html,sgml doc/*
+		cp doc/${PN}.man "${T}"/${PN}.1
+		doman "${T}"/${PN}.1
+	fi
 
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}/icewm"