Fixed emoticon bundle that would mangle some embedded C/C++/ObjC code

5 files changed, 111 insertions, 2 deletions

diff --git a/gnustep-apps/gnumail/ChangeLog b/gnustep-apps/gnumail/ChangeLog
index 227de87cddc5..74ef350847f0 100644
--- a/gnustep-apps/gnumail/ChangeLog
+++ b/gnustep-apps/gnumail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2005/01/10 16:23:48 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.14 2005/01/18 21:59:15 fafhrd Exp $
+
+*gnumail-1.2.0_pre20050106-r1 (18 Jan 2005)
+
+  18 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/Emoticon-dont-break-C.patch, +gnumail-1.2.0_pre20050106-r1.ebuild:
+  Fixed emoticon bundle that would mangle some embedded C/C++/ObjC code
 
 *gnumail-1.2.0_pre20050106 (10 Jan 2005)
 
diff --git a/gnustep-apps/gnumail/Manifest b/gnustep-apps/gnumail/Manifest
index 9366cd16d9c5..da256c71bb5b 100644
--- a/gnustep-apps/gnumail/Manifest
+++ b/gnustep-apps/gnumail/Manifest
@@ -1,6 +1,9 @@
+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 01226626cf81064e4b4664bdfbd4753e ChangeLog 3993
+MD5 1c582fbe49fd940d8ab1dc82bfaca7a6 ChangeLog 4240
 MD5 fd2a74704d1454dc7972123fded408cb metadata.xml 620
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20050106-r1 0
+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
diff --git a/gnustep-apps/gnumail/files/Emoticon-dont-break-C.patch b/gnustep-apps/gnumail/files/Emoticon-dont-break-C.patch
new file mode 100644
index 000000000000..6277aa1a8996
--- /dev/null
+++ b/gnustep-apps/gnumail/files/Emoticon-dont-break-C.patch
@@ -0,0 +1,22 @@
+--- Bundles/Emoticon/EmoticonController.m.orig	2005-01-18 15:55:51.537699400 -0500
++++ Bundles/Emoticon/EmoticonController.m	2005-01-18 16:11:10.642974160 -0500
+@@ -35,8 +35,7 @@
+   {@":)", @"emoticon-face1.tiff"},
+   {@":-)", @"emoticon-face1.tiff"},
+   {@":o)", @"emoticon-face1.tiff"},
+-  {@"8)", @"emoticon-face2.tiff"},
+-  {@"8-)", @"emoticon-face2.tiff"},
++  {@"8-)", @"emoticon-face2.tiff"},  //  8) conflicts with C/ObjC code! like: if (n == 8)
+   {@";)", @"emoticon-face3.tiff"},
+   {@";o)", @"emoticon-face3.tiff"},
+   {@";-)", @"emoticon-face3.tiff"},
+@@ -57,8 +56,7 @@
+   {@";o(", @"emoticon-face11.tiff"},
+   {@":-*", @"emoticon-face13.tiff"},
+   {@":-x", @"emoticon-face14.tiff"},
+-  {@"B)", @"emoticon-face15.tiff"},
+-  {@"B-)", @"emoticon-face15.tiff"},
++  {@"B-)", @"emoticon-face15.tiff"},  // B) conflicts with valid C code! like if (FlagB)
+   {@":-.", @"emoticon-face19.tiff"},
+   {@":o", @"emoticon-face5.tiff"}
+ };
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106-r1 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106-r1
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre20050106-r1.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre20050106-r1.ebuild
new file mode 100644
index 000000000000..7bc589ad4caa
--- /dev/null
+++ b/gnustep-apps/gnumail/gnumail-1.2.0_pre20050106-r1.ebuild
@@ -0,0 +1,78 @@
+# 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-r1.ebuild,v 1.1 2005/01/18 21:59:15 fafhrd 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_unpack() {
+	cvs_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/Emoticon-dont-break-C.patch
+}
+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
+}
+