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

(Portage version: 2.0.51.19)

41 files changed, 263 insertions, 291 deletions

diff --git a/gnustep-apps/clipbook/ChangeLog b/gnustep-apps/clipbook/ChangeLog
index fceb4827e33b..897b075e70e1 100644
--- a/gnustep-apps/clipbook/ChangeLog
+++ b/gnustep-apps/clipbook/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-apps/clipbook
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/clipbook/ChangeLog,v 1.5 2005/01/10 16:26:46 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/clipbook/ChangeLog,v 1.6 2005/03/17 20:59:13 fafhrd Exp $
+
+*clipbook-0.6.0.7.0 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +clipbook-0.6.0.7.0.ebuild, -clipbook-0.94_pre20041203.ebuild,
+  -clipbook-0.94_pre20050106.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
 *clipbook-0.94_pre20050106 (10 Jan 2005)
 
diff --git a/gnustep-apps/clipbook/Manifest b/gnustep-apps/clipbook/Manifest
index 08e98e64310a..eddcaa677beb 100644
--- a/gnustep-apps/clipbook/Manifest
+++ b/gnustep-apps/clipbook/Manifest
@@ -1,6 +1,4 @@
-MD5 c885b1c207c3f374bb72fb4b9b3f78c4 clipbook-0.94_pre20050106.ebuild 864
 MD5 f08d86de628f02285f3f1ddb2eaec77e ChangeLog 1384
 MD5 1723f885d7a1b417a7395f11ff61dbff metadata.xml 324
-MD5 2487331b68c3ce076eebd0e3011b7c3c clipbook-0.94_pre20041203.ebuild 864
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-clipbook-0.94_pre20041203 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-clipbook-0.94_pre20050106 0
+MD5 fc6cc113f23c5c4bde22c21590059e96 clipbook-0.6.0.7.0.ebuild 541
+MD5 341828835de325e6f8e44726b9b5e9bf files/digest-clipbook-0.6.0.7.0 69
diff --git a/gnustep-apps/clipbook/clipbook-0.94_pre20041203.ebuild b/gnustep-apps/clipbook/clipbook-0.6.0.7.0.ebuild
index 152728edae79..b322b6825c6e 100644
--- a/gnustep-apps/clipbook/clipbook-0.94_pre20041203.ebuild
+++ b/gnustep-apps/clipbook/clipbook-0.6.0.7.0.ebuild
@@ -1,21 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/clipbook/clipbook-0.94_pre20041203.ebuild,v 1.2 2005/01/10 16:26:46 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/clipbook/clipbook-0.6.0.7.0.ebuild,v 1.1 2005/03/17 20:59:13 fafhrd Exp $
 
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/usr-apps/gworkspace/${PN/clipb/ClipB}"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
+inherit gnustep
 
-S=${WORKDIR}/${ECVS_MODULE}
+S=${WORKDIR}/gworkspace/${PN/clipb/ClipB}
 
 DESCRIPTION="A clipboard for GNUstep that can hold things for later copy and paste."
 HOMEPAGE="http://www.gnustep.it/enrico/gworkspace/"
+SRC_URI="http://www.gnustep.it/enrico/gworkspace/gworkspace-${PV/0.6.}.tar.gz"
 
 KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
diff --git a/gnustep-apps/clipbook/clipbook-0.94_pre20050106.ebuild b/gnustep-apps/clipbook/clipbook-0.94_pre20050106.ebuild
deleted file mode 100644
index 82d19dda3987..000000000000
--- a/gnustep-apps/clipbook/clipbook-0.94_pre20050106.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/clipbook/clipbook-0.94_pre20050106.ebuild,v 1.1 2005/01/10 16:26:46 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/usr-apps/gworkspace/${PN/clipb/ClipB}"
-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="A clipboard for GNUstep that can hold things for later copy and paste."
-HOMEPAGE="http://www.gnustep.it/enrico/gworkspace/"
-
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="${IUSE}"
-DEPEND="${GS_DEPEND}"
-RDEPEND="${GS_RDEPEND}"
-
-egnustep_install_domain "System"
-
diff --git a/gnustep-apps/clipbook/files/digest-clipbook-0.6.0.7.0 b/gnustep-apps/clipbook/files/digest-clipbook-0.6.0.7.0
new file mode 100644
index 000000000000..f2cfbf043d6d
--- /dev/null
+++ b/gnustep-apps/clipbook/files/digest-clipbook-0.6.0.7.0
@@ -0,0 +1 @@
+MD5 48d830ba3e7ac22b0360a45c1b03a73a gworkspace-0.7.0.tar.gz 1407582
diff --git a/gnustep-apps/desktop/ChangeLog b/gnustep-apps/desktop/ChangeLog
index 1d442e9ba4a6..193775c06dea 100644
--- a/gnustep-apps/desktop/ChangeLog
+++ b/gnustep-apps/desktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-apps/desktop
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/desktop/ChangeLog,v 1.5 2005/01/10 16:27:04 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/desktop/ChangeLog,v 1.6 2005/03/17 20:59:54 fafhrd Exp $
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  -desktop-0.7_pre20041203.ebuild, desktop-0.7_pre20050106.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
 *desktop-0.7_pre20050106 (10 Jan 2005)
 
