cvs snapshot version bumps; cleaned out old cvs versioned ebuilds; fixed date spec on ebuild headers as repoman was complaining

26 files changed, 529 insertions, 40 deletions

diff --git a/gnustep-base/gnustep-back-art/ChangeLog b/gnustep-base/gnustep-back-art/ChangeLog
index cba2b244617f..a9bb42c14a4c 100644
--- a/gnustep-base/gnustep-back-art/ChangeLog
+++ b/gnustep-base/gnustep-back-art/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2005/01/07 00:27:40 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/ChangeLog,v 1.17 2005/01/10 16:22:57 fafhrd Exp $
+
+*gnustep-back-art-0.9.5_pre20050106 (10 Jan 2005)
+
+  10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +gnustep-back-art-0.9.5_pre20050106.ebuild:
+  cvs snapshot version bumps; cleaned out old cvs versioned ebuilds; fixed
+  date spec on ebuild headers as repoman was complaining
 
   06 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-back-art-0.9.4.ebuild, gnustep-back-art-0.9.5_pre20041203.ebuild:
diff --git a/gnustep-base/gnustep-back-art/Manifest b/gnustep-base/gnustep-back-art/Manifest
index f9733dba2e94..014dbdb12f1c 100644
--- a/gnustep-base/gnustep-back-art/Manifest
+++ b/gnustep-base/gnustep-back-art/Manifest
@@ -1,7 +1,9 @@
+MD5 8f71a8b6a11439cb8bda524b534c4bbe gnustep-back-art-0.9.5_pre20050106.ebuild 1270
 MD5 99b117823b1241260423644c1f145c37 gnustep-back-art-0.9.5_pre20041203.ebuild 1403
 MD5 da5b191ac77d2566a9ee212d3df83244 gnustep-back-art-0.9.4.ebuild 1195
 MD5 49cde241db69af8d5f532bae5d89032a ChangeLog 3305
 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 7421c230db078e850be063b28fdf18cf files/config-gnustep-back-art.sh 415
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050106 b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050106
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20050106
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.5_pre20050106.ebuild
new file mode 100644
index 000000000000..a8414026f8ce
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20050106.ebuild
@@ -0,0 +1,52 @@
+# 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 $
+
+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
+
+S=${WORKDIR}/${ECVS_MODULE}
+
+DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library."
+HOMEPAGE="http://www.gnustep.org"
+
+KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+PROVIDE="virtual/gnustep-back"
+
+IUSE="${IUSE} opengl xim doc"
+DEPEND="${GNUSTEP_GUI_DEPEND}
+	virtual/xft
+	>=media-libs/freetype-2.1.5
+	<media-libs/freetype-2.1.8
+	=gnustep-base/gnustep-gui-${PV}*
+	opengl? ( virtual/opengl virtual/glu )
+	gnustep-libs/artresources
+	>=gnustep-base/mknfonts-0.5
+	>=media-libs/libart_lgpl-2.3*"
+RDEPEND="${DEPEND}
+${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_compile() {
+	egnustep_env
+
+	use opengl && myconf="--enable-glx"
+	myconf="$myconf `use_enable xim`"
+	myconf="$myconf --enable-server=x11"
+	myconf="$myconf --enable-graphics=art --with-name=art"
+	econf $myconf || die "configure failed"
+
+	egnustep_make
+}
+
diff --git a/gnustep-base/gnustep-back-xlib/ChangeLog b/gnustep-base/gnustep-back-xlib/ChangeLog
index 7f09d45db943..849afabb69c5 100644
--- a/gnustep-base/gnustep-back-xlib/ChangeLog
+++ b/gnustep-base/gnustep-back-xlib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2004/12/13 23:08:15 fafhrd Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.12 2005/01/10 16:23:15 fafhrd Exp $
+
+*gnustep-back-xlib-0.9.5_pre20050106 (10 Jan 2005)
+
+  10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +gnustep-back-xlib-0.9.5_pre20050106.ebuild:
+  cvs snapshot version bumps; cleaned out old cvs versioned ebuilds; fixed
+  date spec on ebuild headers as repoman was complaining
 
   13 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-back-xlib-0.9.4.ebuild, -gnustep-back-xlib-0.9.5_pre20041030.ebuild,
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
index 2faddaeb0e8e..5401f1dada9c 100644
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ b/gnustep-base/gnustep-back-xlib/Manifest
@@ -1,7 +1,9 @@
-MD5 b433fe246bc03e9deb2de3480d65f222 gnustep-back-xlib-0.9.5_pre20041203.ebuild 1250
-MD5 f284be8f679456681e5a654e6fea3311 gnustep-back-xlib-0.9.4.ebuild 1044
+MD5 904cb5d75e4aeaef101c235df03c6b5f gnustep-back-xlib-0.9.5_pre20050106.ebuild 1115
+MD5 da4808fa545f3dc88eca69fbbbe787fa gnustep-back-xlib-0.9.5_pre20041203.ebuild 1250
+MD5 92d2185a33fcd13ae794e4d48f9afd16 gnustep-back-xlib-0.9.4.ebuild 1044
 MD5 cfc7d158b06926a1d131aa10d44a0044 ChangeLog 2692
 MD5 ef356714ab02a84c6e88fe3720749aea metadata.xml 1022
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20041203 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20050106 0
 MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-xlib-0.9.4 70
 MD5 14c86d6ff5e83af36ad3d54266af5c99 files/config-gnustep-back-xlib.sh 181
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050106 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050106
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050106
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4.ebuild
index 28073534587b..f48544d553e6 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-xlib/gnustep-back-xlib-0.9.4.ebuild,v 1.4 2004/12/13 23:08:15 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4.ebuild,v 1.5 2005/01/10 16:23:15 fafhrd Exp $
 
 inherit gnustep
 
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild
index 88b95dae0dfd..3ad0784f3dd7 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild,v 1.1 2004/12/04 20:19:03 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild,v 1.2 2005/01/10 16:23:15 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild
new file mode 100644
index 000000000000..100fbf863f0b
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild
@@ -0,0 +1,47 @@
+# 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-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild,v 1.1 2005/01/10 16:23:15 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
+
+S=${WORKDIR}/${ECVS_MODULE}
+
+DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library."
+HOMEPAGE="http://www.gnustep.org"
+
+KEYWORDS="~x86 ~ppc ~sparc"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+PROVIDE="virtual/gnustep-back"
+
+IUSE="${IUSE} opengl xim doc"
+DEPEND="${GNUSTEP_GUI_DEPEND}
+	=gnustep-base/gnustep-gui-${PV}*
+	virtual/xft
+	opengl? ( virtual/opengl virtual/glu )"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+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-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index 988ff499d820..e563a80de5be 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2004/12/29 21:43:23 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.19 2005/01/10 16:22:16 fafhrd Exp $
+
+*gnustep-base-1.10.2_pre20050106 (10 Jan 2005)
+
+  10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +gnustep-base-1.10.2_pre20050106.ebuild:
+  cvs snapshot version bumps; cleaned out old cvs versioned ebuilds; fixed
+  date spec on ebuild headers as repoman was complaining
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index 8220c742d15c..72c776279b38 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -1,8 +1,10 @@
-MD5 c79a883fc75e3bfe174b9b6f96758edc gnustep-base-1.10.1-r1.ebuild 2980
+MD5 5ca3c2088658ce59452e8c357e3f22dd gnustep-base-1.10.2_pre20050106.ebuild 3238
+MD5 d8ab5344d125ba8b83fdc1452f55eadc gnustep-base-1.10.1-r1.ebuild 2980
+MD5 1819d56ccc13d70e9b0df6d28a2ba565 gnustep-base-1.10.2_pre20041203.ebuild 3364
 MD5 c88e3a09efd180efd26675264288c4dc ChangeLog 6881
-MD5 c7d888b1465a14cfef894ada4ad9ae66 gnustep-base-1.10.2_pre20041203.ebuild 3364
 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 1e1e21f737b0d25c8faabb89bd286988 files/base-user-defaults.patch-1.10.0 1069
-MD5 efda24cf74398ac3ddce6cba6071561a files/config-gnustep-base.sh 559
-MD5 deded00aa5a335854582a82255ddc2f3 files/digest-gnustep-base-1.10.1-r1 72
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050106 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050106
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050106
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.1-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.1-r1.ebuild
index 51c6a3243784..732f91bc2d19 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.1-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.1-r1.ebuild,v 1.3 2004/12/13 23:07:20 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.1-r1.ebuild,v 1.4 2005/01/10 16:22:16 fafhrd Exp $
 
 inherit gnustep
 
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild
index f561ce65226e..b9be05deb614 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3 2004/12/13 23:07:20 fafhrd Exp $
+# $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 $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
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
new file mode 100644
index 000000000000..060f0c6fec8d
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050106.ebuild
@@ -0,0 +1,115 @@
+# 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-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index d66b921dbd01..d37eac267a50 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2005/01/09 12:18:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.23 2005/01/10 16:22:38 fafhrd Exp $
+
+*gnustep-gui-0.9.5_pre20050106 (10 Jan 2005)
+
+  10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +gnustep-gui-0.9.5_pre20050106.ebuild:
+  cvs snapshot version bumps; cleaned out old cvs versioned ebuilds; fixed
+  date spec on ebuild headers as repoman was complaining
 
   09 Jan 2005; Sven Wegener <swegener@gentoo.org> gnustep-gui-0.9.4.ebuild,
   gnustep-gui-0.9.5_pre20041203.ebuild:
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 7838ffb9410c..b5e0abd329f2 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 ae79851e6542abb5457b9c44fd297dd3 gnustep-gui-0.9.5_pre20050106.ebuild 1516
 MD5 2ecd6205825489f938828ff7e822dda9 gnustep-gui-0.9.5_pre20041203.ebuild 1661
 MD5 ed53a9dcfe92958230d67b0f344c4618 ChangeLog 6329
 MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
@@ -8,10 +6,4 @@ MD5 b0369f4a4802a0e40eb7d4e5d46eae3a gnustep-gui-0.9.4.ebuild 1394
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB4SD/I1lqEGTUzyQRAscDAJ4sv4rDKSyE6EujkW7xuZOHh9+fsQCgxhUf
-g10qLF47pw+ndMU28YWnd9U=
-=Rtez
------END PGP SIGNATURE-----
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20050106 0
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
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050106
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050106.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050106.ebuild
new file mode 100644
index 000000000000..92045980ec3f
--- /dev/null
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050106.ebuild
@@ -0,0 +1,54 @@
+# 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 $
+
+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}
+
+DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
+HOMEPAGE="http://www.gnustep.org"
+
+KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+IUSE="${IUSE} jpeg gif png gsnd doc cups"
+DEPEND="${GNUSTEP_BASE_DEPEND}
+	>=gnustep-base/gnustep-base-1.10.2_pre20041203*
+	virtual/x11
+	>=media-libs/tiff-3*
+	jpeg? >=media-libs/jpeg-6b*
+	gif? >=media-libs/libungif-4.1*
+	png? >=media-libs/libpng-1.2*
+	gsnd? >=media-libs/audiofile-0.2*
+	cups? >=net-print/cups-1.1*
+	app-text/aspell"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+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-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index 434125e141d0..4ebe0d3c6e00 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.20 2004/12/29 21:45:14 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.21 2005/01/10 16:21:55 fafhrd Exp $
+
+*gnustep-make-1.10.1_pre20050106 (10 Jan 2005)
+
+  10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +gnustep-make-1.10.1_pre20050106.ebuild:
+  cvs snapshot version bumps; cleaned out old cvs versioned ebuilds; fixed
+  date spec on ebuild headers as repoman was complaining
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 88ab6c3e774c..9badc9b31761 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,8 +1,10 @@
-MD5 e1cc3954bcfc3a8c81f6b11ba04197ff gnustep-make-1.10.1_pre20041203.ebuild 6617
+MD5 125fe4af8c1a4e22d8f0130d2dfe394d gnustep-make-1.10.0-r1.ebuild 6434
 MD5 2228e71db480a2bc44c3ceac18b7efc3 ChangeLog 6966
