Adjusted dbus dependency (bug #154521). Pruning old ebuilds/patches.

(Portage version: 2.1.2_rc1-r7)
 (Unsigned Manifest commit)

17 files changed, 12 insertions, 1258 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 21b3fb4e3ddf..0b01eadeaf80 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,26 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX evolution-2.0.3-gentoo_etc_services.patch 1662 RMD160 9ac648a5f055cb5e3e98b5e41547fed0c4a7ad3d SHA1 628bf559a4915bd794893f54c552025fb015e4ce SHA256 e881f56b96b7f5b692f63f7d96705bb70626ff1957d6fabd47090ff76f46acb3
-MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
-RMD160 9ac648a5f055cb5e3e98b5e41547fed0c4a7ad3d files/evolution-2.0.3-gentoo_etc_services.patch 1662
-SHA256 e881f56b96b7f5b692f63f7d96705bb70626ff1957d6fabd47090ff76f46acb3 files/evolution-2.0.3-gentoo_etc_services.patch 1662
-AUX evolution-2.2.3-linking-fix.patch 1491 RMD160 1504a120f670a0334ea90153a367ec3a095ac033 SHA1 5e1e6dc83826a2cf3bfff8fd059e69824efdd932 SHA256 210150560c2a95c4f367f35b79e558dabf008e2f238429b98eb6c93f9e6cd6b5
-MD5 388d698898d1346cb7007da471abed11 files/evolution-2.2.3-linking-fix.patch 1491
-RMD160 1504a120f670a0334ea90153a367ec3a095ac033 files/evolution-2.2.3-linking-fix.patch 1491
-SHA256 210150560c2a95c4f367f35b79e558dabf008e2f238429b98eb6c93f9e6cd6b5 files/evolution-2.2.3-linking-fix.patch 1491
 AUX evolution-2.3.7-configure_plugins.patch 3010 RMD160 9ae69aa76db215f6c9dcaf251ed03369131d86d8 SHA1 8b996b3a578dcc593c752e240c01516d5ee5c2f9 SHA256 c7aa48137fff3e4f8d8fe0d466ff70e6feadb95ed07402273318d111b8ee3c70
 MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
 RMD160 9ae69aa76db215f6c9dcaf251ed03369131d86d8 files/evolution-2.3.7-configure_plugins.patch 3010
 SHA256 c7aa48137fff3e4f8d8fe0d466ff70e6feadb95ed07402273318d111b8ee3c70 files/evolution-2.3.7-configure_plugins.patch 3010
-AUX evolution-2.3.8-gentoo.patch 660 RMD160 394e3ef64b158617977ac5267a1a4adb6d44b133 SHA1 1c97ced74438fd5093d0045c5b7141e86362b47f SHA256 37c1532a729000dbbacaaa56eea5485eeaa14ce78cc0dab3b4cc0fd839b0fc77
-MD5 35dfdb3422f49ada8891285f5104d29c files/evolution-2.3.8-gentoo.patch 660
-RMD160 394e3ef64b158617977ac5267a1a4adb6d44b133 files/evolution-2.3.8-gentoo.patch 660
-SHA256 37c1532a729000dbbacaaa56eea5485eeaa14ce78cc0dab3b4cc0fd839b0fc77 files/evolution-2.3.8-gentoo.patch 660
-AUX evolution-2.4.2.1-link.patch 2625 RMD160 3a53cb7f6ad46265421fd66e9e6b15fc3bd98b17 SHA1 9776ab5c690a2c933788ce410f941e335e919de4 SHA256 8aa4091d36645b852f4e3ef604d76165806de9fcaf50d990a185546b62ca5b7d
-MD5 c6f7cb2777a5622bc3ea45b046713895 files/evolution-2.4.2.1-link.patch 2625
-RMD160 3a53cb7f6ad46265421fd66e9e6b15fc3bd98b17 files/evolution-2.4.2.1-link.patch 2625
-SHA256 8aa4091d36645b852f4e3ef604d76165806de9fcaf50d990a185546b62ca5b7d files/evolution-2.4.2.1-link.patch 2625
 AUX evolution-2.5.5.1-sideview.patch 9730 RMD160 3df3caaf77487071e217b2803fe9357b9a6ab2c9 SHA1 d4ed65a575dd55b4a869e6cde2edd82d157f3343 SHA256 cdc2d507df2589ff37b33b72157e3522b5f031969962eef36022930babe5fcbd
 MD5 9e370064cd61615da09034946b0f066e files/evolution-2.5.5.1-sideview.patch 9730
 RMD160 3df3caaf77487071e217b2803fe9357b9a6ab2c9 files/evolution-2.5.5.1-sideview.patch 9730
@@ -33,91 +14,36 @@ AUX evolution-2.7.3-bf-junk.patch.gz 10418 RMD160 8945624b19ac72b6047921b476ef96
 MD5 74c3c80932b7e89b3b44ad3569c3cc49 files/evolution-2.7.3-bf-junk.patch.gz 10418
 RMD160 8945624b19ac72b6047921b476ef968d4e9c2591 files/evolution-2.7.3-bf-junk.patch.gz 10418
 SHA256 a3aec31580402fb4113554acac684d12a083d22b80f273634d96e77364676dad files/evolution-2.7.3-bf-junk.patch.gz 10418
-AUX evolution-2.8.0-64-bit.patch 8622 RMD160 771ee5513d7f08d51452406ab1a7fafcd44798a9 SHA1 0d240faafa5b7a7319bbc58ed9eb5b076ef390c6 SHA256 6aac01f6d570b5384ec52107d9f7a4a516cdc5b5ff87bace25325ad0cf45d8b3
-MD5 31b37532a5d9282d9364f4ee6763ad55 files/evolution-2.8.0-64-bit.patch 8622
-RMD160 771ee5513d7f08d51452406ab1a7fafcd44798a9 files/evolution-2.8.0-64-bit.patch 8622
-SHA256 6aac01f6d570b5384ec52107d9f7a4a516cdc5b5ff87bace25325ad0cf45d8b3 files/evolution-2.8.0-64-bit.patch 8622
-AUX evolution-2.8.0-blank-reply.patch 606 RMD160 c8a377778d408e6487d581efb0193f3204efd32f SHA1 6a83605f5652fd888a80716c559a76fc5a6df27d SHA256 0e5a2c6eeef519bfae9809dd0e9f056c1ac521b76f345d7ae5b72114f4b8b62f
-MD5 e52a96128b67f47ba799bc167a643f9c files/evolution-2.8.0-blank-reply.patch 606
-RMD160 c8a377778d408e6487d581efb0193f3204efd32f files/evolution-2.8.0-blank-reply.patch 606
-SHA256 0e5a2c6eeef519bfae9809dd0e9f056c1ac521b76f345d7ae5b72114f4b8b62f files/evolution-2.8.0-blank-reply.patch 606
-AUX evolution-2.8.0-fix-message-deletion.patch 863 RMD160 0523087465c23838118128f78d997b9a08a76c81 SHA1 1c715b2a2fd1464ea62636f08021ba017b7796d1 SHA256 7521c5c12bf1a3dec404245aecc0aacc403b343590241a98813fcaad5a4efb12
-MD5 38c5176c1d8361b42190e6d866d19936 files/evolution-2.8.0-fix-message-deletion.patch 863
-RMD160 0523087465c23838118128f78d997b9a08a76c81 files/evolution-2.8.0-fix-message-deletion.patch 863
-SHA256 7521c5c12bf1a3dec404245aecc0aacc403b343590241a98813fcaad5a4efb12 files/evolution-2.8.0-fix-message-deletion.patch 863
-AUX evolution-2.8.0-includes.patch 670 RMD160 876a94d3a07af418bcd31051705c649262ecee3c SHA1 59355de5ac6fa86031f5986a4b0e36ebb7e9f883 SHA256 f3fcd6ed94e571ea0580b955f3b309802e91157811f00e98540276d3f854048a
-MD5 49191e4a9a06eb90a9f756599eb455e7 files/evolution-2.8.0-includes.patch 670
-RMD160 876a94d3a07af418bcd31051705c649262ecee3c files/evolution-2.8.0-includes.patch 670
-SHA256 f3fcd6ed94e571ea0580b955f3b309802e91157811f00e98540276d3f854048a files/evolution-2.8.0-includes.patch 670
 AUX evolution-2.8.0-uri.patch.gz 5564 RMD160 9e92e018adfec82ffdf572cc02ef638b4a62053d SHA1 6a52be2358153d0b18a1478b58f473654491839a SHA256 04401695c07ae85490151f65432becdcc23370a55e3c3add40c2618bd398a268
 MD5 a6083b552bc93e9224baecb1a4583941 files/evolution-2.8.0-uri.patch.gz 5564
 RMD160 9e92e018adfec82ffdf572cc02ef638b4a62053d files/evolution-2.8.0-uri.patch.gz 5564
 SHA256 04401695c07ae85490151f65432becdcc23370a55e3c3add40c2618bd398a268 files/evolution-2.8.0-uri.patch.gz 5564
-AUX evolution-2.8.1-64-bit.patch 6566 RMD160 64b831a30040b7e58dba6937f6482ea33419984d SHA1 faff6bea83289133818b0022cef49ba2565638d9 SHA256 449ab7a55404f721e54c383ffec91267c54588f37f41a4f51c242f17d13305f5
-MD5 3ab1cc430efec3d44700a4abd0112300 files/evolution-2.8.1-64-bit.patch 6566
-RMD160 64b831a30040b7e58dba6937f6482ea33419984d files/evolution-2.8.1-64-bit.patch 6566
-SHA256 449ab7a55404f721e54c383ffec91267c54588f37f41a4f51c242f17d13305f5 files/evolution-2.8.1-64-bit.patch 6566
-AUX evolution-2.8.1-filter-bar-crash.patch 1518 RMD160 530fb81af0f3d48335c1f25da5aa62af2ab28dcb SHA1 7be2d8aae24bbd882a9883000891d32622301343 SHA256 62230d26a4b91a6a0cd141b3ff872e1a854e2b50965dcc957e16f3ffcafb86f3
-MD5 b25ab85d211c347ac4116182f19565f8 files/evolution-2.8.1-filter-bar-crash.patch 1518
-RMD160 530fb81af0f3d48335c1f25da5aa62af2ab28dcb files/evolution-2.8.1-filter-bar-crash.patch 1518
-SHA256 62230d26a4b91a6a0cd141b3ff872e1a854e2b50965dcc957e16f3ffcafb86f3 files/evolution-2.8.1-filter-bar-crash.patch 1518
 AUX evolution-2.8.1.1-64-bit.patch 6008 RMD160 3c6b6e652097f939c74431ba63eac677953c6cfd SHA1 2e06ccf50f9a0cd567e9f9a8c8746714a63747e5 SHA256 8d201c3ffc9cbb344b108a2152f16a242327f2c8ca44a60e9a321838c8aad573
 MD5 bfbc220b894bbe9ddc64002d024f2b50 files/evolution-2.8.1.1-64-bit.patch 6008
 RMD160 3c6b6e652097f939c74431ba63eac677953c6cfd files/evolution-2.8.1.1-64-bit.patch 6008
 SHA256 8d201c3ffc9cbb344b108a2152f16a242327f2c8ca44a60e9a321838c8aad573 files/evolution-2.8.1.1-64-bit.patch 6008
-DIST evolution-2.4.2.1.tar.bz2 11503590 RMD160 cb72e939fbd651a43ae09e0341f47e6ebf490c56 SHA1 b3e61e8f013ea35aa137928d1d25a91b3043357d SHA256 eae8fed13de8eee9f60606ec0e645876e4b9a1e9bb30d21dace54e3995ca5f40
 DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA1 465205cf50770b72641995ec59617010dadaf204 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
 DIST evolution-2.6.2.tar.bz2 12394719 RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b SHA1 08a6a9bf3754fff71cbdf82857337b1edc13ef46 SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5
-DIST evolution-2.8.0.tar.bz2 12821926 RMD160 ba73d9529a02f2ea6db8c8f2c7da3041276e1d5c SHA1 0da65a3de84e60d0e41265607c7c7fcec18fe072 SHA256 1d83cbea7ef5b86df5eea5f553a0c3be3d157ed20bb8469b467f30cf18bb3320
 DIST evolution-2.8.1.1.tar.bz2 12897409 RMD160 f8a457e816372ee869092a9c33b0a03a81a85a85 SHA1 13fd219e15efce9522e871943ef157e9dbdc3a57 SHA256 0eeedf3808949772603bef4d54c879437dbc08d08dacba19f5994acc6ba60cb0
-DIST evolution-2.8.1.tar.bz2 12873039 RMD160 8a06f9a3d1a402d3e92edf1de623b07b09322059 SHA1 8f26e39e7c6366213dddb28ca30bc52d1803a983 SHA256 91d3e7c7fd961959fc01abcd7bb18747bfd8fe8b90bd91f03b4392b11f0e3a7b
-EBUILD evolution-2.4.2.1.ebuild 5759 RMD160 1741e9b15ba81cd0b7befebc63d15b1808c4e114 SHA1 dc25b4f38a2700bc17d5b9c5749c5d49cd7079d3 SHA256 758f842eaa8dbffd1a700f6806a1fdd2c66bc9b3eab05aafbb08e54079822660
-MD5 71b07fe7a01202020ed600b75ad32caa evolution-2.4.2.1.ebuild 5759
-RMD160 1741e9b15ba81cd0b7befebc63d15b1808c4e114 evolution-2.4.2.1.ebuild 5759
-SHA256 758f842eaa8dbffd1a700f6806a1fdd2c66bc9b3eab05aafbb08e54079822660 evolution-2.4.2.1.ebuild 5759
-EBUILD evolution-2.6.2-r1.ebuild 6014 RMD160 d90b26a40e3e85f661b4e6322d43d3738ac98e8a SHA1 48d2899afb1b14748790e5dae107abee78a276d2 SHA256 c56c3bcc2375346001dd981e88c7fde86fc5f758d6992e0fe22d8b9bf245671c
-MD5 d9c2452c1e99a4aa0b336bc47371b6fc evolution-2.6.2-r1.ebuild 6014
-RMD160 d90b26a40e3e85f661b4e6322d43d3738ac98e8a evolution-2.6.2-r1.ebuild 6014
-SHA256 c56c3bcc2375346001dd981e88c7fde86fc5f758d6992e0fe22d8b9bf245671c evolution-2.6.2-r1.ebuild 6014
-EBUILD evolution-2.8.0-r1.ebuild 6366 RMD160 a1a2485584b0ba7fb954c12c5b35efba3594a607 SHA1 59a24d8dce85983d32bacbd5e635831e8ddb093b SHA256 3381275f0f09b2a638bc784ec6af5768582fcefd340edf38b425fdb76cbdee4a
-MD5 a234f120db7f1e56289d58ea5c21e191 evolution-2.8.0-r1.ebuild 6366
-RMD160 a1a2485584b0ba7fb954c12c5b35efba3594a607 evolution-2.8.0-r1.ebuild 6366
-SHA256 3381275f0f09b2a638bc784ec6af5768582fcefd340edf38b425fdb76cbdee4a evolution-2.8.0-r1.ebuild 6366
-EBUILD evolution-2.8.1-r1.ebuild 6198 RMD160 4e7567edc516fce249a748d7feac99824a957d08 SHA1 9a61c05e0a622803264fe4665142ffa725185126 SHA256 0d65b3bca6611403f091c1ed5cb73e3ce064eac744c8cb891dc7e060caf1b658
-MD5 8428416782c9eb091e6158bf67ccb35e evolution-2.8.1-r1.ebuild 6198
-RMD160 4e7567edc516fce249a748d7feac99824a957d08 evolution-2.8.1-r1.ebuild 6198
-SHA256 0d65b3bca6611403f091c1ed5cb73e3ce064eac744c8cb891dc7e060caf1b658 evolution-2.8.1-r1.ebuild 6198
-EBUILD evolution-2.8.1.1.ebuild 6127 RMD160 b7f6d4b553aecd9b334f838e598cace4822959b3 SHA1 9f4d6fa4ed7cf842c89a7cd7134582c253ccab54 SHA256 c525fd432e57be34ea8a5e4446158434ca27d4997762821fc32c7677645c7798
-MD5 eb09f6a885394602908062636726e225 evolution-2.8.1.1.ebuild 6127
-RMD160 b7f6d4b553aecd9b334f838e598cace4822959b3 evolution-2.8.1.1.ebuild 6127
-SHA256 c525fd432e57be34ea8a5e4446158434ca27d4997762821fc32c7677645c7798 evolution-2.8.1.1.ebuild 6127
-MISC ChangeLog 38777 RMD160 0060433d84efd0c80f3504e72f318c70a32733e2 SHA1 7d91e8d64aef8559152573819191e7375ffbc3f1 SHA256 76fe6f17af038cee7ac8ec65326df1384d9e9c4729b46de6906e4eba9182b0a0
-MD5 68efcb0239ecac704a7150556dc6d1b2 ChangeLog 38777
-RMD160 0060433d84efd0c80f3504e72f318c70a32733e2 ChangeLog 38777
-SHA256 76fe6f17af038cee7ac8ec65326df1384d9e9c4729b46de6906e4eba9182b0a0 ChangeLog 38777
+EBUILD evolution-2.6.2-r1.ebuild 6101 RMD160 f5acd83e1712b26c8c762f68f80aafe94532ebaa SHA1 e7a7e90e2b0eeeecd267a359d21ed7b36c08c4b9 SHA256 f4aa7497d9cc6ad88352a9b7ad8607ad2788249e70cb3874995265147a3f4bc5
+MD5 5e81f8102e75b4b27c4cfbe856f2b30d evolution-2.6.2-r1.ebuild 6101
+RMD160 f5acd83e1712b26c8c762f68f80aafe94532ebaa evolution-2.6.2-r1.ebuild 6101
+SHA256 f4aa7497d9cc6ad88352a9b7ad8607ad2788249e70cb3874995265147a3f4bc5 evolution-2.6.2-r1.ebuild 6101
+EBUILD evolution-2.8.1.1.ebuild 6035 RMD160 90ae806d781eb0406db923fe4da58fb8be07e81e SHA1 18137a300b716b74a9031870573714fca0900546 SHA256 bf5f58aee7ff6c8136444cfdbc8a5fc4e70912ffff07f6174ae4aaea23477545
+MD5 c2e74fd4f2583fffe511e32f7e0e7ddc evolution-2.8.1.1.ebuild 6035
+RMD160 90ae806d781eb0406db923fe4da58fb8be07e81e evolution-2.8.1.1.ebuild 6035
+SHA256 bf5f58aee7ff6c8136444cfdbc8a5fc4e70912ffff07f6174ae4aaea23477545 evolution-2.8.1.1.ebuild 6035
+MISC ChangeLog 39188 RMD160 b8fb7fe62df4e1dc4a9a940fbec02edeed3d9a98 SHA1 e6c02ad06aa582425a7638abfacfb8b1b3b32a13 SHA256 cb8298ac84b2d4f1df4cbca06c4e35a487255854fc75bffb708f472991e3569b
+MD5 490f95b6294a69eff795dd400273b9c6 ChangeLog 39188
+RMD160 b8fb7fe62df4e1dc4a9a940fbec02edeed3d9a98 ChangeLog 39188
+SHA256 cb8298ac84b2d4f1df4cbca06c4e35a487255854fc75bffb708f472991e3569b ChangeLog 39188
 MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a
 MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228
 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228
 SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a metadata.xml 228
-MD5 c26dc1fd2762cde6c32c4c52d3ce9644 files/digest-evolution-2.4.2.1 262
-RMD160 59ab19f6fa13bb17b8756d4ea326d9827b839bf8 files/digest-evolution-2.4.2.1 262
-SHA256 66512ea95e1843f7da7daff072e06ae1c770a51c57cf954c66d8924ba2c9213c files/digest-evolution-2.4.2.1 262
 MD5 f58ca96f6e0006d63acada5e98d62982 files/digest-evolution-2.6.2-r1 533
 RMD160 94fb86de744f42bcae39b6f5a0d6276ed559014e files/digest-evolution-2.6.2-r1 533
 SHA256 730a2ffe0655db234cb17adecb91357a37e42064f41dc64cccfb7ab2fda0614d files/digest-evolution-2.6.2-r1 533
-MD5 26fe6f66858beb4a799a0d4a2ef4ed19 files/digest-evolution-2.8.0-r1 533
-RMD160 51f8fb00430feb4a94d4851754fc5fe6cc5c77d5 files/digest-evolution-2.8.0-r1 533
-SHA256 ad352c750121d30170619502ba3a3dcf059d205cb1832e31b2f20687e188dbc9 files/digest-evolution-2.8.0-r1 533
-MD5 7aa989b23e314d6e0194123857993c68 files/digest-evolution-2.8.1-r1 533
-RMD160 7a6799ec23898007381f8ba8224817238ce821ee files/digest-evolution-2.8.1-r1 533
-SHA256 a0410f5224e9ef931bb63c7d14940ff8f0ac93665aa70fb2c9b878cf327193a4 files/digest-evolution-2.8.1-r1 533
 MD5 991ee8e9fdc3debf58b6a2a5bc4e18fd files/digest-evolution-2.8.1.1 539
 RMD160 3c8e00d6bf32184f164a7d0a93bbe848fb8b4fe4 files/digest-evolution-2.8.1.1 539
 SHA256 6bcce6b1bfc47b5afa122918e98dd88789e4820a5f45f0804d17398e46c9dcf3 files/digest-evolution-2.8.1.1 539
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFQNTlomPajV0RnrERAnEpAJ0RwXTZgKe4hFpRiixYqNCP6nEMBACcDbk5
-dy70Qh0UG7HfwqKti4M0PXA=
-=qbWW
------END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.4.2.1.ebuild b/mail-client/evolution/evolution-2.4.2.1.ebuild
deleted file mode 100644
index 14d930d41966..000000000000
--- a/mail-client/evolution/evolution-2.4.2.1.ebuild
+++ /dev/null
@@ -1,200 +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/evolution/evolution-2.4.2.1.ebuild,v 1.10 2006/05/21 19:21:58 corsair Exp $
-
-inherit eutils flag-o-matic alternatives gnome2
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=x11-themes/gnome-icon-theme-1.2
-	dev-libs/atk
-	>=gnome-extra/gtkhtml-3.7
-	>=dev-libs/glib-2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.4.1
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2.2
-	>=x11-libs/pango-1.8.1
-	mail-filter/spamassassin
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? (
-		>=dev-libs/nspr-4.4.1
-		>=dev-libs/nss-3.9.2 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	gstreamer? (
-		=media-libs/gstreamer-0.8*
-		=media-libs/gst-plugins-0.8* )
-	dbus? ( sys-apps/dbus )
-	mono? ( >=dev-lang/mono-1 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-USE_DESTDIR="1"
-ELTCONF="--reverse-deps"
-
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="addressbook-file \
-		bbdb \
-		calendar-file \
-		calendar-http \
-		calendar-weather \
-		copy-tool \
-		default-mailer
-		default-source \
-		groupwise-account-setup \
-		groupwise-features \
-		itip-formatter \
-		mail-account-disable \
-		mark-calendar-offline \
-		mail-to-task \
-		mailing-list-actions \
-		mark-all-read \
-		plugin-manager \
-		print-message \
-		sa-junk-plugin \
-		save-calendar \
-		select-one-source \
-		startup-wizard \
-		subject-thread"
-
-	# The special cases
-	use gstreamer && plugins="${plugins} audio-inline"
-	use dbus && plugins="${plugins} new-mail-notify"
-	use mono && plugins="${plugins} mono"
-
-	if built_with_use gnome-extra/evolution-data-server ldap; then
-		plugins="${plugins} exchange-operations"
-	fi
-
-	local pluginlist=""
-	for p in $plugins; do
-		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
-		pluginlist="${pluginlist}${p}"
-	done
-
-	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	gnome2_omf_fix help/omf.make help/C/Makefile.in
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch "${FILESDIR}"/${PN}-2.3.7-configure_plugins.patch
-	# Fix for linking problems, #85013 and #92682
-	epatch "${FILESDIR}"/${PN}-2.2.3-linking-fix.patch
-	# Work-around for a start-up segfault (bug #104587).
-	epatch "${FILESDIR}"/${PN}-2.3.8-gentoo.patch
-
-	# fix linking problems, sent upstream, gnome #323580
-	epatch "${FILESDIR}"/${PN}-2.4.2.1-link.patch
-
-	export WANT_AUTOMAKE=1.9
-	intltoolize -c -f || die "intltoolize failed"
-	sed -n -e '/GNOME_COMPILE_WARNINGS/,/^])/p' aclocal.m4 > gnome.m4
-	aclocal -I . || die "aclocal failed"
-	libtoolize --copy --force || die "libtoolize failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		NSS_LIB=/usr/$(get_libdir)/nss
-		NSS_INC=/usr/include/nss
-		NSPR_LIB=/usr/$(get_libdir)/nspr
-		NSPR_INC=/usr/include/nspr
-
-		G2CONF="${G2CONF} \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB}     \
-			--with-nss-includes=${NSS_INC}   \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	einfo "To change the default browser if you are not using GNOME, do:"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/evolution-2.8.0-r1.ebuild b/mail-client/evolution/evolution-2.8.0-r1.ebuild
deleted file mode 100644
index f7305a26d751..000000000000
--- a/mail-client/evolution/evolution-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,209 +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/evolution/evolution-2.8.0-r1.ebuild,v 1.2 2006/10/03 23:12:51 agriffis Exp $
-
-inherit eutils flag-o-matic alternatives gnome2 autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="bogofilter crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-# evolution-data-server dep is 1.5 because in the e-utils directories,
-# the includes reference locations only present in eds > 1.5
-RDEPEND=">=x11-themes/gnome-icon-theme-1.2
-	dev-libs/atk
-	>=gnome-extra/gtkhtml-3.9.90
-	>=dev-libs/glib-2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.7.90
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2.96
-	>=x11-libs/pango-1.8.1
-	x11-libs/libnotify
-	hal? ( >=sys-apps/hal-0.5.4 )
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( >=dev-libs/nspr-4.6.1
-		   >=dev-libs/nss-3.11 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	dbus? ( sys-apps/dbus )
-	mono? ( >=dev-lang/mono-1 )
-	bogofilter? ( mail-filter/bogofilter )
-	!bogofilter? ( mail-filter/spamassassin )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="calendar-file calendar-http calendar-weather \
-		itip-formatter plugin-manager default-source addressbook-file \
-		startup-wizard print-message mark-all-read groupwise-features \
-		groupwise-account-setup hula-account-setup mail-account-disable \
-		publish-calendar caldav \
-		bbdb subject-thread save-calendar select-one-source copy-tool \
-		mail-to-task mark-calendar-offline mailing-list-actions \
-		new-mail-notify default-mailer import-ics-attachments"
-
-	# For dev releases, add experimental plugins
-	plugins="${plugins} backup-restore folder-unsubscribe mail-to-meeting \
-		prefer-plain save-attachments"
-
-	if use bogofilter; then
-		plugins="${plugins} bf-junk-plugin"
-	else
-		plugins="${plugins} sa-junk-plugin"
-	fi
-
-	# The special cases
-
-	# remove this due to bug #128035 re-enable later if it doesn't dep on
-	# gstreamer-0.8
-	# use gstreamer && plugins="${plugins} audio-inline"
-	use dbus && plugins="${plugins} new-mail-notify"
-	use mono && plugins="${plugins} mono"
-
-	if built_with_use gnome-extra/evolution-data-server ldap; then
-		plugins="${plugins} exchange-operations"
-	fi
-
-	local pluginlist=""
-	for p in $plugins; do
-		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
-		pluginlist="${pluginlist}${p}"
-	done
-
-	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-
-	gnome2_omf_fix help/omf.make
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
-
-	# Move evo to URI-based saving
-	epatch ${FILESDIR}/${PN}-2.8.0-uri.patch.gz
-
-	# Fix 64-bit warnings
-	epatch ${FILESDIR}/${PN}-2.8.0-64-bit.patch
-
-	# Fix missing includes
-	epatch ${FILESDIR}/${PN}-2.8.0-includes.patch
-
-	# Fix blank replys
-	epatch ${FILESDIR}/${PN}-2.8.0-blank-reply.patch
-
-	# Fix non-selection after delete
-	epatch ${FILESDIR}/${P}-fix-message-deletion.patch
-
-	# Add bogofilter junk plugin source
-	use bogofilter && epatch ${FILESDIR}/${PN}-2.7.3-bf-junk.patch.gz
-
-
-	eaclocal || die
-	_elibtoolize --copy --force || die
-	eautoheader || die
-	eautomake || die
-	intltoolize --force || die
-	eautoconf || die
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	einfo "To change the default browser if you are not using GNOME, do:"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/evolution-2.8.1-r1.ebuild b/mail-client/evolution/evolution-2.8.1-r1.ebuild
deleted file mode 100644
index 0fec94691a63..000000000000
--- a/mail-client/evolution/evolution-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,203 +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/evolution/evolution-2.8.1-r1.ebuild,v 1.1 2006/10/13 21:06:47 dang Exp $
-
-inherit eutils flag-o-matic alternatives gnome2 autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="bogofilter crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-# evolution-data-server dep is 1.5 because in the e-utils directories,
-# the includes reference locations only present in eds > 1.5
-RDEPEND=">=x11-themes/gnome-icon-theme-1.2
-	dev-libs/atk
-	>=gnome-extra/gtkhtml-3.9.90
-	>=dev-libs/glib-2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.7.90
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.7
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2.96
-	>=x11-libs/pango-1.8.1
-	x11-libs/libnotify
-	hal? ( >=sys-apps/hal-0.5.4 )
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( >=dev-libs/nspr-4.6.1
-		   >=dev-libs/nss-3.11 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	dbus? ( sys-apps/dbus )
-	mono? ( >=dev-lang/mono-1 )
-	bogofilter? ( mail-filter/bogofilter )
-	!bogofilter? ( mail-filter/spamassassin )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="calendar-file calendar-http calendar-weather \
-		itip-formatter plugin-manager default-source addressbook-file \
-		startup-wizard print-message mark-all-read groupwise-features \
-		groupwise-account-setup hula-account-setup mail-account-disable \
-		publish-calendar caldav \
-		bbdb subject-thread save-calendar select-one-source copy-tool \
-		mail-to-task mark-calendar-offline mailing-list-actions \
-		new-mail-notify default-mailer import-ics-attachments"
-
-	# For dev releases, add experimental plugins
-	plugins="${plugins} backup-restore folder-unsubscribe mail-to-meeting \
-		prefer-plain save-attachments"
-
-	if use bogofilter; then
-		plugins="${plugins} bf-junk-plugin"
-	else
-		plugins="${plugins} sa-junk-plugin"
-	fi
-
-	# The special cases
-
-	# remove this due to bug #128035 re-enable later if it doesn't dep on
-	# gstreamer-0.8
-	# use gstreamer && plugins="${plugins} audio-inline"
-	use dbus && plugins="${plugins} new-mail-notify"
-	use mono && plugins="${plugins} mono"
-
-	if built_with_use gnome-extra/evolution-data-server ldap; then
-		plugins="${plugins} exchange-operations"
-	fi
-
-	local pluginlist=""
-	for p in $plugins; do
-		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
-		pluginlist="${pluginlist}${p}"
-	done
-
-	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-
-	gnome2_omf_fix help/omf.make
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
-
-	# Move evo to URI-based saving
-	epatch ${FILESDIR}/${PN}-2.8.0-uri.patch.gz
-
-	# Fix 64-bit warnings
-	epatch ${FILESDIR}/${P}-64-bit.patch
-
-	# Fix filter-bar crash
-	epatch ${FILESDIR}/${P}-filter-bar-crash.patch
-
-	# Add bogofilter junk plugin source
-	use bogofilter && epatch ${FILESDIR}/${PN}-2.7.3-bf-junk.patch.gz
-
-
-	eaclocal || die
-	_elibtoolize --copy --force || die
-	eautoheader || die
-	eautomake || die
-	intltoolize --force || die
-	eautoconf || die
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	einfo "To change the default browser if you are not using GNOME, do:"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/files/digest-evolution-2.4.2.1 b/mail-client/evolution/files/digest-evolution-2.4.2.1
deleted file mode 100644
index a62a87a833a2..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.4.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cee3e0ac6ca43e5060468c3b938bea72 evolution-2.4.2.1.tar.bz2 11503590
-RMD160 cb72e939fbd651a43ae09e0341f47e6ebf490c56 evolution-2.4.2.1.tar.bz2 11503590
-SHA256 eae8fed13de8eee9f60606ec0e645876e4b9a1e9bb30d21dace54e3995ca5f40 evolution-2.4.2.1.tar.bz2 11503590
diff --git a/mail-client/evolution/files/digest-evolution-2.8.0-r1 b/mail-client/evolution/files/digest-evolution-2.8.0-r1
deleted file mode 100644
index 8b7e069d7086..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.8.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-MD5 fdcdaa4f6c11cb3b42078262838967d7 evolution-2.8.0.tar.bz2 12821926
-RMD160 ba73d9529a02f2ea6db8c8f2c7da3041276e1d5c evolution-2.8.0.tar.bz2 12821926
-SHA256 1d83cbea7ef5b86df5eea5f553a0c3be3d157ed20bb8469b467f30cf18bb3320 evolution-2.8.0.tar.bz2 12821926
diff --git a/mail-client/evolution/files/digest-evolution-2.8.1-r1 b/mail-client/evolution/files/digest-evolution-2.8.1-r1
deleted file mode 100644
index 94690e15dbe4..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.8.1-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-MD5 6a08d1121bc126c4ed7035ab94a09871 evolution-2.8.1.tar.bz2 12873039
-RMD160 8a06f9a3d1a402d3e92edf1de623b07b09322059 evolution-2.8.1.tar.bz2 12873039
-SHA256 91d3e7c7fd961959fc01abcd7bb18747bfd8fe8b90bd91f03b4392b11f0e3a7b evolution-2.8.1.tar.bz2 12873039
diff --git a/mail-client/evolution/files/evolution-2.0.3-gentoo_etc_services.patch b/mail-client/evolution/files/evolution-2.0.3-gentoo_etc_services.patch
deleted file mode 100644
index 41b20cb9302e..000000000000
--- a/mail-client/evolution/files/evolution-2.0.3-gentoo_etc_services.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur evolution-2.0.3/camel/providers/imap/camel-imap-store.c evolution-2.0.3-patched/camel/providers/imap/camel-imap-store.c
---- evolution-2.0.3/camel/providers/imap/camel-imap-store.c	2004-12-06 15:46:51.000000000 +0800
-+++ evolution-2.0.3-patched/camel/providers/imap/camel-imap-store.c	2004-12-30 00:26:50.274319864 +0800
-@@ -534,7 +534,7 @@
- 		serv = g_alloca(16);
- 		sprintf(serv, "%d", service->url->port);
- 	} else {
--		serv = "imap";
-+		serv = "imap2";
- 		port = IMAP_PORT;
- 	}
- 	
-diff -ur evolution-2.0.3/camel/providers/pop3/camel-pop3-store.c evolution-2.0.3-patched/camel/providers/pop3/camel-pop3-store.c
---- evolution-2.0.3/camel/providers/pop3/camel-pop3-store.c	2004-12-06 15:46:51.000000000 +0800
-+++ evolution-2.0.3-patched/camel/providers/pop3/camel-pop3-store.c	2004-12-30 00:28:05.128940232 +0800
-@@ -159,7 +159,7 @@
- 		serv = g_alloca(16);
- 		sprintf(serv, "%d", service->url->port);
- 	} else {
--		serv = "pop3";
-+		serv = "pop-3";
- 		port = "110";
- 	}
- 		
-diff -ur evolution-2.0.3/camel/providers/smtp/camel-smtp-transport.c evolution-2.0.3-patched/camel/providers/smtp/camel-smtp-transport.c
---- evolution-2.0.3/camel/providers/smtp/camel-smtp-transport.c	2004-12-06 15:46:52.000000000 +0800
-+++ evolution-2.0.3-patched/camel/providers/smtp/camel-smtp-transport.c	2004-12-30 00:27:21.094634464 +0800
-@@ -263,7 +263,7 @@
- 			tcp_stream = camel_tcp_stream_ssl_new_raw (service->session, service->url->host, STARTTLS_FLAGS);
- 		} else {
- 			if (service->url->port == 0) {
--				serv = "smtps";
-+				serv = "ssmtp";
- 				port = "465";
- 			}
- 			tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, SSL_PORT_FLAGS);
diff --git a/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch b/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch
deleted file mode 100644
index c62eacd913c1..000000000000
--- a/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- evolution-2.2.3/calendar/gui/Makefile.am	2005-01-07 06:38:57.000000000 -0500
-+++ evolution-2.2.3.new/calendar/gui/Makefile.am	2005-07-19 17:30:27.000000000 -0400
-@@ -216,6 +216,7 @@
- libevolution_calendar_la_LIBADD =					\
- 	$(top_builddir)/widgets/menus/libmenus.la			\
- 	$(top_builddir)/shell/libeshell.la				\
-+	$(top_builddir)/mail/libevolution-mail.la			\
- 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
- 	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la		\
- 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
---- evolution-2.2.3/Makefile.am	2005-02-25 13:02:09.000000000 -0500
-+++ evolution-2.2.3.new/Makefile.am	2005-07-19 18:00:43.000000000 -0400
-@@ -40,10 +40,10 @@
- 	filter			\
- 	$(SMIME_DIR)		\
- 	addressbook		\
--	calendar		\
--        art                     \
- 	composer		\
- 	mail			\
-+	calendar		\
-+        art                     \
- 	plugins			\
- 	ui			\
- 	views			\
---- evolution-2.2.1.1/mail/Makefile.am	2005-01-24 22:06:54.000000000 -0500
-+++ evolution-2.2.1.1.new/mail/Makefile.am	2005-07-18 21:59:53.000000000 -0400
-@@ -197,6 +197,7 @@
- 	$(top_builddir)/filter/libfilter.la			\
- 	$(top_builddir)/widgets/menus/libmenus.la		\
- 	$(top_builddir)/addressbook/util/libeabutil.la		\
-+	$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
- 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
- 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
- 	$(SMIME_LIB)						\
diff --git a/mail-client/evolution/files/evolution-2.3.8-gentoo.patch b/mail-client/evolution/files/evolution-2.3.8-gentoo.patch
deleted file mode 100644
index 15f9ef8bb3ff..000000000000
--- a/mail-client/evolution/files/evolution-2.3.8-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -NurdB evolution-2.3.8/widgets/misc/e-canvas-background.c evolution-2.3.8-patched/widgets/misc/e-canvas-background.c
---- evolution-2.3.8/widgets/misc/e-canvas-background.c	2005-08-22 05:52:55.000000000 -0500
-+++ evolution-2.3.8-patched/widgets/misc/e-canvas-background.c	2005-09-01 23:13:54.000000000 -0500
-@@ -427,6 +427,7 @@
- ecb_style_set (ECanvasBackground *ecb, GtkStyle *previous_style)
- {
- 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (ecb);
-+	g_return_if_fail (ecb->priv->gc != NULL);
- 	gdk_gc_set_foreground (ecb->priv->gc, &GTK_WIDGET(item->canvas)->style->base[GTK_STATE_NORMAL]);
- 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ecb));
- }
diff --git a/mail-client/evolution/files/evolution-2.4.2.1-link.patch b/mail-client/evolution/files/evolution-2.4.2.1-link.patch
deleted file mode 100644
index 6215f0f0534e..000000000000
--- a/mail-client/evolution/files/evolution-2.4.2.1-link.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- evolution-2.4.2.1/widgets/misc/Makefile.am	2005-07-11 04:44:02.000000000 -0400
-+++ evolution-2.4.2.1.new/widgets/misc/Makefile.am	2005-12-08 12:56:16.000000000 -0500
-@@ -156,6 +156,7 @@
- test_calendar_LDADD = 						\
- 	./libemiscwidgets.la					\
- 	$(top_builddir)/e-util/libeutil.la			\
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- # test-dateedit
-@@ -166,6 +167,7 @@
- test_dateedit_LDADD = 			\
- 	./libemiscwidgets.la		\
- 	$(top_builddir)/e-util/libeutil.la	\
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- # test-dropdown-button
-@@ -176,6 +178,7 @@
- test_dropdown_button_LDADD =	\
- 	./libemiscwidgets.la	\
- 	$(top_builddir)/e-util/libeutil.la  \
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- # test-multi-config-dialog
-@@ -186,6 +189,7 @@
- test_multi_config_dialog_LDADD = 	\
- 	./libemiscwidgets.la		\
- 	$(top_builddir)/e-util/libeutil.la	\
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- # test-info-label
-@@ -196,6 +200,7 @@
- test_info_label_LDADD = 		\
- 	./libemiscwidgets.la	\
- 	$(top_builddir)/e-util/libeutil.la	\
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- BUILT_SOURCES = $(MARSHAL_GENERATED)
---- evolution-2.4.2.1/shell/Makefile.am	2005-08-18 00:35:30.000000000 -0400
-+++ evolution-2.4.2.1.new/shell/Makefile.am	2005-12-08 13:08:53.000000000 -0500
-@@ -142,6 +142,7 @@
- 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
- 	$(top_builddir)/e-util/libeutil.la				\
-+	$(top_builddir)/widgets/table/libetable.la			\
- 	$(TZDIALOG_LIBS)						\
- 	$(SHELL_LIBS)
- 
---- evolution-2.4.2.1/calendar/gui/alarm-notify/Makefile.am	2005-08-25 06:26:28.000000000 -0400
-+++ evolution-2.4.2.1.new/calendar/gui/alarm-notify/Makefile.am	2005-12-08 13:24:09.000000000 -0500
-@@ -50,6 +50,7 @@
- 	$(top_builddir)/e-util/libeutil.la				\
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
- 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
-+	$(top_builddir)/widgets/table/libetable.la			\
- 	$(CAMEL_LIBS)							\
- 	$(EVOLUTION_CALENDAR_LIBS)
- 
---- evolution-2.4.2.1/tools/Makefile.am	2005-08-10 06:38:36.000000000 -0400
-+++ evolution-2.4.2.1.new/tools/Makefile.am	2005-12-08 13:49:46.000000000 -0500
-@@ -40,6 +40,7 @@
- killev_LDADD =							\
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
- 	$(top_builddir)/e-util/libeutil.la			\
-+	$(top_builddir)/widgets/table/libetable.la		\
- 	$(E_UTIL_LIBS)
- 
- CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES)
diff --git a/mail-client/evolution/files/evolution-2.8.0-64-bit.patch b/mail-client/evolution/files/evolution-2.8.0-64-bit.patch
deleted file mode 100644
index 0860f297a09a..000000000000
--- a/mail-client/evolution/files/evolution-2.8.0-64-bit.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/a11y/calendar/ea-gnome-calendar.c evolution-2.7.91.64-bit/a11y/calendar/ea-gnome-calendar.c
---- evolution-2.7.91.orig/a11y/calendar/ea-gnome-calendar.c	2004-10-29 05:56:35.000000000 -0400
-+++ evolution-2.7.91.64-bit/a11y/calendar/ea-gnome-calendar.c	2006-08-24 13:18:28.000000000 -0400
-@@ -29,6 +29,7 @@
- #include <gtk/gtknotebook.h>
- #include <libecal/e-cal-time-util.h>
- #include <libgnome/gnome-i18n.h>
-+#include <libedataserver/e-data-server-util.h>
- 
- static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/addressbook/gui/widgets/e-minicard.c evolution-2.7.91.64-bit/addressbook/gui/widgets/e-minicard.c
---- evolution-2.7.91.orig/addressbook/gui/widgets/e-minicard.c	2006-07-22 07:14:49.000000000 -0400
-+++ evolution-2.7.91.64-bit/addressbook/gui/widgets/e-minicard.c	2006-08-24 13:18:28.000000000 -0400
-@@ -40,6 +40,7 @@
- #include "e-minicard-view.h"
- #include "e-contact-editor.h"
- #include <e-util/e-icon-factory.h>
-+#include <e-util/e-html-utils.h>
- #include <libebook/e-destination.h>
- #include "a11y/addressbook/ea-addressbook.h"
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/dialogs/memo-page.h evolution-2.7.91.64-bit/calendar/gui/dialogs/memo-page.h
---- evolution-2.7.91.orig/calendar/gui/dialogs/memo-page.h	2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/dialogs/memo-page.h	2006-08-24 13:18:28.000000000 -0400
-@@ -53,6 +53,8 @@
- GtkType   memo_page_get_type  (void);
- MemoPage *memo_page_construct (MemoPage *epage);
- MemoPage *memo_page_new       (BonoboUIComponent *uic, CompEditorPageFlags flags);
-+void memo_page_set_show_categories (MemoPage *page, gboolean state);
-+void memo_page_set_classification (MemoPage *page, ECalComponentClassification class);
- 
- G_END_DECLS
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-calendar-view.h evolution-2.7.91.64-bit/calendar/gui/e-calendar-view.h
---- evolution-2.7.91.orig/calendar/gui/e-calendar-view.h	2006-08-07 00:47:42.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-calendar-view.h	2006-08-24 13:18:28.000000000 -0400
-@@ -166,6 +166,12 @@
- 					       gboolean new);
- 
- gboolean	e_calendar_view_get_tooltips (ECalendarViewEventData *data);
-+void e_calendar_view_move_tip (GtkWidget *widget, int x, int y);
-+#ifdef ENABLE_CAIRO
-+void draw_curved_rectangle (cairo_t *cr, double x0, double y0,
-+			double rect_width, double rect_height,
-+			double radius);
-+#endif
- G_END_DECLS
- 
- #endif
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-cal-model-tasks.h evolution-2.7.91.64-bit/calendar/gui/e-cal-model-tasks.h
---- evolution-2.7.91.orig/calendar/gui/e-cal-model-tasks.h	2005-10-03 02:16:51.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-cal-model-tasks.h	2006-08-24 13:18:28.000000000 -0400
-@@ -63,6 +63,7 @@
- 
- void            e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row);
- void e_cal_model_tasks_update_due_tasks (ECalModelTasks *model);
-+void e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
- 
- G_END_DECLS
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-day-view.c evolution-2.7.91.64-bit/calendar/gui/e-day-view.c
---- evolution-2.7.91.orig/calendar/gui/e-day-view.c	2006-08-07 00:47:43.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-day-view.c	2006-08-24 13:18:28.000000000 -0400
-@@ -65,6 +65,7 @@
- #include "calendar-commands.h"
- #include "calendar-config.h"
- #include "goto.h"
-+#include "e-calendar-view.h"
- #include "e-cal-model-calendar.h"
- #include "e-day-view-time-item.h"
- #include "e-day-view-top-item.h"
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-meeting-store.c evolution-2.7.91.64-bit/calendar/gui/e-meeting-store.c
---- evolution-2.7.91.orig/calendar/gui/e-meeting-store.c	2006-04-22 00:39:20.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-meeting-store.c	2006-08-24 13:18:28.000000000 -0400
-@@ -1472,7 +1472,7 @@
- guint
- e_meeting_store_get_num_queries (EMeetingStore *store)
- {
--	g_return_if_fail (E_IS_MEETING_STORE (store));
-+	g_return_val_if_fail (E_IS_MEETING_STORE (store), 0);
- 
- 	return store->priv->num_queries;
- }
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-week-view.c evolution-2.7.91.64-bit/calendar/gui/e-week-view.c
---- evolution-2.7.91.orig/calendar/gui/e-week-view.c	2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-week-view.c	2006-08-24 13:18:28.000000000 -0400
-@@ -69,6 +69,7 @@
- #include "e-week-view-layout.h"
- #include "e-week-view-main-item.h"
- #include "e-week-view-titles-item.h"
-+#include "e-calendar-view.h"
- #include "misc.h"
- #include <e-util/e-icon-factory.h>
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/gnome-cal.h evolution-2.7.91.64-bit/calendar/gui/gnome-cal.h
---- evolution-2.7.91.orig/calendar/gui/gnome-cal.h	2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/gnome-cal.h	2006-08-24 13:18:29.000000000 -0400
-@@ -198,6 +198,7 @@
- 						 const char* comp_uid,
- 						 const char* comp_rid);
- 
-+GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
- G_END_DECLS
- 
- #endif
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/composer/e-msg-composer.c evolution-2.7.91.64-bit/composer/e-msg-composer.c
---- evolution-2.7.91.orig/composer/e-msg-composer.c	2006-08-07 00:47:43.000000000 -0400
-+++ evolution-2.7.91.64-bit/composer/e-msg-composer.c	2006-08-24 13:18:29.000000000 -0400
-@@ -63,6 +63,7 @@
- 
- #include <libgnome/gnome-exec.h>
- #include <libgnome/gnome-i18n.h>
-+#include <libgnome/gnome-help.h>
- #include <libgnomeui/gnome-uidefs.h>
- #include <libgnomeui/gnome-window-icon.h>
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/e-util/e-profile-event.c evolution-2.7.91.64-bit/e-util/e-profile-event.c
---- evolution-2.7.91.orig/e-util/e-profile-event.c	2006-02-08 06:43:02.000000000 -0500
-+++ evolution-2.7.91.64-bit/e-util/e-profile-event.c	2006-08-24 13:18:29.000000000 -0400
-@@ -133,12 +133,6 @@
- 
- 	e_event_emit((EEvent *)epe, "event", (EEventTarget *)t);
- }
--#else
--#undef e_profile_event_emit
--void
--e_profile_event_emit(const char *id, const char *uid, guint32 flags)
--{
--}
- #endif
- 
- /* ********************************************************************** */
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/e-util/e-util.h evolution-2.7.91.64-bit/e-util/e-util.h
---- evolution-2.7.91.orig/e-util/e-util.h	2006-07-22 07:14:52.000000000 -0400
-+++ evolution-2.7.91.64-bit/e-util/e-util.h	2006-08-24 13:18:52.000000000 -0400
-@@ -29,6 +29,7 @@
- #include <limits.h>
- #include <gconf/gconf-client.h>
- #include <cairo.h>
-+#include <gtk/gtk.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/mail/em-folder-view.c evolution-2.7.91.64-bit/mail/em-folder-view.c
---- evolution-2.7.91.orig/mail/em-folder-view.c	2006-07-22 07:14:53.000000000 -0400
-+++ evolution-2.7.91.64-bit/mail/em-folder-view.c	2006-08-24 13:18:29.000000000 -0400
-@@ -69,6 +69,8 @@
- #include <gtkhtml/gtkhtml.h>
- #include <gtkhtml/gtkhtml-stream.h>
- 
-+#include <libedataserver/e-data-server-util.h>
-+
- #include "menus/gal-view-etable.h"
- #include "menus/gal-view-factory-etable.h"
- #include "menus/gal-view-instance.h"
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/mail/em-format-html-display.c evolution-2.7.91.64-bit/mail/em-format-html-display.c
---- evolution-2.7.91.orig/mail/em-format-html-display.c	2006-08-07 00:47:44.000000000 -0400
-+++ evolution-2.7.91.64-bit/mail/em-format-html-display.c	2006-08-24 13:18:29.000000000 -0400
-@@ -42,6 +42,7 @@
- #include <gtkhtml/gtkhtml-embedded.h>
- #include <gtkhtml/gtkhtml-search.h>
- 
-+#include <gtk/gtk.h>
- #include <gtk/gtkeventbox.h>
- #include <gtk/gtkvbox.h>
- #include <gtk/gtkhbox.h>
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/plugins/mono/mono-plugin.c evolution-2.7.91.64-bit/plugins/mono/mono-plugin.c
---- evolution-2.7.91.orig/plugins/mono/mono-plugin.c	2005-12-17 13:47:10.000000000 -0500
-+++ evolution-2.7.91.64-bit/plugins/mono/mono-plugin.c	2006-08-24 13:18:29.000000000 -0400
-@@ -8,6 +8,7 @@
- #include <mono/metadata/object.h>
- #include <mono/metadata/appdomain.h>
- #include <mono/metadata/assembly.h>
-+#include <mono/metadata/threads.h>
- #include <mono/jit/jit.h>
- 
- #define d(x)
diff --git a/mail-client/evolution/files/evolution-2.8.0-blank-reply.patch b/mail-client/evolution/files/evolution-2.8.0-blank-reply.patch
deleted file mode 100644
index 6ad938bb234f..000000000000
--- a/mail-client/evolution/files/evolution-2.8.0-blank-reply.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.0.orig/mail/em-folder-view.c evolution-2.8.0/mail/em-folder-view.c
---- evolution-2.8.0.orig/mail/em-folder-view.c	2006-09-02 02:43:04.000000000 -0400
-+++ evolution-2.8.0/mail/em-folder-view.c	2006-09-06 12:24:49.000000000 -0400
-@@ -1486,7 +1486,7 @@
- 
- 	if (gtk_html_command(((EMFormatHTML *)emfv->preview)->html, "is-selection-active")
- 	    && (html = gtk_html_get_selection_html (((EMFormatHTML *)emfv->preview)->html, &len))
--	    && len) {
-+	    && len && html[0]) {
- 		CamelMimeMessage *msg, *src;
- 		struct _camel_header_raw *header;
- 		
diff --git a/mail-client/evolution/files/evolution-2.8.0-fix-message-deletion.patch b/mail-client/evolution/files/evolution-2.8.0-fix-message-deletion.patch
deleted file mode 100644
index f53f23c6e8f4..000000000000
--- a/mail-client/evolution/files/evolution-2.8.0-fix-message-deletion.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- evolution-2.8.0/mail/em-folder-view.c.fix-message-deletion	2006-09-21 16:34:27.000000000 -0400
-+++ evolution-2.8.0/mail/em-folder-view.c	2006-09-21 16:34:40.000000000 -0400
-@@ -957,16 +957,9 @@
- 	count = em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED);
- 	
- 	if (count == 1) {
--		if (!emfv->list->threaded && !message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0) && emfv->hide_deleted)
-+		if (!message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0) && emfv->hide_deleted)
- 			message_list_select (emfv->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0);
--		else if (emfv->list->threaded) {
--			if (emfv->hide_deleted)
--				message_list_select_uid (emfv->list, "");
--			else 
--				message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0);
--		}
- 	}
--
- }
- 
- static void
diff --git a/mail-client/evolution/files/evolution-2.8.0-includes.patch b/mail-client/evolution/files/evolution-2.8.0-includes.patch
deleted file mode 100644
index e6c8a8ff957d..000000000000
--- a/mail-client/evolution/files/evolution-2.8.0-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/widgets/misc/e-attachment-bar.h evolution-2.7.91.includes/widgets/misc/e-attachment-bar.h
---- evolution-2.7.91.orig/widgets/misc/e-attachment-bar.h	2006-05-31 23:30:06.000000000 -0400
-+++ evolution-2.7.91.includes/widgets/misc/e-attachment-bar.h	2006-08-24 12:19:22.000000000 -0400
-@@ -82,6 +82,7 @@
- GSList *e_attachment_bar_get_selected (EAttachmentBar *bar);
- void e_attachment_bar_set_width(EAttachmentBar *bar, int bar_width);
- GSList * e_attachment_bar_get_all_attachments (EAttachmentBar *bar);
-+void e_attachment_bar_create_attachment_cache (EAttachment *attachment);
- 
- #ifdef __cplusplus
- }
diff --git a/mail-client/evolution/files/evolution-2.8.1-64-bit.patch b/mail-client/evolution/files/evolution-2.8.1-64-bit.patch
deleted file mode 100644
index 2c59dbfbc9da..000000000000
--- a/mail-client/evolution/files/evolution-2.8.1-64-bit.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/a11y/calendar/ea-gnome-calendar.c evolution-2.8.1/a11y/calendar/ea-gnome-calendar.c
---- evolution-2.8.1.orig/a11y/calendar/ea-gnome-calendar.c	2006-09-30 01:24:35.000000000 -0400
-+++ evolution-2.8.1/a11y/calendar/ea-gnome-calendar.c	2006-10-13 12:12:10.000000000 -0400
-@@ -30,6 +30,7 @@
- #include <libecal/e-cal-time-util.h>
- #include <libedataserver/e-data-server-util.h>
- #include <libgnome/gnome-i18n.h>
-+#include <libedataserver/e-data-server-util.h>
- 
- static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/addressbook/gui/widgets/e-minicard.c evolution-2.8.1/addressbook/gui/widgets/e-minicard.c
---- evolution-2.8.1.orig/addressbook/gui/widgets/e-minicard.c	2006-10-02 02:25:24.000000000 -0400
-+++ evolution-2.8.1/addressbook/gui/widgets/e-minicard.c	2006-10-13 12:12:10.000000000 -0400
-@@ -41,6 +41,7 @@
- #include "e-contact-editor.h"
- #include <e-util/e-html-utils.h>
- #include <e-util/e-icon-factory.h>
-+#include <e-util/e-html-utils.h>
- #include <libebook/e-destination.h>
- #include "a11y/addressbook/ea-addressbook.h"
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-cal-model-tasks.h evolution-2.8.1/calendar/gui/e-cal-model-tasks.h
---- evolution-2.8.1.orig/calendar/gui/e-cal-model-tasks.h	2006-09-30 01:24:36.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/e-cal-model-tasks.h	2006-10-13 12:12:10.000000000 -0400
-@@ -64,6 +64,7 @@
- void            e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row);
- void            e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
- void e_cal_model_tasks_update_due_tasks (ECalModelTasks *model);
-+void e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
- 
- G_END_DECLS
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-day-view.c evolution-2.8.1/calendar/gui/e-day-view.c
---- evolution-2.8.1.orig/calendar/gui/e-day-view.c	2006-08-07 00:47:43.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/e-day-view.c	2006-10-13 12:12:10.000000000 -0400
-@@ -65,6 +65,7 @@
- #include "calendar-commands.h"
- #include "calendar-config.h"
- #include "goto.h"
-+#include "e-calendar-view.h"
- #include "e-cal-model-calendar.h"
- #include "e-day-view-time-item.h"
- #include "e-day-view-top-item.h"
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-meeting-store.c evolution-2.8.1/calendar/gui/e-meeting-store.c
---- evolution-2.8.1.orig/calendar/gui/e-meeting-store.c	2006-04-22 00:39:20.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/e-meeting-store.c	2006-10-13 12:12:10.000000000 -0400
-@@ -1472,7 +1472,7 @@
- guint
- e_meeting_store_get_num_queries (EMeetingStore *store)
- {
--	g_return_if_fail (E_IS_MEETING_STORE (store));
-+	g_return_val_if_fail (E_IS_MEETING_STORE (store), 0);
- 
- 	return store->priv->num_queries;
- }
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-week-view.c evolution-2.8.1/calendar/gui/e-week-view.c
---- evolution-2.8.1.orig/calendar/gui/e-week-view.c	2006-09-30 01:24:36.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/e-week-view.c	2006-10-13 12:12:10.000000000 -0400
-@@ -69,6 +69,7 @@
- #include "e-week-view-layout.h"
- #include "e-week-view-main-item.h"
- #include "e-week-view-titles-item.h"
-+#include "e-calendar-view.h"
- #include "misc.h"
- #include <e-util/e-icon-factory.h>
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/gnome-cal.h evolution-2.8.1/calendar/gui/gnome-cal.h
---- evolution-2.8.1.orig/calendar/gui/gnome-cal.h	2006-09-30 01:24:36.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/gnome-cal.h	2006-10-13 12:12:10.000000000 -0400
-@@ -200,6 +200,7 @@
- 
- GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
- 
-+GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
- G_END_DECLS
- 
- #endif
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/composer/e-msg-composer.c evolution-2.8.1/composer/e-msg-composer.c
---- evolution-2.8.1.orig/composer/e-msg-composer.c	2006-09-30 01:24:40.000000000 -0400
-+++ evolution-2.8.1/composer/e-msg-composer.c	2006-10-13 12:12:10.000000000 -0400
-@@ -64,6 +64,7 @@
- #include <libgnome/gnome-exec.h>
- #include <libgnome/gnome-help.h>
- #include <libgnome/gnome-i18n.h>
-+#include <libgnome/gnome-help.h>
- #include <libgnomeui/gnome-uidefs.h>
- #include <libgnomeui/gnome-window-icon.h>
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/e-util/e-profile-event.c evolution-2.8.1/e-util/e-profile-event.c
---- evolution-2.8.1.orig/e-util/e-profile-event.c	2006-02-08 06:43:02.000000000 -0500
-+++ evolution-2.8.1/e-util/e-profile-event.c	2006-10-13 12:12:10.000000000 -0400
-@@ -133,12 +133,6 @@
- 
- 	e_event_emit((EEvent *)epe, "event", (EEventTarget *)t);
- }
--#else
--#undef e_profile_event_emit
--void
--e_profile_event_emit(const char *id, const char *uid, guint32 flags)
--{
--}
- #endif
- 
- /* ********************************************************************** */
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/e-util/e-util.h evolution-2.8.1/e-util/e-util.h
---- evolution-2.8.1.orig/e-util/e-util.h	2006-09-02 02:42:18.000000000 -0400
-+++ evolution-2.8.1/e-util/e-util.h	2006-10-13 12:12:10.000000000 -0400
-@@ -29,6 +29,7 @@
- #include <limits.h>
- #include <gconf/gconf-client.h>
- #include <cairo.h>
-+#include <gtk/gtk.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/mail/em-format-html-display.c evolution-2.8.1/mail/em-format-html-display.c
---- evolution-2.8.1.orig/mail/em-format-html-display.c	2006-09-30 02:22:49.000000000 -0400
-+++ evolution-2.8.1/mail/em-format-html-display.c	2006-10-13 12:12:14.000000000 -0400
-@@ -42,6 +42,7 @@
- #include <gtkhtml/gtkhtml-embedded.h>
- #include <gtkhtml/gtkhtml-search.h>
- 
-+#include <gtk/gtk.h>
- #include <gtk/gtkeventbox.h>
- #include <gtk/gtkvbox.h>
- #include <gtk/gtkhbox.h>
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/plugins/mono/mono-plugin.c evolution-2.8.1/plugins/mono/mono-plugin.c
---- evolution-2.8.1.orig/plugins/mono/mono-plugin.c	2005-12-17 13:47:10.000000000 -0500
-+++ evolution-2.8.1/plugins/mono/mono-plugin.c	2006-10-13 12:12:14.000000000 -0400
-@@ -8,6 +8,7 @@
- #include <mono/metadata/object.h>
- #include <mono/metadata/appdomain.h>
- #include <mono/metadata/assembly.h>
-+#include <mono/metadata/threads.h>
- #include <mono/jit/jit.h>
- 
- #define d(x)
diff --git a/mail-client/evolution/files/evolution-2.8.1-filter-bar-crash.patch b/mail-client/evolution/files/evolution-2.8.1-filter-bar-crash.patch
deleted file mode 100644
index 26badb75a5a3..000000000000
--- a/mail-client/evolution/files/evolution-2.8.1-filter-bar-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/widgets/misc/e-filter-bar.c evolution-2.8.1/widgets/misc/e-filter-bar.c
---- evolution-2.8.1.orig/widgets/misc/e-filter-bar.c	2006-09-30 01:24:50.000000000 -0400
-+++ evolution-2.8.1/widgets/misc/e-filter-bar.c	2006-10-13 15:31:15.000000000 -0400
-@@ -120,7 +120,7 @@
- 			
- 			efb->current_query = rule;
- 			g_object_ref (rule);
--			g_signal_emit_by_name (efb, "query_changed");
-+			g_signal_emit_by_name (efb, "search_activated");
- 
- 			gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
- 			gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
-@@ -684,6 +684,8 @@
- 					view_id = xml_get_prop_int (node, "view_id");
- 					scope = xml_get_prop_int (node, "searchscope");
- 					item_id = xml_get_prop_int (node, "item_id");
-+					if (item_id == -1)
-+						item_id = 0;
- 
- 					if (scope == E_FILTERBAR_CURRENT_FOLDER_ID)
- 						is_cur_folder = TRUE;
-@@ -770,7 +772,9 @@
- 						gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL);		
- 						gtk_widget_modify_base (((ESearchBar *)efb)->icon_entry, GTK_STATE_NORMAL, NULL);
- 						e_search_bar_paint (esb);
--						efb->current_query = NULL;
-+						efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base];
-+						if (efb->config && efb->current_query)
-+							efb->config (efb, efb->current_query, item_id, "", efb->config_data);						
- 					}
- 					
- 					xmlFree (text);