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

44 files changed, 433 insertions, 182 deletions

diff --git a/gnustep-apps/preview/ChangeLog b/gnustep-apps/preview/ChangeLog
index 49b2f52401ff..19244121c152 100644
--- a/gnustep-apps/preview/ChangeLog
+++ b/gnustep-apps/preview/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-apps/preview
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preview/ChangeLog,v 1.3 2004/10/22 20:06:42 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preview/ChangeLog,v 1.4 2004/11/12 03:55:33 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  preview-0.7.5_pre20041021.ebuild, preview-0.7.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
 
   22 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org>
   preview-0.7.5_pre20041021.ebuild:
diff --git a/gnustep-apps/preview/preview-0.7.5_pre20041021.ebuild b/gnustep-apps/preview/preview-0.7.5_pre20041021.ebuild
index 3ecd86d15fde..9799d7aa8820 100644
--- a/gnustep-apps/preview/preview-0.7.5_pre20041021.ebuild
+++ b/gnustep-apps/preview/preview-0.7.5_pre20041021.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/preview/preview-0.7.5_pre20041021.ebuild,v 1.2 2004/10/22 20:06:42 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preview/preview-0.7.5_pre20041021.ebuild,v 1.3 2004/11/12 03:55:33 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="cvs.gna.org:/cvs/gsimageapps"
 ECVS_USER="anonymous"
 ECVS_AUTH="pserver"
 ECVS_MODULE="gsimageapps/Applications/Preview"
-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/gna.org-gsimageapps"
 inherit gnustep cvs
 
@@ -27,3 +27,5 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-apps/preview/preview-0.7.ebuild b/gnustep-apps/preview/preview-0.7.ebuild
index b9955168d0e5..b31cb66e0d30 100644
--- a/gnustep-apps/preview/preview-0.7.ebuild
+++ b/gnustep-apps/preview/preview-0.7.ebuild
@@ -1,7 +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/preview/preview-0.7.ebuild,v 1.2 2004/10/21 19:08:50 fafhrd Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preview/preview-0.7.ebuild,v 1.3 2004/11/12 03:55:33 fafhrd Exp $
 
 inherit gnustep
 
@@ -18,3 +17,5 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-apps/projectcenter/ChangeLog b/gnustep-apps/projectcenter/ChangeLog
index cc83a25e123d..87fd311da652 100644
--- a/gnustep-apps/projectcenter/ChangeLog
+++ b/gnustep-apps/projectcenter/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-apps/projectcenter
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectcenter/ChangeLog,v 1.4 2004/09/28 17:54:36 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectcenter/ChangeLog,v 1.5 2004/11/12 03:55:50 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/pc-non-flattened.patch, -projectcenter-0.3.5.ebuild,
+  projectcenter-0.4.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
 
 *projectcenter-0.4.1_pre20040927 (28 Sep 2004)
 
diff --git a/gnustep-apps/projectcenter/files/digest-projectcenter-0.3.5 b/gnustep-apps/projectcenter/files/digest-projectcenter-0.3.5
deleted file mode 100644
index 8dbb74a7dcc2..000000000000
--- a/gnustep-apps/projectcenter/files/digest-projectcenter-0.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8a6f17ea9d2cd1bc1ac7dea53e350c6 ProjectCenter-0.3.5.tar.gz 242653
diff --git a/gnustep-apps/projectcenter/files/pc-non-flattened.patch b/gnustep-apps/projectcenter/files/pc-non-flattened.patch
new file mode 100644
index 000000000000..4eb0c8b20bd0
--- /dev/null
+++ b/gnustep-apps/projectcenter/files/pc-non-flattened.patch
@@ -0,0 +1,11 @@
+--- GNUmakefile.preamble	2004-11-11 16:07:14.214927024 -0500
++++ GNUmakefile.preamble	2004-11-11 16:09:24.561111392 -0500
+@@ -45,7 +45,7 @@
+ 
+ # Additional library directories the linker should search
+ #ADDITIONAL_LIB_DIRS += -L./Library/$(GNUSTEP_OBJ_DIR)
+-ADDITIONAL_LIB_DIRS += -L./Library/ProjectCenter.framework/Versions/Current
++ADDITIONAL_LIB_DIRS += -L./Library/ProjectCenter.framework/Versions/Current/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}
+ 
+ ADDITIONAL_TOOL_LIBS +=
+ 
diff --git a/gnustep-apps/projectcenter/projectcenter-0.3.5.ebuild b/gnustep-apps/projectcenter/projectcenter-0.3.5.ebuild
deleted file mode 100644
index 7bf41f51192a..000000000000
--- a/gnustep-apps/projectcenter/projectcenter-0.3.5.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/projectcenter/projectcenter-0.3.5.ebuild,v 1.2 2004/07/23 14:59:37 fafhrd Exp $
-
-inherit gnustep-old
-
-S=${WORKDIR}/ProjectCenter
-
-DESCRIPTION="GNUstep project developer"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-${PV}.tar.gz"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=gnustep-base/gnustep-gui-0.8.5"
-
-src_unpack() {
-	unpack ProjectCenter-${PV}.tar.gz
-	cd ${S}
-}
diff --git a/gnustep-apps/projectcenter/projectcenter-0.4.1_pre20040927.ebuild b/gnustep-apps/projectcenter/projectcenter-0.4.1_pre20040927.ebuild
index c5c9e02cf75b..d16105f73e01 100644
--- a/gnustep-apps/projectcenter/projectcenter-0.4.1_pre20040927.ebuild
+++ b/gnustep-apps/projectcenter/projectcenter-0.4.1_pre20040927.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/projectcenter/projectcenter-0.4.1_pre20040927.ebuild,v 1.1 2004/09/28 17:54:36 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectcenter/projectcenter-0.4.1_pre20040927.ebuild,v 1.2 2004/11/12 03:55:50 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/projectc/ProjectC}"
-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
 
