summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-22 19:53:19 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-22 19:53:19 +0000
commit5498c5b341404e80b4e4c761bf3a3895d63ef739 (patch)
tree55701824d7d0f84936de89541cdbb626cdd6a17e /mail-client
parentVersion bump, bug #162047 (diff)
downloadhistorical-5498c5b341404e80b4e4c761bf3a3895d63ef739.tar.gz
historical-5498c5b341404e80b4e4c761bf3a3895d63ef739.tar.bz2
historical-5498c5b341404e80b4e4c761bf3a3895d63ef739.zip
Add patch to fix To: appearing as sender address improperly, from upstream, and remove old versions.
Package-Manager: portage-2.1.2-r1
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/mailody/ChangeLog9
-rw-r--r--mail-client/mailody/Manifest54
-rw-r--r--mail-client/mailody/files/digest-mailody-0.2.03
-rw-r--r--mail-client/mailody/files/digest-mailody-0.2.0_rc13
-rw-r--r--mail-client/mailody/files/digest-mailody-0.3.03
-rw-r--r--mail-client/mailody/files/mailody-0.2.0_rc1-dovecot.patch95
-rw-r--r--mail-client/mailody/files/mailody-0.4.0_rc1-fix-parsing.patch52
-rw-r--r--mail-client/mailody/mailody-0.2.0.ebuild23
-rw-r--r--mail-client/mailody/mailody-0.2.0_rc1.ebuild25
-rw-r--r--mail-client/mailody/mailody-0.3.0.ebuild23
-rw-r--r--mail-client/mailody/mailody-0.4.0_rc1.ebuild4
11 files changed, 78 insertions, 216 deletions
diff --git a/mail-client/mailody/ChangeLog b/mail-client/mailody/ChangeLog
index 97b4592f5191..ed535e8d2b57 100644
--- a/mail-client/mailody/ChangeLog
+++ b/mail-client/mailody/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for mail-client/mailody
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/ChangeLog,v 1.5 2007/01/22 18:30:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/ChangeLog,v 1.6 2007/01/22 19:53:19 flameeyes Exp $
+
+ 22 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+ -files/mailody-0.2.0_rc1-dovecot.patch,
+ +files/mailody-0.4.0_rc1-fix-parsing.patch, -mailody-0.2.0_rc1.ebuild,
+ -mailody-0.2.0.ebuild, -mailody-0.3.0.ebuild, mailody-0.4.0_rc1.ebuild:
+ Add patch to fix To: appearing as sender address improperly, from upstream,
+ and remove old versions.
*mailody-0.4.0_rc1 (22 Jan 2007)
diff --git a/mail-client/mailody/Manifest b/mail-client/mailody/Manifest
index 00822f34fde7..399c67ce2be9 100644
--- a/mail-client/mailody/Manifest
+++ b/mail-client/mailody/Manifest
@@ -1,54 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX mailody-0.2.0_rc1-dovecot.patch 3827 RMD160 f7957564c063a191828b44f16013024fc00b740b SHA1 b5d730c96259ad9086947fb766dac9a1468635ba SHA256 01a6bad86770ae652760386f2d31145b238e8f3e61d988c64370cc3ec0f2abc2
-MD5 a012a449663be8f9b3031183ba63ddd3 files/mailody-0.2.0_rc1-dovecot.patch 3827
-RMD160 f7957564c063a191828b44f16013024fc00b740b files/mailody-0.2.0_rc1-dovecot.patch 3827
-SHA256 01a6bad86770ae652760386f2d31145b238e8f3e61d988c64370cc3ec0f2abc2 files/mailody-0.2.0_rc1-dovecot.patch 3827
-DIST mailody-0.2.0-rc1.tar.bz2 632373 RMD160 450fc2192eaab5c751970fbb45c69d835af52f38 SHA1 80cb63826cade4a9a39843cc0f8b516a8c556ddb SHA256 e7f5069e41d252c9ef72d5c2f0cdb7d4b257d2ee9e79b6017f96adf53527e80f
-DIST mailody-0.2.0.tar.bz2 641347 RMD160 5d6b703a151f148a70a6db0904a5d9ac59c1576c SHA1 0703f87bf7575ad7861a5fd8f74790c9fd5d42b4 SHA256 39e12815c691b2bf3e70ad9df41b87272554147007fc3c446febd228600269c3
-DIST mailody-0.3.0.tar.bz2 659394 RMD160 3e4f581c6dc05c0d1e97ae757467917443887d5a SHA1 39e7c93ab6fee462a5b26b8d9684d72209da363f SHA256 9e7f938bb1bea6d8a24e957e1171ae7b8b41efa268eca7e8d5f1dd4629ee8dd2
+AUX mailody-0.4.0_rc1-fix-parsing.patch 2092 RMD160 aedf03ce6b1df0fe9776b80945bcd0d998a30e9b SHA1 51a324b9a0a78a2f4fc9e8934b362816402299d1 SHA256 e217d564cc3c8fa1b54fc452e4f0e263772a63201638846f547dcae277702201
+MD5 10bdb713f672ce651ebd88df74c7f84b files/mailody-0.4.0_rc1-fix-parsing.patch 2092
+RMD160 aedf03ce6b1df0fe9776b80945bcd0d998a30e9b files/mailody-0.4.0_rc1-fix-parsing.patch 2092
+SHA256 e217d564cc3c8fa1b54fc452e4f0e263772a63201638846f547dcae277702201 files/mailody-0.4.0_rc1-fix-parsing.patch 2092
DIST mailody-0.4.0-rc1.tar.bz2 688371 RMD160 c6aad5bc8e01d4c5b7c9065d2cd4a2795f949a81 SHA1 9ff396008ee68f0c784e833d6a9e3f07434cd7ee SHA256 056e15161a51949f73b5b456aebc1664ef2f67f5755cd7b18cf3c963287a7abc
-EBUILD mailody-0.2.0.ebuild 535 RMD160 d1159a707d468c8b26706cfc0d14157aad0f847d SHA1 470bd0748aa1bd96fb1aadec7e0ed060df9c40c9 SHA256 34ac6c587ff57062f02e764402a6c5c3b27bda2f79787693f39cb1ff007afc03
-MD5 1209793b193458b5b8dc8726e7f80a01 mailody-0.2.0.ebuild 535
-RMD160 d1159a707d468c8b26706cfc0d14157aad0f847d mailody-0.2.0.ebuild 535
-SHA256 34ac6c587ff57062f02e764402a6c5c3b27bda2f79787693f39cb1ff007afc03 mailody-0.2.0.ebuild 535
-EBUILD mailody-0.2.0_rc1.ebuild 582 RMD160 dd59b1f3e1e03dfa63e347f9a4d664adbf33033b SHA1 f3e21ecf775914913c488d145de6dd6f9cad5f39 SHA256 5909956eb3f4fa5aa0b125805aa3e636357aceacbfec94502b7c627a73dc8cd9
-MD5 45aa3c6a48e59e0e0c8deb25edeeb55d mailody-0.2.0_rc1.ebuild 582
-RMD160 dd59b1f3e1e03dfa63e347f9a4d664adbf33033b mailody-0.2.0_rc1.ebuild 582
-SHA256 5909956eb3f4fa5aa0b125805aa3e636357aceacbfec94502b7c627a73dc8cd9 mailody-0.2.0_rc1.ebuild 582
-EBUILD mailody-0.3.0.ebuild 535 RMD160 b32a85f2742c976b2b297a4523207fbd0de2f348 SHA1 8d15847cba0ad41eac457e3cc22889dbe6f112c6 SHA256 896ad34525e75c5a8e5981914198e0a4f9e29c344522a8279e53005bce858e0a
-MD5 90308ab5bac5474525f6838115deeeaa mailody-0.3.0.ebuild 535
-RMD160 b32a85f2742c976b2b297a4523207fbd0de2f348 mailody-0.3.0.ebuild 535
-SHA256 896ad34525e75c5a8e5981914198e0a4f9e29c344522a8279e53005bce858e0a mailody-0.3.0.ebuild 535
-EBUILD mailody-0.4.0_rc1.ebuild 539 RMD160 180fe7dee5c70bf8159dc13bec679b49442514f9 SHA1 4963044a7036f7c7aed8f22a32f8dac1316cf84e SHA256 18296cba49a3414195db60839cd5ee645fb97ea5d4dff7a7c3b51d260453ebfc
-MD5 60bdf3e1da442bad2c69bf18ef6759f3 mailody-0.4.0_rc1.ebuild 539
-RMD160 180fe7dee5c70bf8159dc13bec679b49442514f9 mailody-0.4.0_rc1.ebuild 539
-SHA256 18296cba49a3414195db60839cd5ee645fb97ea5d4dff7a7c3b51d260453ebfc mailody-0.4.0_rc1.ebuild 539
-MISC ChangeLog 927 RMD160 edddbae3d2f504a80feffdbab2dcda7bcd3120a4 SHA1 6942aedb95bfd45baeb3fe6489f56baaeb7ed686 SHA256 eaa90c6466ef274d53ef67aa2d68c2929ba4878a97eece2f54b3e4beab44b736
-MD5 03eab62d60f03b4cb7f3c0174ca01c83 ChangeLog 927
-RMD160 edddbae3d2f504a80feffdbab2dcda7bcd3120a4 ChangeLog 927
-SHA256 eaa90c6466ef274d53ef67aa2d68c2929ba4878a97eece2f54b3e4beab44b736 ChangeLog 927
+EBUILD mailody-0.4.0_rc1.ebuild 585 RMD160 7e51173ef8367ecea67e6532a725619f35926721 SHA1 9b8c79bb615c0f6df44f72c0b0ce283d5c75a8f8 SHA256 32efbab750f18b023b6ee77fa2a2dbfc213d427ad6ae0172cdd7644860a33a86
+MD5 d4deba5ca4a373ac339f3822018911fd mailody-0.4.0_rc1.ebuild 585
+RMD160 7e51173ef8367ecea67e6532a725619f35926721 mailody-0.4.0_rc1.ebuild 585
+SHA256 32efbab750f18b023b6ee77fa2a2dbfc213d427ad6ae0172cdd7644860a33a86 mailody-0.4.0_rc1.ebuild 585
+MISC ChangeLog 1275 RMD160 2574a29da82595480e85d17b141ae54e1d1b223c SHA1 35351e5b3341dbad6a3e7a0db7ec2652bf01e960 SHA256 cde584d37c838cc5a81d90d4b9639e099e367960949fc22247c7a6cbf14e0af2
+MD5 7b46815a891cc2d72be39277fc6ce02a ChangeLog 1275
+RMD160 2574a29da82595480e85d17b141ae54e1d1b223c ChangeLog 1275
+SHA256 cde584d37c838cc5a81d90d4b9639e099e367960949fc22247c7a6cbf14e0af2 ChangeLog 1275
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
-MD5 5a3bc1791d1e71cb922dcc1e5bfa0eaa files/digest-mailody-0.2.0 244
-RMD160 11cfb43fc14aef582873b2c01ff950307eefb58e files/digest-mailody-0.2.0 244
-SHA256 e3f4123046a5cc3556e213e224d89c819cd75226979afa79871e3129bb4b9593 files/digest-mailody-0.2.0 244
-MD5 deac7e3f99c8f65649c3842bfdd6f9e8 files/digest-mailody-0.2.0_rc1 256
-RMD160 c59fa44618f995aa42ba67ad861a5e7b32155bec files/digest-mailody-0.2.0_rc1 256
-SHA256 09a2e34cb2151e57be808ba9d5ce580e4f317c7472eac50406409a65900200fa files/digest-mailody-0.2.0_rc1 256
-MD5 0e97e13136ca6fee1414f612e45861fd files/digest-mailody-0.3.0 244
-RMD160 ded25fb5538204a73fddc989b75ed1105c1d7629 files/digest-mailody-0.3.0 244
-SHA256 32c7f06ba10fb63e55d73f2d3516709587a3c157962c819cf47c7bb80d2f8457 files/digest-mailody-0.3.0 244
MD5 147b3218885b8586cd0ae0304f0c4cff files/digest-mailody-0.4.0_rc1 256
RMD160 d832f0e914febc1ecf731fd4b8c489d66fa43b65 files/digest-mailody-0.4.0_rc1 256
SHA256 c71664ecbf4129ebf6e9a4c7d8455412d7474992924172cf9f5d72dbfccb6f66 files/digest-mailody-0.4.0_rc1 256
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.1 (GNU/Linux)
-iD8DBQFFtQK+AiZjviIA2XgRAgSKAJ4uG5EEe2Nn5wdJ8Om0OfUdC5TaAACeMy0Y
-D9y3SgeEz6RN3zG0M5ZDWOg=
-=nLDP
+iD8DBQFFtRY2AiZjviIA2XgRAscpAKDA4wrEyMQ7I1k0bIKC646Ik8gIVACgnLRU
+ulHeNNSdfQvrZQsOCFq/Mro=
+=QdDc
-----END PGP SIGNATURE-----
diff --git a/mail-client/mailody/files/digest-mailody-0.2.0 b/mail-client/mailody/files/digest-mailody-0.2.0
deleted file mode 100644
index 36a86e3ff64e..000000000000
--- a/mail-client/mailody/files/digest-mailody-0.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7256f7ae5198f8f0a12c3ea837a96960 mailody-0.2.0.tar.bz2 641347
-RMD160 5d6b703a151f148a70a6db0904a5d9ac59c1576c mailody-0.2.0.tar.bz2 641347
-SHA256 39e12815c691b2bf3e70ad9df41b87272554147007fc3c446febd228600269c3 mailody-0.2.0.tar.bz2 641347
diff --git a/mail-client/mailody/files/digest-mailody-0.2.0_rc1 b/mail-client/mailody/files/digest-mailody-0.2.0_rc1
deleted file mode 100644
index 4bee0472b5fd..000000000000
--- a/mail-client/mailody/files/digest-mailody-0.2.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7837d83c82ddb13b5f6e1e8b72d993bb mailody-0.2.0-rc1.tar.bz2 632373
-RMD160 450fc2192eaab5c751970fbb45c69d835af52f38 mailody-0.2.0-rc1.tar.bz2 632373
-SHA256 e7f5069e41d252c9ef72d5c2f0cdb7d4b257d2ee9e79b6017f96adf53527e80f mailody-0.2.0-rc1.tar.bz2 632373
diff --git a/mail-client/mailody/files/digest-mailody-0.3.0 b/mail-client/mailody/files/digest-mailody-0.3.0
deleted file mode 100644
index 799759d69683..000000000000
--- a/mail-client/mailody/files/digest-mailody-0.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8e0d5de3739f38da4998c6155d80f12e mailody-0.3.0.tar.bz2 659394
-RMD160 3e4f581c6dc05c0d1e97ae757467917443887d5a mailody-0.3.0.tar.bz2 659394
-SHA256 9e7f938bb1bea6d8a24e957e1171ae7b8b41efa268eca7e8d5f1dd4629ee8dd2 mailody-0.3.0.tar.bz2 659394
diff --git a/mail-client/mailody/files/mailody-0.2.0_rc1-dovecot.patch b/mail-client/mailody/files/mailody-0.2.0_rc1-dovecot.patch
deleted file mode 100644
index 86cf57eb5b1a..000000000000
--- a/mail-client/mailody/files/mailody-0.2.0_rc1-dovecot.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: mailody/mailody/src/imap.cpp
-===================================================================
---- mailody/mailody/src/imap.cpp (revision 604932)
-+++ mailody/mailody/src/imap.cpp (working copy)
-@@ -392,51 +392,72 @@
- //|* 1 FETCH (UID 1 BODY[HEADER.FIELDS ("FROM" "SUBJECT" "DATE")] {148}|
- // Cyrus:
- //|* 1 FETCH (UID 26133 BODY[HEADER.FIELDS (FROM SUBJECT DATE)] {139}|
-+ // Dovecot:
-+ //|* 1 FETCH (RFC822.SIZE 8609 UID 2 BODY[HEADER.FIELDS (FROM TO CC SUBJECT DATE IN-REPLY-TO MESSAGE-ID)] {337}
-
-- QRegExp rx;
-+ QRegExp rx0;
-+ QRegExp rx1;
-+ QRegExp rx2;
- if (m_currentQueueItem.state() == Queue::GetHeaders)
-- rx.setPattern("UID (\\d*) RFC822.SIZE (\\d*)"
-- + QRegExp::escape(" BODY[HEADER.FIELDS ")
-+ {
-+ rx0.setPattern("UID (\\d*) ");
-+ rx1.setPattern("RFC822.SIZE (\\d*) ");
-+ rx2.setPattern( QRegExp::escape(" BODY[HEADER.FIELDS ")
- + "\\(\"?FROM\"? \"?TO\"? \"?CC\"? "
- + "\"?SUBJECT\"? \"?DATE\"? \"?IN-REPLY-TO\"? "
- + "\"?MESSAGE-ID\"?\\)\\] "
- + QRegExp::escape("{") + "(\\d*)" + QRegExp::escape("}"));
-+ }
- else
-- rx.setPattern("UID (\\d*)" + QRegExp::escape(" BODY[] ")
-+ {
-+ rx0.setPattern("UID (\\d*)");
-+ rx2.setPattern(QRegExp::escape(" BODY[] ")
- + QRegExp::escape("{") + "(\\d*)" + QRegExp::escape("}"));
-+ }
-
- m_db->beginTransaction();
- QString r = received;
- QStringList headersToSend;
-- while (rx.search(r.stripWhiteSpace()) != -1)
-+
-+ while (rx0.search(r.stripWhiteSpace()) != -1)
- {
-- int uid = rx.cap(1).toInt();
-
-+ if ( rx2.search(r.stripWhiteSpace()) == -1)
-+ {
-+ emit statusError(i18n("Retrieving failed"));
-+ return;
-+ }
-+
-+ int uid = rx0.cap(1).toInt();
-+
- QString size;
-- int expectedLength;
-- if (m_currentQueueItem.state() == Queue::GetHeaders)
-+ if (m_currentQueueItem.state() == Queue::GetHeaders &&
-+ rx1.search(r.stripWhiteSpace()) != -1)
- {
-- size = "Size: " + rx.cap(2);
-- expectedLength = rx.cap(3).toInt();
-+ size = "Size: " + rx1.cap(1);
- }
-- else
-- expectedLength = rx.cap(2).toInt();
-
-+ int expectedLength = rx2.cap(1).toInt();
-+
- int i = r.find("}")+1;
- QString text = r.mid(i, expectedLength);
-
- if (m_currentQueueItem.state() == Queue::GetHeaders)
- {
-- text += size;
-+ text.append("\r\n");
-+ text.append(size);
- // kdDebug() << "UID: " << uid
-- // << " mb: " << m_currentQueueItem.mailbox()
-- // << "text" << text
-- // << endl;
-+ // << " mb: " << m_currentQueueItem.mailbox()
-+ // << " size: " << size
-+ // << " expect: " << expectedLength
-+ // << " found: " << i
-+ // << " text: " << text
-+ // << endl;
-
-- headersToSend.append(rx.cap(1));
-+ headersToSend.append(rx0.cap(1));
- headersToSend.append(m_currentQueueItem.mailbox());
- headersToSend.append(text);
-- headersToSend.append(m_db->getFlags(rx.cap(1).toInt(),
-+ headersToSend.append(m_db->getFlags(uid,
- m_currentQueueItem.mailbox()));
-
- if (text.isEmpty()) \ No newline at end of file
diff --git a/mail-client/mailody/files/mailody-0.4.0_rc1-fix-parsing.patch b/mail-client/mailody/files/mailody-0.4.0_rc1-fix-parsing.patch
new file mode 100644
index 000000000000..d40a79e75c2c
--- /dev/null
+++ b/mail-client/mailody/files/mailody-0.4.0_rc1-fix-parsing.patch
@@ -0,0 +1,52 @@
+Index: src/messagedata.cpp
+===================================================================
+--- mailody/src/messagedata.cpp (revision 626296)
++++ mailody/src/messagedata.cpp (revision 626297)
+@@ -114,19 +114,19 @@
+ // a case sensitive compare.
+ QString line = (*it).lower().stripWhiteSpace();
+
+- if (line.startsWith("size"))
+- m_size = (*it).section(' ',1).stripWhiteSpace().toInt();
++ if (line.startsWith("size:"))
++ m_size = (*it).section(':',1).stripWhiteSpace().toInt();
+
+ else if (line.startsWith("subject"))
+ {
+ const char* usedCS;
+- QString t = (*it).section(' ',1).stripWhiteSpace();
++ QString t = (*it).section(':',1).stripWhiteSpace();
+ m_subject =
+ KMime::decodeRFC2047String(t.local8Bit(), &usedCS, "", false);
+ }
+- else if (line.startsWith("from"))
++ else if (line.startsWith("from:"))
+ {
+- QString t = (*it).section(' ',1).stripWhiteSpace();
++ QString t = (*it).section(':',1).stripWhiteSpace();
+ const char* usedCS;
+ t = KMime::decodeRFC2047String(t.local8Bit(), &usedCS, "", false);
+ if (Global::myEmail(t))
+@@ -134,11 +134,11 @@
+ m_sender = t;
+ parseEmail(m_sender);
+ }
+- else if (m_sender.isEmpty() && line.startsWith("to"))
++ else if (m_sender.isEmpty() && line.startsWith("to:"))
+ {
+ // If there is no From address use the To address...
+ const char* usedCS;
+- QString t = (*it).section(' ',1).stripWhiteSpace();
++ QString t = (*it).section(':',1).stripWhiteSpace();
+ m_sender =
+ KMime::decodeRFC2047String(t.local8Bit(), &usedCS, "", false);
+ parseEmail(m_sender);
+@@ -428,7 +428,7 @@
+ }
+
+ // Maybe there is a: toma <toma@omat.nl>
+- else if ((start=email.find("<"))!=-1)
++ else if ((start=email.find("<"))!=-1 && start > 2)
+ {
+ email = email.mid(0,start);
+ return;
diff --git a/mail-client/mailody/mailody-0.2.0.ebuild b/mail-client/mailody/mailody-0.2.0.ebuild
deleted file mode 100644
index cd3479ee27d6..000000000000
--- a/mail-client/mailody/mailody-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.2.0.ebuild,v 1.1 2006/12/09 18:12:13 flameeyes Exp $
-
-inherit kde
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="IMAP mail client for KDE"
-HOMEPAGE="http://www.mailody.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="=dev-db/sqlite-3*
- app-crypt/qca-tls"
-
-S="${WORKDIR}/${MY_P}"
-
-need-kde 3.5
diff --git a/mail-client/mailody/mailody-0.2.0_rc1.ebuild b/mail-client/mailody/mailody-0.2.0_rc1.ebuild
deleted file mode 100644
index 98f45419a208..000000000000
--- a/mail-client/mailody/mailody-0.2.0_rc1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.2.0_rc1.ebuild,v 1.2 2006/11/26 15:17:00 betelgeuse Exp $
-
-inherit kde
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="IMAP mail client for KDE"
-HOMEPAGE="http://www.mailody.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="=dev-db/sqlite-3*
- app-crypt/qca-tls"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES="${FILESDIR}/${P}-dovecot.patch"
-
-need-kde 3.5
diff --git a/mail-client/mailody/mailody-0.3.0.ebuild b/mail-client/mailody/mailody-0.3.0.ebuild
deleted file mode 100644
index 4a16b66cb970..000000000000
--- a/mail-client/mailody/mailody-0.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.3.0.ebuild,v 1.1 2006/12/24 16:03:44 flameeyes Exp $
-
-inherit kde
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="IMAP mail client for KDE"
-HOMEPAGE="http://www.mailody.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="=dev-db/sqlite-3*
- app-crypt/qca-tls"
-
-S="${WORKDIR}/${MY_P}"
-
-need-kde 3.5
diff --git a/mail-client/mailody/mailody-0.4.0_rc1.ebuild b/mail-client/mailody/mailody-0.4.0_rc1.ebuild
index 3da3977d9a6e..e7bb8fae4933 100644
--- a/mail-client/mailody/mailody-0.4.0_rc1.ebuild
+++ b/mail-client/mailody/mailody-0.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.4.0_rc1.ebuild,v 1.1 2007/01/22 18:30:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.4.0_rc1.ebuild,v 1.2 2007/01/22 19:53:19 flameeyes Exp $
inherit kde
@@ -21,3 +21,5 @@ RDEPEND="=dev-db/sqlite-3*
S="${WORKDIR}/${MY_P}"
need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-fix-parsing.patch"