diff --git a/gnustep-apps/desktop/Manifest b/gnustep-apps/desktop/Manifest
index 7661133cbca6..71588bd57a80 100644
--- a/gnustep-apps/desktop/Manifest
+++ b/gnustep-apps/desktop/Manifest
@@ -1,7 +1,5 @@
-MD5 2b0c65f9f76c0f84bf5e2e8e249cfb30 desktop-0.7_pre20041203.ebuild 1000
 MD5 6f8e634562b4671432a4e6c8b28dae9e ChangeLog 1379
 MD5 ebbafd529d14e3d9a0fe33fd0cb7202f metadata.xml 228
-MD5 52278053d84bb52083714e8896855418 desktop-0.7_pre20050106.ebuild 1000
-MD5 c41375aecaaa4860a1041b2253ee784f files/seperate-build.patch 2488
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-desktop-0.7_pre20041203 0
+MD5 4aa6088870784d7222e98768ea04999b desktop-0.7_pre20050106.ebuild 1033
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-desktop-0.7_pre20050106 0
+MD5 c41375aecaaa4860a1041b2253ee784f files/seperate-build.patch 2488
diff --git a/gnustep-apps/desktop/desktop-0.7_pre20041203.ebuild b/gnustep-apps/desktop/desktop-0.7_pre20041203.ebuild
deleted file mode 100644
index 9e14bfdc5ec4..000000000000
--- a/gnustep-apps/desktop/desktop-0.7_pre20041203.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/desktop/desktop-0.7_pre20041203.ebuild,v 1.2 2005/01/10 16:27:04 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/usr-apps/gworkspace/${PN/d/D}"
-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="A desktop manager for GNUstep."
-HOMEPAGE="http://www.gnustep.it/enrico/gworkspace/"
-
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="${IUSE}"
-DEPEND="${GS_DEPEND}
-	gnustep-apps/gworkspace"
-RDEPEND="${GS_RDEPEND}
-	gnustep-apps/gworkspace
-	gnustep-apps/recycler"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-	EPATCH_OPTIONS="-d ${S}" epatch ${FILESDIR}/seperate-build.patch
-	egnustep_make
-}
-
diff --git a/gnustep-apps/desktop/desktop-0.7_pre20050106.ebuild b/gnustep-apps/desktop/desktop-0.7_pre20050106.ebuild
index 92900a514b1b..ede16a7c30fa 100644
--- a/gnustep-apps/desktop/desktop-0.7_pre20050106.ebuild
+++ b/gnustep-apps/desktop/desktop-0.7_pre20050106.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-apps/desktop/desktop-0.7_pre20050106.ebuild,v 1.1 2005/01/10 16:27:04 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/desktop/desktop-0.7_pre20050106.ebuild,v 1.2 2005/03/17 20:59:54 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -23,7 +23,8 @@ SLOT="0"
 
 IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}
-	gnustep-apps/gworkspace"
+	gnustep-apps/gworkspace
+	!=gnustep-apps/gworkspace-0.7.0"
 RDEPEND="${GS_RDEPEND}
 	gnustep-apps/gworkspace
 	gnustep-apps/recycler"
diff --git a/gnustep-apps/gnumail/ChangeLog b/gnustep-apps/gnumail/ChangeLog
index 74ef350847f0..4f4eeca5e145 100644
--- a/gnustep-apps/gnumail/ChangeLog
+++ b/gnustep-apps/gnumail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-apps/gnumail
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.14 2005/01/18 21:59:15 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.15 2005/03/17 20:57:35 fafhrd Exp $
+
+*gnumail-1.2.0_pre20050312 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  -gnumail-1.2.0_pre20041203.ebuild, -gnumail-1.2.0_pre20050106.ebuild,
+  +gnumail-1.2.0_pre20050312.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
 *gnumail-1.2.0_pre20050106-r1 (18 Jan 2005)
 