@@ -17,7 +17,7 @@ S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="An IDE for GNUstep."
 HOMEPAGE="http://www.gnustep.org/experience/ProjectCenter.html"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -25,3 +25,14 @@ DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}
 	>=sys-devel/gdb-6.0"
 
+egnustep_install_domain "System"
+
+src_unpack() {
+	cvs_src_unpack
+	egnustep_env
+	cd ${S}
+	if [ -z "${GNUSTEP_FLATTENED}" ]; then
+		epatch ${FILESDIR}/pc-non-flattened.patch
+	fi
+}
+
diff --git a/gnustep-apps/stepulator/ChangeLog b/gnustep-apps/stepulator/ChangeLog
index a1a945ee5929..c675bbae4152 100644
--- a/gnustep-apps/stepulator/ChangeLog
+++ b/gnustep-apps/stepulator/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/stepulator
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/stepulator/ChangeLog,v 1.2 2004/10/18 12:13:19 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/stepulator/ChangeLog,v 1.3 2004/11/12 03:56:08 fafhrd Exp $
+
+*stepulator-1.0-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +stepulator-1.0-r1.ebuild, stepulator-1.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
 
   18 Oct 2004; David Holm <dholm@gentoo.org> stepulator-1.0.ebuild:
   Added to ~ppc.
diff --git a/gnustep-apps/stepulator/files/digest-stepulator-1.0-r1 b/gnustep-apps/stepulator/files/digest-stepulator-1.0-r1
new file mode 100644
index 000000000000..5863f6195679
--- /dev/null
+++ b/gnustep-apps/stepulator/files/digest-stepulator-1.0-r1
@@ -0,0 +1 @@
+MD5 ca745d84e3d24efde9966f35c24b47be stepulator-gs-1.0.tar.Z 23966
diff --git a/gnustep-apps/stepulator/stepulator-1.0-r1.ebuild b/gnustep-apps/stepulator/stepulator-1.0-r1.ebuild
new file mode 100644
index 000000000000..2c5424e1bf8a
--- /dev/null
+++ b/gnustep-apps/stepulator/stepulator-1.0-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/stepulator/stepulator-1.0-r1.ebuild,v 1.1 2004/11/12 03:56:08 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/${PN/s/S}-gs
+
+DESCRIPTION="A Reverse Polish Notation calculator"
+HOMEPAGE="http://www.linuks.mine.nu/stepulator/index.html"
+SRC_URI="http://www.linuks.mine.nu/stepulator/${PN}-gs-${PV}.tar.Z"
+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/stepulator/stepulator-1.0.ebuild b/gnustep-apps/stepulator/stepulator-1.0.ebuild
index 70adfcca1d85..db9628a1981a 100644
--- a/gnustep-apps/stepulator/stepulator-1.0.ebuild
+++ b/gnustep-apps/stepulator/stepulator-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/stepulator/stepulator-1.0.ebuild,v 1.2 2004/10/18 12:13:19 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/stepulator/stepulator-1.0.ebuild,v 1.3 2004/11/12 03:56:08 fafhrd Exp $
 
 inherit gnustep
 
@@ -17,3 +17,5 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-apps/stshell/ChangeLog b/gnustep-apps/stshell/ChangeLog
index 12fdcb0467a7..c64fce6a8643 100644
--- a/gnustep-apps/stshell/ChangeLog
+++ b/gnustep-apps/stshell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-apps/stshell
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/stshell/ChangeLog,v 1.2 2004/10/18 12:13:47 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/stshell/ChangeLog,v 1.3 2004/11/12 03:56:43 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  stshell-0.8.3_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
 
   18 Oct 2004; David Holm <dholm@gentoo.org>
   stshell-0.8.3_pre20040927.ebuild:
