Mass Update: gnustep.eclass revamped to allow configurable root install; gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions bumped where files would change); some KEYWORDS were accidentally dropped between version bumps of packages -- this has been resolved; windowmaker correctly supports gnustep now; gnustep-funcs.eclass added -- used where info on an installed gnustep-env is needed rather than making a full GNUstep application

71 files changed, 439 insertions, 376 deletions

diff --git a/gnustep-apps/aclock/ChangeLog b/gnustep-apps/aclock/ChangeLog
index 2f94b2a4eec6..b5ddbc0e6e84 100644
--- a/gnustep-apps/aclock/ChangeLog
+++ b/gnustep-apps/aclock/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/aclock
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/aclock/ChangeLog,v 1.3 2004/10/14 19:59:41 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/aclock/ChangeLog,v 1.4 2004/11/12 03:49:27 fafhrd Exp $
+
+*aclock-0.2-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> aclock-0.1.0.ebuild,
+  +aclock-0.2-r1.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   14 Oct 2004; David Holm <dholm@gentoo.org> aclock-0.2.ebuild:
   Added to ~ppc.
diff --git a/gnustep-apps/aclock/Manifest b/gnustep-apps/aclock/Manifest
index 4a287bd36bd2..f2b4e9d20244 100644
--- a/gnustep-apps/aclock/Manifest
+++ b/gnustep-apps/aclock/Manifest
@@ -1,7 +1,9 @@
-MD5 34b895a7f39fb74c014cb889dd27d58a ChangeLog 742
-MD5 8218dc6c78dd18255021d0cd608ae8b7 aclock-0.1.0.ebuild 466
 MD5 50585b6e8b72f4945ebf82b548b4bf2b aclock-0.2.ebuild 468
+MD5 ffdcedbdf1444219d54bb78af76c0a56 aclock-0.1.0.ebuild 471
+MD5 bf53c2c2e2e4b4e952f72f68fb7b45a9 aclock-0.2-r1.ebuild 403
+MD5 64529b8344c6af585f0132806857acf8 ChangeLog 1209
 MD5 d421688d8f3f6a5c33b0a960ba0e9e0a metadata.xml 409
+MD5 435c68e277b33f73571f10211eb17dfb files/digest-aclock-0.2 61
 MD5 ce19fe0473570b56889ddc6eee767d7f files/config-aclock.sh 908
 MD5 c7148a77ea1f2b903996e65eeded8582 files/digest-aclock-0.1.0 63
-MD5 435c68e277b33f73571f10211eb17dfb files/digest-aclock-0.2 61
+MD5 435c68e277b33f73571f10211eb17dfb files/digest-aclock-0.2-r1 61
diff --git a/gnustep-apps/aclock/aclock-0.1.0.ebuild b/gnustep-apps/aclock/aclock-0.1.0.ebuild
index f7d8db97cc03..8b2d9f16e80c 100644
--- a/gnustep-apps/aclock/aclock-0.1.0.ebuild
+++ b/gnustep-apps/aclock/aclock-0.1.0.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-apps/aclock/aclock-0.1.0.ebuild,v 1.1 2004/09/24 01:07:05 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/aclock/aclock-0.1.0.ebuild,v 1.2 2004/11/12 03:49:27 fafhrd Exp $
 
 inherit gnustep
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.linuks.mine.nu/aclock/"
 SRC_URI="http://www.linuks.mine.nu/aclock/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
diff --git a/gnustep-apps/aclock/aclock-0.2-r1.ebuild b/gnustep-apps/aclock/aclock-0.2-r1.ebuild
new file mode 100644
index 000000000000..67f99b3cce7b
--- /dev/null
+++ b/gnustep-apps/aclock/aclock-0.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/aclock/aclock-0.2-r1.ebuild,v 1.1 2004/11/12 03:49:27 fafhrd Exp $
+
+inherit gnustep
+
+DESCRIPTION="A clock!"
+HOMEPAGE="http://www.linuks.mine.nu/aclock/"
+SRC_URI="http://www.linuks.mine.nu/aclock/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="${IUSE}"
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "Local"
+
diff --git a/gnustep-apps/aclock/files/digest-aclock-0.2-r1 b/gnustep-apps/aclock/files/digest-aclock-0.2-r1
new file mode 100644
index 000000000000..91529d391e1e
--- /dev/null
+++ b/gnustep-apps/aclock/files/digest-aclock-0.2-r1
@@ -0,0 +1 @@
+MD5 59353be1f1cf90bc8f20edb2b590eb67 aclock-0.2.tar.gz 32011
diff --git a/gnustep-apps/addresses/ChangeLog b/gnustep-apps/addresses/ChangeLog
index 35394b2b0586..646a1b95eeb9 100644
--- a/gnustep-apps/addresses/ChangeLog
+++ b/gnustep-apps/addresses/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-apps/addresses
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/ChangeLog,v 1.2 2004/10/14 19:59:43 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/ChangeLog,v 1.3 2004/11/12 03:49:45 fafhrd Exp $
+
+*addresses-0.4.6-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/address-user-root.patch, +files/nonflattened.patch,
+  +addresses-0.4.6-r1.ebuild, addresses-0.4.6.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
 *addresses-0.4.6 (14 Oct 2004)
 
diff --git a/gnustep-apps/addresses/Manifest b/gnustep-apps/addresses/Manifest
index d6938f9eecc6..c61159bf6ba5 100644
--- a/gnustep-apps/addresses/Manifest
+++ b/gnustep-apps/addresses/Manifest
@@ -1,4 +1,8 @@
-MD5 1f65ee124649b032c533b55d7cf06bb4 ChangeLog 407
-MD5 2712e4dc4aed3f46be4d7f24ca5d127e addresses-0.4.6.ebuild 700
+MD5 17c155dcfb1f3c899e8f7f0ea9a00b96 addresses-0.4.6-r1.ebuild 816
+MD5 bf01eefc4e0d9b08e29375a121d2f9e5 addresses-0.4.6.ebuild 882
+MD5 7f3a9faffdaf14bf8cfe7cd3e6978de0 ChangeLog 948
 MD5 0996c4d3fdc1150372a830b8cf6d7351 metadata.xml 492
+MD5 caa8fe8f357e0952136999cadd1cce78 files/address-user-root.patch 870
+MD5 d7cd9285dafc9723e4acfb35563654a1 files/nonflattened.patch 1520
+MD5 54b2f4dcff77fda04fd19118a505b069 files/digest-addresses-0.4.6-r1 67
 MD5 54b2f4dcff77fda04fd19118a505b069 files/digest-addresses-0.4.6 67
diff --git a/gnustep-apps/addresses/addresses-0.4.6-r1.ebuild b/gnustep-apps/addresses/addresses-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..e3fd829923e5
--- /dev/null
+++ b/gnustep-apps/addresses/addresses-0.4.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/addresses-0.4.6-r1.ebuild,v 1.1 2004/11/12 03:49:45 fafhrd Exp $
+
+inherit gnustep eutils
+
+S=${WORKDIR}/${P/a/A}
+
+DESCRIPTION="Addresses is a Apple Addressbook work alike (standalone and for GNUMail)"
+HOMEPAGE="http://giesler.biz/bjoern/en/sw_addr.html"
+#SRC_URI="mirror://gentoo/${P/a/A}.tar.gz"
+#SRC_URI="http://dev.gentoo.org/~fafhrd/gnustep/apps/${P/a/A}.tar.gz"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/contrib/${P/a/A}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="${IUSE}"
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "Local"
+
+src_unpack() {
+	egnustep_env
+	unpack ${A}
+	cd ${S}
+	if [ -z "${GNUSTEP_FLATTENED}" ]; then
+		epatch ${FILESDIR}/nonflattened.patch
+	fi
+	epatch ${FILESDIR}/address-user-root.patch
+}
+
diff --git a/gnustep-apps/addresses/addresses-0.4.6.ebuild b/gnustep-apps/addresses/addresses-0.4.6.ebuild
index c950250991ff..504c180d4d44 100644
--- a/gnustep-apps/addresses/addresses-0.4.6.ebuild
+++ b/gnustep-apps/addresses/addresses-0.4.6.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-apps/addresses/addresses-0.4.6.ebuild,v 1.2 2004/10/14 19:59:43 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/addresses-0.4.6.ebuild,v 1.3 2004/11/12 03:49:45 fafhrd Exp $
 
 inherit gnustep
 
