Major commit of many files relating to updated GNUstep ebuidlds

37 files changed, 698 insertions, 38 deletions

diff --git a/gnustep-base/gnustep-back-xlib/ChangeLog b/gnustep-base/gnustep-back-xlib/ChangeLog
new file mode 100644
index 000000000000..1aa6a743121d
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for gnustep-base/gnustep-back-xlib
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.1 2004/09/24 01:03:33 fafhrd Exp $
+
+*gnustep-back-xlib-0.9.4_pre20040908 (08 Sep 2004)
+
+  08 Sep 2004; Armando Di Cianno <fafhrd@gentoo.org> +metadata.xml,
+  +files/config-gnustep-back-xlib.sh,
+  +gnustep-back-xlib-0.9.4_pre20040908.ebuild:
+  Version bump; key'd for ~x86.
+
+  28 Aug 2004; Armando Di Cianno <fafhrd@gentoo.org> :
+  Added first gnustep-back-xlib package.
+
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
new file mode 100644
index 000000000000..142e4e5076df
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/Manifest
@@ -0,0 +1,5 @@
+MD5 c13f377509279da7febf5019ca698cc7 gnustep-back-xlib-0.9.4_pre20040920.ebuild 876
+MD5 5d56f34c65dc527f22852a933a96c008 ChangeLog 466
+MD5 ef356714ab02a84c6e88fe3720749aea metadata.xml 1022
+MD5 819cd42faa7b7f3b139c3cb886adc63b files/digest-gnustep-back-xlib-0.9.4_pre20040920 82
+MD5 14c86d6ff5e83af36ad3d54266af5c99 files/config-gnustep-back-xlib.sh 181
diff --git a/gnustep-base/gnustep-back-xlib/files/config-gnustep-back-xlib.sh b/gnustep-base/gnustep-back-xlib/files/config-gnustep-back-xlib.sh
new file mode 100644
index 000000000000..f81b377f9f39
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/files/config-gnustep-back-xlib.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "Switching to libgnustep-xlib backend ..."
+echo "defaults write NSGlobalDomain GSBackend libgnustep-xlib"
+defaults write NSGlobalDomain GSBackend libgnustep-xlib
+
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.4_pre20040920 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.4_pre20040920
new file mode 100644
index 000000000000..5248061ca250
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.4_pre20040920
@@ -0,0 +1 @@
+MD5 6a5ec5821935b5525898a07cf800d479 gnustep-back-0.9.4_pre20040920.tar.gz 412664
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4_pre20040920.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4_pre20040920.ebuild
new file mode 100644
index 000000000000..198dd114ecff
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4_pre20040920.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4_pre20040920.ebuild,v 1.1 2004/09/24 01:03:33 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/back
+
+DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library."
+
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="mirro://gentoo/gnustep-back-${PV}.tar.gz"
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+PROVIDE="virtual/gnustep-back"
+
+IUSE="${IUSE} opengl xim doc"
+DEPEND="${GNUSTEP_GUI_DEPEND}
+	=gnustep-base/gnustep-gui-0.9.4_pre20040920
+	opengl? ( virtual/opengl virtual/glu )
+	virtual/xft
+	=media-libs/freetype-2.1*"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+src_compile() {
+	egnustep_env
+
+	use opengl && myconf="--enable-glx"
+	myconf="$myconf `use_enable xim`"
+	myconf="$myconf --enable-server=x11"
+	myconf="$myconf --enable-graphics=xlib --with-name=xlib"
+	econf $myconf || die "configure failed"
+
+	egnustep_make
+}
+
diff --git a/gnustep-base/gnustep-back-xlib/metadata.xml b/gnustep-base/gnustep-back-xlib/metadata.xml
new file mode 100644
index 000000000000..b954196de55c
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnustep</herd>
+<longdescription>
+It is a back-end component for the GNUstep GUI Library.  The
+implementation of the GNUstep GUI Library is designed in two parts.  The
+first part is the front-end component which is independent of platform
+and display system.  This front-end is combined with a back-end
+component which handles all of the display system dependent such as
+specific calls to the X Window System.  This design allows the GNUstep
+applications to have the "look and feel" of the underlying display
+system without any changes to the application, and the library can be
+easily ported to other display systems.
+
+The GNUstep GUI Backend is for platforms using the X-Window System or
+Window's Systems. It works via a DPS emulation engine to emulate the
+DPS functions required by the front-end system.
+
+This package installs a backend that supports X11.
+</longdescription>
+</pkgmetadata>
diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index b6273e1442c1..574e1c30f344 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for gnustep-base/gnustep-base
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.3 2004/07/27 17:19:30 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.4 2004/09/24 01:04:11 fafhrd Exp $
 
-  23 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org>
+*gnustep-base-1.10.0 (08 Sep 2004)
+
+  08 Sep 2004; Armando Di Cianno <fafhrd@gentoo.org> metadata.xml,
+  +files/base-user-defaults.patch-1.10.0, +files/config-gnustep-base.sh,
+  +gnustep-base-1.10.0.ebuild:
+  Version bump; key'd for ~x86.
+
+  23 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-base-1.5.1.ebuild, gnustep-base-1.6.0-r1.ebuild,
   gnustep-base-1.6.0.ebuild, gnustep-base-1.7.1.ebuild,
   gnustep-base-1.7.2.ebuild:
