6 files changed, 20 insertions, 81 deletions
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/gnumail/files/digest-gnumail-1.2.0_pre20041203 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_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