ebuild updates for GNUstep base, libs, and apps across the board; proper versions (to be stabilized, in due time) added where apropos, cvs-pull versions updated where needed

(Portage version: 2.0.51.19)

32 files changed, 196 insertions, 369 deletions

diff --git a/gnustep-base/gnustep-back-art/ChangeLog b/gnustep-base/gnustep-back-art/ChangeLog
index a5309ed83248..ddf0bc88d212 100644
--- a/gnustep-base/gnustep-back-art/ChangeLog
+++ b/gnustep-base/gnustep-back-art/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnustep-base/gnustep-back-art
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/ChangeLog,v 1.18 2005/01/10 20:29:01 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/ChangeLog,v 1.19 2005/03/17 20:54:20 fafhrd Exp $
+
+*gnustep-back-art-0.9.4-r1 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/font-make-fix.patch-0.9.5_pre20050312,
+  +files/gnustep-back-art-0.9.4-ft219-backport.patch.bz2,
+  +gnustep-back-art-0.9.4-r1.ebuild, gnustep-back-art-0.9.4.ebuild,
+  -gnustep-back-art-0.9.5_pre20041203.ebuild,
+  -gnustep-back-art-0.9.5_pre20050106.ebuild,
+  +gnustep-back-art-0.9.5_pre20050312.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
   10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-back-art-0.9.4.ebuild:
diff --git a/gnustep-base/gnustep-back-art/Manifest b/gnustep-base/gnustep-back-art/Manifest
index b009b4b4171d..5b7179f18f40 100644
--- a/gnustep-base/gnustep-back-art/Manifest
+++ b/gnustep-base/gnustep-back-art/Manifest
@@ -1,9 +1,14 @@
-MD5 ae4b5142e4df0ed33694febc70809617 gnustep-back-art-0.9.5_pre20050106.ebuild 1403
-MD5 99b117823b1241260423644c1f145c37 gnustep-back-art-0.9.5_pre20041203.ebuild 1403
-MD5 157cb86a21773352b1f8026bc99ccf9e gnustep-back-art-0.9.4.ebuild 1194
 MD5 646a620e1e36e9c387d3f4de921d2487 ChangeLog 3700
 MD5 e2bc2a5b2bdec3808102e5a2caf41f7f metadata.xml 1030
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-art-0.9.5_pre20041203 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-art-0.9.5_pre20050106 0
-MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-art-0.9.4 70
+MD5 c3b2acc44bdd1c86d3f3dddfe0054c8e gnustep-back-art-0.9.5_pre20050312.ebuild 1386
+MD5 f73995bb192ba50ef0e6ea61a2929977 gnustep-back-art-0.9.4.ebuild 1194
+MD5 1e345130d56be9dcf06e8939ef8b41da gnustep-back-art-0.9.4-r1.ebuild 1160
 MD5 7421c230db078e850be063b28fdf18cf files/config-gnustep-back-art.sh 415
+MD5 f9dd4c1b68af4bef2e272d82202323ea files/font-make-fix.patch-0.9.5_pre20050312 501
+MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-art-0.9.4 70
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-art-0.9.5_pre20050312 0
+MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-art-0.9.4-r1 70
+MD5 1a11b68ef3b40eefd6f0d2ae207a80c1 files/gnustep-back-art-0.9.4-ft219-backport.patch.bz2 19263
+MD5 400b5174f818b145fdd0660122eaa73b files/ft219/ftfont-old.m.bz2 15446
+MD5 5edc8954410bbf66b0005e9ed4b9f223 files/ft219/ftfont.h.bz2 1038
+MD5 e707aa54f35253e42089b1aff9d9b0d7 files/ft219/ftfont.m.bz2 15611
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.4-r1 b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.4-r1
new file mode 100644
index 000000000000..02750a6ca5aa
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.4-r1
@@ -0,0 +1 @@
+MD5 9bbd37749e8bdd355533bdf5d1d08050 gnustep-back-0.9.4.tar.gz 401182
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20041203 b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20041203
+++ b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050312
diff --git a/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.9.5_pre20050312 b/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.9.5_pre20050312
new file mode 100644
index 000000000000..5554a8b712a7
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.9.5_pre20050312
@@ -0,0 +1,12 @@
+diff -ur Fonts/GNUmakefile Fonts/GNUmakefile
+--- Fonts/GNUmakefile	2005-03-12 23:06:51.808553304 -0500
++++ Fonts/GNUmakefile	2005-02-22 22:47:34.000000000 -0500
+@@ -27,7 +27,7 @@
+ include $(GNUSTEP_MAKEFILES)/common.make
+ 
+ #RESOURCE_SET_NAME = back-resources
+-back-resources_RESOURCE_FILES_INSTALL_DIR = Library/Fonts
++back-resources_RESOURCE_FILES_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Fonts
+ back-resources_RESOURCE_FILES = $(FONT_INSTALL_FILES)
+ 
+ FONT_INSTALL_FILES = Helvetica.nfont
diff --git a/gnustep-base/gnustep-back-art/files/gnustep-back-art-0.9.4-ft219-backport.patch.bz2 b/gnustep-base/gnustep-back-art/files/gnustep-back-art-0.9.4-ft219-backport.patch.bz2
new file mode 100644
index 000000000000..8b32ecf4a2c7
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/files/gnustep-back-art-0.9.4-ft219-backport.patch.bz2
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050106.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4-r1.ebuild
index a8414026f8ce..65890d0564b1 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050106.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4-r1.ebuild
@@ -1,22 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050106.ebuild,v 1.1 2005/01/10 16:22:57 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4-r1.ebuild,v 1.1 2005/03/17 20:54:20 fafhrd Exp $
 
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/back"
-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
+inherit gnustep
 