@@ -10,18 +17,18 @@
 
 *gnustep-base-1.7.2 (23 Jul 2004)
 
-  23 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org> +metadata.xml,
+  23 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org> +metadata.xml,
   +files/gnustep, +gnustep-base-1.5.1.ebuild, +gnustep-base-1.6.0-r1.ebuild,
   +gnustep-base-1.6.0.ebuild, +gnustep-base-1.7.1.ebuild,
   +gnustep-base-1.7.2.ebuild:
   Moved from dev-util/gnustep-base to gnustep-base/gnustep-base.
 
-  22 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org>
+  22 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-base-1.6.0-r1.ebuild, gnustep-base-1.7.1.ebuild,
   gnustep-base-1.7.2.ebuild:
   Changing the eclass to gnustep-old
 
-  22 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org>
+  22 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-base-1.6.0-r1.ebuild, gnustep-base-1.7.1.ebuild,
   gnustep-base-1.7.2.ebuild:
   Changing the eclass to gnustep-old
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index a0787f68fa33..c330cf922b2d 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -1,13 +1,22 @@
 MD5 23859f3d7606a8ef65b494c2e6839bc1 gnustep-base-1.6.0-r1.ebuild 1454
+MD5 66557075cb64812d9f44d1d606a2ded3 gnustep-base-1.10.0.ebuild 2122
 MD5 618fa6ee84194d52655fcb356f143a37 gnustep-base-1.7.1.ebuild 1454
 MD5 44d2d858d061c56b3e03979648cf00e8 gnustep-base-1.6.0.ebuild 1811
+MD5 a605f0098418b0e12bc66b06cce10d6f gnustep-base-1.9.3_pre20040907.ebuild 2164
+MD5 5fde9f59cbb3d13cd71c7dfd85e19547 gnustep-base-1.9.3_pre20040830.ebuild 2127
 MD5 b49b166f4e94fe7eb3ac66a6bb072a3e gnustep-base-1.5.1.ebuild 912
-MD5 9e517c2947166f46af589550ccf04963 ChangeLog 3860
-MD5 80699754a7e9adb6c02df33c8fa16fd6 metadata.xml 161
+MD5 380952f8c45849ebed8ee5c70ed4840f ChangeLog 3844
+MD5 6054f8e4a94313852ff8e1294c8abd88 metadata.xml 670
 MD5 bfeed6219e25f7a18273da8952e28d7a gnustep-base-1.7.2.ebuild 1460
+MD5 1e1e21f737b0d25c8faabb89bd286988 files/base-user-defaults.patch 1069
+MD5 fdbe0aade53dd4476ea7225f56d1a726 files/config-gnustep-base.sh 449
+MD5 da38d67a86d0553b73378aea856093f5 files/digest-gnustep-base-1.10.0 72
+MD5 12cdbf5fb98463abc4c546340c833b03 files/digest-gnustep-base-1.9.3_pre20040830 83
+MD5 4ea7e01319c1d57a5e937df659b6779e files/digest-gnustep-base-1.9.3_pre20040907 83
 MD5 dc4ae26d71ff0a479187c6a818eff837 files/gnustep 1043
 MD5 5d1876e3df6d76d7d40993fb11e8896e files/digest-gnustep-base-1.5.1 71
 MD5 26fed6fc0104a9968ba35fd857ec42d7 files/digest-gnustep-base-1.6.0 71
 MD5 31a850708e7534ab554cd04049cb1930 files/digest-gnustep-base-1.7.1 71
 MD5 1c14747d00a4b6189a4755fec15c8eb5 files/digest-gnustep-base-1.7.2 71
+MD5 1e1e21f737b0d25c8faabb89bd286988 files/base-user-defaults.patch-1.10.0 1069
 MD5 26fed6fc0104a9968ba35fd857ec42d7 files/digest-gnustep-base-1.6.0-r1 71