diff --git a/gnustep-apps/stshell/stshell-0.8.3_pre20040927.ebuild b/gnustep-apps/stshell/stshell-0.8.3_pre20040927.ebuild
index 2f5d49002192..b1d5aa74ae64 100644
--- a/gnustep-apps/stshell/stshell-0.8.3_pre20040927.ebuild
+++ b/gnustep-apps/stshell/stshell-0.8.3_pre20040927.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/stshell/stshell-0.8.3_pre20040927.ebuild,v 1.2 2004/10/18 12:13:47 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/stshell/stshell-0.8.3_pre20040927.ebuild,v 1.3 2004/11/12 03:56:43 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
 ECVS_USER="anoncvs"
 ECVS_AUTH="ext"
 ECVS_MODULE="gnustep/dev-libs/StepTalk/Examples/${PN/sts/S}"
-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
 
@@ -23,7 +23,9 @@ SLOT="0"
 
 IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}
-	=gnustep-libs/steptalk-${PV}"
+	=gnustep-libs/steptalk-${PV}*"
 RDEPEND="${GS_RDEPEND}
-	=gnustep-libs/steptalk-${PV}"
+	=gnustep-libs/steptalk-${PV}*"
+
+egnustep_install_domain "System"
 
diff --git a/gnustep-apps/terminal/ChangeLog b/gnustep-apps/terminal/ChangeLog
index faedc84229e7..1930186036ff 100644
--- a/gnustep-apps/terminal/ChangeLog
+++ b/gnustep-apps/terminal/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/terminal
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/ChangeLog,v 1.6 2004/10/18 12:18:21 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/ChangeLog,v 1.7 2004/11/12 03:57:00 fafhrd Exp $
+
+*terminal-0.9.5_pre20040909 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> -terminal-0.9.4.ebuild,
+  -terminal-0.9.5_pre20040909.ebuild, terminal-0.9.5_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
 
   18 Oct 2004; David Holm <dholm@gentoo.org> :
   Added to ~ppc.