-S=${WORKDIR}/${ECVS_MODULE}
+S=${WORKDIR}/gnustep-back-${PV}
 
 DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library."
-HOMEPAGE="http://www.gnustep.org"
 
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
 KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
 SLOT="0"
 LICENSE="LGPL-2.1"
@@ -25,19 +18,24 @@ PROVIDE="virtual/gnustep-back"
 
 IUSE="${IUSE} opengl xim doc"
 DEPEND="${GNUSTEP_GUI_DEPEND}
+	~gnustep-base/gnustep-gui-0.9.4
 	virtual/xft
-	>=media-libs/freetype-2.1.5
-	<media-libs/freetype-2.1.8
-	=gnustep-base/gnustep-gui-${PV}*
+	~media-libs/freetype-2.1.9
 	opengl? ( virtual/opengl virtual/glu )
 	gnustep-libs/artresources
 	>=gnustep-base/mknfonts-0.5
 	>=media-libs/libart_lgpl-2.3*"
 RDEPEND="${DEPEND}
-${DOC_RDEPEND}"
+	${DOC_RDEPEND}"
 
 egnustep_install_domain "System"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-ft219-backport.patch.bz2
+}
+
 src_compile() {
 	egnustep_env
 
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild
index 82bab9af092b..a2e67843147a 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild,v 1.8 2005/01/10 20:29:01 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild,v 1.9 2005/03/17 20:54:20 fafhrd Exp $
 
 inherit gnustep
 
@@ -20,8 +20,8 @@ IUSE="${IUSE} opengl xim doc"
 DEPEND="${GNUSTEP_GUI_DEPEND}
 	~gnustep-base/gnustep-gui-0.9.4
 	virtual/xft
-	>=media-libs/freetype-2.1.5
-	<media-libs/freetype-2.1.8
+	~media-libs/freetype-2.1.5
+	!~media-libs/freetype-2.1.9
 	opengl? ( virtual/opengl virtual/glu )
 	gnustep-libs/artresources
 	>=gnustep-base/mknfonts-0.5
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20041203.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050312.ebuild
index 00702512f8df..5481a4c64e6f 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20041203.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050312.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20041203.ebuild,v 1.2 2005/01/07 00:27:40 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050312.ebuild,v 1.1 2005/03/17 20:54:20 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -38,6 +38,12 @@ ${DOC_RDEPEND}"
 
 egnustep_install_domain "System"
 
+src_unpack() {
+	cvs_src_unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/font-make-fix.patch-${PV}
+	cd ${S}
+}
+
 src_compile() {
 	egnustep_env
 
diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index c61d05de6ab3..7be7be1a2d93 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-base/gnustep-base
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.20 2005/01/10 20:28:22 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.21 2005/03/17 20:52:30 fafhrd Exp $
+
+*gnustep-base-1.10.2_pre20050312 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/base-user-defaults.patch-1.10.2_pre20050312,
+  -gnustep-base-1.10.2_pre20041203.ebuild,
+  -gnustep-base-1.10.2_pre20050106.ebuild,
+  +gnustep-base-1.10.2_pre20050312.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
   10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-base-1.10.1-r1.ebuild:
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index b5e0e57b41d7..620977fb69e2 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -1,10 +1,9 @@
-MD5 6707aaf43c77d47da7097937e8d0e1ae gnustep-base-1.10.2_pre20050106.ebuild 3364
-MD5 783c7f94f8e2cd3a1925ce5e93d7afc3 gnustep-base-1.10.1-r1.ebuild 2979
-MD5 8814742eb453a29262fe72908d00ab31 gnustep-base-1.10.2_pre20041203.ebuild 3364
 MD5 a2693083f2a22ff6395656e25dc9fc45 ChangeLog 7269
+MD5 783c7f94f8e2cd3a1925ce5e93d7afc3 gnustep-base-1.10.1-r1.ebuild 2979
 MD5 6054f8e4a94313852ff8e1294c8abd88 metadata.xml 670
-MD5 deded00aa5a335854582a82255ddc2f3 files/digest-gnustep-base-1.10.1-r1 72
-MD5 efda24cf74398ac3ddce6cba6071561a files/config-gnustep-base.sh 559
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.2_pre20041203 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.2_pre20050106 0
+MD5 7c36bc6f5ec405f126a294e776aea586 gnustep-base-1.10.2_pre20050312.ebuild 3237
 MD5 1e1e21f737b0d25c8faabb89bd286988 files/base-user-defaults.patch-1.10.0 1069
+MD5 efda24cf74398ac3ddce6cba6071561a files/config-gnustep-base.sh 559
+MD5 3a635544722f08220cbdfe346c41c125 files/base-user-defaults.patch-1.10.2_pre20050312 1096
+MD5 deded00aa5a335854582a82255ddc2f3 files/digest-gnustep-base-1.10.1-r1 72
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.2_pre20050312 0
diff --git a/gnustep-base/gnustep-base/files/base-user-defaults.patch-1.10.2_pre20050312 b/gnustep-base/gnustep-base/files/base-user-defaults.patch-1.10.2_pre20050312
new file mode 100644
index 000000000000..bfe73e8b3da0
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/base-user-defaults.patch-1.10.2_pre20050312
@@ -0,0 +1,33 @@
+diff -ur Source/NSPathUtilities.m Source/NSPathUtilities.m
+--- Source/NSPathUtilities.m	2005-03-03 11:04:22.000000000 -0500
++++ Source/NSPathUtilities.m	2005-03-12 22:13:25.296017304 -0500
+@@ -575,6 +575,8 @@
+ 
+   if (forceD == NO || defs == nil || forceU == NO || user == nil)
+     {
++      char *env_var;
++
+       file = [home stringByAppendingPathComponent: @".GNUsteprc"];
+ 
+       attributes = [manager fileAttributesAtPath: file traverseLink: YES];
+@@ -641,6 +643,20 @@
+ 		}
+ 	    }
+ 	}
++#if !defined(__MINGW__)
++       /* if specified in the environment, as long as system does not override,
++        * observe user environment variables for USER and DEFAULTS here
++        */
++       if((NO == forceU) && (NULL != (env_var = getenv("GNUSTEP_USER_ROOT"))))
++         {   
++           user = [NSString stringWithCString: (const char *)env_var];
++         }
++       if((NO == forceD) && (NULL != (env_var = getenv("GNUSTEP_DEFAULTS_ROOT"))))
++         {   
++           defs = [NSString stringWithCString: (const char *)env_var];
++         }
++#endif
++						 
+     }
+ 
+   if (defaults == YES)
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050106 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050106
+++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050312
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050106.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050106.ebuild
deleted file mode 100644
index 060f0c6fec8d..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050106.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050106.ebuild,v 1.1 2005/01/10 16:22:16 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/base"
-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 toolchain-funcs cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="The GNUstep Base Library is a library of general-purpose, non-graphical Objective C objects."
-
-HOMEPAGE="http://www.gnustep.org"
-#SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="${IUSE} doc gcc-libffi"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-1.10.1_pre20050106
-	|| (
-		gcc-libffi? ( >=sys-devel/gcc-3.3.2 )
-		>=dev-libs/libffi-3* )
-	>=dev-libs/libxml2-2.6*
-	>=dev-libs/libxslt-1.1*
-	>=dev-libs/gmp-4.1*
-	>=dev-libs/openssl-0.9.7*
-	>=sys-libs/zlib-1.2*
-	sys-apps/sed
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-pkg_setup() {
-	gnustep_pkg_setup
-
-	if use gcc-libffi; then
-		if [ "$(ffi_available)" == "no" ]; then
-			ffi_not_available_info
-			die "libffi is not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	cvs_src_unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
-	cd ${S}/Source
-}
-
-src_compile() {
-	egnustep_env
-	# why libffi over ffcall?
-	# - libffi is known to work with 32 and 64 bit platforms
-	# - libffi does not use trampolines
-	local myconf
-	myconf="--disable-ffcall --enable-libffi"
-	if use gcc-libffi; then
-		myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include"
-	else
-		myconf="${myconf} --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi"
-	fi
-	myconf="$myconf --with-xml-prefix=/usr"
-	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install || die
-
-	local base_temp_lib_path
-	if [ ! -z $GNUSTEP_FLATTENED ]; then
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries"
-	else
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO"
-	fi
-
-	if use doc ; then
-		local make_eval="INSTALL_ROOT=\${D} \
-			GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
-			GNUSTEP_NETWORK_ROOT=\$(egnustep_network_root) \
-			GNUSTEP_LOCAL_ROOT=\$(egnustep_local_root) \
-			GNUSTEP_MAKEFILES=\$(egnustep_system_root)/Library/Makefiles \
-			GNUSTEP_USER_ROOT=\${TMP} \
-			GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
-			LD_LIBRARY_PATH=\"\${D}\${base_temp_lib_path}:\${LD_LIBRARY_PATH}\" \
-			GNUSTEP_INSTALLATION_DIR=\${D}\$(egnustep_install_domain) \
-			-j1"
-		if use debug ; then
-			make_eval="${make_eval} debug=yes"
-		fi
-		if use verbose ; then
-			make_eval="${make_eval} verbose=yes"
-		fi
-
-		cd ${S}/Documentation
-		eval emake ${make_eval} all || die "doc make has failed"
-		eval emake ${make_eval} install || die "doc install has failed"
-		cd ..
-	fi
-	egnustep_package_config
-}
-
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050312.ebuild
index b9be05deb614..843c6bdc5c7c 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050312.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild,v 1.4 2005/01/10 16:22:16 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050312.ebuild,v 1.1 2005/03/17 20:52:30 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -24,7 +24,7 @@ LICENSE="GPL-2 LGPL-2.1"
 
 IUSE="${IUSE} doc gcc-libffi"
 DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-1.10.1_pre20041203
