Core GNUstep ebuild bumps; cleaned up dependencies of ancestors of gnustep-env

Package-Manager: portage-2.0.51.19

31 files changed, 656 insertions, 75 deletions

diff --git a/gnustep-base/gnustep-back-art/ChangeLog b/gnustep-base/gnustep-back-art/ChangeLog
index b984506c9d85..eb611e6b4f69 100644
--- a/gnustep-base/gnustep-back-art/ChangeLog
+++ b/gnustep-base/gnustep-back-art/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2005/04/06 03:34:37 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/ChangeLog,v 1.24 2005/04/15 04:30:50 fafhrd Exp $
+
+*gnustep-back-art-0.9.5 (15 Apr 2005)
+
+  15 Apr 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/font-make-fix.patch-0.9.5, +gnustep-back-art-0.9.5.ebuild:
+  Core GNUstep ebuild bumps; cleaned up dependencies of ancestors of gnustep-env
 
   06 Apr 2005; Eric Shattow <jnc@gentoo.org>
   gnustep-back-art-0.9.4-r1.ebuild:
diff --git a/gnustep-base/gnustep-back-art/Manifest b/gnustep-base/gnustep-back-art/Manifest
index d7b83598b27d..1b978e2fe188 100644
--- a/gnustep-base/gnustep-back-art/Manifest
+++ b/gnustep-base/gnustep-back-art/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 35dee2007dd3198825ef39271f597a2b ChangeLog 4777
-MD5 34e6ee9bb772f088fb44fcfa45e44026 gnustep-back-art-0.9.4.ebuild 1196
-MD5 553d07f18b4a27341aea593774a89b9b gnustep-back-art-0.9.5_pre20050312.ebuild 1491
 MD5 e2bc2a5b2bdec3808102e5a2caf41f7f metadata.xml 1030
+MD5 553d07f18b4a27341aea593774a89b9b gnustep-back-art-0.9.5_pre20050312.ebuild 1491
+MD5 34e6ee9bb772f088fb44fcfa45e44026 gnustep-back-art-0.9.4.ebuild 1196
 MD5 464cf5f698af74ded1d2496cb3f43f06 gnustep-back-art-0.9.4-r1.ebuild 1277