@@ -19,3 +19,13 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+src_unpack() {
+	egnustep_env
+	unpack ${A}
+	cd ${S}
+	if [ -z "${GNUSTEP_FLATTENED}" ]; then
+		epatch ${FILESDIR}/nonflattened.patch
+	fi
+	epatch ${FILESDIR}/address-user-root.patch
+}
+
diff --git a/gnustep-apps/addresses/files/address-user-root.patch b/gnustep-apps/addresses/files/address-user-root.patch
new file mode 100644
index 000000000000..1e53ab02ae9f
--- /dev/null
+++ b/gnustep-apps/addresses/files/address-user-root.patch
@@ -0,0 +1,25 @@
+diff -ur Addresses-0.4.6/Frameworks/Addresses/ADLocalAddressBook.m Addresses-0.4.6-adc/Frameworks/Addresses/ADLocalAddressBook.m
+--- Addresses-0.4.6/Frameworks/Addresses/ADLocalAddressBook.m	2004-07-29 08:23:10.000000000 -0400
++++ Addresses-0.4.6-adc/Frameworks/Addresses/ADLocalAddressBook.m	2004-11-08 14:08:07.252017064 -0500
+@@ -308,8 +308,20 @@
+ + (ADAddressBook*) sharedAddressBook
+ {
+   if(!_localAB)
++  {
++    NSProcessInfo *pInfo;
++    NSDictionary *env;
++    NSMutableString *user;
++    
++    pInfo = [NSProcessInfo processInfo];
++    env = [pInfo environment];
++    user = [[[env objectForKey: @"GNUSTEP_USER_ROOT"] 
++      mutableCopy]
++        autorelease];
++    [user appendString: @"/Library/Addresses"];
+     _localAB = [[ADLocalAddressBook alloc]
+-		 initWithLocation: [self defaultLocation]];
++		 initWithLocation: user];
++  }
+   return _localAB;
+ }
+ 
diff --git a/gnustep-apps/addresses/files/digest-addresses-0.4.6-r1 b/gnustep-apps/addresses/files/digest-addresses-0.4.6-r1
new file mode 100644
index 000000000000..42b6dd2b2f30
--- /dev/null
+++ b/gnustep-apps/addresses/files/digest-addresses-0.4.6-r1
@@ -0,0 +1 @@
+MD5 682da8b8530e8c595c7daa46a31b0af7 Addresses-0.4.6.tar.gz 267459
diff --git a/gnustep-apps/addresses/files/nonflattened.patch b/gnustep-apps/addresses/files/nonflattened.patch
new file mode 100644
index 000000000000..2253661b1c18
--- /dev/null
+++ b/gnustep-apps/addresses/files/nonflattened.patch
@@ -0,0 +1,26 @@
+diff -ur Addresses-0.4.6/AddressManager/GNUmakefile Addresses-0.4.6-adc/AddressManager/GNUmakefile
+--- Addresses-0.4.6/AddressManager/GNUmakefile	2004-07-29 08:23:10.000000000 -0400
++++ Addresses-0.4.6-adc/AddressManager/GNUmakefile	2004-11-06 16:31:51.661209800 -0500
+@@ -23,8 +23,8 @@
+ AddressManager_LANGUAGES=Dutch English French German Spanish
+ AddressManager_OBJCFLAGS=-I../Frameworks -Wall
+ AddressManager_LDFLAGS=\
+-	-L../Frameworks/AddressView/AddressView.framework/Versions/A \
+-	-L../Frameworks/Addresses/Addresses.framework/Versions/A     \
++	-L../Frameworks/AddressView/AddressView.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO} \
++	-L../Frameworks/Addresses/Addresses.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO} \
+ 	-lAddressView -lAddresses
+ 
+ -include GNUmakefile.preamble
+diff -ur Addresses-0.4.6/Frameworks/Addresses/GNUmakefile Addresses-0.4.6-adc/Frameworks/Addresses/GNUmakefile
+--- Addresses-0.4.6/Frameworks/Addresses/GNUmakefile	2004-07-29 08:23:10.000000000 -0400
++++ Addresses-0.4.6-adc/Frameworks/Addresses/GNUmakefile	2004-11-06 16:45:42.292934584 -0500
+@@ -49,6 +49,6 @@
+ -include GNUmakefile.postamble
+ 
+ after-Addresses-install::
+-	ln -sf $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/Addresses \
+-	       $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/AddressBook
++	ln -sf $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/${LIBRARY_COMBO}/Addresses \
++	       $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/${LIBRARY_COMBO}/AddressBook
+ 
diff --git a/gnustep-apps/affiche/ChangeLog b/gnustep-apps/affiche/ChangeLog
index 5d33887e5ace..a2a6c7875044 100644
--- a/gnustep-apps/affiche/ChangeLog
+++ b/gnustep-apps/affiche/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/affiche
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/affiche/ChangeLog,v 1.5 2004/10/14 20:00:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/affiche/ChangeLog,v 1.6 2004/11/12 03:50:02 fafhrd Exp $
+
+*affiche-0.6.0-r2 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> +affiche-0.6.0-r2.ebuild,
+  -affiche-0.6.0.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
 *affiche-0.6.0-r1 (14 Oct 2004)
 
diff --git a/gnustep-apps/affiche/Manifest b/gnustep-apps/affiche/Manifest
index 97cac49268d0..ea969e3afce4 100644
--- a/gnustep-apps/affiche/Manifest
+++ b/gnustep-apps/affiche/Manifest
@@ -1,6 +1,6 @@
-MD5 a17f557be2cd8211c87277ec4f6df3bc ChangeLog 1439
-MD5 71a2769247c736ae3283f66ab70732da affiche-0.6.0.ebuild 662
-MD5 13d75e2325bb855a42db67b40837eadc metadata.xml 555
+MD5 3138647a6654549b6b2cad90452b8b8f affiche-0.6.0-r2.ebuild 547
 MD5 172b0eac5530aaf1285941f3158df716 affiche-0.6.0-r1.ebuild 619
-MD5 fea4ce56a126969a3fd8d0f7e06efb8c files/digest-affiche-0.6.0 64
+MD5 6ca106cdb37caeaa9c3aeb693e657bcd ChangeLog 1914
+MD5 13d75e2325bb855a42db67b40837eadc metadata.xml 555
 MD5 fea4ce56a126969a3fd8d0f7e06efb8c files/digest-affiche-0.6.0-r1 64
+MD5 fea4ce56a126969a3fd8d0f7e06efb8c files/digest-affiche-0.6.0-r2 64
diff --git a/gnustep-apps/affiche/affiche-0.6.0.ebuild b/gnustep-apps/affiche/affiche-0.6.0-r2.ebuild
index 8411bf7a59f8..b77a8d1a6486 100644
--- a/gnustep-apps/affiche/affiche-0.6.0.ebuild
+++ b/gnustep-apps/affiche/affiche-0.6.0-r2.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/affiche/affiche-0.6.0.ebuild,v 1.2 2004/07/23 14:57:39 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/affiche/affiche-0.6.0-r2.ebuild,v 1.1 2004/11/12 03:50:02 fafhrd Exp $
 
-inherit gnustep-old
+inherit gnustep
 
 S=${WORKDIR}/${PN/a/A}
 
 DESCRIPTION="Affiche allows people to 'stick' notes"
 HOMEPAGE="http://www.collaboration-world.com/cgi-bin/collaboration-world/project/release.cgi?pid=5"
 SRC_URI="http://www.collaboration-world.com/affiche.data/releases/Stable/${P/a/A}.tar.gz"