diff --git a/gnustep-base/gnustep-base/files/base-user-defaults.patch-1.10.0 b/gnustep-base/gnustep-base/files/base-user-defaults.patch-1.10.0
new file mode 100644
index 000000000000..6fc6167e72c4
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/base-user-defaults.patch-1.10.0
@@ -0,0 +1,32 @@
+diff -ur core/base/Source/NSUser.m core-adc/base/Source/NSUser.m
+--- Source/NSUser.m	2004-06-25 15:30:43.000000000 -0400
++++ Source/NSUser.m	2004-08-18 10:01:31.915847928 -0400
+@@ -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,19 @@
+ 		}
+ 	    }
+ 	}
++#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-base/files/config-gnustep-base.sh b/gnustep-base/gnustep-base/files/config-gnustep-base.sh
new file mode 100644
index 000000000000..5ba53fb5a261
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/config-gnustep-base.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/files/config-gnustep-base.sh,v 1.1 2004/09/24 01:04:11 fafhrd Exp $
+
+TIME_ZONE="America/New_York"
+LANGUAGE="English"
+
+echo "defaults write NSGlobalDomain \"Local Time Zone\" ${TIME_ZONE}"
+defaults write NSGlobalDomain "Local Time Zone" ${TIME_ZONE}
+echo "defaults write NSGlobalDomain NSLanguages \"(${LANGUAGE})\""
+defaults write NSGlobalDomain NSLanguages "(${LANGUAGE})"
+
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.0 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.0
new file mode 100644
index 000000000000..bbb7e59b96fd
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.0
@@ -0,0 +1 @@
+MD5 a948608044062a8ce6fae230144f5519 gnustep-base-1.10.0.tar.gz 1879307
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.0.ebuild
new file mode 100644
index 000000000000..c0af13c6b54c
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 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.0.ebuild,v 1.1 2004/09/24 01:04:11 fafhrd Exp $
+
+inherit gnustep
+
+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="~x86"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE="${IUSE} doc"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	=gnustep-base/gnustep-make-${PV}
+	=dev-libs/libxml2-2.6*
+	=dev-libs/libxslt-1.1*
+	=dev-libs/gmp-4.1*
+	=dev-libs/openssl-0.9.7*
+	=dev-libs/libffi-3*
+	amd64? =dev-libs/libffi-3.4.1
+	=sys-libs/zlib-1.2*
+	${DOC_DEPEND}"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-${PV}
+}
+
+src_compile() {
+	egnustep_env
+	# why libffi over ffcall?
+	# - libffi is known to work with 32 and 64 bit platforms
+	# - libffi does not use trampolines
+	myconf="--enable-libffi --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi --disable-ffcall"
+	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
+	if [ `use doc` ]; then
+		cd ${S}/Documentation
+		make HOME=${TMP} \
+			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
+			INSTALL_ROOT_DIR=${D} \
+			LD_LIBRARY_PATH="${D}${GNUSTEP_SYSTEM_ROOT}/Library/Libraries:${LD_LIBRARY_PATH}" \
+			GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
+			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
+			all || die "doc make failed"
+
+		make HOME=${TMP} \
+			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
+			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
+			INSTALL_ROOT_DIR=${D} \
+			GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
+			GNUSTEP_MAKEFILES=${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles \
+			GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT} \
+			TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \
+			install || die "doc install failed"
+		cd ..
+	fi
+	egnustep_package_config
+}
+
diff --git a/gnustep-base/gnustep-base/metadata.xml b/gnustep-base/gnustep-base/metadata.xml
index 6cfe3231f3bc..7c59c8111c68 100644
--- a/gnustep-base/gnustep-base/metadata.xml
+++ b/gnustep-base/gnustep-base/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd> 
+<herd>gnustep</herd>
+<longdescription>
+The GNUstep Base Library is a library of general-purpose, non-graphical
+Objective C objects.  For example, it includes classes for strings,
+object collections, byte streams, typed coders, invocations,
+notifications, notification dispatchers, moments in time, network ports,
+remote object messaging support (distributed objects), and event loops.
+
+It provides functionality that aims to implement the non-graphical
+portion of the OpenStep standard (the Foundation library).
+</longdescription>
 </pkgmetadata>
diff --git a/gnustep-base/gnustep-env/ChangeLog b/gnustep-base/gnustep-env/ChangeLog
index d3c870957c9b..ef8da06f6e20 100644
--- a/gnustep-base/gnustep-env/ChangeLog
+++ b/gnustep-base/gnustep-env/ChangeLog
@@ -1,13 +1,13 @@
 # ChangeLog for gnustep-base/gnustep-env
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.3 2004/07/27 17:19:30 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.4 2004/09/24 01:05:12 fafhrd Exp $
 
   25 Jul 2004; Lina Pezzella <burgundy@gentoo.org> :
   Fixed Manifest.
 
 *gnustep-env-0.1 (23 Jul 2004)
 
-  23 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org> +files/10gnustep,
+  23 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org> +files/10gnustep,
   +gnustep-env-0.1.ebuild:
   Moved from x11-wm/gnustep-env to gnustep-base/gnustep-env.
 
diff --git a/gnustep-base/gnustep-env/Manifest b/gnustep-base/gnustep-env/Manifest
index 46a5b4324439..3608dc74cb66 100644
--- a/gnustep-base/gnustep-env/Manifest
+++ b/gnustep-base/gnustep-env/Manifest
@@ -1,4 +1,11 @@
+MD5 7804be2ce8b150328676295da6dd9149 gnustep-env-0.1.4.ebuild 772
+MD5 81606291f20be32cc9fe576cd5ad4a4e gnustep-env-0.1.3.ebuild 779
+MD5 81606291f20be32cc9fe576cd5ad4a4e gnustep-env-0.1.2.ebuild 779
 MD5 1e82c3c29105707ada1b6bce01e6cb0f gnustep-env-0.1.ebuild 563