diff --git a/gnustep-apps/gnumail/Manifest b/gnustep-apps/gnumail/Manifest
index da256c71bb5b..49cd3c6b8763 100644
--- a/gnustep-apps/gnumail/Manifest
+++ b/gnustep-apps/gnumail/Manifest
@@ -1,9 +1,7 @@
-MD5 19512f87a582e8170b101a759cad3890 gnumail-1.2.0_pre20050106-r1.ebuild 1783
-MD5 03b34d18528d6514f33f3d29beb5463f gnumail-1.2.0_pre20050106.ebuild 1690
-MD5 3c772daa3d7ad32cc0e4e4ef4615c008 gnumail-1.2.0_pre20041203.ebuild 1696
 MD5 1c582fbe49fd940d8ab1dc82bfaca7a6 ChangeLog 4240
+MD5 19512f87a582e8170b101a759cad3890 gnumail-1.2.0_pre20050106-r1.ebuild 1783
 MD5 fd2a74704d1454dc7972123fded408cb metadata.xml 620
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20050106-r1 0
+MD5 3a5524444719fa61adfb5b1dbb13fb04 gnumail-1.2.0_pre20050312.ebuild 1665
 MD5 e1c6db42f903560ff2fc9d5d8fbdadc2 files/Emoticon-dont-break-C.patch 937
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20041203 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20050106 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20050106-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20050312 0
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106
+++ /dev/null
diff --git a/gnustep-apps/clipbook/files/digest-clipbook-0.94_pre20041203 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-apps/clipbook/files/digest-clipbook-0.94_pre20041203
+++ b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050312
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre20041203.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre20041203.ebuild
deleted file mode 100644
index abd5768679df..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.0_pre20041203.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20041203.ebuild,v 1.2 2005/01/09 10:57:53 swegener Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="Sophos.ca:/opt/cvsroot"
-ECVS_USER="anoncvs"
-ECVS_PASS="anoncvs"
-ECVS_AUTH="pserver"
-ECVS_MODULE="${PN/gnum/GNUM}"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/Sophos.ca-collaborationworld"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="${IUSE} xface crypt emoticon"
-DEPEND="${GS_DEPEND}
-	=gnustep-libs/pantomime-${PV}
-	gnustep-apps/addresses"
-RDEPEND="${GS_RDEPEND}
-	crypt? ( app-crypt/gnupg )
-	=gnustep-libs/pantomime-${PV}
-	gnustep-apps/addresses"
-
-egnustep_install_domain "Local"
-
-src_compile() {
-	egnustep_env
-	egnustep_make
-
-	if use xface ; then
-		cd Bundles/Face
-		egnustep_make
-		cd ../..
-	fi
-
-	if use crypt ; then
-		cd Bundles/PGP
-		egnustep_make
-		cd ../..
-	fi
-
-	if use emoticon ; then
-		cd Bundles/Emoticon
-		egnustep_make
-		cd ../..
-	fi
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install
-	if use doc ; then
-		egnustep_env
-		egnustep_doc || die
-	fi
-
-	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-
-	egnustep_package_config
-}
-
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre20050106.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre20050312.ebuild
index 01033e241cb3..0e4d6c416b61 100644
--- a/gnustep-apps/gnumail/gnumail-1.2.0_pre20050106.ebuild
+++ b/gnustep-apps/gnumail/gnumail-1.2.0_pre20050312.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20050106.ebuild,v 1.1 2005/01/10 16:23:48 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20050312.ebuild,v 1.1 2005/03/17 20:57:35 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="Sophos.ca:/opt/cvsroot"
@@ -33,6 +33,11 @@ RDEPEND="${GS_RDEPEND}
 
 egnustep_install_domain "Local"
 
