Version bump to 0.10.3, removal of all versions. With thanks to Dmitry S. Kulyabov for the ebuild. (bug #117190) Ported to modular X.

(Portage version: 2.1_pre6-r5)

18 files changed, 178 insertions, 767 deletions

diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index 638db64a757a..e29dd2debe01 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-base/gnustep-gui
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.37 2006/01/28 18:08:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.38 2006/03/25 08:57:34 grobian Exp $
+
+*gnustep-gui-0.10.3 (25 Mar 2006)
+
+  20 Mar 2006; Fabian Groffen <grobian@gentoo.org>
+  -files/gnustep-gui-0.9.4-camaelon.patch, +files/gsnd.initd,
+  -files/gui-def.patch, -files/gui-gsspell.patch,
+  -files/gui-use-giflib.patch, -gnustep-gui-0.9.4.ebuild,
+  -gnustep-gui-0.9.4-r1.ebuild, -gnustep-gui-0.9.4-r2.ebuild,
+  -gnustep-gui-0.9.5_pre20050312-r1.ebuild, +gnustep-gui-0.10.3.ebuild:
+  Version bump to 0.10.3, removal of all versions.  With thanks to Dmitry S.
+  Kulyabov for the ebuild. (bug #117190)  Ported to modular X.
 
   28 Jan 2006; Simon Stelling <blubb@gentoo.org>
   +files/gui-use-giflib.patch, -files/gui-use-giflib.patch.bz2,
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index fd2940cd4f3d..cbcbdd1c2c0e 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,16 +1,21 @@
-MD5 9f84b15ebe385e4f78d58fc6305041aa ChangeLog 9080
-MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4 70
-MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4-r1 70
-MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4-r2 70
+MD5 0522b5807b8f55cb26057895546cd68b ChangeLog 9588
+RMD160 d9d663493ba8a28254e85c9759f091af9effa18e ChangeLog 9588
+SHA256 17a250d625d8d0d5f5f375b55f973a81385a6b04a726a14134c87f611ee6047d ChangeLog 9588
+MD5 bed6d9c13574c2ed13f20c9a84b0366a files/digest-gnustep-gui-0.10.3 259
+RMD160 ab1e3111aa53052182b8f8ee0bd6cf46e361430a files/digest-gnustep-gui-0.10.3 259
+SHA256 77f3d9cce6c68e11e65d64a2437df5e96aa42da07bcbdd26688f6edd7e368466 files/digest-gnustep-gui-0.10.3 259
 MD5 689d09b413cf86371215ff560ee74009 files/digest-gnustep-gui-0.9.5 70
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20050312-r1 0
-MD5 6f66904f0ad8d980c653d5c0fdf7d81b files/gnustep-gui-0.9.4-camaelon.patch 4029
-MD5 7bb8ef207dff05d7e80122fcffdcce88 files/gui-def.patch 640
-MD5 de8a4d2ff2308aaa042177ee1bcec78b files/gui-gsspell.patch 650
-MD5 5a65b877f34a9fffbe54bdf47cb91ace files/gui-use-giflib.patch 12744
-MD5 fa604add751f7dba114e52ce6df3832a gnustep-gui-0.9.4-r1.ebuild 1537
-MD5 4ccd8bfe186df0fb8b1f40a6e2b9cdba gnustep-gui-0.9.4-r2.ebuild 1612
-MD5 e80f54d57b12815adbef54325c60f9c5 gnustep-gui-0.9.4.ebuild 1375
-MD5 e8855548952c1fe980720f718bad06cf gnustep-gui-0.9.5.ebuild 1438
-MD5 8389501a869cdfb936b22c0d5cca8845 gnustep-gui-0.9.5_pre20050312-r1.ebuild 1768
+RMD160 2167f009d8335c4837e3da4a7a476b81d2c7f01d files/digest-gnustep-gui-0.9.5 70
+SHA256 0f434a7c0a6265d9fbaadd377065b86e3043253b8828b989d0188bef9ea5cd03 files/digest-gnustep-gui-0.9.5 70
+MD5 73a027dc89058cc65a8e5597deccde44 files/gsnd.initd 869
+RMD160 f4019ccc40c05af3faf915490fcccb5adcb51e39 files/gsnd.initd 869
+SHA256 48c30cfea1cf22050ab28edae998f14ebf93f91e743e01d0a931b3144962c26c files/gsnd.initd 869
+MD5 d6b536869b2d1f3602de3d206d0b8911 gnustep-gui-0.10.3.ebuild 2269
+RMD160 8dbc423f709cc310f4bef1e0d1573bf4b4d6e47d gnustep-gui-0.10.3.ebuild 2269
+SHA256 8f4c46924601e0787be6279fb6646c25e2638aca4c61f187294747d20c3e749c gnustep-gui-0.10.3.ebuild 2269
+MD5 6118babb4a6801b350f35a437f860a81 gnustep-gui-0.9.5.ebuild 1438
+RMD160 4d2fb7057e0d5b25e6788cc65e83c25bc1209cfd gnustep-gui-0.9.5.ebuild 1438
+SHA256 391b5b01d0b4909195f0767a9ae474eed5f6d05535fa3556ba77f48010bee277 gnustep-gui-0.9.5.ebuild 1438
 MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
+RMD160 827c24953436fc2f6f00e6ed106dce431340ec35 metadata.xml 1355
+SHA256 25cc768361f0311d0356e24a68dda7f1cee30c717644cb37884440e6ad0b976b metadata.xml 1355
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.10.3 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.10.3
new file mode 100644
index 000000000000..4badf0265813
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.10.3
@@ -0,0 +1,3 @@
+MD5 ce015fcf9c6ff421e723811275f5a5c6 gnustep-gui-0.10.3.tar.gz 1522039
+RMD160 c556fc64ab74265391156c51d1da86563ff56752 gnustep-gui-0.10.3.tar.gz 1522039
+SHA256 afbbcbed8b07d35cf1993311b5559c61e07c95ba557741a2903c729fe9a5b8ff gnustep-gui-0.10.3.tar.gz 1522039
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4
deleted file mode 100644
index 84f55556e03b..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 399b3a2341899d12710f4d1ed36f3002 gnustep-gui-0.9.4.tar.gz 1839593
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r1 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r1
deleted file mode 100644
index 84f55556e03b..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 399b3a2341899d12710f4d1ed36f3002 gnustep-gui-0.9.4.tar.gz 1839593
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r2 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r2
deleted file mode 100644
index 84f55556e03b..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 399b3a2341899d12710f4d1ed36f3002 gnustep-gui-0.9.4.tar.gz 1839593
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050312-r1 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050312-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050312-r1
+++ /dev/null
diff --git a/gnustep-base/gnustep-gui/files/gnustep-gui-0.9.4-camaelon.patch b/gnustep-base/gnustep-gui/files/gnustep-gui-0.9.4-camaelon.patch
deleted file mode 100644
index 7768893ced1f..000000000000
--- a/gnustep-base/gnustep-gui/files/gnustep-gui-0.9.4-camaelon.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -ur gnustep-gui-0.9.4/Source/Functions.m gnustep-gui-0.9.4-testing/Source/Functions.m
---- gnustep-gui-0.9.4/Source/Functions.m	2004-02-08 08:07:24.000000000 -0500
-+++ gnustep-gui-0.9.4-testing/Source/Functions.m	2004-09-26 18:32:02.192773040 -0400
-@@ -573,9 +573,9 @@
- 			       up_sides, grays, 6);
-     }
- 
--  DPSsetgray(ctxt, NSLightGray);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSLightGray);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void
-@@ -609,9 +609,9 @@
-       DPSrectfill(ctxt, NSMaxX(aRect) - 2., NSMaxY(aRect) - 2., 1., 1.);
-     }
- 
--  DPSsetgray(ctxt, NSLightGray);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSLightGray);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void 
-@@ -637,9 +637,9 @@
- 			       up_sides, grays, 8);
-     }
- 
--  DPSsetgray(ctxt, NSLightGray);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSLightGray);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void 
-@@ -665,9 +665,9 @@
- 			       up_sides, grays, 8);
-     }
- 
--  DPSsetgray(ctxt, NSWhite);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSWhite);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void 
-@@ -771,9 +771,9 @@
- 			       up_sides, grays, 6);
-     }
- 
--  DPSsetgray(ctxt, NSLightGray);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSLightGray);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void 
-Only in gnustep-gui-0.9.4-testing/Source: Functions.m.orig
-diff -ur gnustep-gui-0.9.4/Source/NSApplication.m gnustep-gui-0.9.4-testing/Source/NSApplication.m
---- gnustep-gui-0.9.4/Source/NSApplication.m	2004-07-22 19:57:46.000000000 -0400
-+++ gnustep-gui-0.9.4-testing/Source/NSApplication.m	2004-09-26 19:02:03.996857184 -0400
-@@ -223,6 +223,27 @@
- 	[backend initializeBackend];
-       }
- 
-+      /* hack to load arbitrary bundles - Alexander Malmberg 2002-05-09 */
-+      {
-+        NSUserDefaults *defs=[NSUserDefaults standardUserDefaults];
-+        NSString *s=[defs stringForKey: @"GUIThemeBundles"];
-+        NSArray *a=[s componentsSeparatedByString: @" "];
-+        int i,c=[a count];
-+	
-+        NSLog(@"try loading '%@'",s);
-+        for (i=0;i<c;i++)
-+          {
-+            NSLog(@"try '%@'\n",[a objectAtIndex: i]);
-+            NSBundle *b=[NSBundle bundleWithPath: [a objectAtIndex: i]];
-+            if (!b)
-+              {
-+                NSLog(@"Couldn't load theme bundle '%@'!",[a objectAtIndex: i]);
-+                continue;
-+              }
-+            [[[b principalClass] alloc] init];
-+          }
-+      }
-+
- #else
-       /* GSBackend will be in a separate library, so use the runtime
- 	 to find the class and avoid an unresolved reference problem */
-Only in gnustep-gui-0.9.4-testing/Source: NSApplication.m.orig
-Only in gnustep-gui-0.9.4-testing/Source: NSApplication.m.rej
-Only in gnustep-gui-0.9.4-testing/Source: NSApplication.m~
-diff -ur gnustep-gui-0.9.4/Source/NSColor.m gnustep-gui-0.9.4-testing/Source/NSColor.m
---- gnustep-gui-0.9.4/Source/NSColor.m	2004-01-30 14:49:00.000000000 -0500
-+++ gnustep-gui-0.9.4-testing/Source/NSColor.m	2004-09-26 18:32:02.191773192 -0400
-@@ -713,6 +713,13 @@
-   return systemColorWithName(@"windowFrameTextColor");
- }
- 
-++ (void) setColor: (NSColor*) color forKey: (NSString*) key
-+{
-+        [systemColors setColor: color forKey: key];
-+	[[systemDict objectForKey: key] recache];
-+}
-+
-+
- ////////////////////////////////////////////////////////////
- //
- // Instance methods
-Only in gnustep-gui-0.9.4-testing/Source: NSColor.m.orig
diff --git a/gnustep-base/gnustep-gui/files/gsnd.initd b/gnustep-base/gnustep-gui/files/gsnd.initd
new file mode 100644
index 000000000000..ff67d53156bb
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/gsnd.initd
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/files/gsnd.initd,v 1.1 2006/03/25 08:57:34 grobian Exp $
+
+service_name="GNUstep sound daemon"
+
+if [ -e /etc/GNUstep/GNUstep.conf ];
+then
+	. /etc/GNUstep/GNUstep.conf
+else
+	GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
+fi
+
+start() {
+	ebegin "Starting ${service_name}"
+
+	# Check for necessary files
+	if [ -d ${GNUSTEP_SYSTEM_ROOT}/Makefiles ];
+	then
+		# Source GNUstep makefile
+		. ${GNUSTEP_SYSTEM_ROOT}/Makefiles/GNUstep.sh
+	else
+		exit 1
+	fi
+
+	if [ -z "$GNUSTEP_FLATTENED" ];
+	then
+		TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}
+	else
+		TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools
+	fi
+
+	if [ -x $TDIR/gnustep_sndd ];
+	then
+		$TDIR/gnustep_sndd
+	fi
+}
+
+stop() {
+	ebegin "Stopping ${service_name}"
+
+	# Kill processes
+	killall gnustep_sndd
+}
diff --git a/gnustep-base/gnustep-gui/files/gui-def.patch b/gnustep-base/gnustep-gui/files/gui-def.patch
deleted file mode 100644
index 2c8dd61b51a1..000000000000
--- a/gnustep-base/gnustep-gui/files/gui-def.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: Source/GNUmakefile.postamble
-===================================================================
-RCS file: /cvsroot/gnustep/gnustep/core/gui/Source/GNUmakefile.postamble,v
-retrieving revision 1.15
-retrieving revision 1.16
-diff -u -r1.15 -r1.16
---- Source/GNUmakefile.postamble	3 Dec 2003 01:55:36 -0000	1.15
-+++ Source/GNUmakefile.postamble	6 Oct 2004 03:34:46 -0000	1.16
-@@ -116,6 +116,6 @@
- 	rm -f $@
- 	rm -f _tmp.def
- 	cat win32-def.top > $@
--	nm $^ | grep '^........ [T] _' | sed 's/[^_]*_//' > _tmp.def
-+	nm $^ | grep '^........ [TR] _' | sed 's/[^_]*_//' > _tmp.def
- 	cat _tmp.def | grep "_class_name_" >> $@
- 	rm -rf _tmp.def
diff --git a/gnustep-base/gnustep-gui/files/gui-gsspell.patch b/gnustep-base/gnustep-gui/files/gui-gsspell.patch
deleted file mode 100644
index a8c186c56c15..000000000000
--- a/gnustep-base/gnustep-gui/files/gui-gsspell.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: Tools/GNUmakefile.preamble
-===================================================================
-RCS file: /cvsroot/gnustep/gnustep/core/gui/Tools/GNUmakefile.preamble,v
-retrieving revision 1.6
-diff -u -r1.6 GNUmakefile.preamble
---- Tools/GNUmakefile.preamble	2 Sep 2004 03:27:54 -0000	1.6
-+++ Tools/GNUmakefile.preamble	28 Feb 2005 22:35:52 -0000
-@@ -34,6 +34,7 @@
- gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
- set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
- gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
-+GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS)
- 
- # Additional libraries when linking applications
- # ADDITIONAL_GUI_LIBS +=
diff --git a/gnustep-base/gnustep-gui/files/gui-use-giflib.patch b/gnustep-base/gnustep-gui/files/gui-use-giflib.patch
deleted file mode 100644
index 683011814a3c..000000000000
--- a/gnustep-base/gnustep-gui/files/gui-use-giflib.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-diff -ur gnustep-cvs/core/gui/Headers/Additions/GNUstepGUI/config.h.in gnustep-cvs-test/core/gui/Headers/Additions/GNUstepGUI/config.h.in
---- gnustep-cvs/core/gui/Headers/Additions/GNUstepGUI/config.h.in	2004-06-01 01:50:56.000000000 -0400
-+++ gnustep-cvs-test/core/gui/Headers/Additions/GNUstepGUI/config.h.in	2005-03-18 01:19:45.694954256 -0500
-@@ -36,6 +36,9 @@
- /* Define to 1 if you have the `ungif' library (-lungif). */
- #undef HAVE_LIBUNGIF
- 
-+/* Define to 1 if you have the `giflib' library (-lgif). */
-+#undef HAVE_LIBGIF
-+
- /* Define to 1 if you have the `z' library (-lz). */
- #undef HAVE_LIBZ
- 
-diff -ur gnustep-cvs/core/gui/Source/NSBitmapImageRep+GIF.m gnustep-cvs-test/core/gui/Source/NSBitmapImageRep+GIF.m
---- gnustep-cvs/core/gui/Source/NSBitmapImageRep+GIF.m	2004-01-08 17:31:40.000000000 -0500
-+++ gnustep-cvs-test/core/gui/Source/NSBitmapImageRep+GIF.m	2005-03-18 01:23:47.593180136 -0500
-@@ -28,7 +28,7 @@
- #include "config.h"
- #include "NSBitmapImageRep+GIF.h"
- 
--#if HAVE_LIBUNGIF
-+#if HAVE_LIBUNGIF || HAVE_GIFLIB
- 
- /*
- gif_lib.h (4.1.0b1, possibly other versions) uses Object as the name of an
-@@ -336,7 +336,7 @@
- 
- @end
- 
--#else /* !HAVE_LIBUNGIF */
-+#else /* !HAVE_LIBUNGIF || !HAVE_GIFLIB */
- 
- @implementation NSBitmapImageRep (GIFReading)
- + (BOOL) _bitmapIsGIF: (NSData *)imageData
-@@ -351,5 +351,5 @@
- }
- @end
- 
--#endif /* !HAVE_LIBUNGIF */
-+#endif /* !HAVE_LIBUNGIF || !HAVE_GIFLIB */
- 
-diff -ur gnustep-cvs/core/gui/Source/NSBitmapImageRep.m gnustep-cvs-test/core/gui/Source/NSBitmapImageRep.m
---- gnustep-cvs/core/gui/Source/NSBitmapImageRep.m	2005-01-18 10:35:51.000000000 -0500
-+++ gnustep-cvs-test/core/gui/Source/NSBitmapImageRep.m	2005-03-18 01:24:00.998142272 -0500
-@@ -133,7 +133,7 @@
-       types = [[NSArray alloc] initWithObjects:
- 	@"tiff", @"tif",
- 	@"pnm", @"ppm",
--#if HAVE_LIBUNGIF
-+#if HAVE_LIBUNGIF || HAVE_GIFLIB
- 	@"gif",
- #endif
- #if HAVE_LIBJPEG
-diff -ur gnustep-cvs/core/gui/configure gnustep-cvs-test/core/gui/configure
---- gnustep-cvs/core/gui/configure	2005-03-09 23:16:40.000000000 -0500
-+++ gnustep-cvs-test/core/gui/configure	2005-03-18 01:32:44.662533184 -0500
-@@ -852,6 +852,7 @@
-   --disable-jpeg          Disable JPEG support
-   --disable-png           Disable PNG support
-   --disable-ungif         Disable libungif-based GIF support
-+  --enable-giflib         Enable giflib-based GIF support
-   --disable-gsnd          Disable gsnd server
-   --disable-cups          Disable cups printing support
- 
-@@ -865,6 +866,8 @@
-   --with-tiff-include=DIR TIFF include files are in DIR
-   --with-ungif-library=DIR UNGIF library file are in DIR
-   --with-ungif-include=DIR UNGIF include files are in DIR
-+  --with-giflib-library=DIR GIFLIB library file are in DIR
-+  --with-giflib-include=DIR GIFLIB include files are in DIR
-   --with-audiofile-library=DIR AUDIOFILE library file are in DIR
-   --with-audiofile-include=DIR AUDIOFILE include files are in DIR
- 
-@@ -4990,6 +4993,7 @@
- fi
- 
- 
-+### --- libungif --- ###
- # Check whether --enable-ungif or --disable-ungif was given.
- if test "${enable_ungif+set}" = set; then
-   enableval="$enable_ungif"
-@@ -5209,6 +5213,226 @@
-   fi
- fi
- 
-+### --- giflib --- ###
-+# Check whether --enable-giflib or --disable-giflib was given.
-+if test "${enable_giflib+set}" = set; then
-+  enableval="$enable_giflib"
-+
-+else
-+  enable_giflib=no
-+fi;
-+
-+
-+# Check whether --with-giflib_library or --without-giflib_library was given.
-+if test "${with_giflib_library+set}" = set; then
-+  withval="$with_giflib_library"
-+
-+else
-+  with_ungif_library=
-+fi;
-+
-+# Check whether --with-giflib_include or --without-giflib_include was given.
-+if test "${with_giflib_include+set}" = set; then
-+  withval="$with_giflib_include"
-+
-+else
-+  with_giflib_include=
-+fi;
-+
-+if test "${enable_giflib}" = yes; then
-+  orig_CPPFLAGS="${CPPFLAGS}"
-+  orig_LDFLAGS="${LDFLAGS}"
-+  orig_LIBS="${LIBS}"
-+
-+  if test -n "${with_giflib_library}"; then
-+    with_giflib_library="-L$with_giflib_library"
-+  fi
-+  if test -n "${with_giflib_include}"; then
-+    with_giflib_include="-I$with_giflib_include"
-+  fi
-+  CPPFLAGS="${with_giflib_include} ${CPPFLAGS}"
-+  LDFLAGS="${with_giflib_library} ${LDFLAGS}"
-+
-+
-+echo "$as_me:$LINENO: checking for DGifOpen in -lgif" >&5
-+echo $ECHO_N "checking for DGifOpen in -lgif... $ECHO_C" >&6
-+if test "${ac_cv_lib_gif_DGifOpen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgif  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char DGifOpen ();
-+int
-+main ()
-+{
-+DGifOpen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_gif_DGifOpen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_gif_DGifOpen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_gif_DGifOpen" >&5
-+echo "${ECHO_T}$ac_cv_lib_gif_DGifOpen" >&6
-+if test $ac_cv_lib_gif_DGifOpen = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBGIF 1
-+_ACEOF
-+
-+  LIBS="-lgif $LIBS"
-+
-+fi
-+
-+
-+  if test "${with_x}" != no && test "${ac_cv_lib_giflib_DGifOpen}" = no; then
-+    { echo "$as_me:$LINENO: Checking if giflib is linked against -lX11" >&5
-+echo "$as_me: Checking if giflib is linked against -lX11" >&6;}
-+    # This implies either that giflib is not installed at all, or that it
-+    # explicitly refers to the symbols defined in X11.  Now see if the latter
-+    # is the case.
-+    CPPFLAGS="${CPPFLAGS} -I${ac_x_includes}"
-+    LDFLAGS="${LDFLAGS} -L${ac_x_libraries}"
-+    LIBS="${LIBS} -lX11"
-+
-+
-+echo "$as_me:$LINENO: checking for DGifCloseFile in -lgif" >&5
-+echo $ECHO_N "checking for DGifCloseFile in -lgif... $ECHO_C" >&6
-+if test "${ac_cv_lib_gif_DGifCloseFile+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgif  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char DGifCloseFile ();
-+int
-+main ()
-+{
-+DGifCloseFile ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_gif_DGifCloseFile=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_gif_DGifCloseFile=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_gif_DGifCloseFile" >&5
-+echo "${ECHO_T}$ac_cv_lib_gif_DGifCloseFile" >&6
-+if test $ac_cv_lib_gif_DGifCloseFile = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBGIF 1
-+_ACEOF
-+
-+  LIBS="-lgif $LIBS"
-+
-+fi
-+
-+    if test "${ac_cv_lib_giflib_DGifCloseFile}" = no; then
-+      # This indicates giflib is not installed at all.  The flags reverts to
-+      # the orignal value.
-+      CPPFLAGS="${orig_CPPFLAGS}"
-+      LDFLAGS="${orig_LDFLAGS}"
-+      LIBS="${orig_LIBS}"
-+    else
-+      # This indicates giflib actually refers to the X11's symbols.  We modify
-+      # the flags so that -gui gets linked against the X11 library to support
-+      # giflib.
-+      { echo "$as_me:$LINENO: -gui will be linked against -lX11 to support giflib images" >&5
-+echo "$as_me: -gui will be linked against -lX11 to support giflib images" >&6;}
-+      GRAPHIC_CFLAGS="-I${ac_x_includes} ${with_giflib_include} $GRAPHIC_CFLAGS"
-+      GRAPHIC_LFLAGS="-L${ac_x_libraries} ${with_giflib_library} $GRAPHIC_LFLAGS"
-+    fi
-+  else
-+    GRAPHIC_CFLAGS="${with_giflib_include} $GRAPHIC_CFLAGS"
-+    GRAPHIC_LFLAGS="${with_giflib_library} $GRAPHIC_LFLAGS"
-+  fi
-+fi
-+
- #--------------------------------------------------------------------
- # Check for the spelling lib, for the built-in spell checker...
- #--------------------------------------------------------------------
-diff -ur gnustep-cvs/core/gui/configure.ac gnustep-cvs-test/core/gui/configure.ac
---- gnustep-cvs/core/gui/configure.ac	2005-03-09 23:16:40.000000000 -0500
-+++ gnustep-cvs-test/core/gui/configure.ac	2005-03-18 01:32:26.442303080 -0500
-@@ -193,6 +193,7 @@
- fi
- 
- 
-+### --- libungif --- ###
- AC_ARG_ENABLE(ungif,
-   [  --disable-ungif         Disable libungif-based GIF support],,
-   enable_ungif=yes)
-@@ -250,6 +251,64 @@
-   fi
- fi
- 
-+### --- giflib --- ###
-+AC_ARG_ENABLE(giflib,
-+  [  --enable-giflib         Enable giflib-based GIF support],,
-+  enable_giflib=no)
-+
-+AC_ARG_WITH(giflib_library, 
-+           [  --with-giflib-library=DIR GIFLIB library file are in DIR], ,
-+           with_ungif_library=)
-+AC_ARG_WITH(giflib_include,  
-+	[  --with-giflib-include=DIR GIFLIB include files are in DIR], ,
-+        with_giflib_include=)
-+
-+if test "${enable_giflib}" = yes; then
-+  orig_CPPFLAGS="${CPPFLAGS}"
-+  orig_LDFLAGS="${LDFLAGS}"
-+  orig_LIBS="${LIBS}"
-+
-+  if test -n "${with_giflib_library}"; then
-+    with_giflib_library="-L$with_giflib_library"
-+  fi
-+  if test -n "${with_giflib_include}"; then
-+    with_giflib_include="-I$with_giflib_include"
-+  fi
-+  CPPFLAGS="${with_giflib_include} ${CPPFLAGS}"
-+  LDFLAGS="${with_giflib_library} ${LDFLAGS}"
-+
-+  AC_CHECK_LIB(gif, DGifOpen)
-+
-+  if test "${with_x}" != no && test "${ac_cv_lib_giflib_DGifOpen}" = no; then
-+    AC_MSG_NOTICE([Checking if giflib is linked against -lX11])
-+    # This implies either that giflib is not installed at all, or that it
-+    # explicitly refers to the symbols defined in X11.  Now see if the latter
-+    # is the case.
-+    CPPFLAGS="${CPPFLAGS} -I${ac_x_includes}"
-+    LDFLAGS="${LDFLAGS} -L${ac_x_libraries}"
-+    LIBS="${LIBS} -lX11"
-+
-+    AC_CHECK_LIB(gif, DGifCloseFile)
-+    if test "${ac_cv_lib_giflib_DGifCloseFile}" = no; then
-+      # This indicates giflib is not installed at all.  The flags reverts to
-+      # the orignal value.
-+      CPPFLAGS="${orig_CPPFLAGS}"
-+      LDFLAGS="${orig_LDFLAGS}"
-+      LIBS="${orig_LIBS}"
-+    else
-+      # This indicates giflib actually refers to the X11's symbols.  We modify
-+      # the flags so that -gui gets linked against the X11 library to support
-+      # giflib.
-+      AC_MSG_NOTICE([-gui will be linked against -lX11 to support giflib images])
-+      GRAPHIC_CFLAGS="-I${ac_x_includes} ${with_giflib_include} $GRAPHIC_CFLAGS"
-+      GRAPHIC_LFLAGS="-L${ac_x_libraries} ${with_giflib_library} $GRAPHIC_LFLAGS"
-+    fi
-+  else
-+    GRAPHIC_CFLAGS="${with_giflib_include} $GRAPHIC_CFLAGS"
-+    GRAPHIC_LFLAGS="${with_giflib_library} $GRAPHIC_LFLAGS"
-+  fi
-+fi
-+
- #--------------------------------------------------------------------
- # Check for the spelling lib, for the built-in spell checker...
- #--------------------------------------------------------------------
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.10.3.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.10.3.ebuild
new file mode 100644
index 000000000000..d1562e899a86
--- /dev/null
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.10.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.10.3.ebuild,v 1.1 2006/03/25 08:57:34 grobian Exp $
+
+inherit gnustep
+
+DESCRIPTION="Library of GUI classes written in Obj-C"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+
+# no ppc-macos as it bails out while compiling, needs work
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+# doc has sandbox violations
+IUSE="cups gif gsnd jpeg png"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	>=gnustep-base/gnustep-make-1.12.0
+	>=gnustep-base/gnustep-base-1.12.0
+	|| (
+		( x11-libs/libXt )
+		virtual/x11
+	)
+	>=media-libs/tiff-3
+	jpeg? ( >=media-libs/jpeg-6b )
+	gif? ( >=media-libs/giflib-4.1 )
+	png? ( >=media-libs/libpng-1.2 )
+	gsnd? (
+		>=media-libs/audiofile-0.2
+	)
+	cups? ( >=net-print/cups-1.1 )
+	app-text/aspell"
+# gsnd needs a recent portaudio that's not in the tree yet
+#		=media-libs/portaudio-19*
+RDEPEND="${DEPEND}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+#	if use gsnd ;
+#	then
+#	    sed -i -e "s:#include <portaudio.h>:#include <portaudio-19/portaudio.h>:g" ${S}/Tools/gsnd/gsnd.m
+#	    sed -i -e "s:-lportaudio:-lportaudio-19:g" ${S}/Tools/gsnd/GNUmakefile
+#	    sed -i -e "s:^BUILD_GSND=.*$:BUILD_GSND=gsnd:g" ${S}/config.make.in
+#	fi
+}
+
+src_compile() {
+	egnustep_env
+
+	myconf="--with-tiff-include=/usr/include --with-tiff-library=/usr/lib"
+	use gif && myconf="$myconf --disable-ungif --enable-libgif"
+	myconf="$myconf `use_enable jpeg`"
+	myconf="$myconf `use_enable png`"
+	myconf="$myconf `use_enable cups`"
+
+	if use gsnd ;
+	then
+	    myconf="$myconf --enable-gsnd"
+	    myconf="$myconf --with-audiofile-include=/usr/include --with-audiofile-lib=/usr/lib"
+#	    myconf="$myconf --with-include-flags=-I/usr/include/portaudio-19"
+	fi
+
+	econf $myconf || die "configure failed"
+
+	egnustep_make || die
+
+#	if use doc ;
+#	then
+#	    cd ${S}/Documentation
+#	    egnustep_make || die
+#	fi
+}
+
+src_install() {
+	egnustep_env
+	egnustep_install || die
+
+#	if use doc ;
+#	then
+#		cd ${S}/Documentation
+#		egnustep_install || die
+#	fi
+
+	use gsnd && newinitd ${FILESDIR}/gsnd.initd gsnd
+}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r1.ebuild
deleted file mode 100644
index ba882afc0254..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r1.ebuild,v 1.3 2005/07/16 15:49:54 swegener Exp $
-
-inherit gnustep
-
-DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-IUSE="cups gif gsnd jpeg png"
-DEPEND="${GNUSTEP_BASE_DEPEND}
-	~gnustep-base/gnustep-base-1.10.1
-	virtual/x11
-	>=media-libs/tiff-3
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif? ( >=media-libs/libungif-4.1 )
-	png? ( >=media-libs/libpng-1.2 )
-	gsnd? ( >=media-libs/audiofile-0.2 )
-	cups? ( >=net-print/cups-1.1 )
-	app-text/aspell"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-def.patch
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-gsspell.patch
-}
-
-src_compile() {
-	egnustep_env
-
-	myconf="--with-tiff-include=/usr/include --with-tiff-library=/usr/lib"
-	myconf="$myconf `use_enable gsnd`"
-	use gsnd && myconf="$myconf --with-audiofile-include=/usr/include --with-audiofile-lib=/usr/lib"
-	use gif && myconf="$myconf --enable-ungif"
-	myconf="$myconf `use_enable jpeg`"
-	myconf="$myconf `use_enable png`"
-	myconf="$myconf `use_enable cups`"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r2.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r2.ebuild
deleted file mode 100644
index afe566b479f9..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r2.ebuild,v 1.4 2006/01/28 18:08:09 blubb Exp $
-
-inherit gnustep
-
-DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-IUSE="cups gif gsnd jpeg png"
-DEPEND="${GNUSTEP_BASE_DEPEND}
-	~gnustep-base/gnustep-base-1.10.1
-	virtual/x11
-	>=media-libs/tiff-3
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif? ( >=media-libs/giflib-4.1 )
-	png? ( >=media-libs/libpng-1.2 )
-	gsnd? ( >=media-libs/audiofile-0.2 )
-	cups? ( >=net-print/cups-1.1 )
-	app-text/aspell"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-def.patch
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-gsspell.patch
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-use-giflib.patch
-}
-
-src_compile() {
-	egnustep_env
-
-	myconf="--with-tiff-include=/usr/include --with-tiff-library=/usr/lib"
-	myconf="$myconf `use_enable gsnd`"
-	use gsnd && myconf="$myconf --with-audiofile-include=/usr/include --with-audiofile-lib=/usr/lib"
-	use gif && myconf="$myconf --disable-ungif --enable-giflib"
-	myconf="$myconf `use_enable jpeg`"
-	myconf="$myconf `use_enable png`"
-	myconf="$myconf `use_enable cups`"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild
deleted file mode 100644
index 2b576b083f86..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild,v 1.13 2005/07/16 15:49:54 swegener Exp $
-
-inherit gnustep
-
-DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-KEYWORDS="ppc x86 amd64 sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-IUSE="cups gif gsnd jpeg png"
-DEPEND="${GNUSTEP_BASE_DEPEND}
-	~gnustep-base/gnustep-base-1.10.1
-	virtual/x11
-	>=media-libs/tiff-3
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif? ( >=media-libs/libungif-4.1 )
-	png? ( >=media-libs/libpng-1.2 )
-	gsnd? ( >=media-libs/audiofile-0.2 )
-	cups? ( >=net-print/cups-1.1 )
-	app-text/aspell"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-
-	myconf="--with-tiff-include=/usr/include --with-tiff-library=/usr/lib"
-	myconf="$myconf `use_enable gsnd`"
-	use gsnd && myconf="$myconf --with-audiofile-include=/usr/include --with-audiofile-lib=/usr/lib"
-	use gif && myconf="$myconf --enable-ungif"
-	myconf="$myconf `use_enable jpeg`"
-	myconf="$myconf `use_enable png`"
-	myconf="$myconf `use_enable cups`"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5.ebuild
index e2f82f95fd6c..409a370e1227 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5.ebuild,v 1.7 2005/12/23 23:55:59 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5.ebuild,v 1.8 2006/03/25 08:57:34 grobian Exp $
 
 inherit gnustep
 
@@ -16,7 +16,10 @@ IUSE="cups gif gsnd jpeg png"
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	~gnustep-base/gnustep-make-1.10.0
 	~gnustep-base/gnustep-base-1.10.3
-	virtual/x11
+	|| (
+		( x11-libs/libXt )
+		virtual/x11
+	)
 	>=media-libs/tiff-3
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif? ( >=media-libs/giflib-4.1 )
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312-r1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312-r1.ebuild
deleted file mode 100644
index 8ffea7484c8f..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312-r1.ebuild,v 1.5 2006/01/28 18:08:09 blubb Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/gui"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-IUSE="cups gif gsnd jpeg png"
-DEPEND="${GNUSTEP_BASE_DEPEND}
-	>=gnustep-base/gnustep-base-1.10.2_pre20050312
-	virtual/x11
-	>=media-libs/tiff-3
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif? ( >=media-libs/giflib-4.1 )
-	png? ( >=media-libs/libpng-1.2 )
-	gsnd? ( >=media-libs/audiofile-0.2 )
-	cups? ( >=net-print/cups-1.1 )
-	app-text/aspell"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	cvs_src_unpack ${A}
-	cd ${S}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-use-giflib.patch
-}
-
-src_compile() {
-	egnustep_env
-
-	myconf="--with-tiff-include=/usr/include --with-tiff-library=/usr/lib"
-	myconf="$myconf `use_enable gsnd`"
-	use gsnd && myconf="$myconf --with-audiofile-include=/usr/include --with-audiofile-lib=/usr/lib"
-	use gif && myconf="$myconf --disable-ungif --enable-giflib"
-	myconf="$myconf `use_enable jpeg`"
-	myconf="$myconf `use_enable png`"
-	myconf="$myconf `use_enable cups`"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-