Version bump.

7 files changed, 21 insertions, 34 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 88666af1fd72..3dc230358498 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/squirrelmail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.6 2004/06/03 17:05:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.7 2004/06/08 03:11:35 eradicator Exp $
+
+*squirrelmail-1.4.3a-r1 (07 Jun 2004)
+
+  07 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  squirrelmail-1.4.3-r1.ebuild, squirrelmail-1.4.3.ebuild,
+  squirrelmail-1.4.3a-r1.ebuild, squirrelmail-1.4.3a.ebuild,
+  files/squirrelmail-1.4.3-compose.patch:
+  Version bump.
 
   03 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
   files/squirrelmail-1.4.3-compose.patch:
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index 5dc4a15c9724..6158e9439154 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -1,14 +1,13 @@
-MD5 ee4e859992a6c80640f7a56b0165205f squirrelmail-1.4.3-r1.ebuild 5403
-MD5 d5d817f3126d8a78e5a798bda1d35591 squirrelmail-1.4.3.ebuild 5109
-MD5 3fe6178cb758095975c5e475eeb2ec68 squirrelmail-1.4.3_rc1.ebuild 5057
-MD5 a5ab119d80d43cee77ddf207d867f2f1 ChangeLog 9816
+MD5 8570a6468986584fa3d2d822d5201daf squirrelmail-1.4.3a.ebuild 5058
+MD5 4f93291c522b1866e04566e3f158f955 squirrelmail-1.4.3a-r1.ebuild 5350
+MD5 ec1a50354bc2e5609dcea5b647e4f4e4 squirrelmail-1.4.3_rc1.ebuild 5056
+MD5 b8e4f8701010bdb21db9d348be6528da ChangeLog 10090
 MD5 08cd5d6f4b8f101029a526ea0a1ea4b1 metadata.xml 258
-MD5 73fe3f24cf52892f23afb6e4faf1e597 squirrelmail-1.4.3_rc1-r1.ebuild 5351
-MD5 a1527f151877e56d7ded68a08be86d27 files/digest-squirrelmail-1.4.3 635
+MD5 bd7ce6398187ee517f57ab6471578229 squirrelmail-1.4.3_rc1-r1.ebuild 5350
 MD5 ebb6924dba63e16023a37f0f4f5563e8 files/squirrelmail-fortune.patch 603
 MD5 a34a9335bafb3173bb60b373caae8c4e files/postinstall-en.txt 698
-MD5 c9b62321077ecc7730b74c9f84bc4280 files/squirrelmail-1.4.3-compose.patch 810
-MD5 a1527f151877e56d7ded68a08be86d27 files/digest-squirrelmail-1.4.3-r1 635
+MD5 3ba374a5c4f5e7a0f7c64b9f9ba000ae files/digest-squirrelmail-1.4.3a 636
+MD5 3ba374a5c4f5e7a0f7c64b9f9ba000ae files/digest-squirrelmail-1.4.3a-r1 636
 MD5 19099cd147d6281aad79ea067c5ed4fd files/digest-squirrelmail-1.4.3_rc1 639
 MD5 1ebd5ce3ff0ce02fa62f3890b6a8f255 files/ldapuserdata-0.4-gentoo.patch 709
 MD5 19099cd147d6281aad79ea067c5ed4fd files/digest-squirrelmail-1.4.3_rc1-r1 639
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.3 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.3a
index 3cffaf5a51e2..a4ebb31682f2 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.3
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.3a
@@ -1,4 +1,4 @@
-MD5 b887b736ab752eff8886383a91f25678 squirrelmail-1.4.3.tar.bz2 2254146
+MD5 9564fed8b8dc6fc75d5ac31825569a77 squirrelmail-1.4.3a.tar.bz2 2254039
 MD5 dfe469f7ab473fd2292b30800e3141d5 retrieveuserdata.0.9-1.4.0.tar.gz 10448
 MD5 049c46507ef161ad4ba5f4d4a0b96d09 compatibility-1.3.tar.gz 5966
 MD5 73d2c111579e2fad17c289f62e0be855 secure_login-1.2-1.2.8.tar.gz 6361
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.3-r1 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.3a-r1
index 3cffaf5a51e2..a4ebb31682f2 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.3-r1
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.3a-r1
@@ -1,4 +1,4 @@
-MD5 b887b736ab752eff8886383a91f25678 squirrelmail-1.4.3.tar.bz2 2254146
+MD5 9564fed8b8dc6fc75d5ac31825569a77 squirrelmail-1.4.3a.tar.bz2 2254039
 MD5 dfe469f7ab473fd2292b30800e3141d5 retrieveuserdata.0.9-1.4.0.tar.gz 10448
 MD5 049c46507ef161ad4ba5f4d4a0b96d09 compatibility-1.3.tar.gz 5966
 MD5 73d2c111579e2fad17c289f62e0be855 secure_login-1.2-1.2.8.tar.gz 6361
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.4.3-compose.patch b/mail-client/squirrelmail/files/squirrelmail-1.4.3-compose.patch
deleted file mode 100644
index d9ed77eb41c0..000000000000
--- a/mail-client/squirrelmail/files/squirrelmail-1.4.3-compose.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- compose.php.orig	2004-05-24 00:56:51.000000000 -0700
-+++ compose.php	2004-06-03 10:00:52.015627918 -0700
-@@ -757,9 +757,9 @@
-               sqWordWrap($rewrap_body[$i], ($editor_size));
-                 if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
-                     $gt = $matches[1];
--                    $body .= $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
-+                    $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
-                 } else {
--                    $body .= $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
-+                    $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
-                 }
-                 unset($rewrap_body[$i]);
-             }
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.3-r1.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.3a-r1.ebuild
index 02ca8718c4cc..407bd8b78f16 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.3-r1.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.3a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.3-r1.ebuild,v 1.2 2004/06/02 19:33:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.3a-r1.ebuild,v 1.1 2004/06/08 03:11:35 eradicator Exp $
 
 IUSE="crypt virus-scan ldap ssl"
 
@@ -49,9 +49,6 @@ src_unpack() {
 	mv config/config_default.php config/config.php
 	epatch ${FILESDIR}/${PN}-fortune.patch
 
-	cd ${S}/src
-	epatch ${FILESDIR}/${P}-compose.patch
-
 	# Now do the plugins
 	cd ${S}/plugins
 
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.3.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.3a.ebuild
index f88d381c7061..5608139f767b 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.3.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.3a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.3.ebuild,v 1.4 2004/06/02 19:33:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.3a.ebuild,v 1.1 2004/06/08 03:11:35 eradicator Exp $
 
 inherit webapp-apache eutils
 
@@ -36,7 +36,7 @@ IUSE="crypt virus-scan ldap ssl apache2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="x86 ~ppc sparc alpha ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 
 DEPEND="virtual/php
 	dev-perl/DB_File
@@ -60,9 +60,6 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-fortune.patch
 
-	cd ${S}/src
-	epatch ${FILESDIR}/${P}-compose.patch
-
 	# Now do the plugins
 	cd ${S}/plugins