+src_unpack() {
+	cvs_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/Emoticon-dont-break-C.patch
+}
 src_compile() {
 	egnustep_env
 	egnustep_make
diff --git a/gnustep-apps/gworkspace/ChangeLog b/gnustep-apps/gworkspace/ChangeLog
index 33dd4c8e8a12..5fe0827bf4d5 100644
--- a/gnustep-apps/gworkspace/ChangeLog
+++ b/gnustep-apps/gworkspace/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-apps/gworkspace
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.14 2005/01/10 16:28:20 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.15 2005/03/17 20:58:27 fafhrd Exp $
+
+*gworkspace-0.7.0 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  -gworkspace-0.6.6_pre20041203.ebuild, +gworkspace-0.7.0.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
 *gworkspace-0.6.6_pre20050106 (10 Jan 2005)
 
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index d266ee708a51..cb422f7b3fd9 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,7 +1,7 @@
-MD5 06ac60bf1cf4394e8c3e4697507e5e32 gworkspace-0.6.6_pre20050106.ebuild 1061
-MD5 e36cede3aaa5561f2986d237dc9d2283 gworkspace-0.6.6_pre20041203.ebuild 1063
 MD5 bdcdab33f94367b1e7431390b217af0d ChangeLog 3653
+MD5 06ac60bf1cf4394e8c3e4697507e5e32 gworkspace-0.6.6_pre20050106.ebuild 1061
 MD5 144bf372071e2a59ced95e82e91531bd metadata.xml 391
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gworkspace-0.6.6_pre20041203 0
+MD5 affa229700911971f37c81a06f09537a gworkspace-0.7.0.ebuild 633
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gworkspace-0.6.6_pre20050106 0
 MD5 660807348555935d3d149797044803b3 files/seperate-desktop-recycler.patch 316
+MD5 341828835de325e6f8e44726b9b5e9bf files/digest-gworkspace-0.7.0 69
diff --git a/gnustep-apps/gworkspace/files/digest-gworkspace-0.6.6_pre20041203 b/gnustep-apps/gworkspace/files/digest-gworkspace-0.6.6_pre20041203
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-apps/gworkspace/files/digest-gworkspace-0.6.6_pre20041203
+++ /dev/null
diff --git a/gnustep-apps/gworkspace/files/digest-gworkspace-0.7.0 b/gnustep-apps/gworkspace/files/digest-gworkspace-0.7.0
new file mode 100644
index 000000000000..f2cfbf043d6d
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/digest-gworkspace-0.7.0
@@ -0,0 +1 @@
+MD5 48d830ba3e7ac22b0360a45c1b03a73a gworkspace-0.7.0.tar.gz 1407582
diff --git a/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20041203.ebuild b/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20041203.ebuild
deleted file mode 100644
index 12f11dd305eb..000000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20041203.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20041203.ebuild,v 1.2 2005/01/09 10:55:52 swegener Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/usr-apps/${PN}"
-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="A workspace manager for GNUstep."
-HOMEPAGE="http://www.gnustep.it/enrico/gworkspace/"
-
-KEYWORDS="~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="${IUSE} pdfkit"
-DEPEND="${GS_DEPEND}
-	pdfkit? ( gnustep-libs/pdfkit )
-	>=dev-db/sqlite-3.0.8-r1"
-RDEPEND="${GS_RDEPEND}
-	>=dev-db/sqlite-3.0.8-r1"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-
-	EPATCH_OPTIONS="-d ${S}" epatch ${FILESDIR}/seperate-desktop-recycler.patch
-
-	econf || die "configure failed"
-
-	egnustep_make
-}
-
diff --git a/gnustep-apps/gworkspace/gworkspace-0.7.0.ebuild b/gnustep-apps/gworkspace/gworkspace-0.7.0.ebuild
new file mode 100644
index 000000000000..ae9db89b4196
--- /dev/null
+++ b/gnustep-apps/gworkspace/gworkspace-0.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.7.0.ebuild,v 1.1 2005/03/17 20:58:27 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/${PN}
+
+DESCRIPTION="A workspace manager for GNUstep."
+HOMEPAGE="http://www.gnustep.it/enrico/gworkspace/"
+SRC_URI="http://www.gnustep.it/enrico/gworkspace/${P}.tar.gz"
+
+KEYWORDS="~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="${IUSE} pdfkit"
+DEPEND="${GS_DEPEND}
+	pdfkit? ( gnustep-libs/pdfkit )
+	!gnustep-apps/desktop
+	!gnustep-apps/recycler"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_compile() {
+	egnustep_env
+
+	econf || die "configure failed"
+
+	egnustep_make
+}
+
diff --git a/gnustep-base/gnustep-back-xlib/ChangeLog b/gnustep-base/gnustep-back-xlib/ChangeLog
index 849afabb69c5..f6d064942f08 100644
--- a/gnustep-base/gnustep-back-xlib/ChangeLog
+++ b/gnustep-base/gnustep-back-xlib/ChangeLog
@@ -1,6 +1,17 @@
 # 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.12 2005/01/10 16:23:15 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.13 2005/03/17 20:55:08 fafhrd Exp $
