Fix bug 193806, add some quoting

Package-Manager: portage-2.1.3.9

5 files changed, 148 insertions, 5 deletions

diff --git a/gnustep-apps/gnumail/ChangeLog b/gnustep-apps/gnumail/ChangeLog
index 4665c5e81cbb..c177dad10a68 100644
--- a/gnustep-apps/gnumail/ChangeLog
+++ b/gnustep-apps/gnumail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-apps/gnumail
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.24 2007/09/10 19:06:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.25 2007/09/26 11:52:46 voyageur Exp $
+
+*gnumail-1.2.0_pre3-r1 (26 Sep 2007)
+
+  26 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/gnumail-1.2.0_pre3-pgpversion.patch, +gnumail-1.2.0_pre3-r1.ebuild:
+  Fix a crash on amd64, patch by Jose Quinteiro <gentoo@quinteiro.com>
 
 *gnumail-1.2.0_pre3 (10 Sep 2007)
 
diff --git a/gnustep-apps/gnumail/Manifest b/gnustep-apps/gnumail/Manifest
index ad7f6543ed66..2d9229b55448 100644
--- a/gnustep-apps/gnumail/Manifest
+++ b/gnustep-apps/gnumail/Manifest
@@ -2,15 +2,23 @@ AUX gnumail-1.2.0_pre3-index.patch 1276 RMD160 61db1f6235e038aec440908692c6c633f
 MD5 e2899828954206e0d7dc6698d16263ea files/gnumail-1.2.0_pre3-index.patch 1276
 RMD160 61db1f6235e038aec440908692c6c633f576ba0b files/gnumail-1.2.0_pre3-index.patch 1276
 SHA256 1836fb38201c30fa52d9b96cb14447844a426e56d2ef8c5af90ebec0c5cf9473 files/gnumail-1.2.0_pre3-index.patch 1276
+AUX gnumail-1.2.0_pre3-pgpversion.patch 932 RMD160 ac0e46682ae26864795436cc99144c8335ff697a SHA1 40b71deaf70f1afed742e4a2c95b8c03997cc9e1 SHA256 5f7af2e8b1177f361347978b6e858279fd83f4c2c7e32783f6448c7ae2f61c5c
+MD5 12ce8482ef1a1eb99ba8c71bde8e7309 files/gnumail-1.2.0_pre3-pgpversion.patch 932
+RMD160 ac0e46682ae26864795436cc99144c8335ff697a files/gnumail-1.2.0_pre3-pgpversion.patch 932
+SHA256 5f7af2e8b1177f361347978b6e858279fd83f4c2c7e32783f6448c7ae2f61c5c files/gnumail-1.2.0_pre3-pgpversion.patch 932
 DIST GNUMail-1.2.0pre3.tar.gz 1327521 RMD160 5d8ff5d6d520f586eca5eb194ed2bafa3e718d0c SHA1 a03e8cc6281c5c050a6fee204d1057be17d69a36 SHA256 29127a65f35208a461436853b41de81f46db7d735958b40e06776805114d7b37
+EBUILD gnumail-1.2.0_pre3-r1.ebuild 1812 RMD160 167ff054071d3ecfb6ea2c6975f09170ae848aaf SHA1 97eebcb3163c1a1d00abe9e2670de0009f1ec431 SHA256 410f9c3e4f58fb383f34f02c3322ba0b1b100b13db62637da55d1e2832817267
+MD5 45aa9bda289947113ca811a56499ebda gnumail-1.2.0_pre3-r1.ebuild 1812
+RMD160 167ff054071d3ecfb6ea2c6975f09170ae848aaf gnumail-1.2.0_pre3-r1.ebuild 1812
+SHA256 410f9c3e4f58fb383f34f02c3322ba0b1b100b13db62637da55d1e2832817267 gnumail-1.2.0_pre3-r1.ebuild 1812
 EBUILD gnumail-1.2.0_pre3.ebuild 1741 RMD160 92233eb661d5aa89dd4e314195b625f868ead9f4 SHA1 a4f66debdbc857bbb5e94c7fb674b439f95170db SHA256 7026a2fbacb0382679ee2ce602190157c4bf68b3f8caa44d9430d317e84ec0ad
 MD5 683606e722622fbf19f218ca75342c36 gnumail-1.2.0_pre3.ebuild 1741
 RMD160 92233eb661d5aa89dd4e314195b625f868ead9f4 gnumail-1.2.0_pre3.ebuild 1741
 SHA256 7026a2fbacb0382679ee2ce602190157c4bf68b3f8caa44d9430d317e84ec0ad gnumail-1.2.0_pre3.ebuild 1741