-MD5 d59e543d00f517677d5c1f994a72abe6 ChangeLog 1359
+MD5 2ef1d67fa91cd0d1b90e29deadf54d15 ChangeLog 1355
+MD5 c603ed4d589dc2091e618436e4de9c78 metadata.xml 371
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.4 0
+MD5 256683e2f3f96656fc708692786a2e0b files/gnustep.runscript-0.1.4 1037
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1 0
+MD5 f09a2c358b99621be462aa2cab5c0516 files/gnustep.env-0.1.4 451
 MD5 766b0cb8343bea6f212694c1fd261335 files/10gnustep 36
diff --git a/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.4 b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.4
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.4
diff --git a/gnustep-base/gnustep-env/files/gnustep.env-0.1.4 b/gnustep-base/gnustep-env/files/gnustep.env-0.1.4
new file mode 100644
index 000000000000..c98548a749de
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/gnustep.env-0.1.4
@@ -0,0 +1,3 @@
+MANPATH="/usr/GNUstep/System/Library/Documentation/man:/usr/GNUstep/Local/Library/Documentation/man:/usr/GNUstep/Network/Library/Documentation/man"
+INFODIR="/usr/GNUstep/System/Library/Documentation/info:/usr/GNUstep/Local/Library/Documentation/info:/usr/GNUstep/Network/Library/Documentation/info"
+INFOPATH="/usr/GNUstep/System/Library/Documentation/info:/usr/GNUstep/Local/Library/Documentation/info:/usr/GNUstep/Network/Library/Documentation/info"
diff --git a/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.4 b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.4
new file mode 100644
index 000000000000..eac8f01a12d9
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.4
@@ -0,0 +1,52 @@
+#!/sbin/runscript
+#
+# (c) 2003 Dennis Leeuw
+# License: GPL version 2 or any newer version
+#
+# Modifications, truncation, and gentoo-ification:
+# Copyright 2004 Gentoo Technologies, Inc.
+
+GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
+. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh
+TOOLS="${GNUSTEP_SYSTEM_ROOT}/Tools"
+
+start() {
+	ebegin "Starting gnustep daemons..."
+
+	if [ -x $TOOLS/gdomap ]; then 
+		ebegin "\tgdomap "
+		GNUSTEP_USER_ROOT=/var/run/GNUstep \
+		GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+		$TOOLS/gdomap
+	fi
+	if [ -x $TOOLS/gdnc ]; then
+		ebegin "\tgdnc "
+		GNUSTEP_USER_ROOT=/var/run/GNUstep \
+		GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+		$TOOLS/gdnc
+	fi
+	if [ -x $TOOLS/gnustep_sndd ]; then 
+		ebegin "\tgnustep_sndd"
+		GNUSTEP_USER_ROOT=/var/run/GNUstep \
+		GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+		$TOOLS/gnustep_sndd
+	fi
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping gnustep daemons..."
+
+	ebegin "\tgdomap "
+	killall gdomap
+	
+	ebegin "\tgdnc "
+	killall gdnc
+
+	ebegin "\tgnustep_sndd"
+	killall gnustep_sndd
+
+	eend $?
+}
+
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild
new file mode 100644
index 000000000000..83170f7bfd9a
--- /dev/null
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild,v 1.1 2004/09/24 01:05:12 fafhrd Exp $
+
+inherit gnustep
+
+DESCRIPTION="This is a convience package that installs all base GNUstep libraries, convenience scripts, and environment settings for use on Gentoo."
+# These are support files for GNUstep on Gentoo, so setting
+#   homepage thusly
+HOMEPAGE="http://www.gnustep.org"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+src_unpack() {
+	echo "nothing to unpack"
+}
+
+src_compile() {
+	echo "nothing to compile"
+}
+
+src_install() {
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/gnustep.runscript-${PV} gnustep
+	insinto /etc/env.d
+	newins ${FILESDIR}/gnustep.env-${PV} 99gnustep
+	dodir /var/run/GNUstep
+	einfo "Check http://dev.gentoo.org/~fafhrd/ for very handy info in setting up your GNUstep env."
+}
+
diff --git a/gnustep-base/gnustep-env/metadata.xml b/gnustep-base/gnustep-env/metadata.xml
new file mode 100644
index 000000000000..94a4e189f64c
--- /dev/null
+++ b/gnustep-base/gnustep-env/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnustep</herd>
+<longdescription>
+gnustep-env offers a run-script for starting GNUstep daemons (/etc/init.d/gnustep), and an env file that loads correct GNUstep paths for libraries and other important files.
+</longdescription>
+</pkgmetadata>
diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index 4420a7e1f10b..7f5967aa3368 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for gnustep-base/gnustep-gui
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.3 2004/07/27 17:19:30 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.4 2004/09/24 01:04:50 fafhrd Exp $
 