-IUSE=""
-LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+LICENSE="GPL-2"
 
-DEPEND=">=gnustep-base/gnustep-gui-0.8.5"
+IUSE="${IUSE}"
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "Local"
 
-src_unpack() {
-	unpack ${P/a/A}.tar.gz
-	cd ${S}
-}
diff --git a/gnustep-apps/affiche/files/digest-affiche-0.6.0 b/gnustep-apps/affiche/files/digest-affiche-0.6.0-r2
index ca12f8768415..ca12f8768415 100644
--- a/gnustep-apps/affiche/files/digest-affiche-0.6.0
+++ b/gnustep-apps/affiche/files/digest-affiche-0.6.0-r2
diff --git a/gnustep-apps/clipbook/ChangeLog b/gnustep-apps/clipbook/ChangeLog
index bf7d1b8f25d1..af1bcb2bf322 100644
--- a/gnustep-apps/clipbook/ChangeLog
+++ b/gnustep-apps/clipbook/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-apps/clipbook
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/clipbook/ChangeLog,v 1.2 2004/10/14 20:09:37 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/clipbook/ChangeLog,v 1.3 2004/11/12 03:50:19 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  clipbook-0.94_pre20040928.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   14 Oct 2004; David Holm <dholm@gentoo.org>
   clipbook-0.94_pre20040928.ebuild:
diff --git a/gnustep-apps/clipbook/Manifest b/gnustep-apps/clipbook/Manifest
index a738ff15d04a..8577da641b44 100644
--- a/gnustep-apps/clipbook/Manifest
+++ b/gnustep-apps/clipbook/Manifest
@@ -1,4 +1,4 @@
-MD5 bf908236330948487e5024dd1ef41ac5 ChangeLog 500
-MD5 ca5f7dc4b786814148e408a54e212c0e clipbook-0.94_pre20040928.ebuild 822
+MD5 8c01b8e0180d675ab4e7b675d70c111d clipbook-0.94_pre20040928.ebuild 863
+MD5 efdc32a02d678b88b4710eeb57611734 ChangeLog 927
 MD5 1723f885d7a1b417a7395f11ff61dbff metadata.xml 324
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-clipbook-0.94_pre20040928 0
diff --git a/gnustep-apps/clipbook/clipbook-0.94_pre20040928.ebuild b/gnustep-apps/clipbook/clipbook-0.94_pre20040928.ebuild
index 8cf73915bb8f..0828b4235068 100644
--- a/gnustep-apps/clipbook/clipbook-0.94_pre20040928.ebuild
+++ b/gnustep-apps/clipbook/clipbook-0.94_pre20040928.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/clipbook/clipbook-0.94_pre20040928.ebuild,v 1.2 2004/10/14 20:09:37 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/clipbook/clipbook-0.94_pre20040928.ebuild,v 1.3 2004/11/12 03:50:19 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
 ECVS_USER="anoncvs"
 ECVS_AUTH="ext"
 ECVS_MODULE="gnustep/usr-apps/gworkspace/${PN/clipb/ClipB}"
-ECVS_CO_OPTS="-D ${PV/*_pre}"
-ECVS_UP_OPTS="-D ${PV/*_pre}"
+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
 
@@ -25,3 +25,5 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-apps/desktop/ChangeLog b/gnustep-apps/desktop/ChangeLog
index aafeba8c8a61..ed35745cb11f 100644
--- a/gnustep-apps/desktop/ChangeLog
+++ b/gnustep-apps/desktop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-apps/desktop
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/desktop/ChangeLog,v 1.2 2004/10/09 22:30:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/desktop/ChangeLog,v 1.3 2004/11/12 03:50:39 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  desktop-0.7_pre20040928.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   10 Oct 2004; David Holm <dholm@gentoo.org> desktop-0.7_pre20040928.ebuild:
   Added to ~ppc.
diff --git a/gnustep-apps/desktop/Manifest b/gnustep-apps/desktop/Manifest
index e7a36a0570d1..6f0b542700fa 100644
--- a/gnustep-apps/desktop/Manifest
+++ b/gnustep-apps/desktop/Manifest
@@ -1,5 +1,5 @@
-MD5 2fc462931105a8dd7e09c2c0853d3177 ChangeLog 507
-MD5 861ffe4af40bd92369a30957af913db6 desktop-0.7_pre20040928.ebuild 958
+MD5 c79e1f48b35cf81a0ade2339c155eda9 desktop-0.7_pre20040928.ebuild 992
+MD5 d813ce5a258b706ac3b6d72969f674e9 ChangeLog 932
 MD5 ebbafd529d14e3d9a0fe33fd0cb7202f metadata.xml 228
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-desktop-0.7_pre20040928 0
 MD5 c41375aecaaa4860a1041b2253ee784f files/seperate-build.patch 2488
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-desktop-0.7_pre20040928 0
diff --git a/gnustep-apps/desktop/desktop-0.7_pre20040928.ebuild b/gnustep-apps/desktop/desktop-0.7_pre20040928.ebuild
index 1f311cc06156..d7236ccae182 100644
--- a/gnustep-apps/desktop/desktop-0.7_pre20040928.ebuild
+++ b/gnustep-apps/desktop/desktop-0.7_pre20040928.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-apps/desktop/desktop-0.7_pre20040928.ebuild,v 1.2 2004/10/09 22:30:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/desktop/desktop-0.7_pre20040928.ebuild,v 1.3 2004/11/12 03:50:39 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -28,6 +28,8 @@ RDEPEND="${GS_RDEPEND}
 	gnustep-apps/gworkspace
 	gnustep-apps/recycler"
 