+
+*gnustep-back-xlib-0.9.5_pre20050312 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/font-make-fix.patch-0.9.5_pre20050312,
+  -gnustep-back-xlib-0.9.5_pre20041203.ebuild,
+  -gnustep-back-xlib-0.9.5_pre20050106.ebuild,
+  +gnustep-back-xlib-0.9.5_pre20050312.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
 *gnustep-back-xlib-0.9.5_pre20050106 (10 Jan 2005)
 
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
index b09d13724f60..8fc098ebe06c 100644
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ b/gnustep-base/gnustep-back-xlib/Manifest
@@ -1,9 +1,8 @@
-MD5 9fd8da560009a11bd153f8a87bfe8219 gnustep-back-xlib-0.9.5_pre20050106.ebuild 1250
-MD5 c6ec14987937ebe2b39bde8fd7dd3508 gnustep-back-xlib-0.9.5_pre20041203.ebuild 1250
-MD5 da93923431441b659098180464e6f996 gnustep-back-xlib-0.9.4.ebuild 1044
 MD5 fab2165da115acddd806d207e07f95d0 ChangeLog 2977
 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 5f2833c7c77395d7700d355e79a0973d gnustep-back-xlib-0.9.5_pre20050312.ebuild 1231
+MD5 da93923431441b659098180464e6f996 gnustep-back-xlib-0.9.4.ebuild 1044
 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
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041203 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041203
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041203
+++ /dev/null
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
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050106
+++ /dev/null
diff --git a/gnustep-apps/clipbook/files/digest-clipbook-0.94_pre20050106 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-apps/clipbook/files/digest-clipbook-0.94_pre20050106
+++ b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050312
diff --git a/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5_pre20050312 b/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5_pre20050312
new file mode 100644
index 000000000000..5554a8b712a7
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5_pre20050312
@@ -0,0 +1,12 @@
+diff -ur Fonts/GNUmakefile Fonts/GNUmakefile
+--- Fonts/GNUmakefile	2005-03-12 23:06:51.808553304 -0500
++++ Fonts/GNUmakefile	2005-02-22 22:47:34.000000000 -0500
+@@ -27,7 +27,7 @@
+ include $(GNUSTEP_MAKEFILES)/common.make
+ 
+ #RESOURCE_SET_NAME = back-resources
+-back-resources_RESOURCE_FILES_INSTALL_DIR = Library/Fonts
++back-resources_RESOURCE_FILES_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Fonts
+ back-resources_RESOURCE_FILES = $(FONT_INSTALL_FILES)
+ 
+ FONT_INSTALL_FILES = Helvetica.nfont
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild
deleted file mode 100644
index 100fbf863f0b..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-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-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050312.ebuild
index 3ad0784f3dd7..0200d6557935 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_pre20050312.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild,v 1.2 2005/01/10 16:23:15 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050312.ebuild,v 1.1 2005/03/17 20:55:08 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -33,6 +33,12 @@ RDEPEND="${DEPEND}
 
 egnustep_install_domain "System"
 