-  23 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org>
+*gnustep-gui-0.9.4_pre20040908 (08 Sep 2004)
+
+  08 Sep 2004; Armando Di Cianno <fafhrd@gentoo.org> metadata.xml,
+  +gnustep-gui-0.9.4_pre20040908.ebuild:
+  Version bump; key'd for ~x86.
+
+  23 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-gui-0.7.9.ebuild, gnustep-gui-0.8.0.ebuild,
   gnustep-gui-0.8.3.ebuild, gnustep-gui-0.8.5-r1.ebuild,
   gnustep-gui-0.8.5.ebuild, gnustep-gui-0.8.7.ebuild,
@@ -11,19 +17,19 @@
 
 *gnustep-gui-0.7.9 (23 Jul 2004)
 
-  23 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org> +metadata.xml,
+  23 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org> +metadata.xml,
   +gnustep-gui-0.7.9.ebuild, +gnustep-gui-0.8.0.ebuild,
   +gnustep-gui-0.8.3.ebuild, +gnustep-gui-0.8.5-r1.ebuild,
   +gnustep-gui-0.8.5.ebuild, +gnustep-gui-0.8.7.ebuild,
   +gnustep-gui-0.8.8.ebuild:
   Moved from dev-util/gnustep-gui to gnustep-base/gnustep-gui.
 
-  22 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org>
+  22 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-gui-0.8.5-r1.ebuild, gnustep-gui-0.8.7.ebuild,
   gnustep-gui-0.8.8.ebuild:
   Changing the eclass to gnustep-old
 
-  22 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org>
+  22 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-gui-0.8.5-r1.ebuild, gnustep-gui-0.8.7.ebuild,
   gnustep-gui-0.8.8.ebuild:
   Changing the eclass to gnustep-old
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 1e9f24a27505..d55c1af0413c 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -3,11 +3,15 @@ MD5 e14e1639b26da4acf77a9eab4ad5e320 gnustep-gui-0.8.3.ebuild 1070
 MD5 ec1df9161d8f1382a12157b4670a1981 gnustep-gui-0.8.5.ebuild 1070
 MD5 6116d8408ca55f6d4a520b0e5a83619d gnustep-gui-0.8.0.ebuild 1033
 MD5 ec2a075a4a96dd9d782e868467c96986 gnustep-gui-0.7.9.ebuild 1033
+MD5 f927f9aff7b9dd35d5b8dbbdd077caf8 gnustep-gui-0.9.4_pre20040908.ebuild 1249
 MD5 a99822a371283fd3dd2abd1563b08c76 gnustep-gui-0.8.7.ebuild 799
 MD5 be917ba7298ba3bd936d874774de0a7d gnustep-gui-0.8.5-r1.ebuild 798
-MD5 49fe8199bc714f02539ffef57262e997 ChangeLog 2900
-MD5 80699754a7e9adb6c02df33c8fa16fd6 metadata.xml 161
+MD5 f927f9aff7b9dd35d5b8dbbdd077caf8 gnustep-gui-0.9.4_pre20040920.ebuild 1249
+MD5 81d6270a49423078948f48e6757801fb ChangeLog 3071
+MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
 MD5 82f2e76d38bbd5e31455ac00bd902b50 files/digest-gnustep-gui-0.8.5-r1 70