+egnustep_install_domain "System"
+
 src_compile() {
 	egnustep_env
 	EPATCH_OPTIONS="-d ${S}" epatch ${FILESDIR}/seperate-build.patch
diff --git a/gnustep-apps/easydiff/ChangeLog b/gnustep-apps/easydiff/ChangeLog
index 828d9e7903ac..5b304c025c53 100644
--- a/gnustep-apps/easydiff/ChangeLog
+++ b/gnustep-apps/easydiff/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-apps/easydiff
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/easydiff/ChangeLog,v 1.6 2004/10/17 09:23:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/easydiff/ChangeLog,v 1.7 2004/11/12 03:51:53 fafhrd Exp $
+
+*easydiff-0.3.1_pre20040927-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> -easydiff-0.1.ebuild,
+  -easydiff-0.3.1_pre20040920.ebuild, +easydiff-0.3.1_pre20040927-r1.ebuild,
+  easydiff-0.3.1_pre20040927.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   17 Oct 2004; David Holm <dholm@gentoo.org>
   easydiff-0.3.1_pre20040927.ebuild:
diff --git a/gnustep-apps/easydiff/Manifest b/gnustep-apps/easydiff/Manifest
index b5c8767fe29a..358bbf3f91bd 100644
--- a/gnustep-apps/easydiff/Manifest
+++ b/gnustep-apps/easydiff/Manifest
@@ -1,8 +1,6 @@
-MD5 b96b0cd6c6671cacaacee0c58d551c67 ChangeLog 1458
-MD5 e34d136977928ca58aaf48268856953d easydiff-0.1.ebuild 567
+MD5 93150b1f5599255ef6256d52d5a352a8 easydiff-0.3.1_pre20040927-r1.ebuild 746
+MD5 1727bab7c8fa6ecdb889ce01017ba73a easydiff-0.3.1_pre20040927.ebuild 822
+MD5 5054105f7bb10df17e8799990e13ed10 ChangeLog 2031
 MD5 e2bbe71216a3d5a6ee303cbd462acddf metadata.xml 267
-MD5 3827aab04c0f46cab1de7ecb05380c9a easydiff-0.3.1_pre20040920.ebuild 569
-MD5 4f35a1e82550ce4b0180eca372713c21 easydiff-0.3.1_pre20040927.ebuild 802
-MD5 5df6bbc9e196a285a7d04bbebb457c0d files/digest-easydiff-0.1 63
-MD5 bbe9b879535aec1e131da3c85617a119 files/digest-easydiff-0.3.1_pre20040920 77
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-easydiff-0.3.1_pre20040927-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-easydiff-0.3.1_pre20040927 0
diff --git a/gnustep-apps/easydiff/easydiff-0.1.ebuild b/gnustep-apps/easydiff/easydiff-0.1.ebuild
deleted file mode 100644
index 89ccea2e9651..000000000000
--- a/gnustep-apps/easydiff/easydiff-0.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/easydiff/easydiff-0.1.ebuild,v 1.1 2004/07/22 22:03:49 fafhrd Exp $
-
-inherit gnustep-old
-
-need-gnustep-gui
-
-DESCRIPTION="GNUstep app that lets you easily see the differences between two text files."
-HOMEPAGE="http://www.collaboration-world.com/easydiff/"
-LICENSE="GPL-2"
-SRC_URI="http://freshmeat.net/redir/easydiff/33520/url_tgz/EasyDiff-${PV}.tar.gz"
-KEYWORDS="x86 ~ppc"
-SLOT="0"
-S=${WORKDIR}/EasyDiff
-IUSE=""
diff --git a/gnustep-apps/easydiff/easydiff-0.3.1_pre20040920.ebuild b/gnustep-apps/easydiff/easydiff-0.3.1_pre20040920.ebuild
deleted file mode 100644
index 3065446f962d..000000000000
--- a/gnustep-apps/easydiff/easydiff-0.3.1_pre20040920.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/easydiff/easydiff-0.3.1_pre20040920.ebuild,v 1.1 2004/09/24 01:08:05 fafhrd Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/EasyDiff
-
-DESCRIPTION="GNUstep app that lets you easily see the differences between two text files."
-HOMEPAGE="http://www.collaboration-world.com/easydiff/"
-LICENSE="GPL-2"
-
-SRC_URI="mirrror://gentoo/${P}.tar.gz"
-KEYWORDS="~x86"
-SLOT="0"
-
-IUSE="${IUSE}"
-DEPEND="${GS_DEPEND}"
-RDEPEND="${GS_RDEPEND}"
-
diff --git a/gnustep-apps/easydiff/easydiff-0.3.1_pre20040927-r1.ebuild b/gnustep-apps/easydiff/easydiff-0.3.1_pre20040927-r1.ebuild
new file mode 100644
index 000000000000..49266840f7e5
--- /dev/null
+++ b/gnustep-apps/easydiff/easydiff-0.3.1_pre20040927-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/easydiff/easydiff-0.3.1_pre20040927-r1.ebuild,v 1.1 2004/11/12 03:51:53 fafhrd Exp $
+
+ECVS_CVS_COMMAND="cvs -q"
+ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
+ECVS_USER="anoncvs"
+ECVS_AUTH="ext"
+ECVS_MODULE="gnustep/dev-apps/${PN/easyd/EasyD}"
+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="GNUstep app that lets you easily see the differences between two text files."
+HOMEPAGE="http://www.collaboration-world.com/easydiff/"
+
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="${IUSE}"
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "Local"
+
diff --git a/gnustep-apps/easydiff/easydiff-0.3.1_pre20040927.ebuild b/gnustep-apps/easydiff/easydiff-0.3.1_pre20040927.ebuild
index b8eac88360a3..42ff27594524 100644
--- a/gnustep-apps/easydiff/easydiff-0.3.1_pre20040927.ebuild
+++ b/gnustep-apps/easydiff/easydiff-0.3.1_pre20040927.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-apps/easydiff/easydiff-0.3.1_pre20040927.ebuild,v 1.2 2004/10/17 09:23:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/easydiff/easydiff-0.3.1_pre20040927.ebuild,v 1.3 2004/11/12 03:51:53 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -10,6 +10,7 @@ ECVS_MODULE="gnustep/dev-apps/${PN/easyd/EasyD}"
 ECVS_CO_OPTS="-D ${PV/*_pre}"
 ECVS_UP_OPTS="-D ${PV/*_pre}"
 ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
+inherit gnustep cvs
 
 S=${WORKDIR}/${ECVS_MODULE}
 
diff --git a/gnustep-apps/easydiff/files/digest-easydiff-0.1 b/gnustep-apps/easydiff/files/digest-easydiff-0.1
deleted file mode 100644
index 1f15fd518fff..000000000000
--- a/gnustep-apps/easydiff/files/digest-easydiff-0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 728972275d2324cb215819a0a333d6e3 EasyDiff-0.1.tar.gz 16711
diff --git a/gnustep-apps/easydiff/files/digest-easydiff-0.3.1_pre20040920 b/gnustep-apps/easydiff/files/digest-easydiff-0.3.1_pre20040920
deleted file mode 100644
index e3a9385d7a6d..000000000000
--- a/gnustep-apps/easydiff/files/digest-easydiff-0.3.1_pre20040920
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a1b68045d71d67b3e14e00377311087 easydiff-0.3.1_pre20040920.tar.gz 28558
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040927 b/gnustep-apps/easydiff/files/digest-easydiff-0.3.1_pre20040927-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040927
+++ b/gnustep-apps/easydiff/files/digest-easydiff-0.3.1_pre20040927-r1
diff --git a/gnustep-apps/gmines/ChangeLog b/gnustep-apps/gmines/ChangeLog
index 4fb7ea6d1f89..fb9ed3e5a6ab 100644
--- a/gnustep-apps/gmines/ChangeLog
+++ b/gnustep-apps/gmines/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-apps/gmines
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gmines/ChangeLog,v 1.2 2004/10/17 09:36:36 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gmines/ChangeLog,v 1.3 2004/11/12 03:52:12 fafhrd Exp $
+
+*gmines-0.1-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> +gmines-0.1-r1.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   17 Oct 2004; David Holm <dholm@gentoo.org> gmines-0.1.ebuild:
   Added to ~ppc.
diff --git a/gnustep-apps/gmines/Manifest b/gnustep-apps/gmines/Manifest
index 3840677d1d8a..93a8299400b4 100644
--- a/gnustep-apps/gmines/Manifest
+++ b/gnustep-apps/gmines/Manifest
@@ -1,4 +1,6 @@
-MD5 ce2f8985c1383518757cf7626c23ed8c ChangeLog 441
+MD5 b2eb9eae6f4d8828d1f07e70f32850c9 gmines-0.1-r1.ebuild 471
 MD5 6c6c9fb90689e69f799e309f9d0d0ee7 gmines-0.1.ebuild 536
+MD5 82c1a447ec58bf7e91c8aaa117607a0c ChangeLog 885
 MD5 7fba9271d2a85ce1378fc8c83e092ac7 metadata.xml 328
 MD5 a1afa096024788b08b3d9753c780faa1 files/digest-gmines-0.1 53
+MD5 a1afa096024788b08b3d9753c780faa1 files/digest-gmines-0.1-r1 53
diff --git a/gnustep-apps/gmines/files/digest-gmines-0.1-r1 b/gnustep-apps/gmines/files/digest-gmines-0.1-r1
new file mode 100644
index 000000000000..11356805727f
--- /dev/null
+++ b/gnustep-apps/gmines/files/digest-gmines-0.1-r1
@@ -0,0 +1 @@
+MD5 b93d88768b6745004561cd0d80da3ed2 GMines.tgz 7369
diff --git a/gnustep-apps/gmines/gmines-0.1-r1.ebuild b/gnustep-apps/gmines/gmines-0.1-r1.ebuild
new file mode 100644
index 000000000000..764370808615
--- /dev/null
+++ b/gnustep-apps/gmines/gmines-0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gmines/gmines-0.1-r1.ebuild,v 1.1 2004/11/12 03:52:12 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/${PN/gm/GM}
+
+DESCRIPTION="The well-known minesweeper game."
+HOMEPAGE="http://www.gnustep.it/marko/GMines/index.html"
+SRC_URI="http://www.gnustep.it/marko/GMines/${PN/gm/GM}.tgz"
+KEYWORDS="~x86 ~ppc"
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="${IUSE}"
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "Local"
+
diff --git a/gnustep-apps/gnumail/ChangeLog b/gnustep-apps/gnumail/ChangeLog
index 0a3a9059caa4..3e18534c6c49 100644
--- a/gnustep-apps/gnumail/ChangeLog
+++ b/gnustep-apps/gnumail/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-apps/gnumail
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.8 2004/10/31 17:09:16 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.9 2004/11/12 03:52:49 fafhrd Exp $
+
+*gnumail-1.2.0_pre20041108 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> -gnumail-1.1.0.ebuild,
+  -gnumail-1.2.0_pre20040916.ebuild, -gnumail-1.2.0_pre20040927.ebuild,
+  gnumail-1.2.0_pre20041030.ebuild, +gnumail-1.2.0_pre20041108.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
 *gnumail-1.2.0_pre20041030 (31 Oct 2004)
 
diff --git a/gnustep-apps/gnumail/Manifest b/gnustep-apps/gnumail/Manifest
index 53965c6590bc..7b47d58ed870 100644
--- a/gnustep-apps/gnumail/Manifest
+++ b/gnustep-apps/gnumail/Manifest
@@ -1,10 +1,6 @@
-MD5 ef6bdf6c0d8aed84cf5642d241b91638 ChangeLog 2581
-MD5 f017bae9db7c408766832ae0ab99f298 gnumail-1.1.0.ebuild 1118
-MD5 43a49ca587685082a81a7968640998cd gnumail-1.2.0_pre20040916.ebuild 1412
-MD5 79feb2939106d2ea09b24e8b4dda0bd1 gnumail-1.2.0_pre20040927.ebuild 1659
+MD5 9d6c0cb7e7ef188925c7b369aae01f43 gnumail-1.2.0_pre20041030.ebuild 1654
+MD5 82b34786b44f7731306931f2023e8ac2 gnumail-1.2.0_pre20041108.ebuild 1575
+MD5 7e621eac0a01e4f849ddeae6793a0f62 ChangeLog 3180
 MD5 fd2a74704d1454dc7972123fded408cb metadata.xml 620
-MD5 fb52b5fb63a95f5216db1f81de06b80d gnumail-1.2.0_pre20041030.ebuild 1661
-MD5 a6afb5fd55515a881cc64e0b5f2667d9 files/digest-gnumail-1.1.0 66
-MD5 f36a821d49eb1f2777e387ce18f224ba files/digest-gnumail-1.2.0_pre20040916 78
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20040927 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20041030 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20041108 0
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.1.0 b/gnustep-apps/gnumail/files/digest-gnumail-1.1.0
deleted file mode 100644
index 81a08ea226a1..000000000000
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8b9d1030849dbc91c2d28716c6fceef2 GNUMail-1.1.0.tar.gz 1002575
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040916 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040916
deleted file mode 100644
index 6bec5a19c07f..000000000000
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040916
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddca3b5011d36201e3cb029c2a012a72 GNUMail-1.2.0_pre20040916.tar.gz 1171847
diff --git a/gnustep-apps/gorm/files/digest-gorm-0.8.1_pre20040927 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20041108
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-apps/gorm/files/digest-gorm-0.8.1_pre20040927
+++ b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20041108
diff --git a/gnustep-apps/gnumail/gnumail-1.1.0.ebuild b/gnustep-apps/gnumail/gnumail-1.1.0.ebuild
deleted file mode 100644
index b3326997f481..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.1.0.ebuild,v 1.2 2004/07/23 15:47:22 fafhrd Exp $
-
-inherit gnustep-old
-
-IUSE="crypt xface"
-S=${WORKDIR}/GNUMail
-
-newdepend gnustep-base/gnustep-gui
-newdepend gnustep-libs/pantomime
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-SRC_URI="http://www.collaboration-world.com/gnumail.data/releases/Stable/GNUMail-${PV}.tar.gz"
-
-DEPEND="${DEPEND}"
-RDEPEND="${RDEPEND} gnustep-base/gnustep-back"
-
-KEYWORDS="x86 ~ppc alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	unpack GNUMail-${PV}.tar.gz
-	cd ${S}
-}
-
-src_compile() {
-	egnustepmake
-
-	if use xface; then
-		cd ${S}/Bundles/Face
-		make
-		cd ${S}
-	fi
-
-	if use crypt; then
-		cd ${S}/Bundles/PGP
-		make
-		cd ${S}
-	fi
-}
-
-src_install() {
-	egnustepinstall
-
-	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}usr/GNUstep/System/Library/GNUMail/
-
-	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}usr/GNUstep/System/Library/GNUMail/
-}
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre20040916.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre20040916.ebuild
deleted file mode 100644
index ce7d6b58988e..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.0_pre20040916.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20040916.ebuild,v 1.3 2004/10/21 19:08:12 fafhrd Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/${PN/gnum/GNUM}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-SRC_URI="mirror://gentoo/${P/gnum/GNUM}.tar.gz"
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="${IUSE} xface crypt emoticon"
-DEPEND="${GS_DEPEND}
-	gnustep-libs/pantomime
-	gnustep-apps/addresses"
-RDEPEND="${GS_RDEPEND}
-	crypt? app-crypt/gnupg
-	gnustep-libs/pantomime
-	gnustep-apps/addresses"
-
-src_compile() {
-	egnustep_env
-	egnustep_make
-
-	if use xface ; then
-		cd Bundles/Face
-		egnustep_make
-		cd ../..
-	fi
-
-	if use crypt ; then
-		cd Bundles/PGP
-		egnustep_make
-		cd ../..
-	fi
-
-	if use emoticon ; then
-		cd Bundles/Emoticon
-		egnustep_make
-		cd ../..
-	fi
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install
-	if use doc ; then
-		egnustep_env
-		egnustep_doc || die
-	fi
-
-	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-
-	egnustep_package_config
-}
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild
index b78aec56eeeb..43eff0a8c7ac 100644
--- a/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild
+++ b/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.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-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild,v 1.1 2004/10/31 17:09:16 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild,v 1.2 2004/11/12 03:52:49 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="Sophos.ca:/opt/cvsroot"
@@ -18,7 +18,7 @@ S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="A fully featured mail application for GNUstep"
 HOMEPAGE="http://www.collaboration-world.com/gnumail/"
 
