Cleanup of windowmaker ebuild files, patches, etc

Package-Manager: portage-2.0.51.22-r1

19 files changed, 55 insertions, 345 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index d9c3fd5b7e48..d5f6df69c650 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.49 2005/06/23 22:06:48 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.50 2005/06/23 22:53:01 fafhrd Exp $
+
+  23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  -files/singleclick-shadeormaxopts-0.9x.patch,
+  +files/0.80.2/gtk2flickerfix.patch, -files/wlist-0.9x.patch,
+  +files/0.80.2/xinerama.patch.bz2,
+  +files/0.91.0/64bit+endian-fixes-0.9x.patch,
+  +files/0.91.0/maximize-fix-0.9x.patch, +files/0.91.0/wlist-0.9x.patch,
+  -files/singleclick-shadeormaxopts-0.9x.patch2,
+  +files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch,
+  +files/0.80.2/wlist.patch, +files/0.91.0/menufocus.patch,
+  -files/20_endian+64bit.diff,
+  +files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2,
+  -files/windowmaker-0.80.2-r1-gentoo.patch,
+  +files/0.80.2/trance.patch.WM-0.80.2.diff, +files/0.80.2/wmfpo.patch,
+  -files/gtk2flickerfix.patch, -files/64bit+endian-fixes-0.9x.patch,
+  -files/maximize-fix-0.9x.patch, -files/trance.patch.WM-0.80.2.diff,
+  -files/menufocus.patch, -files/wlist.patch, -files/wmfpo.patch,
+  -files/xinerama.patch.bz2, windowmaker-0.80.2-r2.ebuild,
+  windowmaker-0.80.2-r4.ebuild, windowmaker-0.91.0-r1.ebuild,
+  windowmaker-0.91.0-r7.ebuild:
+  Cleanup of windowmaker ebuild files, patches, etc
 
   23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
   -windowmaker-0.80.2-r3.ebuild, -windowmaker-0.91.0-r6.ebuild:
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 882510348422..4777c98cad62 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,24 +1,22 @@
-MD5 d34d8f12ade4ec45a61930d8327c1c6d windowmaker-0.91.0-r1.ebuild 5903
-MD5 f85c62f96342786ef1452bd97504d6ef windowmaker-0.80.2-r2.ebuild 3445
-MD5 1c6bba221de348c79f9e7037d96eaa7d windowmaker-0.80.2-r4.ebuild 4046
-MD5 f9b537f490464e93f0c67d491fa7cdf0 windowmaker-0.91.0-r7.ebuild 6766
-MD5 17b17914e8bfe0c81bbea2b1abe72f78 ChangeLog 12265
+MD5 d3046462a4dd550dcda85a7a5de6fb90 windowmaker-0.91.0-r1.ebuild 5910
+MD5 216067ab79cabdbd41540b5395ef7e02 windowmaker-0.80.2-r2.ebuild 3452
+MD5 a95454a71fe7aebc49bb65cb1b118d79 windowmaker-0.80.2-r4.ebuild 4083
+MD5 f4dafbfbc35ed1703384f98bd3ca8e0b windowmaker-0.91.0-r7.ebuild 6789
+MD5 62074ef1b97044187eeb4ad4fee23ebd ChangeLog 13361
 MD5 641b83c6027dc91a4ac14e1749a58b41 metadata.xml 222
-MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/trance.patch.WM-0.80.2.diff 9738
-MD5 3a5eaebd5ccf7d3384c042e13f52bef1 files/wlist-0.9x.patch 2980
-MD5 c8eb68627dc7b53b10143626018ff597 files/gtk2flickerfix.patch 1969
-MD5 0b1eb289596c8aa934b6c17362b0201c files/maximize-fix-0.9x.patch 1245
-MD5 c41215f830e33a636a440ce389db01eb files/menufocus.patch 1554
-MD5 c53a14e14931247288ba66cb017a9f42 files/64bit+endian-fixes-0.9x.patch 4831
-MD5 a062e261bd5aaca39bc17be01f07f1b6 files/wlist.patch 2776
-MD5 37aefa1e6f793583e8fa7890231d1721 files/wmfpo.patch 7696
-MD5 f0ba434033b1f1e0956a037076da0b9c files/20_endian+64bit.diff 2740
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r2 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r4 144
-MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/windowmaker-0.80.2-r1-gentoo.patch 4331
 MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r1 144
 MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r7 227