+MD5 3b839361dd5d336529a8cc6be9a10a14 files/digest-gnustep-gui-0.9.4_pre20040908 82
+MD5 b6e6085c50ec0914b7fd160ba4bd7784 files/digest-gnustep-gui-0.9.4_pre20040920 82
 MD5 6511d4ca362a94c774358fa192e6db0b files/digest-gnustep-gui-0.7.9 70
 MD5 5baad5af49b8264c69ed660df9f0c066 files/digest-gnustep-gui-0.8.0 70
 MD5 1f422b6764274b25f0b97d452edf5855 files/digest-gnustep-gui-0.8.3 70
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4_pre20040920 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4_pre20040920
new file mode 100644
index 000000000000..7654eb95cd76
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4_pre20040920
@@ -0,0 +1 @@
+MD5 2f6d3e24c22a5ba4113ef31388a1950a gnustep-gui-0.9.4_pre20040920.tar.gz 1908419
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4_pre20040920.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4_pre20040920.ebuild
new file mode 100644
index 000000000000..ddc2a3c4b6bf
--- /dev/null
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4_pre20040920.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4_pre20040920.ebuild,v 1.1 2004/09/24 01:04:50 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/gui
+
+DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+IUSE="${IUSE} jpeg gif png gsnd doc cups"
+DEPEND="${GNUSTEP_BASE_DEPEND}
+	=gnustep-base/gnustep-make-1.10.0
+	=gnustep-base/gnustep-base-1.10.0
+	virtual/x11
+	=media-libs/tiff-3.5.7*
+	jpeg? =media-libs/jpeg-6b*
+	gif? =media-libs/libungif-4.1.0*
+	png? =media-libs/libpng-1.2.5*
+	gsnd? =media-libs/audiofile-0.2.6*
+	cups? =net-print/cups-1.1.20*
+	=app-text/aspell-0.50.5*"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+src_compile() {
+	egnustep_env
+
+	myconf="--with-tiff-include=/usr/include --with-tiff-library=/usr/lib"
+	myconf="$myconf `use_enable gsnd`"
+	use gsnd && myconf="$myconf --with-audiofile-include=/usr/include --with-audiofile-lib=/usr/lib"
+	use gif && myconf="$myconf --enable-ungif"
+	myconf="$myconf `use_enable jpeg`"
+	myconf="$myconf `use_enable png`"
+	myconf="$myconf `use_enable cups`"
+	econf $myconf || die "configure failed"
+
+	egnustep_make || die
+}
+
diff --git a/gnustep-base/gnustep-gui/metadata.xml b/gnustep-base/gnustep-gui/metadata.xml
index 6cfe3231f3bc..898bf9282f17 100644
--- a/gnustep-base/gnustep-gui/metadata.xml
+++ b/gnustep-base/gnustep-gui/metadata.xml
@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd> 
+<herd>gnustep</herd>
+<longdescription>
+It is a library of graphical user interface classes written completely
+in the Objective-C language; the classes are based upon the OpenStep
+specification as release by NeXT Software, Inc.  The library has been
+enhanced in a number of ways to take advantage of the GNU system.
+These classes include graphical objects such as buttons, text fields,
+popup lists, browser lists, and windows; there are also many associated
+classes for handling events, colors, fonts, pasteboards and images.
+
+The GNUstep GUI Library is designed in two parts.  The first part is
+the front-end component which is independent of platform and display
+system.  This front-end is combined with a back-end component which
+handles all of the display system dependent such as specific calls to
+X/Windows.  This design allows the GNUstep applications to have the
+"look and feel" of the underlying display system without any changes to
+the application, and the library can be easily ported to other display
+systems.
+
+The GNUstep GUI Library requires the GNU Objective-C compiler, the
+GNUstep Base Library, the TIFF Graphics library, and a back-end
+component like the GNUstep 'Back' Backend.
+</longdescription>
 </pkgmetadata>
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index 1beae8449773..29d602372787 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-base/gnustep-make
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.4 2004/09/06 00:13:49 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.5 2004/09/24 01:03:52 fafhrd Exp $
+
+*gnustep-make-1.10.0 (08 Sep 2004)
+
+  08 Sep 2004; Armando Di Cianno <fafhrd@gentoo.org> metadata.xml,
+  +files/helloworld.m, +files/make-user-defaults.patch-1.10.0,
+  +gnustep-make-1.10.0.ebuild:
+  Version bump; key'd for ~x86.
 
   06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> gnustep-make-1.7.2.ebuild:
   Switch to use epause and ebeep, bug #62950
@@ -10,7 +17,7 @@
 
 *gnustep-make-1.5.1 (23 Jul 2004)
 
-  23 Jul 2004; Armando Di Cianno,,, <armando@gentoo.org> +metadata.xml,
+  23 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org> +metadata.xml,
   +gnustep-make-1.3.4.ebuild, +gnustep-make-1.5.1.ebuild,
   +gnustep-make-1.6.0.ebuild, +gnustep-make-1.7.1.ebuild,
   +gnustep-make-1.7.2.ebuild:
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 56e527a6ab88..017f3f31d3fc 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,22 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4be980e592bdb4c6972fb1952dce50f8 ChangeLog 3721
-MD5 78eb514dc70af3bf2b8119347f4a23a5 gnustep-make-1.3.4.ebuild 4892
-MD5 1d0f0080a652d06bb33b0521cbec7af3 gnustep-make-1.7.1.ebuild 1022
-MD5 80699754a7e9adb6c02df33c8fa16fd6 metadata.xml 161
 MD5 535178ca88572076fc9a4b6ad6651d98 gnustep-make-1.5.1.ebuild 957
 MD5 95b076f758f375caa475d9f50360001f gnustep-make-1.7.2.ebuild 1291
+MD5 a0d78cddcb6611fa38fddf0201057d36 gnustep-make-1.10.0.ebuild 2454
+MD5 78eb514dc70af3bf2b8119347f4a23a5 gnustep-make-1.3.4.ebuild 4892
+MD5 33903ac2c91c99fd33c912f2c84b3f75 gnustep-make-1.9.3_pre20040907.ebuild 2454
+MD5 1d0f0080a652d06bb33b0521cbec7af3 gnustep-make-1.7.1.ebuild 1022
 MD5 422a26483b4dc19239451d201d729d61 gnustep-make-1.6.0.ebuild 1027
-MD5 da53863996607e45303ea37b8f665922 files/digest-gnustep-make-1.7.2 70
+MD5 b373c44ae7459da12893a425eb431fc1 ChangeLog 3717
+MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
+MD5 33903ac2c91c99fd33c912f2c84b3f75 gnustep-make-1.9.3_pre20040830.ebuild 2454
+MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch 1282
+MD5 4ba1b8533c9b3b56077617796abc9ab6 files/helloworld.m 1004
+MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch-1.10.0 1282
 MD5 485db65d6cab1cfb13ed506b1460a0f5 files/digest-gnustep-make-1.3.4 139