-KEYWORDS="~ppc"
+KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -62,9 +62,9 @@ src_install() {
 		egnustep_doc || die
 	fi
 
-	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
+	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}$(egnustep_prefix)/System/Library/GNUMail/
+	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}$(egnustep_prefix)/System/Library/GNUMail/
+	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}$(egnustep_prefix)/System/Library/GNUMail/
 
 	egnustep_package_config
 }
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre20040927.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre20041108.ebuild
index 9640fb7a5eda..7f3473b594d3 100644
--- a/gnustep-apps/gnumail/gnumail-1.2.0_pre20040927.ebuild
+++ b/gnustep-apps/gnumail/gnumail-1.2.0_pre20041108.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-apps/gnumail/gnumail-1.2.0_pre20040927.ebuild,v 1.4 2004/10/21 19:08:12 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20041108.ebuild,v 1.1 2004/11/12 03:52:49 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="Sophos.ca:/opt/cvsroot"
@@ -8,8 +8,8 @@ ECVS_USER="anoncvs"
 ECVS_PASS="anoncvs"
 ECVS_AUTH="pserver"
 ECVS_MODULE="${PN/gnum/GNUM}"
-ECVS_CO_OPTS="-D ${PV/*_pre}"
-ECVS_UP_OPTS="-D ${PV/*_pre}"
+ECVS_CO_OPTS="-P -D ${PV/*_pre}"
+ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
 ECVS_TOP_DIR="${DISTDIR}/cvs-src/Sophos.ca-collaborationworld"
 inherit gnustep cvs
 