+MD5 ccbb6585527eb50cedc588d2cbc7fcfc gnustep-back-art-0.9.5.ebuild 1414
 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 f9dd4c1b68af4bef2e272d82202323ea files/font-make-fix.patch-0.9.5_pre20050312 501
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCU1pY+uC/ViVka/0RAgcUAJ47Ry+cgqNMp1Q62sMbGBj0NJB0OACgqcdN
-3N4sBHWejOwOSgOOeVk8S6o=
-=cMqy
------END PGP SIGNATURE-----
+MD5 e80f67b11659da59c1aeb0d995a8cf4c files/font-make-fix.patch-0.9.5 737
+MD5 886a210bb5db57775f15aa3261c8e632 files/digest-gnustep-back-art-0.9.5 70
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5 b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5
new file mode 100644
index 000000000000..3a9e1d43a6a7
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5
@@ -0,0 +1 @@
+MD5 65793b1026b2a06198b8438718309deb gnustep-back-0.9.5.tar.gz 820026
diff --git a/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.9.5 b/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.9.5
new file mode 100644
index 000000000000..ce66c0c0c82d
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/files/font-make-fix.patch-0.9.5
@@ -0,0 +1,19 @@
+diff -ur gnustep-back-0.9.5/Fonts/GNUmakefile gnustep-back-0.9.5-test/Fonts/GNUmakefile
+--- gnustep-back-0.9.5/Fonts/GNUmakefile	2005-02-22 22:47:34.000000000 -0500
++++ gnustep-back-0.9.5-test/Fonts/GNUmakefile	2005-04-09 14:27:01.000000000 -0400
+@@ -21,7 +21,7 @@
+ #  License along with this library; if not, write to the Free
+ #  Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+ 
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
++#GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+ 
+ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../back.make
+ include $(GNUSTEP_MAKEFILES)/common.make
+@@ -36,5 +36,5 @@
+ 
+ include $(GNUSTEP_MAKEFILES)/rules.make
+ 
+--include GNUmakefile.postamble
++#-include GNUmakefile.postamble
+ 
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5.ebuild
new file mode 100644
index 000000000000..2fe95214ebb6
--- /dev/null
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5.ebuild
@@ -0,0 +1,61 @@
+# 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.ebuild,v 1.1 2005/04/15 04:30:50 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/gnustep-back-${PV}
+
+DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library."
+
+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"
+
+PROVIDE="virtual/gnustep-back"
+
+IUSE="${IUSE} opengl xim doc"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	~gnustep-base/gnustep-make-1.10.0
+	~gnustep-base/gnustep-base-1.10.3
+	~gnustep-base/gnustep-gui-0.9.5
+	virtual/xft
+	~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}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/font-make-fix.patch-${PV}
+}
+
+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
+}
+
+src_install() {
+	gnustep_src_install
+	cd ${S}
+	egnustep_env
+	mkdir -p ${D}/System/Library/Fonts
+	cp -a Fonts/Helvetica.nfont ${D}/${GNUSTEP_SYSTEM_ROOT}/Library/Fonts
+}
+
diff --git a/gnustep-base/gnustep-back-xlib/ChangeLog b/gnustep-base/gnustep-back-xlib/ChangeLog
index f6d064942f08..8d207d174beb 100644
--- a/gnustep-base/gnustep-back-xlib/ChangeLog
+++ b/gnustep-base/gnustep-back-xlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-base/gnustep-back-xlib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.13 2005/03/17 20:55:08 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.14 2005/04/15 04:30:33 fafhrd Exp $
+
+*gnustep-back-xlib-0.9.5 (15 Apr 2005)
+
+  15 Apr 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/font-make-fix.patch-0.9.5, +gnustep-back-xlib-0.9.5.ebuild:
+  Core GNUstep ebuild bumps; cleaned up dependencies of ancestors of gnustep-env
 
 *gnustep-back-xlib-0.9.5_pre20050312 (17 Mar 2005)
 
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
index 70dcd788a662..6524b2d2e9f0 100644
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ b/gnustep-base/gnustep-back-xlib/Manifest
@@ -2,7 +2,10 @@ MD5 d0a666f4eef9f6a4b25f4cf478f62d35 ChangeLog 3452
 MD5 ef356714ab02a84c6e88fe3720749aea metadata.xml 1022
 MD5 de8babeab823e1e020918b004859e773 gnustep-back-xlib-0.9.5_pre20050312.ebuild 1366
 MD5 da93923431441b659098180464e6f996 gnustep-back-xlib-0.9.4.ebuild 1044
