Replace headers patches with cleaner one from Debian, fixes bug #331431 at the same time

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 334 insertions, 74 deletions

diff --git a/gnustep-apps/projectmanager/ChangeLog b/gnustep-apps/projectmanager/ChangeLog
index be7376e2d63e..46ca2268ba11 100644
--- a/gnustep-apps/projectmanager/ChangeLog
+++ b/gnustep-apps/projectmanager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-apps/projectmanager
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectmanager/ChangeLog,v 1.6 2008/03/08 13:42:12 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectmanager/ChangeLog,v 1.7 2010/08/20 14:53:15 voyageur Exp $
+
+  20 Aug 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  projectmanager-0.2.ebuild,
+  -files/projectmanager-0.2-gnustep-base1.15.patch,
+  -files/projectmanager-0.2-gui12.patch,
+  +files/projectmanager-0.2-missing_includes.patch:
+  Replace headers patches with cleaner one from Debian, fixes bug #331431 at
+  the same time
 
   08 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
   projectmanager-0.2.ebuild:
diff --git a/gnustep-apps/projectmanager/Manifest b/gnustep-apps/projectmanager/Manifest
index ef2fdd76dd87..0276f4f08af4 100644
--- a/gnustep-apps/projectmanager/Manifest
+++ b/gnustep-apps/projectmanager/Manifest
@@ -1,7 +1,6 @@
-AUX projectmanager-0.2-gnustep-base1.15.patch 1153 RMD160 67cb55e5806f6e85f15536231db9c56908b2708a SHA1 0aafc5bf48b7eeb7ceb6dcac31d50344827a1955 SHA256 4acee21c58694f0d7c407141607500dc75e243ab4fa88dc2ef3ad9b4945254ca
-AUX projectmanager-0.2-gui12.patch 1606 RMD160 4886990f25dabd2ef231b5eacc62bd3cad968386 SHA1 ef82e81684664cdd56447f12a91b6520e65d9dd0 SHA256 ff2e251d7fd3dcd3c2d4f027138363e3ce2275f0d558d79f75fc8d5be085933a
+AUX projectmanager-0.2-missing_includes.patch 13420 RMD160 f27ea1a5e4d10a22fbd86929fed309a2df1690ed SHA1 ba6529cfee802c6ea9910060edd4563b43f118f5 SHA256 a2e3b672a567a94b8056463a0a555da5e424ce77041a31f156baa2d6ed77da16
 AUX projectmanager-0.2-pathdomainmask.patch 385 RMD160 89e2868fc18530c427fb5e67e8ab00011c62ada1 SHA1 ce6dc42241974931cca3408b09e89e96b6538e4e SHA256 c035fbb5eda90c2042b6cd20641b286774ef6312cb2997d2ce6e81cfc44637eb
 DIST ProjectManager-0.2.tar.bz2 378748 RMD160 5e33cbc2a28d5d22adee8b3ec8a54667deccefc8 SHA1 c48e0e465c7c603c4da09f9765d92903834496a1 SHA256 4a8f6b77d4e621ce58cf433828b8f28aaf99cdf7a685362990ab4f42106d0fea
-EBUILD projectmanager-0.2.ebuild 838 RMD160 2201315b99d7d4231a91eea8dd6354a43ab707ef SHA1 812debd4417862c517736acadfa4548b9a050efa SHA256 2d4e49f50e1d74e5214e4f053ca4f220b9dd8734643c56580cde52b1935c0ded
-MISC ChangeLog 1244 RMD160 c4ae1fc1bf80148e65cad8944d697644862ed14c SHA1 6b8a13ecfb9d19a36fe9e0bb8441625e964d55f5 SHA256 e9e04d76982c329579e9dbc3a6547250e215e821abbd26697cf79fb60d6c2b4a
+EBUILD projectmanager-0.2.ebuild 807 RMD160 714baf394b41986782ad790c9dd2005b8a41317d SHA1 a228375c5f9ddb307f23a948bb210671ae9b5d5a SHA256 308b4f08b671c6d3b5529334a6fd7d6eaaba8b6ea1c6df3176cdb4d575a4ccbf
+MISC ChangeLog 1567 RMD160 c7957dad94e1faa044200ba7e55e8a1995d2d32f SHA1 e73c396c04a6abfab4b3eb743fefb5df3734b18b SHA256 b9d013b039abb346a7006b8461c9154b5306b1761b763e5b18d41a25a0744a9b
 MISC metadata.xml 418 RMD160 c721e253d72de18e78c9d39ad957c7c19323fd91 SHA1 edea8ce24c9a9c43a5c67f5cfd54673c2652edce SHA256 0fb43f4cc28c07bba2a7c9cda8f883ef355fd74a73bac8b93ba97124664303f2