+	>=gnustep-base/gnustep-make-1.10.1_pre20050312
 	|| (
 		gcc-libffi? ( >=sys-devel/gcc-3.3.2 )
 		>=dev-libs/libffi-3* )
@@ -53,7 +53,7 @@ pkg_setup() {
 
 src_unpack() {
 	cvs_src_unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-${PV}
 	cd ${S}/Source
 }
 
diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index 43db93efa0f9..928933f3a5d0 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-base/gnustep-gui
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.24 2005/01/10 20:28:41 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.25 2005/03/17 20:53:20 fafhrd Exp $
+
+*gnustep-gui-0.9.5_pre20050312 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org> +files/gui-def.patch,
+  +files/gui-gsspell.patch, +gnustep-gui-0.9.4-r1.ebuild,
+  -gnustep-gui-0.9.5_pre20041203.ebuild,
+  -gnustep-gui-0.9.5_pre20050106.ebuild,
+  +gnustep-gui-0.9.5_pre20050312.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
   10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-gui-0.9.4.ebuild:
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 7360a1d7654d..be3da5ca59f3 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,9 +1,11 @@
-MD5 00d9850555a8c14ca791f3dff567bd1f gnustep-gui-0.9.5_pre20050106.ebuild 1639
-MD5 2ecd6205825489f938828ff7e822dda9 gnustep-gui-0.9.5_pre20041203.ebuild 1661
 MD5 1aa574cd23ec3a92457023ae70c277f1 ChangeLog 6707
-MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
 MD5 c350e41ce6bd8d971b0b9400707aedbd gnustep-gui-0.9.4.ebuild 1392
+MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
+MD5 aca1797234f9d7961baba79580592cf7 gnustep-gui-0.9.5_pre20050312.ebuild 1516
+MD5 93f56de0dde618945f46bbae824ea6f3 gnustep-gui-0.9.4-r1.ebuild 1439
 MD5 6f66904f0ad8d980c653d5c0fdf7d81b files/gnustep-gui-0.9.4-camaelon.patch 4029
 MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4 70
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20041203 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20050106 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20050312 0
+MD5 7bb8ef207dff05d7e80122fcffdcce88 files/gui-def.patch 640
+MD5 de8a4d2ff2308aaa042177ee1bcec78b files/gui-gsspell.patch 650
+MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4-r1 70
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r1 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r1
new file mode 100644
index 000000000000..84f55556e03b
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r1
@@ -0,0 +1 @@
+MD5 399b3a2341899d12710f4d1ed36f3002 gnustep-gui-0.9.4.tar.gz 1839593
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041203 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041203
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041203
+++ /dev/null
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050106 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050106
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050106
+++ /dev/null
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20041203 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20041203
+++ b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050312
diff --git a/gnustep-base/gnustep-gui/files/gui-def.patch b/gnustep-base/gnustep-gui/files/gui-def.patch
new file mode 100644
index 000000000000..2c8dd61b51a1
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/gui-def.patch
@@ -0,0 +1,16 @@
+Index: Source/GNUmakefile.postamble
+===================================================================
+RCS file: /cvsroot/gnustep/gnustep/core/gui/Source/GNUmakefile.postamble,v
+retrieving revision 1.15
+retrieving revision 1.16
+diff -u -r1.15 -r1.16
+--- Source/GNUmakefile.postamble	3 Dec 2003 01:55:36 -0000	1.15
++++ Source/GNUmakefile.postamble	6 Oct 2004 03:34:46 -0000	1.16
+@@ -116,6 +116,6 @@
+ 	rm -f $@
+ 	rm -f _tmp.def
+ 	cat win32-def.top > $@
+-	nm $^ | grep '^........ [T] _' | sed 's/[^_]*_//' > _tmp.def
++	nm $^ | grep '^........ [TR] _' | sed 's/[^_]*_//' > _tmp.def
+ 	cat _tmp.def | grep "_class_name_" >> $@
+ 	rm -rf _tmp.def
diff --git a/gnustep-base/gnustep-gui/files/gui-gsspell.patch b/gnustep-base/gnustep-gui/files/gui-gsspell.patch
new file mode 100644
index 000000000000..a8c186c56c15
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/gui-gsspell.patch
@@ -0,0 +1,15 @@
+Index: Tools/GNUmakefile.preamble
+===================================================================
+RCS file: /cvsroot/gnustep/gnustep/core/gui/Tools/GNUmakefile.preamble,v
+retrieving revision 1.6
+diff -u -r1.6 GNUmakefile.preamble
+--- Tools/GNUmakefile.preamble	2 Sep 2004 03:27:54 -0000	1.6
++++ Tools/GNUmakefile.preamble	28 Feb 2005 22:35:52 -0000
+@@ -34,6 +34,7 @@
+ gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
+ set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
+ gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
++GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS)
+ 
+ # Additional libraries when linking applications
+ # ADDITIONAL_GUI_LIBS +=
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041203.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r1.ebuild
index 853932d5a013..d2c8fbd3531e 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041203.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r1.ebuild
@@ -1,21 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041203.ebuild,v 1.2 2005/01/09 12:18:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r1.ebuild,v 1.1 2005/03/17 20:53:20 fafhrd Exp $
 
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/gui"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
+inherit gnustep
 
 DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
 HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
 SLOT="0"