@@ -31,6 +31,8 @@ RDEPEND="${GS_RDEPEND}
 	=gnustep-libs/pantomime-${PV}
 	gnustep-apps/addresses"
 
+egnustep_install_domain "Local"
+
 src_compile() {
 	egnustep_env
 	egnustep_make
@@ -62,9 +64,9 @@ src_install() {
 		egnustep_doc || die
 	fi
 
-	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
+	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
+	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
+	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
 
 	egnustep_package_config
 }
diff --git a/gnustep-apps/gorm/ChangeLog b/gnustep-apps/gorm/ChangeLog
index a9b1d5220885..69d5e4cdd39a 100644
--- a/gnustep-apps/gorm/ChangeLog
+++ b/gnustep-apps/gorm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-apps/gorm
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/ChangeLog,v 1.8 2004/10/17 09:38:07 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/ChangeLog,v 1.9 2004/11/12 03:53:07 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> -gorm-0.3.0.ebuild,
+  gorm-0.8.0-r1.ebuild, -gorm-0.8.0.ebuild, gorm-0.8.1_pre20040927-r1.ebuild,
+  -gorm-0.8.1_pre20040927.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   17 Oct 2004; David Holm <dholm@gentoo.org>
   gorm-0.8.1_pre20040927-r1.ebuild:
diff --git a/gnustep-apps/gorm/Manifest b/gnustep-apps/gorm/Manifest
index e4a0fa60b99e..2771ab2c856e 100644
--- a/gnustep-apps/gorm/Manifest
+++ b/gnustep-apps/gorm/Manifest
@@ -1,12 +1,6 @@
-MD5 52486ffe1cf8ae45e344588dee07dbd8 ChangeLog 2020
-MD5 7995fa6ecb224c40ae7487e52372a02b gorm-0.3.0.ebuild 565
+MD5 cc07cb451890f2019867c6e3e5aea473 gorm-0.8.1_pre20040927-r1.ebuild 1359
+MD5 93cb8a4570d8d85d472663312cf27118 ChangeLog 2543
 MD5 521ef42b013a69d7099613591efccc02 metadata.xml 1489
-MD5 bf530ad965ae887d0419917f383e3e7e gorm-0.8.0.ebuild 561
-MD5 d763559425842b6da444534813d6854d gorm-0.8.1_pre20040927.ebuild 784
-MD5 72f54abe249fa35052cbe4e2cc9d5047 gorm-0.8.0-r1.ebuild 1097
-MD5 60390e9715b0101b853de97bb05ba9cf gorm-0.8.1_pre20040927-r1.ebuild 1318
-MD5 0143cd1d679015adfc56920df6e378ef files/digest-gorm-0.3.0 62
-MD5 0ed5404b24f90c037c8308694ff79ddf files/digest-gorm-0.8.0 62
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gorm-0.8.1_pre20040927 0
-MD5 0ed5404b24f90c037c8308694ff79ddf files/digest-gorm-0.8.0-r1 62
+MD5 6b3763d2a20da41e517fd66f02a62c79 gorm-0.8.0-r1.ebuild 1136
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gorm-0.8.1_pre20040927-r1 0
+MD5 0ed5404b24f90c037c8308694ff79ddf files/digest-gorm-0.8.0-r1 62
diff --git a/gnustep-apps/gorm/files/digest-gorm-0.3.0 b/gnustep-apps/gorm/files/digest-gorm-0.3.0
deleted file mode 100644
index 355935a325a0..000000000000
--- a/gnustep-apps/gorm/files/digest-gorm-0.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e28ac65632819d74f7622fc0a628e857 Gorm-0.3.0.tar.gz 362392
diff --git a/gnustep-apps/gorm/files/digest-gorm-0.8.0 b/gnustep-apps/gorm/files/digest-gorm-0.8.0
deleted file mode 100644
index 95144f671f10..000000000000
--- a/gnustep-apps/gorm/files/digest-gorm-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c454db0888217e7972fea76d05e8d86c Gorm-0.8.0.tar.gz 461164
diff --git a/gnustep-apps/gorm/gorm-0.3.0.ebuild b/gnustep-apps/gorm/gorm-0.3.0.ebuild
deleted file mode 100644
index b35c941d1548..000000000000
--- a/gnustep-apps/gorm/gorm-0.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-0.3.0.ebuild,v 1.2 2004/07/23 14:58:03 fafhrd Exp $
-
-inherit base gnustep-old
-
-S=${WORKDIR}/${P/g/G}
-
-DESCRIPTION="GNUstep GUI interface designer"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P/g/G}.tar.gz"
-IUSE=""
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-DEPEND=">=gnustep-base/gnustep-gui-0.8.5"
-
-src_unpack() {
-	unpack ${P/g/G}.tar.gz
-	cd ${S}
-}
diff --git a/gnustep-apps/gorm/gorm-0.8.0-r1.ebuild b/gnustep-apps/gorm/gorm-0.8.0-r1.ebuild
index fa449f4f1a50..4f42714f63a8 100644
--- a/gnustep-apps/gorm/gorm-0.8.0-r1.ebuild
+++ b/gnustep-apps/gorm/gorm-0.8.0-r1.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-apps/gorm/gorm-0.8.0-r1.ebuild,v 1.1 2004/10/04 22:02:50 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-0.8.0-r1.ebuild,v 1.2 2004/11/12 03:53:07 fafhrd Exp $
 
 inherit gnustep
 
@@ -10,7 +10,7 @@ DESCRIPTION="Gorm is a clone of the NeXTstep Interface Builder application for G
 HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P/g/G}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -19,6 +19,8 @@ DEPEND="${GS_DEPEND}
 	doc? sys-apps/sed"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
 src_unpack() {
 	unpack ${A}
 	sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
diff --git a/gnustep-apps/gorm/gorm-0.8.0.ebuild b/gnustep-apps/gorm/gorm-0.8.0.ebuild
deleted file mode 100644
index 53d0c20bb4cc..000000000000
--- a/gnustep-apps/gorm/gorm-0.8.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-0.8.0.ebuild,v 1.1 2004/09/26 21:17:17 fafhrd Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/${P/g/G}
-
-DESCRIPTION="Gorm is a clone of the NeXTstep Interface Builder application for GNUstep."
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P/g/G}.tar.gz"
-
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="${GS_DEPEND}"
-RDEPEND="${GS_RDEPEND}"
-
diff --git a/gnustep-apps/gorm/gorm-0.8.1_pre20040927-r1.ebuild b/gnustep-apps/gorm/gorm-0.8.1_pre20040927-r1.ebuild
index fabbe14651e6..84074af3e521 100644
--- a/gnustep-apps/gorm/gorm-0.8.1_pre20040927-r1.ebuild
+++ b/gnustep-apps/gorm/gorm-0.8.1_pre20040927-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-0.8.1_pre20040927-r1.ebuild,v 1.2 2004/10/17 09:38:07 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-0.8.1_pre20040927-r1.ebuild,v 1.3 2004/11/12 03:53:07 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
 ECVS_USER="anoncvs"
 ECVS_AUTH="ext"
 ECVS_MODULE="gnustep/dev-apps/${PN/g/G}"
-ECVS_CO_OPTS="-D ${PV/*_pre}"
-ECVS_UP_OPTS="-D ${PV/*_pre}"
+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
 