-MISC ChangeLog 6415 RMD160 58d37bd9459a3fa0047d219fbdad50be1164839d SHA1 5b15cb2117dc6f10cc589badde0f8dc8c69ed70c SHA256 43bd0710a0c57a14fadacf9f8df67a2aab4d16142e31185bc5ff0eb24b3978a6
-MD5 7f2bbc62a361208d6341f5d35c314250 ChangeLog 6415
-RMD160 58d37bd9459a3fa0047d219fbdad50be1164839d ChangeLog 6415
-SHA256 43bd0710a0c57a14fadacf9f8df67a2aab4d16142e31185bc5ff0eb24b3978a6 ChangeLog 6415
+MISC ChangeLog 6657 RMD160 5271b444f87ecb69c10d86f4d4aef065e457710e SHA1 4a78e2adcc4cb99e8fe29330f484cfc6e6927dca SHA256 0e2ce6457eb05a4093dbea1fa5c4eb0fdcb0b27b0024fcef5cecfdcf7f5faf9c
+MD5 7bb132caa4bf3442dd3e982ab72c3acc ChangeLog 6657
+RMD160 5271b444f87ecb69c10d86f4d4aef065e457710e ChangeLog 6657
+SHA256 0e2ce6457eb05a4093dbea1fa5c4eb0fdcb0b27b0024fcef5cecfdcf7f5faf9c ChangeLog 6657
 MISC metadata.xml 620 RMD160 a3054e457ecdf3de9c5d832c0093ce7defa3e302 SHA1 b3077d7a9c139477f17c0f2fadd3ea1174d1aad4 SHA256 556897db77f34504d6384f12e9cb78f9f317aa66bb57cf993668441410cfe31f
 MD5 fd2a74704d1454dc7972123fded408cb metadata.xml 620
 RMD160 a3054e457ecdf3de9c5d832c0093ce7defa3e302 metadata.xml 620
@@ -18,3 +26,6 @@ SHA256 556897db77f34504d6384f12e9cb78f9f317aa66bb57cf993668441410cfe31f metadata
 MD5 ee522d772473e2479c8b6bdb81b22b38 files/digest-gnumail-1.2.0_pre3 256
 RMD160 f3c0bef51d46ea7dd123e62f14235c74b0028f0f files/digest-gnumail-1.2.0_pre3 256
 SHA256 6fc423194cafa96a179dbfb719d0ab2b67557c5fa8094d3a638a3821acd90206 files/digest-gnumail-1.2.0_pre3 256