+MD5 96bc401509bf8ef170866624af539728 gnustep-back-xlib-0.9.5.ebuild 1118
 MD5 14c86d6ff5e83af36ad3d54266af5c99 files/config-gnustep-back-xlib.sh 181
 MD5 f9dd4c1b68af4bef2e272d82202323ea files/font-make-fix.patch-0.9.5_pre20050312 501
 MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-xlib-0.9.4 70
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20050312 0
+MD5 e80f67b11659da59c1aeb0d995a8cf4c files/font-make-fix.patch-0.9.5 737
+MD5 886a210bb5db57775f15aa3261c8e632 files/digest-gnustep-back-xlib-0.9.5 70
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5
new file mode 100644
index 000000000000..3a9e1d43a6a7
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5
@@ -0,0 +1 @@
+MD5 65793b1026b2a06198b8438718309deb gnustep-back-0.9.5.tar.gz 820026
diff --git a/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5 b/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5
new file mode 100644
index 000000000000..ce66c0c0c82d
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5
@@ -0,0 +1,19 @@
+diff -ur gnustep-back-0.9.5/Fonts/GNUmakefile gnustep-back-0.9.5-test/Fonts/GNUmakefile
+--- gnustep-back-0.9.5/Fonts/GNUmakefile	2005-02-22 22:47:34.000000000 -0500
++++ gnustep-back-0.9.5-test/Fonts/GNUmakefile	2005-04-09 14:27:01.000000000 -0400
+@@ -21,7 +21,7 @@
+ #  License along with this library; if not, write to the Free
+ #  Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+ 
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
++#GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+ 
+ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../back.make
+ include $(GNUSTEP_MAKEFILES)/common.make
+@@ -36,5 +36,5 @@
+ 
+ include $(GNUSTEP_MAKEFILES)/rules.make
+ 
+--include GNUmakefile.postamble
++#-include GNUmakefile.postamble
+ 
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5.ebuild
new file mode 100644
index 000000000000..940edad8f70d
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5.ebuild
@@ -0,0 +1,49 @@
+# 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.ebuild,v 1.1 2005/04/15 04:30:33 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/gnustep-back-${PV}
+
+DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library."
+
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
+KEYWORDS="~x86 ~ppc ~sparc"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+PROVIDE="virtual/gnustep-back"
+
+IUSE="${IUSE} opengl xim doc"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	~gnustep-base/gnustep-make-1.10.0
+	~gnustep-base/gnustep-base-1.10.3
+	~gnustep-base/gnustep-gui-0.9.5
+	virtual/xft
+	opengl? ( virtual/opengl virtual/glu )"
+RDEPEND="${DEPEND}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/font-make-fix.patch-${PV}
+}
+
+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 8d119606b378..3ab2eefa73f7 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,15 @@
 # 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.22 2005/04/04 20:34:01 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.23 2005/04/15 04:29:55 fafhrd Exp $
+
+*gnustep-base-1.10.3 (15 Apr 2005)
+*gnustep-base-1.10.2-r1 (15 Apr 2005)
+*gnustep-base-1.10.2 (15 Apr 2005)
+
+  15 Apr 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/base-path.patch-gsstartup-0.10.2, +gnustep-base-1.10.2.ebuild,
+  +gnustep-base-1.10.2-r1.ebuild, +gnustep-base-1.10.3.ebuild:
+  Core GNUstep ebuild bumps; cleaned up dependencies of ancestors of gnustep-env
 
   04 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gnustep-base-1.10.1-r1.ebuild:
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index 6da58aac01c4..bab3bc82fef6 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 591bd9ba0a0f7ec28010f9e25461374f ChangeLog 7842
 MD5 7ed5343ad46462095179bcd75fb9b23f gnustep-base-1.10.1-r1.ebuild 2980
-MD5 b0817074d5c7b4ccfd32c617971f9b7e gnustep-base-1.10.2_pre20050312.ebuild 3363
 MD5 6054f8e4a94313852ff8e1294c8abd88 metadata.xml 670