diff --git a/gnustep-apps/terminal/files/digest-terminal-0.9.4 b/gnustep-apps/terminal/files/digest-terminal-0.9.4
deleted file mode 100644
index 1cb04ad9a99b..000000000000
--- a/gnustep-apps/terminal/files/digest-terminal-0.9.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16dcfe9d79f18253abf243ff83a5b5fd Terminal-0.9.4.tar.gz 63303
diff --git a/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20040909 b/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20040909
deleted file mode 100644
index cb293f53fd4e..000000000000
--- a/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20040909
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c8e6bd25b3fbc78497a8782e2e2f695e Backbone-cvs-20040909.tar.gz 683202
diff --git a/gnustep-apps/terminal/terminal-0.9.4.ebuild b/gnustep-apps/terminal/terminal-0.9.4.ebuild
deleted file mode 100644
index e2c909ed60f1..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.4.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/terminal/terminal-0.9.4.ebuild,v 1.2 2004/07/23 14:59:59 fafhrd Exp $
-
-inherit gnustep-old
-
-S=${WORKDIR}/${P/t/T}
-
-DESCRIPTION="GNUstep terminal emulator"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="http://savannah.nongnu.org/download/terminal/Terminal.pkg/${PV}/${P/t/T}.tar.gz"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=gnustep-base/gnustep-gui-0.8.5"
-
-src_unpack() {
-	unpack ${P/t/T}.tar.gz
-	cd ${S}
-}
diff --git a/gnustep-apps/terminal/terminal-0.9.5_pre20040909.ebuild b/gnustep-apps/terminal/terminal-0.9.5_pre20040909.ebuild
deleted file mode 100644
index e7eda2325677..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.5_pre20040909.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/terminal/terminal-0.9.5_pre20040909.ebuild,v 1.1 2004/09/24 01:07:41 fafhrd Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/Backbone/System/Applications/${PN/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="mirror://gentoo/Backbone-cvs-${PV/0.9.5_pre/}.tar.gz"
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="${IUSE}"
-DEPEND="${GS_DEPEND}"
-RDEPEND="${GS_RDEPEND}"
-
diff --git a/gnustep-apps/terminal/terminal-0.9.5_pre20040927.ebuild b/gnustep-apps/terminal/terminal-0.9.5_pre20040927.ebuild
index ddebb455bb00..15047f96f2e1 100644
--- a/gnustep-apps/terminal/terminal-0.9.5_pre20040927.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.5_pre20040927.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/terminal/terminal-0.9.5_pre20040927.ebuild,v 1.2 2004/10/17 19:29:11 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.5_pre20040927.ebuild,v 1.3 2004/11/12 03:57:00 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/backbone"
 ECVS_USER="anoncvs"
 ECVS_AUTH="no"
 ECVS_MODULE="System"
-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-backbone"
 inherit gnustep cvs
 
@@ -25,3 +25,5 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-apps/textedit/ChangeLog b/gnustep-apps/textedit/ChangeLog
index 9e4b91e4bcda..cb9ecbf9a345 100644
--- a/gnustep-apps/textedit/ChangeLog
+++ b/gnustep-apps/textedit/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/textedit
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/textedit/ChangeLog,v 1.3 2004/10/18 12:18:35 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/textedit/ChangeLog,v 1.4 2004/11/12 03:57:17 fafhrd Exp $
+
+*textedit-0.95_pre20040909 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  -textedit-0.95_pre20040909.ebuild, textedit-0.95_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
 
   18 Oct 2004; David Holm <dholm@gentoo.org>
   textedit-0.95_pre20040927.ebuild:
diff --git a/gnustep-apps/textedit/files/digest-textedit-0.95_pre20040909 b/gnustep-apps/textedit/files/digest-textedit-0.95_pre20040909
deleted file mode 100644
index cb293f53fd4e..000000000000
--- a/gnustep-apps/textedit/files/digest-textedit-0.95_pre20040909
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c8e6bd25b3fbc78497a8782e2e2f695e Backbone-cvs-20040909.tar.gz 683202
diff --git a/gnustep-apps/textedit/textedit-0.95_pre20040909.ebuild b/gnustep-apps/textedit/textedit-0.95_pre20040909.ebuild
deleted file mode 100644
index e9eed02c24fe..000000000000
--- a/gnustep-apps/textedit/textedit-0.95_pre20040909.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/textedit/textedit-0.95_pre20040909.ebuild,v 1.1 2004/09/24 01:08:30 fafhrd Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/Backbone/System/Applications/${PN/texte/TextE}
-
-DESCRIPTION="A text editor with font, color, and style capabilities for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="mirror://gentoo/Backbone-cvs-${PV/0.95_pre/}.tar.gz"
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="${IUSE}"
-DEPEND="${GS_DEPEND}"
-RDEPEND="${GS_RDEPEND}"
-
diff --git a/gnustep-apps/textedit/textedit-0.95_pre20040927.ebuild b/gnustep-apps/textedit/textedit-0.95_pre20040927.ebuild
index 10961cd00ff2..b68ef9704862 100644
--- a/gnustep-apps/textedit/textedit-0.95_pre20040927.ebuild
+++ b/gnustep-apps/textedit/textedit-0.95_pre20040927.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/textedit/textedit-0.95_pre20040927.ebuild,v 1.2 2004/10/18 12:18:35 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/textedit/textedit-0.95_pre20040927.ebuild,v 1.3 2004/11/12 03:57:17 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/backbone"
 ECVS_USER="anoncvs"
 ECVS_AUTH="no"
 ECVS_MODULE="System"
-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-backbone"
 inherit gnustep cvs
 
@@ -25,3 +25,5 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-apps/viewpdf/ChangeLog b/gnustep-apps/viewpdf/ChangeLog
index 9f97e7e59005..0149435c2694 100644
--- a/gnustep-apps/viewpdf/ChangeLog
+++ b/gnustep-apps/viewpdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-apps/viewpdf
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/viewpdf/ChangeLog,v 1.1 2004/10/22 07:38:48 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/viewpdf/ChangeLog,v 1.2 2004/11/12 03:57:34 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> viewpdf-0.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
 
 *viewpdf-0.9 (22 Oct 2004)
 
diff --git a/gnustep-apps/viewpdf/viewpdf-0.9.ebuild b/gnustep-apps/viewpdf/viewpdf-0.9.ebuild
index 1a963ea22639..98e5b9870366 100644
--- a/gnustep-apps/viewpdf/viewpdf-0.9.ebuild
+++ b/gnustep-apps/viewpdf/viewpdf-0.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/viewpdf/viewpdf-0.9.ebuild,v 1.2 2004/10/22 19:51:20 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/viewpdf/viewpdf-0.9.ebuild,v 1.3 2004/11/12 03:57:34 fafhrd Exp $
 
 inherit gnustep
 
@@ -20,3 +20,5 @@ DEPEND="${GS_DEPEND}
 RDEPEND="${GS_RDEPEND}
 	gnustep-libs/pdfkit"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-libs/camaelon/ChangeLog b/gnustep-libs/camaelon/ChangeLog
index 0cb84b36b013..db40f69083fc 100644
--- a/gnustep-libs/camaelon/ChangeLog
+++ b/gnustep-libs/camaelon/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-libs/camaelon
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/camaelon/ChangeLog,v 1.5 2004/11/05 22:11:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/camaelon/ChangeLog,v 1.6 2004/11/12 03:57:54 fafhrd Exp $
+
+*camaelon-0.1-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> files/config-camaelon.sh,
+  +camaelon-0.1-r1.ebuild, camaelon-0.1.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
 
   05 Nov 2004; Simon Stelling <blubb@gentoo.org> camaelon-0.1.ebuild:
   added ~amd64
diff --git a/gnustep-libs/camaelon/camaelon-0.1-r1.ebuild b/gnustep-libs/camaelon/camaelon-0.1-r1.ebuild
new file mode 100644
index 000000000000..d869e39d28d3
--- /dev/null
+++ b/gnustep-libs/camaelon/camaelon-0.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/camaelon/camaelon-0.1-r1.ebuild,v 1.1 2004/11/12 03:57:54 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/${PN/c/C}
+
+DESCRIPTION="Camaelon allows you to load theme bundles for GNUstep."
+
+HOMEPAGE="http://www.roard.com/camaelon/"
+SRC_URI="http://www.roard.com/camaelon/download/${P/c/C}.tgz"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+IUSE="${IUSE}"
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "Local"
+
diff --git a/gnustep-libs/camaelon/camaelon-0.1.ebuild b/gnustep-libs/camaelon/camaelon-0.1.ebuild
index 0be0af04a571..b1027a3b1236 100644
--- a/gnustep-libs/camaelon/camaelon-0.1.ebuild
+++ b/gnustep-libs/camaelon/camaelon-0.1.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-libs/camaelon/camaelon-0.1.ebuild,v 1.5 2004/11/05 22:11:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/camaelon/camaelon-0.1.ebuild,v 1.6 2004/11/12 03:57:54 fafhrd Exp $
 
 inherit gnustep
 
@@ -18,3 +18,5 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-libs/camaelon/files/config-camaelon.sh b/gnustep-libs/camaelon/files/config-camaelon.sh
index 6636748ecfdd..0300ad754327 100644
--- a/gnustep-libs/camaelon/files/config-camaelon.sh
+++ b/gnustep-libs/camaelon/files/config-camaelon.sh
@@ -1,4 +1,4 @@
 echo "Applying Camaelon default theme..."
-echo "defaults write NSGlobalDomain GUIThemeBundles \"${GNUSTEP_SYSTEM_ROOT}/Library/Bundles/Camaelon.themeEngine\""
-defaults write NSGlobalDomain GUIThemeBundles "${GNUSTEP_SYSTEM_ROOT}/Library/Bundles/Camaelon.themeEngine"
+echo "defaults write NSGlobalDomain GSAppKitUserBundles \"(${GNUSTEP_LOCAL_ROOT}/Library/Bundles/Camaelon.themeEngine)\""
+defaults write NSGlobalDomain GSAppKitUserBundles "(${GNUSTEP_LOCAL_ROOT}/Library/Bundles/Camaelon.themeEngine)"
 
diff --git a/gnustep-libs/camaelon/files/digest-camaelon-0.1-r1 b/gnustep-libs/camaelon/files/digest-camaelon-0.1-r1
new file mode 100644
index 000000000000..beb8fb05c375
--- /dev/null
+++ b/gnustep-libs/camaelon/files/digest-camaelon-0.1-r1
@@ -0,0 +1 @@
+MD5 5b870e8e8d543ac25e58a231ab86bb57 Camaelon-0.1.tgz 50170
diff --git a/gnustep-libs/imagekits/ChangeLog b/gnustep-libs/imagekits/ChangeLog
index 5211072b64b5..51ca9820a15c 100644
--- a/gnustep-libs/imagekits/ChangeLog
+++ b/gnustep-libs/imagekits/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-libs/imagekits
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/imagekits/ChangeLog,v 1.2 2004/10/09 22:19:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/imagekits/ChangeLog,v 1.3 2004/11/12 03:58:10 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> imagekits-0.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
 
 *imagekits-0.6 (10 Oct 2004)
 
diff --git a/gnustep-libs/imagekits/imagekits-0.6.ebuild b/gnustep-libs/imagekits/imagekits-0.6.ebuild
index 679217750079..9eb68e0a68ee 100644
--- a/gnustep-libs/imagekits/imagekits-0.6.ebuild
+++ b/gnustep-libs/imagekits/imagekits-0.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-libs/imagekits/imagekits-0.6.ebuild,v 1.2 2004/10/09 22:19:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/imagekits/imagekits-0.6.ebuild,v 1.3 2004/11/12 03:58:10 fafhrd Exp $
 
 inherit gnustep
 
@@ -17,3 +17,5 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
diff --git a/gnustep-libs/renaissance/ChangeLog b/gnustep-libs/renaissance/ChangeLog
index 35a34665f5e9..a89fd8011a0a 100644
--- a/gnustep-libs/renaissance/ChangeLog
+++ b/gnustep-libs/renaissance/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-libs/renaissance
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/renaissance/ChangeLog,v 1.6 2004/10/17 10:02:19 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/renaissance/ChangeLog,v 1.7 2004/11/12 03:58:29 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  -renaissance-0.7.0.ebuild, renaissance-0.8.0.ebuild,
+  renaissance-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>
   renaissance-0.8.1_pre20040927.ebuild:
diff --git a/gnustep-libs/renaissance/files/digest-renaissance-0.7.0 b/gnustep-libs/renaissance/files/digest-renaissance-0.7.0
deleted file mode 100644
index 11b81be6a899..000000000000
--- a/gnustep-libs/renaissance/files/digest-renaissance-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9ff8c15473dda40ad199c7c30e0d6c3 Renaissance-0.7.0.tar.gz 264580
diff --git a/gnustep-libs/renaissance/renaissance-0.7.0.ebuild b/gnustep-libs/renaissance/renaissance-0.7.0.ebuild
deleted file mode 100644
index 139eb85869eb..000000000000
--- a/gnustep-libs/renaissance/renaissance-0.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/renaissance/renaissance-0.7.0.ebuild,v 1.2 2004/07/23 15:01:54 fafhrd Exp $
-
-inherit gnustep-old
-
-S=${WORKDIR}/${P/r/R}
-
-DESCRIPTION="GNUstep xml-based UI toolkit"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="http://www.gnustep.it/Renaissance/Download/${P/r/R}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-DEPEND=">=gnustep-base/gnustep-gui-0.8.5"
-IUSE=""
-
-src_compile() {
-	addwrite ~/GNUstep/Library/Services/.GNUstepAppList
-	egnustepmake
-}
diff --git a/gnustep-libs/renaissance/renaissance-0.8.0.ebuild b/gnustep-libs/renaissance/renaissance-0.8.0.ebuild
index c3cb24a49870..3017a18d2c96 100644
--- a/gnustep-libs/renaissance/renaissance-0.8.0.ebuild
+++ b/gnustep-libs/renaissance/renaissance-0.8.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-libs/renaissance/renaissance-0.8.0.ebuild,v 1.2 2004/10/21 19:09:54 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/renaissance/renaissance-0.8.0.ebuild,v 1.3 2004/11/12 03:58:29 fafhrd Exp $
 
 inherit gnustep
 
@@ -18,6 +18,8 @@ IUSE="${IUSE} doc"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
 src_install() {
 	cd ${S}
 	egnustep_env
@@ -28,9 +30,9 @@ src_install() {
 		egnustep_make
 		egnustep_install
 		mkdir -p ${TMP}/tmpdocs
-		mv ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/* ${TMP}/tmpdocs
-		mkdir -p ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/Developer/Renaissance
-		mv ${TMP}/tmpdocs/* ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/Developer/Renaissance
+		mv ${D}$(egnustep_install_domain)/Library/Documentation/* ${TMP}/tmpdocs
+		mkdir -p ${D}$(egnustep_install_domain)/Library/Documentation/Developer/Renaissance
+		mv ${TMP}/tmpdocs/* ${D}$(egnustep_install_domain)/Library/Documentation/Developer/Renaissance
 		cd ..
 	fi
 	egnustep_package_config
diff --git a/gnustep-libs/renaissance/renaissance-0.8.1_pre20040927.ebuild b/gnustep-libs/renaissance/renaissance-0.8.1_pre20040927.ebuild
index 6cb6ea077cb7..25fa0632cda5 100644
--- a/gnustep-libs/renaissance/renaissance-0.8.1_pre20040927.ebuild
+++ b/gnustep-libs/renaissance/renaissance-0.8.1_pre20040927.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-libs/renaissance/renaissance-0.8.1_pre20040927.ebuild,v 1.3 2004/10/21 19:09:54 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/renaissance/renaissance-0.8.1_pre20040927.ebuild,v 1.4 2004/11/12 03:58:29 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
 ECVS_USER="anoncvs"
 ECVS_AUTH="ext"
 ECVS_MODULE="gnustep/dev-libs/${PN/r/R}"
-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,6 +25,8 @@ IUSE="${IUSE} doc"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
 src_install() {
 	cd ${S}
 	egnustep_env
@@ -35,9 +37,9 @@ src_install() {
 		egnustep_make
 		egnustep_install
 		mkdir -p ${TMP}/tmpdocs
-		mv ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/* ${TMP}/tmpdocs
-		mkdir -p ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/Developer/Renaissance
-		mv ${TMP}/tmpdocs/* ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/Developer/Renaissance
+		mv ${D}$(egnustep_install_domain)/Library/Documentation/* ${TMP}/tmpdocs
+		mkdir -p ${D}$(egnustep_install_domain)/Library/Documentation/Developer/Renaissance
+		mv ${TMP}/tmpdocs/* ${D}$(egnustep_install_domain)/Library/Documentation/Developer/Renaissance
 		cd ..
 	fi
 	egnustep_package_config
diff --git a/gnustep-libs/steptalk/ChangeLog b/gnustep-libs/steptalk/ChangeLog
index cba531be69b7..a7ab0d29a444 100644
--- a/gnustep-libs/steptalk/ChangeLog
+++ b/gnustep-libs/steptalk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-libs/steptalk
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/steptalk/ChangeLog,v 1.2 2004/10/18 12:13:11 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/steptalk/ChangeLog,v 1.3 2004/11/12 03:56:25 fafhrd Exp $
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  steptalk-0.8.3_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
 
   18 Oct 2004; David Holm <dholm@gentoo.org>
   steptalk-0.8.3_pre20040927.ebuild:
diff --git a/gnustep-libs/steptalk/steptalk-0.8.3_pre20040927.ebuild b/gnustep-libs/steptalk/steptalk-0.8.3_pre20040927.ebuild
index 5552f03da448..de53f479778b 100644
--- a/gnustep-libs/steptalk/steptalk-0.8.3_pre20040927.ebuild
+++ b/gnustep-libs/steptalk/steptalk-0.8.3_pre20040927.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-libs/steptalk/steptalk-0.8.3_pre20040927.ebuild,v 1.3 2004/10/21 19:10:16 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/steptalk/steptalk-0.8.3_pre20040927.ebuild,v 1.4 2004/11/12 03:56:25 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
 ECVS_USER="anoncvs"
 ECVS_AUTH="ext"
 ECVS_MODULE="gnustep/dev-libs/${PN/stept/StepT}"
-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,6 +25,8 @@ IUSE="${IUSE} doc"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
 src_install() {
 	cd ${S}
 	egnustep_env
@@ -36,8 +38,8 @@ src_install() {
 		mkdir -p ${TMP}/tmpdocs
 		mv *.* ${TMP}/tmpdocs
 		mv Reference ${TMP}/tmpdocs
-		mkdir -p ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/Developer/${PN/stept/StepT}
-		mv ${TMP}/tmpdocs/* ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/Developer/${PN/stept/StepT}
+		mkdir -p ${D}$(egnustep_install_domain)/Library/Documentation/Developer/${PN/stept/StepT}
+		mv ${TMP}/tmpdocs/* ${D}$(egnustep_install_domain)/Library/Documentation/Developer/${PN/stept/StepT}
 		cd ..
 	fi
 	egnustep_package_config
diff --git a/profiles/package.mask b/profiles/package.mask
index 028b16203f73..e6d50d13c580 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 #####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.3310 2004/11/11 08:30:07 eradicator Exp $#
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.3311 2004/11/12 04:00:18 fafhrd Exp $#
 #When you add an entry to this file, add your name, the date, and an
 #explanation of why something is getting masked
 #
@@ -216,30 +216,10 @@ dev-perl/libapreq2
 # - This will "make room" for the new packages/setup for GNUstep
 # - This will make it much more apparent to users that these packages
 #     are broken, for most intents and purposes
-# gnustep-libs
 =gnustep-libs/gnustep-guile-1.0.3
 =gnustep-libs/gnustep-guile-1.1.1
 =gnustep-libs/jigs-1.5.5
-=gnustep-libs/renaissance-0.7.0
-=gnustep-libs/pantomime-1.1.0*
-# gnustep-base
-<=gnustep-base/gnustep-make-1.7.2
-<=gnustep-base/gnustep-base-1.7.2
-<=gnustep-base/gnustep-gui-0.8.8
-<=gnustep-base/gnustep-back-0.8.8
-=gnustep-base/gnustep-env-0.1
-# gnustep-apps
-=gnustep-apps/affiche-0.6.0
-=gnustep-apps/easydiff-0.1
-=gnustep-apps/gnumail-1.1.0
-=gnustep-apps/gorm-0.3.0
-=gnustep-apps/gridlock-1.6.1
-=gnustep-apps/gworkspace-0.5.3
-=gnustep-apps/helpviewer-0.3
-=gnustep-apps/imageviewer-0.6.2
-=gnustep-apps/projectcenter-0.3.5
 =gnustep-apps/talksoup-0.81
-=gnustep-apps/terminal-0.9.4
 
 # Karl Trygve Kalleberg <karltk@gentoo.org> (23 Sep 2004)
 # upstream is unstable
diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index f46d9ef8f293..7f8782713b7a 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.27 2004/11/07 09:44:05 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.28 2004/11/12 03:58:52 fafhrd Exp $
+
+*windowmaker-0.91.0-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +windowmaker-0.91.0-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
 
   07 Nov 2004; Simon Stelling <blubb@gentoo.org> windowmaker-0.91.0.ebuild:
   added ~amd64
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r1 b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r1
new file mode 100644
index 000000000000..8973161344f4
--- /dev/null
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r1
@@ -0,0 +1,2 @@
+MD5 be07953e905d1e42fe7a65ac2193a5f9 WindowMaker-0.91.0.tar.gz 2742380
+MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
new file mode 100644
index 000000000000..1b9097fcdce7
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.1 2004/11/12 03:58:52 fafhrd Exp $
+
+inherit eutils gnustep-funcs
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+DESCRIPTION="The fast and light GNUstep window manager"
+SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+HOMEPAGE="http://www.windowmaker.org/"
+
+IUSE="gif gnustep jpeg nls png tiff modelock vdesktop xinerama"
+DEPEND="x11-base/xorg-x11
+	media-libs/fontconfig
+	gif? ( || ( >=media-libs/libungif-4.1.0
+			>=media-libs/giflib-4.1.0-r3))
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.6.1-r2 )"
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )
+	gnustep? ( gnustep-base/gnustep-env )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+if use gnustep; then
+	egnustep_install_domain "System"
+fi
+
+src_compile() {
+	local myconf
+	local gs_user_postfix
+
+	# image format types
+	# xpm is provided by X itself
+	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable vdesktop) $(use_enable xinerama)"
+
+	# integrate with GNUstep environment, or not
+	if use gnustep ; then
+		egnustep_env
+		myconf="${myconf} --with-appspath=$(egnustep_system_root)/Applications"
+	else
+		# no change from wm-0.80* ebuilds, as to not pollute things more
+		myconf="${myconf} --with-appspath=/usr/lib/GNUstep/Applications"
+	fi
+
+	use nls \
+		&& export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \
+		|| myconf="${myconf} --disable-nls --disable-locale"
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir=/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir=/usr/share/pixmaps \
+		${myconf} || die
+
+	# don't know if zh_TW is still non-functional, but leaving it out still
+	#  for now
+	cd ${S}/po
+	cp Makefile Makefile.orig
+	sed 's:zh_TW.*::' \
+		Makefile.orig > Makefile
+
+	cd ${S}/WPrefs.app/po
+	cp Makefile Makefile.orig
+	sed 's:zh_TW.*::' \
+		Makefile.orig > Makefile
+
+	cd ${S}
+	for file in ${S}/WindowMaker/*menu*; do
+		if [ -r $file ]; then
+			if use gnustep ; then
+				sed -e "s/\/usr\/local\/GNUstep/`cat ${TMP}/sed.gs_prefix`System/g;
+					s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+			else
+				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;' < $file > $file.tmp
+			fi
+			mv $file.tmp $file;
+
+			sed -e 's/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+			mv $file.tmp $file;
+		fi;
+	done;
+
+	cd ${S}
+	emake -j1 || die "windowmaker: make has failed"
+
+	cd ${S}
+	for file in ${S}/WindowMaker/Defaults/W*; do
+		if [ -r $file ]; then
+			if use gnustep; then
+				sed -e "s/\$HOME\/GNUstep\//\$HOME`cat ${TMP}/sed.gs_user_root_suffix`/g;
+						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+				mv $file.tmp $file;
+
+				sed -e "s/~\/GNUstep\//~`cat ${TMP}/sed.gs_user_root_suffix`/g;
+						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+				mv $file.tmp $file;
+			fi
+		fi
+	done;
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	econf || die "windowmaker-extra: configure has failed"
+	emake || die "windowmaker-extra: make has failed"
+}
+
+src_install() {
+	emake install DESTDIR=${D} || die "windowmaker: install has failed."
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
+	      MIRRORS README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake install DESTDIR=${D} || die "windowmaker-extra: install failed"
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/bin/bash" > wmaker
+	echo "/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+}
+
+pkg_postinst() {
+	einfo "If you are using 'startx' from the command line, and require"
+	einfo "  .xinitrc, you may need to execute 'wmaker.inst', which will"
+	einfo "  setup default configurations for you."
+	einfo ""
+
+	if use gnustep ; then
+		einfo "WPrefs.app is installed in you GNUstep System Applications directory."
+		einfo ""
+		ewarn "*** IMPORTANT ***"
+		ewarn "If you changed the GNUstep user root, via a use flag like 'layout-osx-like' in gnustep-make"
+		ewarn "  you will have to repair the personal WindowMaker config files you have.  For example,"
+		ewarn "  if you changed the default user root as above, \$HOME/GNUstep to ~/, these commands"
+		ewarn "  will help you:"
+		ewarn "cd ; cp -a ./GNUstep/.AppInfo . ; cp -a ./GNUstep/Defaults/W* ./Defaults/ ;"
+		ewarn "  cp -a ./GNUstep/Library/Icons ./GNUstep/Library/WindowMaker ./Library/"
+		ewarn "The above commands are specifically to help repair your WindowMaker install;"
+		ewarn "  a less elegant, but reasonable method is to simply run wmaker.inst again,"
+		ewarn "  **after sourcing GNUstep.sh**, as this env script sets the GNUSTEP_USER_ROOT variable."
+		ewarn "Generally, other config files in your old ~/GNUstep directory, can simply be"
+		ewarn "  moved to the new GNUSTEP_USER_ROOT."
+		ewarn "^^^ IMPORTANT ^^^"
+		ewarn ""
+	else
+		einfo "Even though you are not using the GNUstep environment, wmaker.inst will"
+		einfo "  create a 'GNUstep' directory in your home -- it uses this dirctory"
+		einfo "  to store your WindowMaker configuration files."
+		einfo "WPrefs.app can be launched at /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"
+		einfo "  or by simply **clicking on it in the WindowMaker default dock.**"
+		einfo ""
+	fi
+
+	if use vdesktop ; then
+		ewarn "Note that enabling support for NETWM virtual desktops will make"
+		ewarn "  menus that should be autoscrolling seem to not scroll, as they"
+		ewarn "  are not off the screen, but rather in another virtual desktop."
+		ewarn ""
+	fi
+
+	ewarn "This package provides libwraster.so.3.  Packages depending on"
+	ewarn "  libwraster.so.2 will have to be rebuilt, i.e. 'revdep-rebuild'"
+
+	ebeep 4
+	epause 4
+}
+