+MD5 ee522d772473e2479c8b6bdb81b22b38 files/digest-gnumail-1.2.0_pre3-r1 256
+RMD160 f3c0bef51d46ea7dd123e62f14235c74b0028f0f files/digest-gnumail-1.2.0_pre3-r1 256
+SHA256 6fc423194cafa96a179dbfb719d0ab2b67557c5fa8094d3a638a3821acd90206 files/digest-gnumail-1.2.0_pre3-r1 256
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre3-r1 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre3-r1
new file mode 100644
index 000000000000..f6d45a96a127
--- /dev/null
+++ b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre3-r1
@@ -0,0 +1,3 @@
+MD5 66094028676b19cb2eee15e163073ee5 GNUMail-1.2.0pre3.tar.gz 1327521
+RMD160 5d8ff5d6d520f586eca5eb194ed2bafa3e718d0c GNUMail-1.2.0pre3.tar.gz 1327521
+SHA256 29127a65f35208a461436853b41de81f46db7d735958b40e06776805114d7b37 GNUMail-1.2.0pre3.tar.gz 1327521
diff --git a/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-pgpversion.patch b/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-pgpversion.patch
new file mode 100644
index 000000000000..6fd1d333a00b
--- /dev/null
+++ b/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-pgpversion.patch
@@ -0,0 +1,33 @@
+--- Bundles/PGP/PGPController.h.orig    2007-09-21 13:51:25.000000000 -0700
++++ Bundles/PGP/PGPController.h 2007-09-21 13:58:22.000000000 -0700
+@@ -69,6 +69,7 @@
+ // other methods
+ //
+ - (void) updateAndRestartTimer;
++- (NSString *) myVersion;
+ 
+ @end
+ 
+--- Bundles/PGP/PGPController.m.orig    2007-09-21 13:51:37.000000000 -0700
++++ Bundles/PGP/PGPController.m 2007-09-21 13:58:19.000000000 -0700
+@@ -274,7 +274,7 @@
+ //
+ //
+ //
+-- (NSString *) version
++- (NSString *) myVersion
+ {
+   return @"v0.9.1";
+ }
+--- Bundles/PGP/PGPViewController.m.orig        2007-09-25 11:42:10.000000000 -0700
++++ Bundles/PGP/PGPViewController.m     2007-09-25 11:42:30.000000000 -0700
+@@ -71,7 +71,7 @@
+ 
+   // We set the version label value
+   [versionLabel setStringValue: [NSString stringWithFormat: _(@"Version: %@"),
+-					  [[PGPController singleInstance] version]]];
++					  [[PGPController singleInstance] myVersion]]];
+ 
+   return self;
+ }
+
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild
new file mode 100644
index 000000000000..a7eab67a2974
--- /dev/null
+++ b/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2007 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_pre3-r1.ebuild,v 1.1 2007/09/26 11:52:46 voyageur Exp $
+
+inherit gnustep-2
+
+MY_PN=${PN/gnum/GNUM}
+
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="A fully featured mail application for GNUstep"
+HOMEPAGE="http://www.collaboration-world.com/gnumail/"
+SRC_URI="http://www.collaboration-world.com/gnumail.data/releases/Stable/${MY_PN}-${PV/_/}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="crypt emoticon xface"
+DEPEND="=gnustep-libs/pantomime-${PV}
+	>=gnustep-base/gnustep-gui-0.11.0
+	gnustep-apps/addresses"
+RDEPEND="crypt? ( app-crypt/gnupg )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-index.patch
+	epatch "${FILESDIR}"/${P}-pgpversion.patch
+	sed -i -e \
+		's|$(GNUSTEP_INSTALLATION_DIR)/Library|$(DESTDIR)$(GNUSTEP_SYSTEM_LIBRARY)|' \
+		Bundles/*/GNUmakefile || die "gnustep-make-2 sed failed"
+}
+
+src_compile() {
+	egnustep_env
+	egnustep_make
+
+	cd Bundles/Clock
+	egnustep_make
+	cd "${S}"
+
+	if use xface ; then
+		cd Bundles/Face
+		egnustep_make
+		cd "${S}"
+	fi
+
+	if use crypt ; then
+		cd Bundles/PGP
+		egnustep_make
+		cd "${S}"
+	fi
+
+	if use emoticon ; then
+		cd Bundles/Emoticon
+		egnustep_make
+		cd "${S}"
+	fi
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	cd Bundles/Clock
+	egnustep_install || die
+	cd "${S}"
+
+	if use xface ; then
+		cd Bundles/Face
+		egnustep_install || die
+		cd "${S}"
+	fi
+	if use crypt ; then
+		cd Bundles/PGP
+		egnustep_install || die
+		cd "${S}"
+	fi
+	if use emoticon ; then
+		cd Bundles/Emoticon
+		egnustep_install || die
+		cd "${S}"
+	fi
+
+	dodoc "${S}"/Documentation/*
+
+	# FIX ?
+	rm -rf "${D}"$(egnustep_install_domain)/Applications/GNUMail.app/Resources/Resources
+}