Remove old unstable gnustep-base packages

Update etoile-wildmenus patch against unstable

svn path=/overlay/; revision=361

4 files changed, 40 insertions, 3 deletions

diff --git a/gnustep-libs/etoile-wildmenus/Manifest b/gnustep-libs/etoile-wildmenus/Manifest
index 9c76475..4c192cd 100644
--- a/gnustep-libs/etoile-wildmenus/Manifest
+++ b/gnustep-libs/etoile-wildmenus/Manifest
@@ -1,3 +1,4 @@
-AUX etoile-wildmenus-0.2-gnustep-base1.15.patch 350 RMD160 fa269bcbd8da1301f7bb223e7df2a01637944f02 SHA1 8e1cd9f957f7e5d95b163e861da41127e79ac6b3 SHA256 b6ae3167231b1d93be07ecc582e6cf9dd1c00a81f5566abc4c27ced595e814d4
+AUX etoile-wildmenus-0.2-gnustep-base-1.15.patch 350 RMD160 fa269bcbd8da1301f7bb223e7df2a01637944f02 SHA1 8e1cd9f957f7e5d95b163e861da41127e79ac6b3 SHA256 b6ae3167231b1d93be07ecc582e6cf9dd1c00a81f5566abc4c27ced595e814d4
+AUX etoile-wildmenus-0.2-gnustep-gui-0.13.1.patch 1120 RMD160 0c3f37f6985f8e67e9b9cbd5c6112982c9e7c240 SHA1 9950fd7e0aae28565daca409292931c93d8c34f5 SHA256 ac6cc60b93d0a1d96704ae90e6e5d3e0fa4d0bbf69c7f3bf67b5ce7fbcef07eb
 DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD etoile-wildmenus-0.2.ebuild 661 RMD160 7afa2c57f9a62e06eb7631742ea960190884bfa9 SHA1 aa1d5ce26ad0006c1b55a7b1e53c989e11eb5b0c SHA256 a6251f4f7cde31620f3f0e0497c84370e78c356f929261026531786d8f3a91b8
+EBUILD etoile-wildmenus-0.2.ebuild 714 RMD160 ea5c96e8e03c879b89c0f1dd896316ce789d39f3 SHA1 96b950fda11f8a0ccf393f9a9834d28f4d59f722 SHA256 1cfd21494a3049bb30968c6f3ffd95fdcb825b2b558911d8ed958ba669264e94
diff --git a/gnustep-libs/etoile-wildmenus/etoile-wildmenus-0.2.ebuild b/gnustep-libs/etoile-wildmenus/etoile-wildmenus-0.2.ebuild
index e4aaa12..b4c9f59 100644
--- a/gnustep-libs/etoile-wildmenus/etoile-wildmenus-0.2.ebuild
+++ b/gnustep-libs/etoile-wildmenus/etoile-wildmenus-0.2.ebuild
@@ -17,7 +17,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-gnustep-base1.15.patch
+	epatch "${FILESDIR}"/${P}-gnustep-base-1.15.patch
+	epatch "${FILESDIR}"/${P}-gnustep-gui-0.13.1.patch
 }
 
 gnustep_config_script() {
diff --git a/gnustep-libs/etoile-wildmenus/files/etoile-wildmenus-0.2-gnustep-base1.15.patch b/gnustep-libs/etoile-wildmenus/files/etoile-wildmenus-0.2-gnustep-base-1.15.patch
index fa8f872..fa8f872 100644
--- a/gnustep-libs/etoile-wildmenus/files/etoile-wildmenus-0.2-gnustep-base1.15.patch
+++ b/gnustep-libs/etoile-wildmenus/files/etoile-wildmenus-0.2-gnustep-base-1.15.patch
diff --git a/gnustep-libs/etoile-wildmenus/files/etoile-wildmenus-0.2-gnustep-gui-0.13.1.patch b/gnustep-libs/etoile-wildmenus/files/etoile-wildmenus-0.2-gnustep-gui-0.13.1.patch
new file mode 100644
index 0000000..2d51076
--- /dev/null
+++ b/gnustep-libs/etoile-wildmenus/files/etoile-wildmenus-0.2-gnustep-gui-0.13.1.patch
@@ -0,0 +1,35 @@
+--- trunk/Etoile/Bundles/EtoileWildMenus/NSMenu+Hackery.m.orig	2008-01-04 00:44:24.000000000 +0100
++++ trunk/Etoile/Bundles/EtoileWildMenus/NSMenu+Hackery.m	2008-01-04 00:46:07.000000000 +0100
+@@ -27,6 +27,8 @@
+ #include <AppKit/NSMenuView.h>
+ #include <AppKit/NSWindow.h>
+ 
++#include <GNUstepGUI/GSVersion.h>
++
+ #include "NSMenu+Hackery.h"
+ 
+ #import "MenuBarHeight.h"
+@@ -47,7 +49,11 @@
+ 
+ - (void) shiftOnScreen
+ {
++#if (GNUSTEP_GUI_MINOR_VERSION < 13)
+   NSWindow *theWindow = _transient ? _bWindow : _aWindow;
++#else
++  NSWindow *theWindow = _menu.transient ? _bWindow : _aWindow;
++#endif
+   NSRect    frameRect = [theWindow frame];
+   NSRect    screenRect = [[NSScreen mainScreen] frame];
+   NSPoint   vector    = {0.0, 0.0};
+@@ -103,7 +109,11 @@
+ - (void) _rightMouseDisplay: (NSEvent*)theEvent 
+ {
+   // enable context menus to function
++#if (GNUSTEP_GUI_MINOR_VERSION < 13)
+   if (_horizontal == NO && [(NSMenuView *) _view isHorizontal] == NO)
++#else
++  if (_menu.horizontal == NO && [(NSMenuView *) _view isHorizontal] == NO)
++#endif
+     {
+       [self displayTransient];
+       [_view mouseDown: theEvent];