+MD5 164ab133fe871eff3a78a9f4aa435408 gnustep-base-1.10.3.ebuild 2885
+MD5 b0817074d5c7b4ccfd32c617971f9b7e gnustep-base-1.10.2_pre20050312.ebuild 3363
+MD5 06739b6e0c19d018b964e28897373005 gnustep-base-1.10.2-r1.ebuild 2943
+MD5 da2003832e9f7f0fc6eeee5410f6ac63 gnustep-base-1.10.2.ebuild 2868
 MD5 1e1e21f737b0d25c8faabb89bd286988 files/base-user-defaults.patch-1.10.0 1069
 MD5 efda24cf74398ac3ddce6cba6071561a files/config-gnustep-base.sh 559
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.2_pre20050312 0
-MD5 deded00aa5a335854582a82255ddc2f3 files/digest-gnustep-base-1.10.1-r1 72
 MD5 3a635544722f08220cbdfe346c41c125 files/base-user-defaults.patch-1.10.2_pre20050312 1096
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCUaTXKRy60XGEcJIRAvr9AJ9TPbzEL6b77uOHhzRUX+G2rlrQCgCgsK8V
-/W7uwmNlQA8SWYMmEizU0dA=
-=KUfo
------END PGP SIGNATURE-----
+MD5 deded00aa5a335854582a82255ddc2f3 files/digest-gnustep-base-1.10.1-r1 72
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.2_pre20050312 0
+MD5 1d0f2a1118d08b617edef7ae05c4001e files/digest-gnustep-base-1.10.2 72
+MD5 ec6765fbba5bf4048f63898acc20ce6e files/base-path.patch-gsstartup-0.10.2 487
+MD5 1d0f2a1118d08b617edef7ae05c4001e files/digest-gnustep-base-1.10.2-r1 72
+MD5 353cee9163437665f9a7e18d77ba6a65 files/digest-gnustep-base-1.10.3 72
diff --git a/gnustep-base/gnustep-base/files/base-path.patch-gsstartup-0.10.2 b/gnustep-base/gnustep-base/files/base-path.patch-gsstartup-0.10.2
new file mode 100644
index 000000000000..7c74ad834a65
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/base-path.patch-gsstartup-0.10.2
@@ -0,0 +1,16 @@
+diff -u -r1.332 NSString.m
+--- Source/NSString.m	22 Feb 2005 11:22:44 -0000	1.332
++++ Source/NSString.m	6 Apr 2005 17:41:03 -0000
+@@ -3409,10 +3409,12 @@
+ 	{
+ 	  if (pathSepMember(buf[aLength]) == YES)
+ 	    {
++              buf[aLength] = '/';       // Standardise
+ 	      if (pathSepMember(buf[aLength-1]) == YES)
+ 		{
+ 		  unsigned	pos;
+ 
++                  buf[aLength-1] = '/'; // Standardise
+ 		  for (pos = aLength+1; pos < length; pos++)
+ 		    {
+ 		      buf[pos-1] = buf[pos];
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2
new file mode 100644
index 000000000000..3976c5be438d
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2
@@ -0,0 +1 @@
+MD5 1b3fe2b48917ba1c63828d58295b1044 gnustep-base-1.10.2.tar.gz 1925577
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2-r1 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2-r1
new file mode 100644
index 000000000000..3976c5be438d
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2-r1
@@ -0,0 +1 @@
+MD5 1b3fe2b48917ba1c63828d58295b1044 gnustep-base-1.10.2.tar.gz 1925577
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3
new file mode 100644
index 000000000000..258b08f6c6b4
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3
@@ -0,0 +1 @@
+MD5 48d4f1dd5d01747c54c444a76b06a87d gnustep-base-1.10.3.tar.gz 1925587
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.2-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..46c5a50be2ee
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.2-r1.ebuild
@@ -0,0 +1,105 @@
+# 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-r1.ebuild,v 1.1 2005/04/15 04:29:55 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="~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.0
+	|| (
+		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+		>=dev-libs/libffi-3.3.5
+	)
+	>=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() {
+	if use gcc-libffi; then
+		if [ "$(ffi_available)" == "no" ]; then
+			ffi_not_available_info
+			die "libffi is not available"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-path.patch-gsstartup-0.10.2
+}
+
+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="--enable-libffi --disable-ffcall"
+	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.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2.ebuild
new file mode 100644
index 000000000000..ff1a6f89b2e1
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.2.ebuild
@@ -0,0 +1,104 @@
+# 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.ebuild,v 1.1 2005/04/15 04:29:55 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="~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.0
+	|| (
+		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+		>=dev-libs/libffi-3.3.5
+	)
+	>=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() {
+	if use gcc-libffi; then
+		if [ "$(ffi_available)" == "no" ]; then
+			ffi_not_available_info
+			die "libffi is not available"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
+}
+
+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="--enable-libffi --disable-ffcall"
+	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.3.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild
new file mode 100644
index 000000000000..572b82fcb93e
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild
@@ -0,0 +1,105 @@
+# 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.3.ebuild,v 1.1 2005/04/15 04:29:55 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="~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.0
+	|| (
+		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+		>=dev-libs/libffi-3.3.5
+	)
+	>=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}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+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() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
+}
+
+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="--enable-libffi --disable-ffcall"
+	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-env/ChangeLog b/gnustep-base/gnustep-env/ChangeLog
index fca221275f9b..6c3ba8c699e1 100644
--- a/gnustep-base/gnustep-env/ChangeLog
+++ b/gnustep-base/gnustep-env/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-base/gnustep-env
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.15 2005/04/04 20:51:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.16 2005/04/15 04:31:38 fafhrd Exp $
+
+*gnustep-env-0.1.6-r1 (15 Apr 2005)
+
+  15 Apr 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  gnustep-env-0.1.6.ebuild, +gnustep-env-0.1.6-r1.ebuild:
+  Core GNUstep ebuild bumps; cleaned up dependencies of ancestors of gnustep-env
 
   04 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gnustep-env-0.1.4.ebuild:
diff --git a/gnustep-base/gnustep-env/Manifest b/gnustep-base/gnustep-env/Manifest
index 65929f981fa7..075a32e72948 100644
--- a/gnustep-base/gnustep-env/Manifest
+++ b/gnustep-base/gnustep-env/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3ed2f4259c7deac6c9912c9b083ba5be ChangeLog 3334
 MD5 583e2f025312917b8c0ec1bb60d2c983 gnustep-env-0.1.4.ebuild 1202
-MD5 4c2ee22f9b4999544c7a742dc8abe7d9 gnustep-env-0.1.5.ebuild 1568
-MD5 d4fc2bb8242101f6876d7271cd9aaf8b gnustep-env-0.1.6.ebuild 1519
 MD5 c603ed4d589dc2091e618436e4de9c78 metadata.xml 371
+MD5 4c2ee22f9b4999544c7a742dc8abe7d9 gnustep-env-0.1.5.ebuild 1568
+MD5 997f7f4bc41a21e3bb788655dcfb64f4 gnustep-env-0.1.6.ebuild 1519
+MD5 385c02774b345943f4371801aadced5d gnustep-env-0.1.6-r1.ebuild 1506
 MD5 766b0cb8343bea6f212694c1fd261335 files/10gnustep 36
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.6 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.5 0
 MD5 1588a64b28bc5eb05d1c93571ad340b1 files/gnustep.env-0.1.4 586
@@ -16,10 +13,5 @@ MD5 f814aedb43348b181f1ee9c044efa12c files/gnustep.runscript-0.1.4 1052
 MD5 8a7d7c75991671d8b36f9f229404edf7 files/gnustep.runscript-0.1.5 944
 MD5 9b9d12281e414534a0e1fbd04cb3e2d1 files/gnustep.env-0.1.6 682
 MD5 fc067eeb87dd2dbfc9cf4f2c4e1df860 files/gnustep.runscript-0.1.6 1006
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCUajoKRy60XGEcJIRAnHXAJ4ieUDOCG5EQvVoQlErMI9/MhWeWwCeK/ve
-yV/1nNGXIkK4tJmXeyWRUSA=
-=MSdx
------END PGP SIGNATURE-----
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.6 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.6-r1 0
diff --git a/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.6-r1 b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.6-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.6-r1
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.6-r1.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.6-r1.ebuild
new file mode 100644
index 000000000000..101286a7af57
--- /dev/null
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.6-r1.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-env/gnustep-env-0.1.6-r1.ebuild,v 1.1 2005/04/15 04:31:38 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 ~ppc ~alpha ~sparc ~amd64"
+
+IUSE=""
+DEPEND="~gnustep-base/gnustep-make-1.10.0
+	>=gnustep-base/gnustep-base-1.10.2
+	>=gnustep-base/gnustep-gui-0.9.5
+	virtual/gnustep-back"
+#RDEPEND="${GS_RDEPEND}"
+RDEPEND="${DEPEND}"
+
+egnustep_install_domain="System"
+
+src_unpack() {
+	echo "nothing to unpack"
+}
+
+src_compile() {
+	echo "nothing to compile"
+}
+
+src_install() {
+	egnustep_env
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/gnustep.runscript-${PV} gnustep
+	#dosed "s:XXX_GENTOO_GNUSTEP_ROOT_XXX:$(egnstep_prefix):g" /etc/init.d/gnustep
+	insinto /etc/env.d
+	newins ${FILESDIR}/gnustep.env-${PV} 99gnustep
+	dosed "s:XXX_GNUSTEP_USER_ROOT_XXX:~$(egnustep_user_root_suffix):g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_LOCAL_ROOT_XXX:$(egnustep_local_root):g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_NETWORK_ROOT_XXX:$(egnustep_network_root):g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_SYSTEM_ROOT_XXX:$(egnustep_system_root):g" /etc/env.d/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/gnustep-env-0.1.6.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.6.ebuild
index 7a36409edbfc..592e8d317185 100644
--- a/gnustep-base/gnustep-env/gnustep-env-0.1.6.ebuild
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.6.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-env/gnustep-env-0.1.6.ebuild,v 1.1 2005/03/17 20:55:59 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/gnustep-env-0.1.6.ebuild,v 1.2 2005/04/15 04:31:38 fafhrd Exp $
 
 inherit gnustep
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
 
 IUSE=""
 DEPEND="${GS_DEPEND}
-	>=gnustep-base/gnustep-base-1.10.1"
+	>=gnustep-base/gnustep-base-1.10.2"
 RDEPEND="${GS_RDEPEND}"
 
 egnustep_install_domain="System"
diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index c533a9b8a9f5..72a541265b31 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2005/04/04 20:40:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.28 2005/04/15 04:30:16 fafhrd Exp $
+
+*gnustep-gui-0.9.5 (15 Apr 2005)
+
+  15 Apr 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +gnustep-gui-0.9.5.ebuild:
+  Core GNUstep ebuild bumps; cleaned up dependencies of ancestors of gnustep-env
 
   04 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gnustep-gui-0.9.4.ebuild:
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 78029fbcc77e..c5274fc78877 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 489f567d6392d874296ed5ffe92e8759 ChangeLog 7520
 MD5 fa8af1acfe6e432fd1212c1da45059b9 gnustep-gui-0.9.4.ebuild 1393
-MD5 d64d70f2616f08e544d2e5819fd60ba8 gnustep-gui-0.9.5_pre20050312-r1.ebuild 1772
 MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
 MD5 41121d765735950991921796f34e7dda gnustep-gui-0.9.5_pre20050312.ebuild 1639
 MD5 e618ce7d8aa0b80e4aee50cbaca94a00 gnustep-gui-0.9.4-r1.ebuild 1553
 MD5 48b7e65e81090704a7ec23e883b24229 gnustep-gui-0.9.4-r2.ebuild 1635
+MD5 d64d70f2616f08e544d2e5819fd60ba8 gnustep-gui-0.9.5_pre20050312-r1.ebuild 1772
+MD5 2339a33cd2c168a43112c6af35182d6b gnustep-gui-0.9.5.ebuild 1350
+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_pre20050312 0
-MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4-r1 70
-MD5 6f66904f0ad8d980c653d5c0fdf7d81b files/gnustep-gui-0.9.4-camaelon.patch 4029
 MD5 7bb8ef207dff05d7e80122fcffdcce88 files/gui-def.patch 640
-MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4-r2 70
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20050312-r1 0
 MD5 de8a4d2ff2308aaa042177ee1bcec78b files/gui-gsspell.patch 650
+MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4-r1 70
+MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4-r2 70
 MD5 a25aeac9ea3688989059cc6eb7edd207 files/gui-use-giflib.patch.bz2 3037
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCUaZFKRy60XGEcJIRAmQ/AKCoNikhMXIOad53TXPXC4zogw5afQCfaPj4
-+PN0xr3jA1Qh+7GbjRfUyGw=
-=oEQe
------END PGP SIGNATURE-----
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20050312-r1 0
+MD5 689d09b413cf86371215ff560ee74009 files/digest-gnustep-gui-0.9.5 70
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5
new file mode 100644
index 000000000000..3b7a12906e92
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5
@@ -0,0 +1 @@
+MD5 59c151b1edc2e8e9c1e5aff70569783e gnustep-gui-0.9.5.tar.gz 1876715
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5.ebuild
new file mode 100644
index 000000000000..5d032e2a32ce
--- /dev/null
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5.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-gui/gnustep-gui-0.9.5.ebuild,v 1.1 2005/04/15 04:30:16 fafhrd Exp $
+
+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"
+LICENSE="LGPL-2.1"
+
+IUSE="${IUSE} jpeg gif png gsnd doc cups"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	~gnustep-base/gnustep-make-1.10.0
+	~gnustep-base/gnustep-base-1.10.3
+	virtual/x11
+	>=media-libs/tiff-3*
+	jpeg? ( >=media-libs/jpeg-6b* )
+	gif? ( >=media-libs/giflib-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}
+	${DEBUG_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 --disable-ungif --enable-libgif"
+	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/mknfonts/ChangeLog b/gnustep-base/mknfonts/ChangeLog
index 8ab941a70e05..cf956f8cbd42 100644
--- a/gnustep-base/mknfonts/ChangeLog
+++ b/gnustep-base/mknfonts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnustep-base/mknfonts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/mknfonts/ChangeLog,v 1.11 2005/04/04 20:47:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/mknfonts/ChangeLog,v 1.12 2005/04/15 04:31:21 fafhrd Exp $
+
+  15 Apr 2005; Armando Di Cianno <fafhrd@gentoo.org> mknfonts-0.5.ebuild:
+  Core GNUstep ebuild bumps; cleaned up dependencies of ancestors of gnustep-env
 
   04 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> mknfonts-0.5.ebuild:
   Stable on sparc
diff --git a/gnustep-base/mknfonts/Manifest b/gnustep-base/mknfonts/Manifest
index 0c2923562c6b..06de517fdf1b 100644
--- a/gnustep-base/mknfonts/Manifest
+++ b/gnustep-base/mknfonts/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8d39aaa046ddba50769232abe809ad51 ChangeLog 1547
 MD5 459d449951c0cddb6f8c892a247ef78f metadata.xml 293
-MD5 fd9aa6266e82f39641cca29d82b0008f mknfonts-0.5.ebuild 682
+MD5 9673a1a8240f33824ad270c52dbc4b17 mknfonts-0.5.ebuild 684
 MD5 0d9da4daa8baa4f7d051077a6da4f2c3 files/digest-mknfonts-0.5 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCUagPKRy60XGEcJIRArxKAJ9hz9ZyERRxJsdB6AZZ+1KoUIFukACfUJyU
-JXa2qssJ/TgSU2i0r0bTGy8=
-=pVXn
------END PGP SIGNATURE-----
diff --git a/gnustep-base/mknfonts/mknfonts-0.5.ebuild b/gnustep-base/mknfonts/mknfonts-0.5.ebuild
index 5a58a9301b93..cca86a86b624 100644
--- a/gnustep-base/mknfonts/mknfonts-0.5.ebuild
+++ b/gnustep-base/mknfonts/mknfonts-0.5.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/mknfonts/mknfonts-0.5.ebuild,v 1.10 2005/04/04 20:47:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/mknfonts/mknfonts-0.5.ebuild,v 1.11 2005/04/15 04:31:21 fafhrd Exp $
 
 inherit eutils gnustep
 
@@ -13,7 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 IUSE="${IUSE}"
-DEPEND="${GNUSTEP_BASE_DEPEND}
+DEPEND="gnustep-base/gnustep-gui
 	>=media-libs/freetype-2.1*"
 RDEPEND="${DEPEND}"