@@ -23,7 +14,7 @@ LICENSE="LGPL-2.1"
 
 IUSE="${IUSE} jpeg gif png gsnd doc cups"
 DEPEND="${GNUSTEP_BASE_DEPEND}
-	>=gnustep-base/gnustep-base-1.10.2_pre20041203*
+	~gnustep-base/gnustep-base-1.10.1
 	virtual/x11
 	>=media-libs/tiff-3*
 	jpeg? ( >=media-libs/jpeg-6b* )
@@ -37,6 +28,13 @@ RDEPEND="${DEPEND}
 
 egnustep_install_domain "System"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-def.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-gsspell.patch
+}
+
 src_compile() {
 	egnustep_env
 
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050106.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312.ebuild
index 92045980ec3f..6ef0e01db72e 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050106.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050106.ebuild,v 1.1 2005/01/10 16:22:38 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312.ebuild,v 1.1 2005/03/17 20:53:20 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -23,7 +23,7 @@ LICENSE="LGPL-2.1"
 
 IUSE="${IUSE} jpeg gif png gsnd doc cups"
 DEPEND="${GNUSTEP_BASE_DEPEND}
-	>=gnustep-base/gnustep-base-1.10.2_pre20041203*
+	>=gnustep-base/gnustep-base-1.10.2_pre20050312*
 	virtual/x11
 	>=media-libs/tiff-3*
 	jpeg? >=media-libs/jpeg-6b*
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index 41541b014edb..dd8bdf0a22c0 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-base/gnustep-make
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.22 2005/01/10 20:28:02 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.23 2005/03/17 20:51:22 fafhrd Exp $
+
+*gnustep-make-1.10.1_pre20050312 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  -gnustep-make-1.10.1_pre20041203.ebuild,
+  -gnustep-make-1.10.1_pre20050106.ebuild,
+  +gnustep-make-1.10.1_pre20050312.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
   10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-make-1.10.0-r1.ebuild:
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index ecd698c79ab8..4445d306b7cb 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,10 +1,8 @@
-MD5 cf7a6d8c538b43e8f6dd06f1b65c23a9 gnustep-make-1.10.0-r1.ebuild 6433
 MD5 5669998860d36ed26e14a58e9f375ee3 ChangeLog 7354
-MD5 7b7d9c115bfa24dd292f0c7ffde1bc14 gnustep-make-1.10.1_pre20050106.ebuild 6617
+MD5 cf7a6d8c538b43e8f6dd06f1b65c23a9 gnustep-make-1.10.0-r1.ebuild 6433
 MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
-MD5 45323b754a4494d03e43774e1d40cd4d gnustep-make-1.10.1_pre20041203.ebuild 6617
-MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch-1.10.0 1282
+MD5 f1cc86c49e2a50ec12042f88dd274b58 gnustep-make-1.10.1_pre20050312.ebuild 6426
 MD5 ff55be8ebf757b97d823bb3cf08b8bc4 files/GNUstep-reset.sh.patch 2121
+MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch-1.10.0 1282
 MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0-r1 71
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041203 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20050106 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20050312 0
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041203 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041203
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041203
+++ /dev/null
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20050106 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20050106
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20050106
+++ /dev/null
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050106 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050106
+++ b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20050312
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050106.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050106.ebuild
deleted file mode 100644
index f8916be1919b..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050106.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050106.ebuild,v 1.1 2005/01/10 16:21:55 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/make"
-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="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="${IUSE} doc layout-from-conf-file layout-osx-like non-flattened"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-pkg_setup() {
-	gnustep_pkg_setup
-
-	if [ "$(objc_available)" == "no" ]; then
-		objc_not_available_info
-		die "ObjC support not available"
-	fi
-
-	if use layout-from-conf-file && use layout-osx-like ; then
-		eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags."
-		die "USE flag misconfiguration -- please correct"
-	fi
-
-	if use layout-from-conf-file || use layout-osx-like ; then
-		ewarn "USE layout-from-conf-file || layout-osx-like"
-		ewarn "Utilizing these USE flags allows one to install files in non standard"
-		ewarn "  locations vis a vis the Linux FHS -- please fully comprehend what you"
-		ewarn "  are doing when setting this USE flag."
-	fi
-
-	if use layout-from-conf-file; then
-		if [ ! -f /etc/conf.d/gnustep.env ]; then
-			eerror "There is no /etc/conf.d/gnustep.env file!"
-			eerror "Did you read the USE flag description?"
-			die "USE flag misconfiguration -- please correct"
-		else
-			unset GNUSTEP_SYSTEM_ROOT
-			unset GNUSTEP_LOCAL_ROOT
-			unset GNUSTEP_NETWORK_ROOT
-			unset GNUSTEP_USER_ROOT
-			. /etc/conf.d/gnustep.env
-			if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_SYSTEM_ROOT is missing or misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			fi
-			if [ "/System" != ${GNUSTEP_SYSTEM_ROOT:$((${#GNUSTEP_SYSTEM_ROOT}-7)):7} ]; then
-				eerror "GNUSTEP_SYSTEM_ROOT must end with \"System\" -- read the USE flag directions!!!"
-				die "USE flag misconfiguration -- please correct"
-			fi
-			if [ "${GNUSTEP_LOCAL_ROOT}" ] && [ "/" != "${GNUSTEP_LOCAL_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_LOCAL_ROOT is misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			elif [ -z "${GNUSTEP_LOCAL_ROOT}" ]; then
-				GNUSTEP_LOCAL_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Local"
-			fi
-			if [ "${GNUSTEP_NETWORK_ROOT}" ] && [ "/" != "${GNUSTEP_NETWORK_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_NETWORK_ROOT is misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			elif [ -z "${GNUSTEP_NETWORK_ROOT}" ]; then
-				GNUSTEP_NETWORK_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Network"
-			fi
-			if [ "${GNUSTEP_USER_ROOT}" ] && [ '~' != "${GNUSTEP_USER_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_USER_ROOT is misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			elif [ -z "${GNUSTEP_USER_ROOT}" ]; then
-				GNUSTEP_USER_ROOT='~/GNUstep'
-			fi
-
-			egnustep_prefix "$(dirname ${GNUSTEP_SYSTEM_ROOT})"
-			egnustep_system_root "${GNUSTEP_SYSTEM_ROOT}"
-			egnustep_local_root "${GNUSTEP_LOCAL_ROOT}"
-			egnustep_network_root "${GNUSTEP_NETWORK_ROOT}"
-			egnustep_user_root "${GNUSTEP_USER_ROOT}"
-		fi
-	elif use layout-osx-like; then
-		egnustep_prefix "/"
-		egnustep_system_root "/System"
-		egnustep_local_root "/"
-		egnustep_network_root "/Network"
-		egnustep_user_root '~'
-	else
-		# setup defaults here
-		egnustep_prefix "/usr/GNUstep"
-		egnustep_system_root "/usr/GNUstep/System"
-		egnustep_local_root "/usr/GNUstep/Local"
-		egnustep_network_root "/usr/GNUstep/Network"
-		egnustep_user_root '~/GNUstep'
-	fi
-
-	einfo "GNUstep installation will be laid out thusly:"
-	einfo "\tGNUSTEP_SYSTEM_ROOT=`egnustep_system_root`"
-	einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`"
-	einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`"
-	einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`"
-	ebeep
-	epause 10
-}
-
-src_unpack() {
-	cvs_src_unpack
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/GNUstep-reset.sh.patch
-}
-
-src_compile() {
-	cd ${S}
-
-	# gnustep-make ./configure : "prefix" here is going to be where
-	#  "System" is installed -- other correct paths should be set
-	#  by econf
-	local myconf
-	myconf="--prefix=`egnustep_prefix`"
-	use non-flattened && myconf="$myconf --disable-flattened"
-	myconf="$myconf --with-tar=/bin/tar"
-	myconf="$myconf --with-local-root=`egnustep_local_root`"
-	myconf="$myconf --with-network-root=`egnustep_network_root`"
-	myconf="$myconf --with-user-root=`egnustep_user_root`"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
-src_install() {
-	. ${S}/GNUstep.sh
-
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		local make_eval="INSTALL_ROOT=\${D} \
-		GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
-		GNUSTEP_NETWORK_ROOT=\${D}\$(egnustep_network_root) \
-		GNUSTEP_LOCAL_ROOT=\${D}\$(egnustep_local_root) \
-		GNUSTEP_MAKEFILES=\${D}\$(egnustep_system_root)/Library/Makefiles \
-		GNUSTEP_USER_ROOT=\${TMP} \
-		GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
-		-j1"
-
-		if use debug ; then
-			make_eval="${make_eval} debug=yes"
-		fi
-		if use verbose ; then
-			make_eval="${make_eval} verbose=yes"
-		fi
-		eval emake ${make_eval} install || die "install has failed"
-	else
-		die "no Makefile found"
-	fi
-
-	if use doc ; then
-		cd Documentation
-		eval emake ${make_eval} all || die "doc make has failed"
-		eval emake ${make_eval} install || die "doc install has failed"
-		cd ..
-	fi
-
-	dodir /etc/conf.d
-	echo "GNUSTEP_SYSTEM_ROOT=$(egnustep_system_root)" > ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_USER_ROOT='$(egnustep_user_root)'" >> ${D}/etc/conf.d/gnustep.env
-}
-
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050312.ebuild
index db18bddc13ac..108684352ec3 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050312.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild,v 1.4 2005/01/10 16:21:55 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050312.ebuild,v 1.1 2005/03/17 20:51:22 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -125,7 +125,6 @@ pkg_setup() {
 src_unpack() {
 	cvs_src_unpack
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/GNUstep-reset.sh.patch
 }
 
 src_compile() {