diff --git a/gnustep-apps/projectmanager/files/projectmanager-0.2-gnustep-base1.15.patch b/gnustep-apps/projectmanager/files/projectmanager-0.2-gnustep-base1.15.patch
deleted file mode 100644
index b31a7546045e..000000000000
--- a/gnustep-apps/projectmanager/files/projectmanager-0.2-gnustep-base1.15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- ProjectManager-0.2/EditorRulerView.m.orig	2007-12-10 11:17:35.000000000 +0100
-+++ ProjectManager-0.2/EditorRulerView.m	2007-12-10 11:20:18.000000000 +0100
-@@ -23,6 +23,7 @@
- 
- #import "EditorRulerView.h"
- 
-+#import <AppKit/NSAttributedString.h>
- #import <AppKit/NSColor.h>
- #import <AppKit/NSEvent.h>
- #import <AppKit/NSFont.h>
---- ProjectManager-0.2/SourceEditorDocument.m.orig	2007-12-10 11:21:49.000000000 +0100
-+++ ProjectManager-0.2/SourceEditorDocument.m	2007-12-10 11:22:11.000000000 +0100
-@@ -33,6 +33,7 @@
- #import <Foundation/NSUserDefaults.h>
- #import <Foundation/NSValue.h>
- 
-+#import <AppKit/NSAttributedString.h>
- #import <AppKit/NSFont.h>
- #import <AppKit/NSImage.h>
- #import <AppKit/NSLayoutManager.h>
---- ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m.orig	2007-12-10 11:25:00.000000000 +0100
-+++ ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m	2007-12-10 11:25:18.000000000 +0100
-@@ -30,6 +30,7 @@
- #import <Foundation/NSTask.h>
- #import <Foundation/NSUserDefaults.h>
- 
-+#import <AppKit/NSAttributedString.h>
- #import <AppKit/NSButton.h>
- #import <AppKit/NSCell.h>
- #import <AppKit/NSDocumentController.h>
diff --git a/gnustep-apps/projectmanager/files/projectmanager-0.2-gui12.patch b/gnustep-apps/projectmanager/files/projectmanager-0.2-gui12.patch
deleted file mode 100644
index a69ccff5a859..000000000000
--- a/gnustep-apps/projectmanager/files/projectmanager-0.2-gui12.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur pmanager-0.2.orig/ProjectManager-0.2/Controller.m pmanager-0.2/ProjectManager-0.2/Controller.m
---- pmanager-0.2.orig/ProjectManager-0.2/Controller.m	2007-06-30 09:36:45.000000000 +0200
-+++ pmanager-0.2/ProjectManager-0.2/Controller.m	2007-06-30 09:37:17.000000000 +0200
-@@ -29,6 +29,8 @@
- #import <Foundation/NSFileManager.h>
- #import <Foundation/NSUserDefaults.h>
- #import <Foundation/NSNotification.h>
-+#import <Foundation/NSError.h>
-+#import <Foundation/NSDebug.h> 
- 
- #import <AppKit/NSOpenPanel.h>
- #import <AppKit/NSView.h>
-diff -Naur pmanager-0.2.orig/ProjectManager-0.2/ProjectCreator.m pmanager-0.2/ProjectManager-0.2/ProjectCreator.m
---- pmanager-0.2.orig/ProjectManager-0.2/ProjectCreator.m	2007-06-30 09:36:45.000000000 +0200
-+++ pmanager-0.2/ProjectManager-0.2/ProjectCreator.m	2007-06-30 09:37:26.000000000 +0200
-@@ -27,6 +27,7 @@
- #import <Foundation/NSUserDefaults.h>
- #import <Foundation/NSNotification.h>
- #import <Foundation/NSError.h>
-+#import <Foundation/NSProcessInfo.h> 
- 
- #import <AppKit/NSOpenPanel.h>
- #import <AppKit/NSView.h>
-diff -Naur pmanager-0.2.orig/ProjectManager-0.2/ProjectDocument.m pmanager-0.2/ProjectManager-0.2/ProjectDocument.m
---- pmanager-0.2.orig/ProjectManager-0.2/ProjectDocument.m	2007-06-30 09:36:45.000000000 +0200
-+++ pmanager-0.2/ProjectManager-0.2/ProjectDocument.m	2007-06-30 09:37:38.000000000 +0200
-@@ -28,6 +28,7 @@
- #import <Foundation/NSDictionary.h>
- #import <Foundation/NSUserDefaults.h>
- #import <Foundation/NSProcessInfo.h>
-+#import <Foundation/NSError.h>
- 
- #import <AppKit/NSWorkspace.h>
- #import <AppKit/NSDocumentController.h>
diff --git a/gnustep-apps/projectmanager/files/projectmanager-0.2-missing_includes.patch b/gnustep-apps/projectmanager/files/projectmanager-0.2-missing_includes.patch
new file mode 100644
index 000000000000..e6e8d864ccc5
--- /dev/null
+++ b/gnustep-apps/projectmanager/files/projectmanager-0.2-missing_includes.patch
@@ -0,0 +1,317 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_missing_includes.dpatch by Yavor Doganov <yavor@gnu.org>
+##
+## DP: Fixes to build with recent GNUstep Base and GNUstep Make.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/Controller.m projectmanager.app-0.2/ProjectManager-0.2/Controller.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/Controller.m	2010-05-21 12:25:06.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/Controller.m	2010-05-21 12:25:18.000000000 +0300
+@@ -23,21 +23,7 @@
+ 
+ #import "Controller.h"
+ 
+-#import <Foundation/NSBundle.h>
+-#import <Foundation/NSSortDescriptor.h>
+-#import <Foundation/NSString.h>
+-#import <Foundation/NSFileManager.h>
+-#import <Foundation/NSUserDefaults.h>
+-#import <Foundation/NSNotification.h>
+-
+-#import <AppKit/NSOpenPanel.h>
+-#import <AppKit/NSView.h>
+-#import <AppKit/NSNibLoading.h>
+-#import <AppKit/NSTextField.h>
+-#import <AppKit/NSDocumentController.h>
+-#import <AppKit/NSMenu.h>
+-#import <AppKit/NSMenuItem.h>
+-#import <AppKit/NSApplication.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "Preferences.h"
+ #import "ProjectCreator.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/EditorRulerView.m projectmanager.app-0.2/ProjectManager-0.2/EditorRulerView.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/EditorRulerView.m	2010-05-21 12:25:06.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/EditorRulerView.m	2010-05-21 12:25:18.000000000 +0300
+@@ -23,17 +23,7 @@
+ 
+ #import "EditorRulerView.h"
+ 
+-#import <AppKit/NSColor.h>
+-#import <AppKit/NSEvent.h>
+-#import <AppKit/NSFont.h>
+-#import <AppKit/NSGraphics.h>
+-#import <AppKit/NSScrollView.h>
+-#import <AppKit/NSStringDrawing.h>
+-#import <AppKit/NSWindow.h>
+-#import <AppKit/PSOperators.h>
+-
+-#import <Foundation/NSKeyedArchiver.h>
+-#import <Foundation/NSUserDefaults.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "EditorTextView.h"
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/Preferences.m projectmanager.app-0.2/ProjectManager-0.2/Preferences.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/Preferences.m	2010-05-21 12:25:06.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/Preferences.m	2010-05-21 12:25:18.000000000 +0300
+@@ -22,15 +22,7 @@
+ 
+ #import "Preferences.h"
+ 
+-#import <Foundation/NSBundle.h>
+-#import <Foundation/NSString.h>
+-#import <Foundation/NSArray.h>
+-#import <Foundation/NSDictionary.h>
+-
+-#import <AppKit/NSNibLoading.h>
+-#import <AppKit/NSBox.h>
+-#import <AppKit/NSPopUpButton.h>
+-#import <AppKit/NSPanel.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "PreferencesModule.h"
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectCreator.m projectmanager.app-0.2/ProjectManager-0.2/ProjectCreator.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/ProjectCreator.m	2010-05-21 12:25:17.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/ProjectCreator.m	2010-05-21 12:25:18.000000000 +0300
+@@ -20,27 +20,7 @@
+ 
+ #import "ProjectCreator.h"
+ 
+-#import <Foundation/NSBundle.h>
+-#import <Foundation/NSSortDescriptor.h>
+-#import <Foundation/NSString.h>
+-#import <Foundation/NSFileManager.h>
+-#import <Foundation/NSUserDefaults.h>
+-#import <Foundation/NSNotification.h>
+-#import <Foundation/NSError.h>
+-
+-#import <AppKit/NSOpenPanel.h>
+-#import <AppKit/NSView.h>
+-#import <AppKit/NSNibLoading.h>
+-#import <AppKit/NSTextField.h>
+-#import <AppKit/NSDocumentController.h>
+-#import <AppKit/NSMenu.h>
+-#import <AppKit/NSMenuItem.h>
+-#import <AppKit/NSApplication.h>
+-#import <AppKit/NSForm.h>
+-#import <AppKit/NSFormCell.h>
+-#import <AppKit/NSScrollView.h>
+-#import <AppKit/NSButton.h>
+-#import <AppKit/NSOutlineView.h>
++#import <AppKit/AppKit.h>
+ 
+ #import <../WizardKit-0.1/WizardKit.h>
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectDocument.m projectmanager.app-0.2/ProjectManager-0.2/ProjectDocument.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/ProjectDocument.m	2010-05-21 12:25:06.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/ProjectDocument.m	2010-05-21 12:25:18.000000000 +0300
+@@ -23,18 +23,7 @@
+ 
+ #import "ProjectDocument.h"
+ 
+-#import <Foundation/NSString.h>
+-#import <Foundation/NSArray.h>
+-#import <Foundation/NSDictionary.h>
+-#import <Foundation/NSUserDefaults.h>
+-#import <Foundation/NSProcessInfo.h>
+-
+-#import <AppKit/NSWorkspace.h>
+-#import <AppKit/NSDocumentController.h>
+-#import <AppKit/NSImage.h>
+-#import <AppKit/NSPanel.h>
+-#import <AppKit/NSOpenPanel.h>
+-#import <AppKit/NSButton.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "SourceEditorDocument.h"
+ #import "ProjectWindowController.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/FileManager/ProjectImageView.m projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/FileManager/ProjectImageView.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/FileManager/ProjectImageView.m	2010-05-21 12:25:06.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/FileManager/ProjectImageView.m	2010-05-21 12:25:18.000000000 +0300
+@@ -23,13 +23,7 @@
+ 
+ #import "ProjectImageView.h"
+ 
+-#import <Foundation/NSArray.h>
+-
+-#import <AppKit/NSEvent.h>
+-#import <AppKit/NSPasteboard.h>
+-#import <AppKit/NSWindow.h>
+-#import <AppKit/NSDragging.h>
+-#import <AppKit/NSImage.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "FileManager.h"
+ #import "FileManagerDelegate.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m	2010-05-21 12:25:06.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m	2010-05-21 12:25:18.000000000 +0300
+@@ -23,30 +23,7 @@
+ 
+ #import "GNUstepAppLauncher.h"
+ 
+-#import <Foundation/NSBundle.h>
+-#import <Foundation/NSException.h>
+-#import <Foundation/NSFileHandle.h>
+-#import <Foundation/NSNotification.h>
+-#import <Foundation/NSProcessInfo.h>
+-#import <Foundation/NSString.h>
+-#import <Foundation/NSTask.h>
+-
+-#import <AppKit/NSColor.h>
+-#import <AppKit/NSFont.h>
+-#import <AppKit/NSFormCell.h>
+-#import <AppKit/NSForm.h>
+-#import <AppKit/NSImage.h>
+-#import <AppKit/NSMenuItem.h>
+-#import <AppKit/NSNibLoading.h>
+-#import <AppKit/NSOpenPanel.h>
+-#import <AppKit/NSPopUpButton.h>
+-#import <AppKit/NSTableColumn.h>
+-#import <AppKit/NSTableView.h>
+-#import <AppKit/NSTextStorage.h>
+-#import <AppKit/NSTextView.h>
+-#import <AppKit/NSWindow+Toolbar.h>
+-#import <AppKit/NSToolbar.h>
+-#import <AppKit/NSToolbarItem.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "GNUstepAppLauncherDelegate.h"
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m	2010-05-21 12:25:06.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m	2010-05-21 12:25:18.000000000 +0300
+@@ -22,31 +22,7 @@
+ 
+ #import "MakeBuilder.h"
+ 
+-#import <Foundation/NSArray.h>
+-#import <Foundation/NSException.h>
+-#import <Foundation/NSFileHandle.h>
+-#import <Foundation/NSNotification.h>
+-#import <Foundation/NSString.h>
+-#import <Foundation/NSTask.h>
+-#import <Foundation/NSUserDefaults.h>
+-
+-#import <AppKit/NSButton.h>
+-#import <AppKit/NSCell.h>
+-#import <AppKit/NSDocumentController.h>
+-#import <AppKit/NSImage.h>
+-#import <AppKit/NSMatrix.h>
+-#import <AppKit/NSMenuItem.h>
+-#import <AppKit/NSNibLoading.h>
+-#import <AppKit/NSPanel.h>
+-#import <AppKit/NSPopUpButton.h>
+-#import <AppKit/NSScroller.h>
+-#import <AppKit/NSScrollView.h>
+-#import <AppKit/NSTableColumn.h>
+-#import <AppKit/NSTableView.h>
+-#import <AppKit/NSToolbar.h>
+-#import <AppKit/NSToolbarItem.h>
+-#import <AppKit/NSView.h>
+-#import <AppKit/NSWindow+Toolbar.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "MakeBuilderDelegate.h"
+ #import "../../ProjectDocument.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/SubprojectsManager/SubprojectsManager.m projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/SubprojectsManager/SubprojectsManager.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/SubprojectsManager/SubprojectsManager.m	2006-07-09 17:11:42.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/SubprojectsManager/SubprojectsManager.m	2010-05-21 12:27:49.000000000 +0300
+@@ -23,22 +23,7 @@
+ 
+ #import "SubprojectsManager.h"
+ 
+-#import <Foundation/NSArray.h>
+-#import <Foundation/NSDictionary.h>
+-#import <Foundation/NSError.h>
+-#import <Foundation/NSFileManager.h>
+-#import <Foundation/NSNotification.h>
+-#import <Foundation/NSSortDescriptor.h>
+-
+-#import <AppKit/NSDocumentController.h>
+-#import <AppKit/NSNibLoading.h>
+-#import <AppKit/NSOpenPanel.h>
+-#import <AppKit/NSPanel.h>
+-#import <AppKit/NSTableColumn.h>
+-#import <AppKit/NSOutlineView.h>
+-#import <AppKit/NSToolbarItem.h>
+-#import <AppKit/NSView.h>
+-#import <AppKit/NSWindow.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "../../NSImageAdditions.h"
+ #import "../../ProjectDocument.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectTypes/Application/ApplicationTypeAttributes.m projectmanager.app-0.2/ProjectManager-0.2/ProjectTypes/Application/ApplicationTypeAttributes.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/ProjectTypes/Application/ApplicationTypeAttributes.m	2006-07-09 17:11:43.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/ProjectTypes/Application/ApplicationTypeAttributes.m	2010-05-21 12:26:59.000000000 +0300
+@@ -23,12 +23,7 @@
+ 
+ #import "ApplicationTypeAttributes.h"
+ 
+-#import <Foundation/NSString.h>
+-
+-#import <AppKit/NSNibLoading.h>
+-#import <AppKit/NSTextField.h>
+-#import <AppKit/NSTableView.h>
+-#import <AppKit/NSImageView.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "../../ProjectDocument.h"
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectWindowController.m projectmanager.app-0.2/ProjectManager-0.2/ProjectWindowController.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/ProjectWindowController.m	2010-05-21 12:25:06.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/ProjectWindowController.m	2010-05-21 12:25:18.000000000 +0300
+@@ -23,20 +23,7 @@
+ 
+ #import "ProjectWindowController.h"
+ 
+-#import <AppKit/NSImage.h>
+-#import <AppKit/NSWindow.h>
+-#import <AppKit/NSWindow+Toolbar.h>
+-#import <AppKit/NSToolbar.h>
+-#import <AppKit/NSToolbarItem.h>
+-#import <AppKit/NSBox.h>
+-#import <AppKit/NSPopUpButton.h>
+-#import <AppKit/NSScrollView.h>
+-#import <AppKit/NSTextView.h>
+-#import <AppKit/NSTextStorage.h>
+-
+-#import <Foundation/NSBundle.h>
+-#import <Foundation/NSException.h>
+-#import <Foundation/NSNotification.h>
++#import <AppKit/AppKit.h>
+ 
+ #import "ProjectDocument.h"
+ #import "ProjectModule.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/SourceEditorDocument.m projectmanager.app-0.2/ProjectManager-0.2/SourceEditorDocument.m
+--- projectmanager.app-0.2~/ProjectManager-0.2/SourceEditorDocument.m	2010-05-21 12:25:17.000000000 +0300
++++ projectmanager.app-0.2/ProjectManager-0.2/SourceEditorDocument.m	2010-05-21 12:25:18.000000000 +0300
+@@ -23,25 +23,7 @@
+ 
+ #import "SourceEditorDocument.h"
+ 
+-#import <Foundation/NSKeyedArchiver.h>
+-#import <Foundation/NSBundle.h>
+-#import <Foundation/NSFileHandle.h>
+-#import <Foundation/NSIndexSet.h>
+-#import <Foundation/NSKeyValueCoding.h>
+-#import <Foundation/NSString.h>
+-#import <Foundation/NSTask.h>
+-#import <Foundation/NSUserDefaults.h>
+-#import <Foundation/NSValue.h>
+-
+-#import <AppKit/NSFont.h>
+-#import <AppKit/NSImage.h>
+-#import <AppKit/NSLayoutManager.h>
+-#import <AppKit/NSPanel.h>
+-#import <AppKit/NSParagraphStyle.h>
+-#import <AppKit/NSRulerView.h>
+-#import <AppKit/NSScrollView.h>
+-#import <AppKit/NSTextStorage.h>
+-#import <AppKit/NSTextView.h>
++#import <AppKit/AppKit.h>
+ 
+ #import <../HighlighterKit-0.1/HighlighterKit.h>
+ 
diff --git a/gnustep-apps/projectmanager/projectmanager-0.2.ebuild b/gnustep-apps/projectmanager/projectmanager-0.2.ebuild
index 79a65d886556..705a7bf141bc 100644
--- a/gnustep-apps/projectmanager/projectmanager-0.2.ebuild
+++ b/gnustep-apps/projectmanager/projectmanager-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectmanager/projectmanager-0.2.ebuild,v 1.5 2008/03/08 13:42:12 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectmanager/projectmanager-0.2.ebuild,v 1.6 2010/08/20 14:53:15 voyageur Exp $
 
 inherit gnustep-2
 
@@ -14,6 +14,7 @@ SRC_URI="http://download.gna.org/pmanager/${PV}/${MY_PN}-${PV}.tar.bz2"
 KEYWORDS="amd64 ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
+IUSE=""
 
 DEPEND="gnustep-apps/keyarcher
 	gnustep-apps/plconv
@@ -25,7 +26,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-gui12.patch
+	epatch "${FILESDIR}"/${P}-missing_includes.patch
 	epatch "${FILESDIR}"/${P}-pathdomainmask.patch
-	epatch "${FILESDIR}"/${P}-gnustep-base1.15.patch
 }