Added support for gnustep-libs/camaelon, via a local use flag (patches in support). Camaelon is a GNUstep theme engine.

4 files changed, 142 insertions, 5 deletions

diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index 85287c88d2f0..5f95f3c5489a 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-base/gnustep-gui
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.7 2004/09/26 02:46:23 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.8 2004/09/27 00:20:17 fafhrd Exp $
+
+  26 Sep 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/gnustep-gui-0.9.4-camaelon.patch, gnustep-gui-0.9.4.ebuild:
+  New local USE flag 'camaelon' patches in support for Camaelon GNUstep theme
+  engine; PDEPEND added if this USE flag is on for gnustep-libs/camaelon.
 
   25 Sep 2004; Armando Di Cianno <fafhrd@gentoo.org> gnustep-gui-0.9.4.ebuild:
   Made library depends less strict.
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 7709eea28549..943c4d2234d6 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -6,9 +6,10 @@ MD5 ec2a075a4a96dd9d782e868467c96986 gnustep-gui-0.7.9.ebuild 1033
 MD5 a99822a371283fd3dd2abd1563b08c76 gnustep-gui-0.8.7.ebuild 799
 MD5 be917ba7298ba3bd936d874774de0a7d gnustep-gui-0.8.5-r1.ebuild 798
 MD5 c52eb56cd951547cce27cfef118b9e7f gnustep-gui-0.9.4_pre20040920.ebuild 1372
-MD5 a68c693c23b19ef33ed02d3a452142e7 ChangeLog 3479
+MD5 67e68d0738f546dddb6ec03bb079ce7b ChangeLog 3754
 MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
-MD5 b9d54f2a0d29c8671f5a56035a502aee gnustep-gui-0.9.4.ebuild 1280
+MD5 8596a2332c83364ee72b8555cf3296f0 gnustep-gui-0.9.4.ebuild 1444
+MD5 6f66904f0ad8d980c653d5c0fdf7d81b files/gnustep-gui-0.9.4-camaelon.patch 4029
 MD5 82f2e76d38bbd5e31455ac00bd902b50 files/digest-gnustep-gui-0.8.5-r1 70
 MD5 b6e6085c50ec0914b7fd160ba4bd7784 files/digest-gnustep-gui-0.9.4_pre20040920 82
 MD5 6511d4ca362a94c774358fa192e6db0b files/digest-gnustep-gui-0.7.9 70
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
new file mode 100644
index 000000000000..7768893ced1f
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/gnustep-gui-0.9.4-camaelon.patch
@@ -0,0 +1,121 @@
+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/gnustep-gui-0.9.4.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild
index 8a8a0fdcd464..b558fb9545bc 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.3 2004/09/26 02:46:23 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild,v 1.4 2004/09/27 00:20:17 fafhrd Exp $
 
 inherit gnustep
 
@@ -12,7 +12,7 @@ KEYWORDS="~x86"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-IUSE="${IUSE} jpeg gif png gsnd doc cups"
+IUSE="${IUSE} jpeg gif png gsnd doc cups camaelon"
 DEPEND="${GNUSTEP_BASE_DEPEND}
 	virtual/x11
 	=media-libs/tiff-3*
@@ -24,6 +24,16 @@ DEPEND="${GNUSTEP_BASE_DEPEND}
 	=app-text/aspell-0.50*"
 RDEPEND="${DEPEND}
 	${DOC_RDEPEND}"
+PDEPEND="camaelon? =gnustep-libs/camaelon-0.1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use camaelon
+	then
+		epatch ${FILESDIR}/${P}-camaelon.patch
+	fi
+}
 
 src_compile() {
 	egnustep_env