+src_unpack() {
+	cvs_src_unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/font-make-fix.patch-${PV}
+	cd ${S}
+}
+
 src_compile() {
 	egnustep_env
 
diff --git a/gnustep-base/gnustep-env/ChangeLog b/gnustep-base/gnustep-env/ChangeLog
index 9ef2a8a4f4fb..078dadb94582 100644
--- a/gnustep-base/gnustep-env/ChangeLog
+++ b/gnustep-base/gnustep-env/ChangeLog
@@ -1,6 +1,15 @@
 # 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.13 2005/03/12 11:43:26 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.14 2005/03/17 20:55:59 fafhrd Exp $
+
+*gnustep-env-0.1.6 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/gnustep.env-0.1.6, +files/gnustep.runscript-0.1.6,
+  gnustep-env-0.1.5.ebuild, +gnustep-env-0.1.6.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
   12 Mar 2005; Eric Shattow <jnc@gentoo.org> gnustep-env-0.1.4.ebuild:
   quasi-stable on x86 (fixes broken dependency tracking in stable arch)
diff --git a/gnustep-base/gnustep-env/Manifest b/gnustep-base/gnustep-env/Manifest
index dfaff8a85c9a..85c3f1cc797c 100644
--- a/gnustep-base/gnustep-env/Manifest
+++ b/gnustep-base/gnustep-env/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7163891cbbaf64de56ee85b45970507e ChangeLog 2845
 MD5 f61990fa6c6fb4772239840f832cac4b gnustep-env-0.1.4.ebuild 1198
-MD5 683ed938f678c1dad3737b6c3db75570 gnustep-env-0.1.5.ebuild 1514
 MD5 c603ed4d589dc2091e618436e4de9c78 metadata.xml 371
+MD5 955db58bb8f28c7074ac5d1c8ce1a20a gnustep-env-0.1.6.ebuild 1408
+MD5 15e40e50c9f63742032688d1e6166299 gnustep-env-0.1.5.ebuild 1565
 MD5 766b0cb8343bea6f212694c1fd261335 files/10gnustep 36
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.5 0
@@ -12,10 +10,6 @@ MD5 1588a64b28bc5eb05d1c93571ad340b1 files/gnustep.env-0.1.4 586
 MD5 9b9d12281e414534a0e1fbd04cb3e2d1 files/gnustep.env-0.1.5 682
 MD5 f814aedb43348b181f1ee9c044efa12c files/gnustep.runscript-0.1.4 1052
 MD5 8a7d7c75991671d8b36f9f229404edf7 files/gnustep.runscript-0.1.5 944
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCMtbY+uC/ViVka/0RAoMhAKCFqF9LwyX2abFWdgIbgdf2dACRYACgiTfI
-4MceodqaeHRcVRDgFv3N2LQ=
-=nFof
------END PGP SIGNATURE-----
+MD5 9b9d12281e414534a0e1fbd04cb3e2d1 files/gnustep.env-0.1.6 682
+MD5 fc067eeb87dd2dbfc9cf4f2c4e1df860 files/gnustep.runscript-0.1.6 1006
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.6 0
diff --git a/gnustep-apps/desktop/files/digest-desktop-0.7_pre20041203 b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.6
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-apps/desktop/files/digest-desktop-0.7_pre20041203
+++ b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.6
diff --git a/gnustep-base/gnustep-env/files/gnustep.env-0.1.6 b/gnustep-base/gnustep-env/files/gnustep.env-0.1.6
new file mode 100644
index 000000000000..364c5fece416
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/gnustep.env-0.1.6
@@ -0,0 +1,4 @@
+MANPATH="XXX_GNUSTEP_USER_ROOT_XXX/Library/Documentation/man:XXX_GNUSTEP_LOCAL_ROOT_XXX/Library/Documentation/man:XXX_GNUSTEP_NETWORK_ROOT_XXX/Library/Documentation/man:XXX_GNUSTEP_SYSTEM_ROOT_XXX/Library/Documentation/man"
+INFOPATH="XXX_GNUSTEP_USER_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_LOCAL_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_NETWORK_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_SYSTEM_ROOT_XXX/Library/Documentation/info"
+INFODIR="XXX_GNUSTEP_USER_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_LOCAL_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_NETWORK_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_SYSTEM_ROOT_XXX/Library/Documentation/info"
+
diff --git a/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.6 b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.6
new file mode 100755
index 000000000000..4383517c9d04
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.6
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+#
+# (c) 2003 Dennis Leeuw
+# License: GPL version 2 or any newer version
+#
+# Modifications, truncation, and gentoo-ification:
+# Copyright 2004 Gentoo Technologies, Inc.
+
+if [ -f /etc/conf.d/gnustep.env ]; then
+	. /etc/conf.d/gnustep.env
+else
+	GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
+fi
+. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh
+
+start() {
+#	ebegin "Starting gnustep daemons"
+
+	ebegin "Starting gdomap "
+	GNUSTEP_USER_ROOT=/var/run/GNUstep \
+		GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+		gdomap
+	eend $?
+	ebegin "Starting gdnc "
+	GNUSTEP_USER_ROOT=/var/run/GNUstep \
+		GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+		gdnc &
+	eend $?
+#	ebegin "\tgnustep_sndd"
+#	GNUSTEP_USER_ROOT=/var/run/GNUstep \
+#	GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+#		/gnustep_sndd
+#	eend $?
+}
+
+stop() {
+#	ebegin "Stopping gnustep daemons"
+
+	ebegin "Stopping gdomap "
+	killall gdomap
+	eend $?
+	
+	ebegin "Stopping gdnc "
+	killall gdnc
+	eend $?
+
+#	ebegin "\tgnustep_sndd"
+#	killall gnustep_sndd
+#	eend $?
+}
+
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild
index b8b9067ad21d..1c455a89e967 100644
--- a/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.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/gnustep-env/gnustep-env-0.1.5.ebuild,v 1.4 2005/03/12 11:43:26 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild,v 1.5 2005/03/17 20:55:59 fafhrd Exp $
 
 inherit gnustep
 
@@ -15,7 +15,10 @@ KEYWORDS="~x86 ppc ~alpha ~sparc amd64"
 IUSE=""
 DEPEND="${GS_DEPEND}
 	>=gnustep-base/gnustep-base-1.10.1"
-RDEPEND="${GS_RDEPEND}"
+RDEPEND="${DEPEND}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}
+	virtual/gnustep-back"
 
 egnustep_install_domain="System"
 
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.6.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.6.ebuild
new file mode 100644
index 000000000000..7a36409edbfc
--- /dev/null
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.6.ebuild
@@ -0,0 +1,44 @@
+# 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 $
+
+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="${GS_DEPEND}
+	>=gnustep-base/gnustep-base-1.10.1"
+RDEPEND="${GS_RDEPEND}"
+
+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-libs/pantomime/ChangeLog b/gnustep-libs/pantomime/ChangeLog
index 27767c840d92..a2254020b2e3 100644
--- a/gnustep-libs/pantomime/ChangeLog
+++ b/gnustep-libs/pantomime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-libs/pantomime
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/ChangeLog,v 1.11 2005/01/10 16:23:31 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/ChangeLog,v 1.12 2005/03/17 20:56:46 fafhrd Exp $
+
+*pantomime-1.2.0_pre20050312 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  -pantomime-1.2.0_pre20041203.ebuild, +pantomime-1.2.0_pre20050312.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
 *pantomime-1.2.0_pre20050106 (10 Jan 2005)
 
diff --git a/gnustep-libs/pantomime/Manifest b/gnustep-libs/pantomime/Manifest
index 485aea409e28..69735cce62f1 100644
--- a/gnustep-libs/pantomime/Manifest
+++ b/gnustep-libs/pantomime/Manifest
@@ -1,6 +1,6 @@
-MD5 d0834bb64547603e9299adca9842b557 pantomime-1.2.0_pre20050106.ebuild 879
-MD5 8edb8c548b3912fbb35f3160395d19b2 pantomime-1.2.0_pre20041203.ebuild 879
 MD5 c17533aec23cb4eb840a07f5aee07641 ChangeLog 3587
 MD5 e7c6a4ecebe301f312dc1f6c496ab97e metadata.xml 344
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-pantomime-1.2.0_pre20041203 0
+MD5 d0834bb64547603e9299adca9842b557 pantomime-1.2.0_pre20050106.ebuild 879
+MD5 579455b50234e3ab47fb855d49a7250d pantomime-1.2.0_pre20050312.ebuild 760
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-pantomime-1.2.0_pre20050106 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-pantomime-1.2.0_pre20050312 0
diff --git a/gnustep-libs/pantomime/files/digest-pantomime-1.2.0_pre20041203 b/gnustep-libs/pantomime/files/digest-pantomime-1.2.0_pre20041203
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-libs/pantomime/files/digest-pantomime-1.2.0_pre20041203
+++ /dev/null
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20041203 b/gnustep-libs/pantomime/files/digest-pantomime-1.2.0_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20041203
+++ b/gnustep-libs/pantomime/files/digest-pantomime-1.2.0_pre20050312
diff --git a/gnustep-libs/pantomime/pantomime-1.2.0_pre20041203.ebuild b/gnustep-libs/pantomime/pantomime-1.2.0_pre20050312.ebuild
index e4d2051c16a3..639181c1d1b5 100644
--- a/gnustep-libs/pantomime/pantomime-1.2.0_pre20041203.ebuild
+++ b/gnustep-libs/pantomime/pantomime-1.2.0_pre20050312.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/pantomime-1.2.0_pre20041203.ebuild,v 1.2 2005/01/10 16:23:31 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/pantomime-1.2.0_pre20050312.ebuild,v 1.1 2005/03/17 20:56:46 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="Sophos.ca:/opt/cvsroot"