+MD5 7de971aacfff80866d769c9f95822546 files/digest-gnustep-make-1.5.1 70
 MD5 a93883f335b56238e3f70c5bc9672408 files/digest-gnustep-make-1.6.0 70
 MD5 6775eb17a0b900da39e32aa867303d71 files/digest-gnustep-make-1.7.1 70
-MD5 7de971aacfff80866d769c9f95822546 files/digest-gnustep-make-1.5.1 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBO6sULLFUmVNQ7rkRAqTLAJ9j6w2RdFCiGReFjxo1JchPl4zeiACeJBUH
-ZYch/GCMvm5Fc5onlghVeOg=
-=2z2g
------END PGP SIGNATURE-----
+MD5 da53863996607e45303ea37b8f665922 files/digest-gnustep-make-1.7.2 70
+MD5 9a48bfaf0d3457f93c8db1b04453e604 files/digest-gnustep-make-1.9.3_pre20040830 162
+MD5 7ad100227bcaa2ad37ae3923ec67db55 files/digest-gnustep-make-1.9.3_pre20040907 82
+MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0 71
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0
new file mode 100644
index 000000000000..a6f51a10dfba
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0
@@ -0,0 +1 @@
+MD5 bfd0f6530b938e7ee1d5a300219a0ab3 gnustep-make-1.10.0.tar.gz 372852
diff --git a/gnustep-base/gnustep-make/files/helloworld.m b/gnustep-base/gnustep-make/files/helloworld.m
new file mode 100644
index 000000000000..af2414df1c03
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/helloworld.m
@@ -0,0 +1,54 @@
+/**
+ * This example taken from the tutorial at:
+ * http://gnustep.made-it.com/GSPT/xml/Tutorial_en.html
+ *
+ <quote>
+ A GNUstep Programming Tutorial
+ Time is on our side...
+ Yen-Ju Chen
+ Dennis Leeuw
+
+ Copyright © 2003 Yen-Ju Chen, Dennis Leeuw
+
+ Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ </quote>
+ */
+
+#include <objc/Object.h>
+
+@interface Greeter:Object
+{
+  /* This is left empty on purpose:
+   ** Normally instance variables would be declared here,
+   ** but these are not used in our example.
+   */
+}
+
+- (void)greet;
+
+@end
+
+#include <stdio.h>
+
+@implementation Greeter
+
+- (void)greet
+{
+	printf("Hello, World!\n");
+}
+
+@end
+
+#include <stdlib.h>
+
+int main(void)
+{
+	id myGreeter;
+	myGreeter=[Greeter new];
+
+	[myGreeter greet];
+
+	[myGreeter free];
+	return EXIT_SUCCESS;
+}
+
diff --git a/gnustep-base/gnustep-make/files/make-user-defaults.patch-1.10.0 b/gnustep-base/gnustep-make/files/make-user-defaults.patch-1.10.0
new file mode 100644
index 000000000000..025226dd367a
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/make-user-defaults.patch-1.10.0
@@ -0,0 +1,50 @@
+diff -ur core/make/user_home.c core-adc/make/user_home.c
+--- user_home.c	2004-02-23 23:02:41.000000000 -0500
++++ user_home.c	2004-08-18 09:34:23.755365944 -0400
+@@ -316,6 +316,8 @@
+ 
+       if (*user == '\0' || forceU == 0 || *defs == '\0' || forceD == 0)
+ 	{
++          char *env_var;
++
+ 	  strcpy(path, home);
+ 	  strcat(path, SEP);
+ 	  strcat(path, ".GNUsteprc");
+@@ -381,6 +383,21 @@
+ 		}
+ 	      fclose(fptr);
+ 	    }
++#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((0 == forceU) && (NULL != (env_var = getenv("GNUSTEP_USER_ROOT"))))
++            {
++		user = malloc(strlen(env_var) + 1);
++            	strcpy(user, env_var);
++	    }
++	    if((0 == forceD) && (NULL != (env_var = getenv("GNUSTEP_DEFAULTS_ROOT"))))
++            {
++		defs = malloc(strlen(env_var) + 1);
++            	strcpy(defs, env_var);
++	    }
++#endif
+ 	}
+ 
+       if (type == DEFS)
+@@ -402,6 +419,15 @@
+ 	  strcat(path, SEP);
+ 	  strcat(path, "GNUstep");
+ 	}
++
++      if (*defs != '\0')
++        {
++          free(defs);
++        }
++      if (*user != '\0')
++        {
++          free(user);
++        }
+     }
+ #if defined(__MINGW__)
+   /*
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
new file mode 100644
index 000000000000..faa2ac828318
--- /dev/null
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 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.0.ebuild,v 1.1 2004/09/24 01:03:52 fafhrd Exp $
+
+inherit gnustep
+
+DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
+
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="${IUSE} doc"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	>=sys-devel/make-3.75
+	${DOC_DEPEND}"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+pkg_setup() {
+	gnustep_pkg_setup
+
+	# okay, I couldn't figure out how to check if a dependency was
+	#  compiled with a specific use flag, so we do it ./configure
+	#  check-for-lib style ...
+	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
+		"gcc must be compiled with Objective-C support! See the objc USE flag."
+}
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-${PV}
+}
+
+src_compile() {
+	cd ${S}
+
+	myconf="--prefix=/usr/GNUstep"
+	myconf="$myconf --with-network-root=/usr/GNUstep/Network"
+	myconf="$myconf --with-tar=/bin/tar"
+	econf $myconf || die "configure failed"
+
+	egnustep_make
+}
+
+src_install() {
+	. ${S}/GNUstep.sh
+
+	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
+		if [ `use debug` ]; then
+			emake -j1 INSTALL_ROOT=${D} \
+				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
+				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
+				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
+				debug=yes install || die "install has failed"
+		else
+			emake -j1 INSTALL_ROOT=${D} \
+				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
+				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
+				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
+				install || die "install has failed"
+		fi
+	else
+		die "no Makefile found"
+	fi
+
+	. ${D}usr/GNUstep/System/Library/Makefiles/GNUstep.sh
+
+	if [ `use doc` ]; then
+		cd Documentation
+		make INSTALL_ROOT=${D} \
+			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
+			GNUSTEP_MAKEFILES=${D}usr/GNUstep/System/Library/Makefiles \
+			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
+			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
+			all || die "doc build failed"
+		make INSTALL_ROOT=${D} \
+			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
+			GNUSTEP_MAKEFILES=${D}usr/GNUstep/System/Library/Makefiles \
+			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
+			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
+			install || die "doc install failed"
+		cd ..
+	fi
+}
+
diff --git a/gnustep-base/gnustep-make/metadata.xml b/gnustep-base/gnustep-make/metadata.xml
index 6cfe3231f3bc..0a6595ff0508 100644
--- a/gnustep-base/gnustep-make/metadata.xml
+++ b/gnustep-base/gnustep-make/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd> 
+<herd>gnustep</herd>
+<longdescription>
+The makefile package is a simple, powerful and extensible way to write
+makefiles for a GNUstep-based project.  It allows the user to write a
+project without having to deal with the complex issues associated with
+configuration, building, installation, and packaging.  It also allows
+the user to easily create cross-compiled binaries.
+</longdescription>
 </pkgmetadata>
diff --git a/gnustep-base/mknfonts/ChangeLog b/gnustep-base/mknfonts/ChangeLog
new file mode 100644
index 000000000000..20eceda7230b
--- /dev/null
+++ b/gnustep-base/mknfonts/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for gnustep-base/mknfonts
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/mknfonts/ChangeLog,v 1.1 2004/09/24 01:05:34 fafhrd Exp $
+
+  28 Aug 2004; Armando Di Cianno <fafhrd@gentoo.org> :
+  Added first package.
+
diff --git a/gnustep-base/mknfonts/Manifest b/gnustep-base/mknfonts/Manifest
new file mode 100644
index 000000000000..7f52f9cdb523
--- /dev/null
+++ b/gnustep-base/mknfonts/Manifest
@@ -0,0 +1,2 @@
+MD5 ecab2bccee7c7d17e115e58bc1f8fdbb mknfonts-0.5.ebuild 527
+MD5 0d9da4daa8baa4f7d051077a6da4f2c3 files/digest-mknfonts-0.5 62
diff --git a/gnustep-base/mknfonts/files/digest-mknfonts-0.5 b/gnustep-base/mknfonts/files/digest-mknfonts-0.5
new file mode 100644
index 000000000000..89c724ca8a3e
--- /dev/null
+++ b/gnustep-base/mknfonts/files/digest-mknfonts-0.5
@@ -0,0 +1 @@
+MD5 1cd463efe56c274379bdbd4ecf50b08a mknfonts-0.5.tar.gz 2890
diff --git a/gnustep-base/mknfonts/metadata.xml b/gnustep-base/mknfonts/metadata.xml
new file mode 100644
index 000000000000..048bebbcbc72
--- /dev/null
+++ b/gnustep-base/mknfonts/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnustep</herd>
+<longdescription>
+mknfonts is a tool that offers ease of creating new font sets for the gnustep-back-art package.
+</longdescription>
+</pkgmetadata>
diff --git a/gnustep-base/mknfonts/mknfonts-0.5.ebuild b/gnustep-base/mknfonts/mknfonts-0.5.ebuild
new file mode 100644
index 000000000000..c3519059edbb
--- /dev/null
+++ b/gnustep-base/mknfonts/mknfonts-0.5.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-base/mknfonts/mknfonts-0.5.ebuild,v 1.1 2004/09/24 01:05:34 fafhrd Exp $
+
+inherit eutils gnustep
+
+DESCRIPTION="Provides the tool to create .nfont packages suitable for use with gnustep-back-art."
+
+HOMEPAGE="http://w1.423.telia.com/~u42308495/alex/backart/"
+SRC_URI="http://w1.423.telia.com/~u42308495/alex/backart/mknfonts-0.5.tar.gz"
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="${IUSE}"
+DEPEND="${GNUSTEP_BASE_DEPEND}
+	=media-libs/freetype-2.1*"
+RDEPEND="${DEPEND}"
+