-MD5 e451189d91551534b18988709274b73b files/xinerama.patch.bz2 5908
-MD5 84bc0e347cd23ca347219959362afa91 files/singleclick-shadeormaxopts-0.9x.patch2 7788
 MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
-MD5 618ce508c693218a801d59c1b7909a07 files/singleclick-shadeormaxopts-0.9x.patch 8299
+MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/0.80.2/trance.patch.WM-0.80.2.diff 9738
+MD5 c8eb68627dc7b53b10143626018ff597 files/0.80.2/gtk2flickerfix.patch 1969
+MD5 a062e261bd5aaca39bc17be01f07f1b6 files/0.80.2/wlist.patch 2776
+MD5 37aefa1e6f793583e8fa7890231d1721 files/0.80.2/wmfpo.patch 7696
+MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331
+MD5 e451189d91551534b18988709274b73b files/0.80.2/xinerama.patch.bz2 5908
+MD5 3a5eaebd5ccf7d3384c042e13f52bef1 files/0.91.0/wlist-0.9x.patch 2980
+MD5 0b1eb289596c8aa934b6c17362b0201c files/0.91.0/maximize-fix-0.9x.patch 1245
+MD5 c41215f830e33a636a440ce389db01eb files/0.91.0/menufocus.patch 1554
+MD5 c53a14e14931247288ba66cb017a9f42 files/0.91.0/64bit+endian-fixes-0.9x.patch 4831
+MD5 84bc0e347cd23ca347219959362afa91 files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 7788
diff --git a/x11-wm/windowmaker/files/gtk2flickerfix.patch b/x11-wm/windowmaker/files/0.80.2/gtk2flickerfix.patch
index 188c6e3a031d..188c6e3a031d 100644
--- a/x11-wm/windowmaker/files/gtk2flickerfix.patch
+++ b/x11-wm/windowmaker/files/0.80.2/gtk2flickerfix.patch
diff --git a/x11-wm/windowmaker/files/trance.patch.WM-0.80.2.diff b/x11-wm/windowmaker/files/0.80.2/trance.patch.WM-0.80.2.diff
index c5ef62f76cee..c5ef62f76cee 100644
--- a/x11-wm/windowmaker/files/trance.patch.WM-0.80.2.diff
+++ b/x11-wm/windowmaker/files/0.80.2/trance.patch.WM-0.80.2.diff
diff --git a/x11-wm/windowmaker/files/windowmaker-0.80.2-r1-gentoo.patch b/x11-wm/windowmaker/files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch
index 75c081e86f49..75c081e86f49 100644
--- a/x11-wm/windowmaker/files/windowmaker-0.80.2-r1-gentoo.patch
+++ b/x11-wm/windowmaker/files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch
diff --git a/x11-wm/windowmaker/files/wlist.patch b/x11-wm/windowmaker/files/0.80.2/wlist.patch
index 4e24e6f0d211..4e24e6f0d211 100644
--- a/x11-wm/windowmaker/files/wlist.patch
+++ b/x11-wm/windowmaker/files/0.80.2/wlist.patch
diff --git a/x11-wm/windowmaker/files/wmfpo.patch b/x11-wm/windowmaker/files/0.80.2/wmfpo.patch
index 662e4949ee18..662e4949ee18 100644
--- a/x11-wm/windowmaker/files/wmfpo.patch
+++ b/x11-wm/windowmaker/files/0.80.2/wmfpo.patch
diff --git a/x11-wm/windowmaker/files/xinerama.patch.bz2 b/x11-wm/windowmaker/files/0.80.2/xinerama.patch.bz2
index 61d7417af13b..61d7417af13b 100644
--- a/x11-wm/windowmaker/files/xinerama.patch.bz2
+++ b/x11-wm/windowmaker/files/0.80.2/xinerama.patch.bz2
diff --git a/x11-wm/windowmaker/files/64bit+endian-fixes-0.9x.patch b/x11-wm/windowmaker/files/0.91.0/64bit+endian-fixes-0.9x.patch
index c922fc965789..c922fc965789 100644
--- a/x11-wm/windowmaker/files/64bit+endian-fixes-0.9x.patch
+++ b/x11-wm/windowmaker/files/0.91.0/64bit+endian-fixes-0.9x.patch
diff --git a/x11-wm/windowmaker/files/maximize-fix-0.9x.patch b/x11-wm/windowmaker/files/0.91.0/maximize-fix-0.9x.patch
index 553b05c1ffb3..553b05c1ffb3 100644
--- a/x11-wm/windowmaker/files/maximize-fix-0.9x.patch
+++ b/x11-wm/windowmaker/files/0.91.0/maximize-fix-0.9x.patch
diff --git a/x11-wm/windowmaker/files/menufocus.patch b/x11-wm/windowmaker/files/0.91.0/menufocus.patch
index f913777bcb26..f913777bcb26 100644
--- a/x11-wm/windowmaker/files/menufocus.patch
+++ b/x11-wm/windowmaker/files/0.91.0/menufocus.patch
diff --git a/x11-wm/windowmaker/files/singleclick-shadeormaxopts-0.9x.patch2 b/x11-wm/windowmaker/files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2
index dd37b92c5e94..dd37b92c5e94 100644
--- a/x11-wm/windowmaker/files/singleclick-shadeormaxopts-0.9x.patch2
+++ b/x11-wm/windowmaker/files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2
diff --git a/x11-wm/windowmaker/files/wlist-0.9x.patch b/x11-wm/windowmaker/files/0.91.0/wlist-0.9x.patch
index c165cce2e545..c165cce2e545 100644
--- a/x11-wm/windowmaker/files/wlist-0.9x.patch
+++ b/x11-wm/windowmaker/files/0.91.0/wlist-0.9x.patch
diff --git a/x11-wm/windowmaker/files/20_endian+64bit.diff b/x11-wm/windowmaker/files/20_endian+64bit.diff
deleted file mode 100644
index 1acf3d991c5d..000000000000
--- a/x11-wm/windowmaker/files/20_endian+64bit.diff
+++ /dev/null
@@ -1,82 +0,0 @@
---- WindowMaker-0.91.0/src/wmspec.c.old	2004-10-24 21:36:15.000000000 +0200
-+++ WindowMaker-0.91.0/src/wmspec.c	2004-12-09 18:29:00.000000000 +0100
-@@ -27,6 +27,7 @@
- 
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
-+#include <X11/Xarch.h>
- #include <string.h>
- 
- #include "WindowMaker.h"
-@@ -382,40 +383,54 @@
-                                 &nitems_return, &bytes_after_return, &prop_return);
- 
-     if (rc==Success && prop_return) {
--        unsigned int *data = (unsigned int *)prop_return;
-+        unsigned long *data = (unsigned long *)prop_return;
-         unsigned int pos = 0, len = 0;
-         unsigned int best_pos = 0, best_tmp = ~0;
-+        unsigned int tmp;
-         extern WPreferences wPreferences;
-         unsigned int pref_size = wPreferences.icon_size;
-         unsigned int pref_sq = pref_size*pref_size;
--        char *src, *dst;
-+        unsigned char *src, *dst;
-         RImage *new_rimage;
- 
-         do {
-             len = data[pos+0]*data[pos+1];
--            unsigned int tmp = pref_sq-len;
-+            tmp = pref_sq-len;
-             if (tmp < best_tmp && tmp > 0) {
-                 best_tmp = tmp;
--                best_pos = pos;
-+                best_pos = pos+2;
-             }
-             pos += 2+len;
-         } while (pos < nitems_return && len != 0);
- 
--        new_rimage = RCreateImage(data[best_pos+0], data[best_pos+1], True);
--        len = data[best_pos+0] * data[best_pos+1];
--        src = (char*)&data[best_pos+2];
--        dst = new_rimage->data;
--        for (pos=0; pos<len; ++pos, src+=4, dst+=4) {
--            dst[0] = src[2]; /* R */
--            dst[1] = src[1]; /* G */
--            dst[2] = src[0]; /* B */
--            dst[3] = src[3]; /* A */
--        }
-+	if ( best_pos < 2 )  best_pos = 2;
-+
-+        new_rimage = RCreateImage(data[best_pos-2], data[best_pos-1], True);
- 
-         if (new_rimage) {
--            if (wwin->net_icon_image)
--                RReleaseImage(wwin->net_icon_image);
--            wwin->net_icon_image = new_rimage;
-+          len = data[best_pos-2] * data[best_pos-1];
-+          dst = new_rimage->data;
-+
-+	  for (pos = best_pos; pos < best_pos + len; pos++, dst += 4) {
-+	    src = (unsigned char *) &data[pos];
-+
-+#if BYTE_ORDER == BIG_ENDIAN
-+	    src += sizeof(unsigned long) - 4;
-+	    dst[0] = src[1]; /* R */
-+	    dst[1] = src[2]; /* G */
-+	    dst[2] = src[3]; /* B */
-+	    dst[3] = src[0]; /* A */
-+#else /* Little endian */
-+	    dst[0] = src[2]; /* R */
-+	    dst[1] = src[1]; /* G */
-+	    dst[2] = src[0]; /* B */
-+	    dst[3] = src[3]; /* A */
-+#endif /* endianness */
-+	  }
-+
-+	  if (wwin->net_icon_image)
-+	    RReleaseImage(wwin->net_icon_image);
-+	  wwin->net_icon_image = new_rimage;
-         }
- 
-         XFree(prop_return);
diff --git a/x11-wm/windowmaker/files/singleclick-shadeormaxopts-0.9x.patch b/x11-wm/windowmaker/files/singleclick-shadeormaxopts-0.9x.patch
deleted file mode 100644
index 000a3b45f0c7..000000000000
--- a/x11-wm/windowmaker/files/singleclick-shadeormaxopts-0.9x.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff -ur WindowMaker-0.91.0/WPrefs.app/Expert.c WindowMaker-0.91.0-test/WPrefs.app/Expert.c
---- WindowMaker-0.91.0/WPrefs.app/Expert.c	2004-10-22 23:04:38.000000000 -0400
-+++ WindowMaker-0.91.0-test/WPrefs.app/Expert.c	2005-03-13 14:44:03.428047768 -0500
-@@ -54,9 +54,10 @@
-     WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill"));
-     WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking"));
-     WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText"));
-+    WMSetButtonSelected(panel->swi[7], GetBoolForKey("DCMaximize"));
-+    WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch"));
- }
- 
--
- static void
- createPanel(Panel *p)
- {
-@@ -66,10 +67,10 @@
-     panel->box = WMCreateBox(panel->parent);
-     WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
- 
--    for (i=0; i<7; i++) {
-+    for (i=0; i<9; i++) {
-         panel->swi[i] = WMCreateSwitchButton(panel->box);
-         WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
--        WMMoveWidget(panel->swi[i], 20, 20+i*25);
-+        WMMoveWidget(panel->swi[i], 20, 20+i*23);
-     }
- 
-     WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."));
-@@ -81,6 +82,9 @@
-     WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart)."));
- 
-     WMSetButtonEnabled(panel->swi[6], True);
-+    WMSetButtonText(panel->swi[7], _("Double click on title bar maximize"));
-+    WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click"));
-+
- 
-     WMRealizeWidget(panel->box);
-     WMMapSubwidgets(panel->box);
-@@ -103,6 +107,8 @@
-     SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill");
-     SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking");
-     SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText");
-+    SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "DCMaximize");
-+    SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch");
- }
- 
- 
-diff -ur WindowMaker-0.91.0/src/WindowMaker.h WindowMaker-0.91.0-test/src/WindowMaker.h
---- WindowMaker-0.91.0/src/WindowMaker.h	2004-10-24 21:48:39.000000000 -0400
-+++ WindowMaker-0.91.0-test/src/WindowMaker.h	2005-03-13 14:44:03.430047464 -0500
-@@ -466,6 +466,12 @@
-     /* shading animation */
-     signed char shade_speed;
- 
-+    /* double click on title bar maximize */
-+    char dc_maximize;
-+
-+    /* single click to lauch applications */
-+    char single_click;
-+
-     int edge_resistance;
-     char attract;
- 
-diff -ur WindowMaker-0.91.0/src/appicon.c WindowMaker-0.91.0-test/src/appicon.c
---- WindowMaker-0.91.0/src/appicon.c	2004-10-14 13:31:49.000000000 -0400
-+++ WindowMaker-0.91.0-test/src/appicon.c	2005-03-13 14:44:03.432047160 -0500
-@@ -585,6 +585,7 @@
-     int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;
-     int ix, iy;
-     int clickButton = event->xbutton.button;
-+    Bool hasMoved = False;
-     Pixmap ghost = None;
-     Window wins[2];
-     Bool movingSingle = False;
-@@ -665,6 +666,7 @@
-             break;
- 
-         case MotionNotify:
-+            hasMoved = True;
-             if (!grabbed) {
-                 if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
-                     || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
-@@ -802,6 +804,9 @@
-             if (wPreferences.auto_arrange_icons)
-                 wArrangeIcons(scr, True);
- 
-+            if (!hasMoved && wPreferences.single_click)
-+                iconDblClick(desc, event);
-+
-             done = 1;
-             break;
-         }
-diff -ur WindowMaker-0.91.0/src/defaults.c WindowMaker-0.91.0-test/src/defaults.c
---- WindowMaker-0.91.0/src/defaults.c	2004-10-25 21:13:50.000000000 -0400
-+++ WindowMaker-0.91.0-test/src/defaults.c	2005-03-13 14:44:03.436046552 -0500
-@@ -556,6 +556,12 @@
-     {"DisableBlinking",	"NO",		NULL,
-     &wPreferences.dont_blink,	getBool,	NULL
-     },
-+    {"DCMaximize", "NO",               NULL,
-+    &wPreferences.dc_maximize,   getBool,        NULL
-+    },
-+    {"SingleClickLaunch", "NO",                NULL,
-+    &wPreferences.single_click,  getBool,        NULL
-+    },
-     /* style options */
-     {"MenuStyle", 	"normal",  		seMenuStyles,
-     &wPreferences.menu_style, getEnum, 	setMenuStyle
-diff -ur WindowMaker-0.91.0/src/dock.c WindowMaker-0.91.0-test/src/dock.c
---- WindowMaker-0.91.0/src/dock.c	2004-10-22 23:10:40.000000000 -0400
-+++ WindowMaker-0.91.0-test/src/dock.c	2005-03-13 14:52:34.738316792 -0500
-@@ -3758,7 +3758,7 @@
- 
- 
- 
--static void
-+static Bool
- handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
- {
-     WScreen *scr = dock->screen_ptr;
-@@ -3774,6 +3774,7 @@
-     int tmp;
-     Pixmap ghost = None;
-     Bool docked;
-+    Bool hasMoved = False;
-     int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
-     int omnipresent = aicon->omnipresent; /* this must be cached!!! */
- 
-@@ -3828,6 +3829,7 @@
-             break;
- 
-         case MotionNotify:
-+	    hasMoved = True;
-             if (!grabbed) {
-                 if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
-                     || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {
-@@ -3977,7 +3979,7 @@
- #ifdef DEBUG
-             puts("End icon move");
- #endif
--            return;
-+            return hasMoved;
-         }
-     }
- }
-@@ -4114,10 +4116,11 @@
-             if (getClipButton(event->xbutton.x, event->xbutton.y)!=CLIP_IDLE
-                 && dock->type==WM_CLIP)
-                 handleClipChangeWorkspace(scr, event);
--            else
--                handleDockMove(dock, aicon, event);
--        } else
--            handleIconMove(dock, aicon, event);
-+            } else {
-+                Bool hasMoved = handleIconMove(dock, aicon, event);
-+                if (!hasMoved && wPreferences.single_click)
-+                   iconDblClick(desc, event);
-+                }
- 
-     } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
-                aicon==scr->clip_icon) {
-diff -ur WindowMaker-0.91.0/src/icon.c WindowMaker-0.91.0-test/src/icon.c
---- WindowMaker-0.91.0/src/icon.c	2004-10-16 18:16:21.000000000 -0400
-+++ WindowMaker-0.91.0-test/src/icon.c	2005-03-13 14:44:03.443045488 -0500
-@@ -891,6 +891,7 @@
-     int dx=event->xbutton.x, dy=event->xbutton.y;
-     int grabbed=0;
-     int clickButton=event->xbutton.button;
-+    Bool hasMoved = False;
- 
-     if (WCHECK_STATE(WSTATE_MODAL))
-         return;
-@@ -942,6 +943,7 @@
-             break;
- 
-         case MotionNotify:
-+	    hasMoved = True;
-             if (!grabbed) {
-                 if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
-                     || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
-@@ -979,6 +981,9 @@
- 
-             if (wPreferences.auto_arrange_icons)
-                 wArrangeIcons(wwin->screen_ptr, True);
-+            if (!hasMoved && wPreferences.single_click)
-+                miniwindowDblClick(desc, event);
-+
-             return;
- 
-         }
-diff -ur WindowMaker-0.91.0/src/window.c WindowMaker-0.91.0-test/src/window.c
---- WindowMaker-0.91.0/src/window.c	2004-10-22 23:11:10.000000000 -0400
-+++ WindowMaker-0.91.0-test/src/window.c	2005-03-13 14:44:03.446045032 -0500
-@@ -3100,13 +3100,29 @@
- 
-     if (event->xbutton.button==Button1) {
-         if (event->xbutton.state == 0) {
--            if (!WFLAGP(wwin, no_shadeable)) {
-+           /* check preferences, maximize or shade */
-+           if (wPreferences.dc_maximize) {
-+              if (!WFLAGP(wwin, no_resizable)) {
-+                 /* maximize window */
-+                 if (wwin->flags.maximized != 0) {
-+                    wUnmaximizeWindow(wwin);
-+                    wwin->flags.maximized = 0;
-+                 }
-+                 else {
-+                    wMaximizeWindow(wwin, MAX_VERTICAL|MAX_HORIZONTAL);
-+                    wwin->flags.maximized = MAX_VERTICAL|MAX_HORIZONTAL;
-+                 }
-+              }
-+           }
-+	   else {
-+             if (!WFLAGP(wwin, no_shadeable)) {
-                 /* shade window */
-                 if (wwin->flags.shaded)
--                    wUnshadeWindow(wwin);
-+                   wUnshadeWindow(wwin);
-                 else
--                    wShadeWindow(wwin);
--            }
-+                   wShadeWindow(wwin);
-+           }
-+     }
-         } else {
-             int dir = 0;
- 
diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
index 89a40ca9d566..153e0fe0bebb 100644
--- a/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild,v 1.9 2005/03/18 02:03:07 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild,v 1.10 2005/06/23 22:53:01 fafhrd Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ KEYWORDS="x86 ppc sparc alpha ~mips"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.80.2-r1-gentoo.patch
+	epatch ${FILESDIR}/${PV}/${PN}-0.80.2-r1-gentoo.patch
 }
 
 src_compile() {
diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
index 15675fd9a39c..6fb42046dd68 100644
--- a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.9 2005/03/18 02:03:07 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.10 2005/06/23 22:53:01 fafhrd Exp $
 
 inherit eutils flag-o-matic
 filter-mfpmath "sse" "387"
@@ -32,26 +32,26 @@ KEYWORDS="~x86 ppc ~sparc ~alpha ~mips amd64 ppc64"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.80.2-r1-gentoo.patch
+	epatch ${FILESDIR}/${PV}/${PN}-0.80.2-r1-gentoo.patch
 
 	# scroll with the arrow keys
 	cd ${S}/WINGs
-	epatch ${FILESDIR}/wlist.patch
+	epatch ${FILESDIR}/${PV}/wlist.patch
 
 	# transparency/translucency
 	cd ${S}
-	epatch ${FILESDIR}/trance.patch.WM-0.80.2.diff
+	epatch ${FILESDIR}/${PV}/trance.patch.WM-0.80.2.diff
 
 	# Add some BETTER xinerama support
-	use xinerama && epatch ${FILESDIR}/xinerama.patch.bz2
+	use xinerama && epatch ${FILESDIR}/${PV}/xinerama.patch.bz2
 
 	# Fix GTK2 window flickering bug
-	epatch ${FILESDIR}/gtk2flickerfix.patch
+	epatch ${FILESDIR}/${PV}/gtk2flickerfix.patch
 
 	# Add options to WPrefs for single-click launching of windows
 	# and maximize vs. shading when double-click on titlebars
 	# http://orbita.starmedia.com/~neofpo/home.html
-	epatch ${FILESDIR}/wmfpo.patch
+	epatch ${FILESDIR}/${PV}/wmfpo.patch
 }
 
 src_compile() {
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
index 6ce5f59a81df..c8ac4845a472 100644
--- a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.13 2005/04/07 17:24:12 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.14 2005/06/23 22:53:01 fafhrd Exp $
 
 inherit eutils gnustep-funcs
 
@@ -33,7 +33,7 @@ fi
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/menufocus.patch || die "menu focus patch failed"
+	epatch ${FILESDIR}/${PV}/menufocus.patch || die "menu focus patch failed"
 }
 
 src_compile() {
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
index 0064b4878ca0..869fe5fabb23 100644
--- a/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild,v 1.1 2005/06/23 22:01:34 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild,v 1.2 2005/06/23 22:53:01 fafhrd Exp $
 
 inherit eutils gnustep-funcs flag-o-matic
 
@@ -36,11 +36,11 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${WORKDIR}/windowmaker-0.9X-use-giflib.patch3 || die "giflib patch failed"
-	epatch ${FILESDIR}/menufocus.patch || die "menu focus patch failed"
-	epatch ${FILESDIR}/singleclick-shadeormaxopts-0.9x.patch2 || die "single click and shade-or-maximize-options patch failed"
-	epatch ${FILESDIR}/wlist-0.9x.patch || die "window list patch failed"
-	epatch ${FILESDIR}/64bit+endian-fixes-0.9x.patch || die "64-bit + endian fix patch failed"
-	epatch ${FILESDIR}/maximize-fix-0.9x.patch || die "64-bit + endian fix patch failed"
+	epatch ${FILESDIR}/${PV}/menufocus.patch || die "menu focus patch failed"
+	epatch ${FILESDIR}/${PV}/singleclick-shadeormaxopts-0.9x.patch2 || die "single click and shade-or-maximize-options patch failed"
+	epatch ${FILESDIR}/${PV}/wlist-0.9x.patch || die "window list patch failed"
+	epatch ${FILESDIR}/${PV}/64bit+endian-fixes-0.9x.patch || die "64-bit + endian fix patch failed"
+	epatch ${FILESDIR}/${PV}/maximize-fix-0.9x.patch || die "maximize fix patch failed"
 }
 
 src_compile() {