-MD5 73785fca5db889a1115b7f3878c6d466 gnustep-make-1.10.0-r1.ebuild 6434
+MD5 ff6f01c4c1b6043147f59c06e0cfdb32 gnustep-make-1.10.1_pre20050106.ebuild 6491
 MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
-MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0-r1 71
-MD5 ff55be8ebf757b97d823bb3cf08b8bc4 files/GNUstep-reset.sh.patch 2121
+MD5 4fbf54887155cf30128aa23d16aa2f27 gnustep-make-1.10.1_pre20041203.ebuild 6617
 MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch-1.10.0 1282
+MD5 ff55be8ebf757b97d823bb3cf08b8bc4 files/GNUstep-reset.sh.patch 2121
+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
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
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20050106
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild
index 67f22307c61d..fdf69a38b21c 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.2 2004/12/13 23:06:59 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild,v 1.3 2005/01/10 16:21:55 fafhrd Exp $
 
 inherit gnustep
 
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild
index e4f3b8b1b9b1..db18bddc13ac 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3 2004/12/13 23:06:59 fafhrd Exp $
+# $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 $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
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
new file mode 100644
index 000000000000..f8916be1919b
--- /dev/null
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050106.ebuild
@@ -0,0 +1,186 @@
+# 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
+}
+