@@ -26,6 +26,8 @@ DEPEND="${GS_DEPEND}
 	doc? sys-apps/sed"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
 src_unpack() {
 	cvs_src_unpack
 	sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
diff --git a/gnustep-apps/gorm/gorm-0.8.1_pre20040927.ebuild b/gnustep-apps/gorm/gorm-0.8.1_pre20040927.ebuild
deleted file mode 100644
index 693f18a234f8..000000000000
--- a/gnustep-apps/gorm/gorm-0.8.1_pre20040927.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-0.8.1_pre20040927.ebuild,v 1.1 2004/09/28 17:54:04 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/dev-apps/${PN/g/G}"
-ECVS_CO_OPTS="-D ${PV/*_pre}"
-ECVS_UP_OPTS="-D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="Gorm is a clone of the NeXTstep Interface Builder application for GNUstep."
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="${GS_DEPEND}"
-RDEPEND="${GS_RDEPEND}"
-
diff --git a/gnustep-apps/gridlock/ChangeLog b/gnustep-apps/gridlock/ChangeLog
index ac46dcaf082e..80ecb89c8e3d 100644
--- a/gnustep-apps/gridlock/ChangeLog
+++ b/gnustep-apps/gridlock/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/gridlock
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/ChangeLog,v 1.5 2004/10/17 09:38:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/ChangeLog,v 1.6 2004/11/12 03:53:29 fafhrd Exp $
+
+*gridlock-1.9-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> -gridlock-1.6.1.ebuild,
+  +gridlock-1.9-r1.ebuild, gridlock-1.9.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   17 Oct 2004; David Holm <dholm@gentoo.org> gridlock-1.9.ebuild:
   Added to ~ppc.
diff --git a/gnustep-apps/gridlock/Manifest b/gnustep-apps/gridlock/Manifest
index 50e2b8434da9..6560ca10e4ef 100644
--- a/gnustep-apps/gridlock/Manifest
+++ b/gnustep-apps/gridlock/Manifest
@@ -1,6 +1,6 @@
-MD5 c2bd20fcdcf1b04b00a766313daa8c31 ChangeLog 1320
-MD5 349c49699fa48f2d6ce3ad6eb35114d4 gridlock-1.6.1.ebuild 596
+MD5 f43684ae52398617798d41725e2d5e88 gridlock-1.9-r1.ebuild 748
+MD5 18382290fa1774112361538e1c49a3db gridlock-1.9.ebuild 815
+MD5 b3e9a4ef8ba347936491027c10b23224 ChangeLog 1815
 MD5 b18e9974948edfd39ccec88acfcea333 metadata.xml 418
-MD5 0fd1acfff906ffdb99e1fdbd9a7fe9ab gridlock-1.9.ebuild 809
-MD5 63293230c20e5507fec605ea87fa0bf7 files/digest-gridlock-1.6.1 74
+MD5 f07903e65a83b0f4d5f1f38b00acb63e files/digest-gridlock-1.9-r1 72
 MD5 f07903e65a83b0f4d5f1f38b00acb63e files/digest-gridlock-1.9 72
diff --git a/gnustep-apps/gridlock/files/digest-gridlock-1.6.1 b/gnustep-apps/gridlock/files/digest-gridlock-1.6.1
deleted file mode 100644
index 8adfac755a1d..000000000000
--- a/gnustep-apps/gridlock/files/digest-gridlock-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34a47e168793c3949e25460d6ea36830 Gridlock-GNUstep-1.6.1.tar.gz 191166
diff --git a/gnustep-apps/gridlock/files/digest-gridlock-1.9-r1 b/gnustep-apps/gridlock/files/digest-gridlock-1.9-r1
new file mode 100644
index 000000000000..14058755559b
--- /dev/null
+++ b/gnustep-apps/gridlock/files/digest-gridlock-1.9-r1
@@ -0,0 +1 @@
+MD5 05ea4dc2c2b1a36771b374b29701753f Gridlock-gnustep-1.9.tar.gz 211523
diff --git a/gnustep-apps/gridlock/gridlock-1.6.1.ebuild b/gnustep-apps/gridlock/gridlock-1.6.1.ebuild
deleted file mode 100644
index 05c59ed734fd..000000000000
--- a/gnustep-apps/gridlock/gridlock-1.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.6.1.ebuild,v 1.2 2004/07/23 14:58:21 fafhrd Exp $
-
-inherit gnustep-old
-
-S=${WORKDIR}/${PN/g/G}
-
-DESCRIPTION="Gridlock is a collection of grid-based games"
-HOMEPAGE="http://dozingcat.com/"
-SRC_URI="http://dozingcat.com/Gridlock/${PN/g/G}-GNUstep-${PV}.tar.gz"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-DEPEND=">=gnustep-base/gnustep-gui-0.8.5"
-
-src_unpack() {
-	unpack ${PN/g/G}-GNUstep-${PV}.tar.gz
-	cd ${S}
-}
diff --git a/gnustep-apps/gridlock/gridlock-1.9-r1.ebuild b/gnustep-apps/gridlock/gridlock-1.9-r1.ebuild
new file mode 100644
index 000000000000..2cf25a35329c
--- /dev/null
+++ b/gnustep-apps/gridlock/gridlock-1.9-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.9-r1.ebuild,v 1.1 2004/11/12 03:53:29 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/${PN/g/G}
+
+DESCRIPTION="Gridlock is a collection of grid-based games"
+HOMEPAGE="http://dozingcat.com/"
+SRC_URI="http://dozingcat.com/Gridlock/${PN/g/G}-gnustep-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="${IUSE} doc"
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "Local"
+
+src_install() {
+	egnustep_env
+	egnustep_install || die
+	if use doc
+	then
+		mkdir -p ${D}$(egnustep_install_domain)/Library/Documentation/User/Gridlock
+		cp Resources/readme.html ${D}$(egnustep_install_domain)/Library/Documentation/User/Gridlock
+	fi
+	egnustep_package_config
+}
+
diff --git a/gnustep-apps/gridlock/gridlock-1.9.ebuild b/gnustep-apps/gridlock/gridlock-1.9.ebuild
index 252d95804a15..0fbc1fce3e71 100644
--- a/gnustep-apps/gridlock/gridlock-1.9.ebuild
+++ b/gnustep-apps/gridlock/gridlock-1.9.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-apps/gridlock/gridlock-1.9.ebuild,v 1.2 2004/10/17 09:38:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.9.ebuild,v 1.3 2004/11/12 03:53:29 fafhrd Exp $
 
 inherit gnustep
 
@@ -22,8 +22,8 @@ src_install() {
 	egnustep_install || die
 	if use doc
 	then
-		mkdir -p ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/User/Gridlock
-		cp Resources/readme.html ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/User/Gridlock
+		mkdir -p ${D}$(egnustep_prefix)/System/Library/Documentation/User/Gridlock
+		cp Resources/readme.html ${D}$(egnustep_prefix)/System/Library/Documentation/User/Gridlock
 	fi
 	egnustep_package_config
 }
diff --git a/gnustep-apps/gwnet/ChangeLog b/gnustep-apps/gwnet/ChangeLog
index 7205189e6b92..139a2b4adfad 100644
--- a/gnustep-apps/gwnet/ChangeLog
+++ b/gnustep-apps/gwnet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-apps/gwnet
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gwnet/ChangeLog,v 1.2 2004/10/17 09:41:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gwnet/ChangeLog,v 1.3 2004/11/12 03:53:47 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  gwnet-0.1_pre20040928.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   17 Oct 2004; David Holm <dholm@gentoo.org> gwnet-0.1_pre20040928.ebuild:
   Added to ~ppc.
diff --git a/gnustep-apps/gwnet/Manifest b/gnustep-apps/gwnet/Manifest
index 11bbd422a234..17ccd7994a3b 100644
--- a/gnustep-apps/gwnet/Manifest
+++ b/gnustep-apps/gwnet/Manifest
@@ -1,4 +1,4 @@
-MD5 d50a7797c6db4dd845d8862370ab24c2 ChangeLog 486
-MD5 d22d2676f374fe86d534bd8b9acab4cd gwnet-0.1_pre20040928.ebuild 899
+MD5 4088145deaaceec994a7380e7e4fa226 gwnet-0.1_pre20040928.ebuild 940
+MD5 9f07e8605e20828f697c8eaa873232ea ChangeLog 909
 MD5 f2392691afe8da10b2b7110b933fd207 metadata.xml 282
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gwnet-0.1_pre20040928 0
diff --git a/gnustep-apps/gwnet/gwnet-0.1_pre20040928.ebuild b/gnustep-apps/gwnet/gwnet-0.1_pre20040928.ebuild
index ddfded4bef16..6aa743e0f0a5 100644
--- a/gnustep-apps/gwnet/gwnet-0.1_pre20040928.ebuild
+++ b/gnustep-apps/gwnet/gwnet-0.1_pre20040928.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gwnet/gwnet-0.1_pre20040928.ebuild,v 1.2 2004/10/17 09:41:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gwnet/gwnet-0.1_pre20040928.ebuild,v 1.3 2004/11/12 03:53:47 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
 ECVS_USER="anoncvs"
 ECVS_AUTH="ext"
 ECVS_MODULE="gnustep/usr-apps/gworkspace/${PN/gwn/GWN}"
-ECVS_CO_OPTS="-D ${PV/*_pre}"
-ECVS_UP_OPTS="-D ${PV/*_pre}"
+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
 
@@ -28,3 +28,5 @@ DEPEND="${GS_DEPEND}
 RDEPEND="${GS_RDEPEND}
 	gnustep-libs/smbkit"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-apps/gworkspace/ChangeLog b/gnustep-apps/gworkspace/ChangeLog
index 4625e9d6f70b..e5126c51b08c 100644
--- a/gnustep-apps/gworkspace/ChangeLog
+++ b/gnustep-apps/gworkspace/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-apps/gworkspace
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.10 2004/10/22 05:18:29 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.11 2004/11/12 03:51:18 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> -gworkspace-0.5.3.ebuild,
+  gworkspace-0.6.6_pre20040928-r3.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
 *gworkspace-0.6.6_pre20040928-r3 (22 Oct 2004)
 
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index b9062a49df6d..0199e0364a2d 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,13 +1,11 @@
-MD5 af10a40f22acbff26201ae69164fb32d ChangeLog 2443
-MD5 fc35533cd18704845b8a9528844d0cf4 gworkspace-0.5.3.ebuild 619
-MD5 17550668a1428fcc2a0e7bc989ac3931 gworkspace-0.6.6_pre20040928-r1.ebuild 931
 MD5 04f194acbd67ab74bd3f25c79fd39234 gworkspace-0.6.6_pre20040928-r2.ebuild 979
-MD5 513c29d824c7e48febfad8e782fd3bee gworkspace-0.6.6_pre20040928.ebuild 894
+MD5 17550668a1428fcc2a0e7bc989ac3931 gworkspace-0.6.6_pre20040928-r1.ebuild 931
+MD5 bdfd9713a31d0e0210ccd089725a2ad6 gworkspace-0.6.6_pre20040928-r3.ebuild 1005
+MD5 e20ca8d1de0c67924ca072a54d1e4513 ChangeLog 2902
 MD5 144bf372071e2a59ced95e82e91531bd metadata.xml 391
-MD5 5dbabf2c57823621e0dc58f18c049318 gworkspace-0.6.6_pre20040928-r3.ebuild 971
-MD5 48cb1091fdd1df58f0a32711945b64fb files/digest-gworkspace-0.5.3 69
+MD5 513c29d824c7e48febfad8e782fd3bee gworkspace-0.6.6_pre20040928.ebuild 894
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gworkspace-0.6.6_pre20040928 0
+MD5 660807348555935d3d149797044803b3 files/seperate-desktop-recycler.patch 316
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gworkspace-0.6.6_pre20040928-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gworkspace-0.6.6_pre20040928-r2 0
-MD5 660807348555935d3d149797044803b3 files/seperate-desktop-recycler.patch 316
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gworkspace-0.6.6_pre20040928-r3 0
diff --git a/gnustep-apps/gworkspace/files/digest-gworkspace-0.5.3 b/gnustep-apps/gworkspace/files/digest-gworkspace-0.5.3
deleted file mode 100644
index b8af27dcf117..000000000000
--- a/gnustep-apps/gworkspace/files/digest-gworkspace-0.5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 119523e6762a5abe9226877045e2faec gworkspace-0.5.3.tar.gz 1104593
diff --git a/gnustep-apps/gworkspace/gworkspace-0.5.3.ebuild b/gnustep-apps/gworkspace/gworkspace-0.5.3.ebuild
deleted file mode 100644
index 6b4495d4af6e..000000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.5.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.5.3.ebuild,v 1.2 2004/07/23 14:58:41 fafhrd Exp $
-
-inherit gnustep-old
-
-S=${WORKDIR}/GWorkspace-${PV}
-
-DESCRIPTION="GNUstep workspace manager"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="http://www.gnustep.it/enrico/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-DEPEND=">=gnustep-base/gnustep-gui-0.8.5"
-IUSE=""
-
-src_install() {
-	egnustepinstall
-	cd ${S}/Apps_wrappers
-	cp -a * ${D}${GNUSTEP_SYSTEM_ROOT}/Applications
-}
diff --git a/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040928-r3.ebuild b/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040928-r3.ebuild
index 46d1e9314a30..cf02f3021095 100644
--- a/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040928-r3.ebuild
+++ b/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040928-r3.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-apps/gworkspace/gworkspace-0.6.6_pre20040928-r3.ebuild,v 1.2 2004/10/22 19:51:02 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040928-r3.ebuild,v 1.3 2004/11/12 03:51:18 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -26,6 +26,8 @@ DEPEND="${GS_DEPEND}
 	pdfkit? ( gnustep-libs/pdfkit )"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
 src_compile() {
 	egnustep_env
 
diff --git a/gnustep-apps/recycler/ChangeLog b/gnustep-apps/recycler/ChangeLog
index b9ddbbaa5c5d..39471d207789 100644
--- a/gnustep-apps/recycler/ChangeLog
+++ b/gnustep-apps/recycler/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-apps/recycler
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/recycler/ChangeLog,v 1.2 2004/10/09 22:28:26 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/recycler/ChangeLog,v 1.3 2004/11/12 03:51:36 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  recycler-0.7_pre20040928.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   10 Oct 2004; David Holm <dholm@gentoo.org>
   recycler-0.7_pre20040928.ebuild:
diff --git a/gnustep-apps/recycler/Manifest b/gnustep-apps/recycler/Manifest
index f2e7866c0c71..86f8d138719c 100644
--- a/gnustep-apps/recycler/Manifest
+++ b/gnustep-apps/recycler/Manifest
@@ -1,5 +1,5 @@
-MD5 ffd650dc291a9797a60d559b5c5f9bd4 ChangeLog 514
+MD5 50b51e1df5994928a5305eb3099e77b8 recycler-0.7_pre20040928.ebuild 964
+MD5 b7d0657b276e9df46ef5af44ae371ec2 ChangeLog 940
 MD5 87d1c55f65942899d02fea4a72e0734b metadata.xml 221
-MD5 5bd69c9c1427bf294d55c6499ce256b5 recycler-0.7_pre20040928.ebuild 930
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-recycler-0.7_pre20040928 0
 MD5 3a7eba5c741d50419324a30fafe92c2a files/seperate-build.patch 1695
diff --git a/gnustep-apps/recycler/recycler-0.7_pre20040928.ebuild b/gnustep-apps/recycler/recycler-0.7_pre20040928.ebuild
index 84708bb918f0..295fd934b5d1 100644
--- a/gnustep-apps/recycler/recycler-0.7_pre20040928.ebuild
+++ b/gnustep-apps/recycler/recycler-0.7_pre20040928.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-apps/recycler/recycler-0.7_pre20040928.ebuild,v 1.2 2004/10/09 22:28:26 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/recycler/recycler-0.7_pre20040928.ebuild,v 1.3 2004/11/12 03:51:36 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -27,6 +27,8 @@ DEPEND="${GS_DEPEND}
 RDEPEND="${GS_RDEPEND}
 	gnustep-apps/gworkspace"
 
+egnustep_install_domain "System"
+
 src_compile() {
 	egnustep_env
 	EPATCH_OPTIONS="-d ${S}" epatch ${FILESDIR}/seperate-build.patch