Clean up for bug #140527

(Portage version: 2.1.1_pre3)
 (Unsigned Manifest commit)

12 files changed, 8 insertions, 1281 deletions

diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 1f0f80b1e0c9..4e7b27cbe38e 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -10,10 +10,6 @@ AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742bedd
 MD5 d3b6df49d772fdf4425d4c2376bc7173 files/secrets.cf 664
 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a files/secrets.cf 664
 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139 files/secrets.cf 664
-AUX spamassassin-3.1.1-lint-de.diff 3779 RMD160 a28f308380634e607d307763b51b381bd254b173 SHA1 4e17202f9090e0b0f18cf37307463a3f1e21a669 SHA256 b5c405e8fd698a3360d4255ad0533ee8e0f2a8be587e4936d1e3d30c7369e907
-MD5 3b1ec9cd3b71b0c0fbd4db9a0a9715e5 files/spamassassin-3.1.1-lint-de.diff 3779
-RMD160 a28f308380634e607d307763b51b381bd254b173 files/spamassassin-3.1.1-lint-de.diff 3779
-SHA256 b5c405e8fd698a3360d4255ad0533ee8e0f2a8be587e4936d1e3d30c7369e907 files/spamassassin-3.1.1-lint-de.diff 3779
 AUX spamassassin-3.1.3-bug-4930.diff 627 RMD160 159305a6523b39141797683e49312952c093f820 SHA1 bd005f211623af8312f8777196414485d7177139 SHA256 b9615710931f259956b878eb1f5c6edfe90fd4d591df90b5fe67fe3102a61c2d
 MD5 d7431feb86847e0f0166e9f13e9f9e28 files/spamassassin-3.1.3-bug-4930.diff 627
 RMD160 159305a6523b39141797683e49312952c093f820 files/spamassassin-3.1.3-bug-4930.diff 627
@@ -26,35 +22,12 @@ AUX spamd.init 617 RMD160 4624c79222ba863dc68e88a13f3de6bb0d579f89 SHA1 dc90ac2f
 MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617
 RMD160 4624c79222ba863dc68e88a13f3de6bb0d579f89 files/spamd.init 617
 SHA256 8b5abf70f7aac3ddcf7b258ce693f01dd4691048bb4f40a19c25a92e985321a8 files/spamd.init 617
-DIST Mail-SpamAssassin-3.0.4.tar.bz2 847365
 DIST Mail-SpamAssassin-3.1.0.tar.bz2 1012946 RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 SHA1 0185f076f619dd9e64e94b453017f9b08d4b0f04 SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4
-DIST Mail-SpamAssassin-3.1.1.tar.bz2 974527 RMD160 811a00bd79bb4d6c35cf107f3a67f60f488795fd SHA256 edcb4adca3e28914bb59b44c320e1139f133535928cd6dfaaa50d128ecce812f
-DIST Mail-SpamAssassin-3.1.2.tar.bz2 975060 RMD160 cde5ee2e9d0e2b4efdbd8b68367ca9508254a4c8 SHA1 aad32b73f2870182fe8f2dd5277e94d0da91b196 SHA256 43b932797494b4d2a299228b5c793181fb335dac6f78c099bd6ae3cda64f85d3
 DIST Mail-SpamAssassin-3.1.3.tar.bz2 975274 RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 SHA1 e1f4489ec8805985e0ca79765bde586bf0286725 SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4
-EBUILD spamassassin-3.0.4.ebuild 6561 RMD160 bc0e1a76c93306949b7b235cc2d8713b089857b0 SHA1 c1df899603985d82f8d01ee54f4a363e2168e5ab SHA256 959c26395036031dfe29ad0411ea537a221137d68939be91477274a96ff8aaa5
-MD5 d054996d958c54cab0a2f99acc44ce9e spamassassin-3.0.4.ebuild 6561
-RMD160 bc0e1a76c93306949b7b235cc2d8713b089857b0 spamassassin-3.0.4.ebuild 6561
-SHA256 959c26395036031dfe29ad0411ea537a221137d68939be91477274a96ff8aaa5 spamassassin-3.0.4.ebuild 6561
-EBUILD spamassassin-3.1.0-r1.ebuild 6737 RMD160 9192f1c8facf0f4d87d271f5cacfeaa55ad5e905 SHA1 e45c9a076bc20c09e4a729daeef54ff759a78d63 SHA256 66d6b428675c6bfefc4a053d34156d0b6ed115f6a2cf3986be3e61b8e78a941f
-MD5 5a1429650c999fd901d0bd156f522797 spamassassin-3.1.0-r1.ebuild 6737
-RMD160 9192f1c8facf0f4d87d271f5cacfeaa55ad5e905 spamassassin-3.1.0-r1.ebuild 6737
-SHA256 66d6b428675c6bfefc4a053d34156d0b6ed115f6a2cf3986be3e61b8e78a941f spamassassin-3.1.0-r1.ebuild 6737
-EBUILD spamassassin-3.1.0-r2.ebuild 6836 RMD160 dfc676c21f12460df64fefedf2b01ada83742a6a SHA1 d028f41f3d46cb9b79161565a9519119adf4e6a0 SHA256 a4ee5488f45cc1fd47d5a21d7874e71c5e8fdb784a3d4bda372757267030b4ec
-MD5 c415f6600f4680f9fa0a07d8b30f9444 spamassassin-3.1.0-r2.ebuild 6836
-RMD160 dfc676c21f12460df64fefedf2b01ada83742a6a spamassassin-3.1.0-r2.ebuild 6836
-SHA256 a4ee5488f45cc1fd47d5a21d7874e71c5e8fdb784a3d4bda372757267030b4ec spamassassin-3.1.0-r2.ebuild 6836
-EBUILD spamassassin-3.1.0.ebuild 6548 RMD160 3b0c215e71b024ac4c1a96e5aee173da8303bb2b SHA1 ff6d8d9af66437b2e3feddd89bd62b5c4b8fc67d SHA256 1934133d522d65f45a0a147e0ae1699148b526b2dc4c5b36cd94199064d65271
-MD5 63777d17906e1c96d8a194d8335385f5 spamassassin-3.1.0.ebuild 6548
-RMD160 3b0c215e71b024ac4c1a96e5aee173da8303bb2b spamassassin-3.1.0.ebuild 6548
-SHA256 1934133d522d65f45a0a147e0ae1699148b526b2dc4c5b36cd94199064d65271 spamassassin-3.1.0.ebuild 6548
-EBUILD spamassassin-3.1.1.ebuild 7910 RMD160 69cca26480802821b24a59faa53c10adb1f83734 SHA1 7daf85f99eb5e858a21222225faf0f8b20173184 SHA256 a798f0ea81b3d07dd864795da7741d950d26ddbd458814b1f09b08731430de5a
-MD5 7f0c87bd783f395b6c87c479edcba6b3 spamassassin-3.1.1.ebuild 7910
-RMD160 69cca26480802821b24a59faa53c10adb1f83734 spamassassin-3.1.1.ebuild 7910
-SHA256 a798f0ea81b3d07dd864795da7741d950d26ddbd458814b1f09b08731430de5a spamassassin-3.1.1.ebuild 7910
-EBUILD spamassassin-3.1.2.ebuild 7845 RMD160 d667ae17f5062da42686b4a5c49dd5a2a2e38bbc SHA1 b0af5a5b1d2391fc3631ce60ed3ca1a8fa558a95 SHA256 59b95fe9ad574db0818426eb80a341fc218b8359beb819638a4c61e579f76b99
-MD5 7dc45eaca25f274ff9267ffa1318abc1 spamassassin-3.1.2.ebuild 7845
-RMD160 d667ae17f5062da42686b4a5c49dd5a2a2e38bbc spamassassin-3.1.2.ebuild 7845
-SHA256 59b95fe9ad574db0818426eb80a341fc218b8359beb819638a4c61e579f76b99 spamassassin-3.1.2.ebuild 7845
+EBUILD spamassassin-3.1.0.ebuild 6500 RMD160 855e73b34f75dd247892daeeaedccea6fd5ab140 SHA1 934db3c658b6a365378cdf5af8ff6673e5861333 SHA256 1c5150c0be7fa48f1185bc7c63c6ae05fe930154e4d77ff793178ac36908c5f2
+MD5 925e038959618d5d0a78eed2cc27d4e2 spamassassin-3.1.0.ebuild 6500
+RMD160 855e73b34f75dd247892daeeaedccea6fd5ab140 spamassassin-3.1.0.ebuild 6500
+SHA256 1c5150c0be7fa48f1185bc7c63c6ae05fe930154e4d77ff793178ac36908c5f2 spamassassin-3.1.0.ebuild 6500
 EBUILD spamassassin-3.1.3-r1.ebuild 8057 RMD160 303a6cbc6e8e48dbc3909431dce849683ecefd06 SHA1 5635fb60f2b59286f0615c057a7e5262237eeecc SHA256 063a0f24b41cf3dfd2053afe642d0c98699386c24d8916f896784eddbdb9d1a2
 MD5 27386d4542358191f0bd972e89555956 spamassassin-3.1.3-r1.ebuild 8057
 RMD160 303a6cbc6e8e48dbc3909431dce849683ecefd06 spamassassin-3.1.3-r1.ebuild 8057
@@ -63,32 +36,17 @@ EBUILD spamassassin-3.1.3.ebuild 7834 RMD160 b456eceae31a9a43862c95065c19ba8afa8
 MD5 e0b79272c10b1986d6327163c916ebd7 spamassassin-3.1.3.ebuild 7834
 RMD160 b456eceae31a9a43862c95065c19ba8afa88873c spamassassin-3.1.3.ebuild 7834
 SHA256 eec4f5b69a2f1be0a9a600ef3a65044674502ee8bfef2bc1be3326575bf5d8e2 spamassassin-3.1.3.ebuild 7834
-MISC ChangeLog 26185 RMD160 01d600ad973bd49b52c416397e7172d1ec9c7b46 SHA1 3ee85a3d076f2b83d718b6c73f5910858066e29f SHA256 0ccf8b5a2e899ee9a2513221dd7918fe90de4b720f2937a80bfb9e969284c57d
-MD5 9fc37b88a5277309bdea5cabcbf97ab3 ChangeLog 26185
-RMD160 01d600ad973bd49b52c416397e7172d1ec9c7b46 ChangeLog 26185
-SHA256 0ccf8b5a2e899ee9a2513221dd7918fe90de4b720f2937a80bfb9e969284c57d ChangeLog 26185
+MISC ChangeLog 26503 RMD160 62c17d898e571c7b45593607cffb8a81dbe19b89 SHA1 39b336141a0eca482e418a39147ed6c583ac1bdc SHA256 54f3346d356074f72a431908834e31766abaf6439705dda606f5e63a4b059368
+MD5 bbf55fb11f9032a3ed61e9a364313db5 ChangeLog 26503
+RMD160 62c17d898e571c7b45593607cffb8a81dbe19b89 ChangeLog 26503
+SHA256 54f3346d356074f72a431908834e31766abaf6439705dda606f5e63a4b059368 ChangeLog 26503
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
 SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
-MD5 4783482f6c574067f3c8fa48e3202fae files/digest-spamassassin-3.0.4 76
-RMD160 b7b5e479085c42b5b0a30bd5df858ad10f88b541 files/digest-spamassassin-3.0.4 76
-SHA256 6a52b28213070af05b519aaea3f9c8e5bd711c9e209535ce12c4d9c665201497 files/digest-spamassassin-3.0.4 76
 MD5 adfd3091f64ba62fc9f715b6022cc2b9 files/digest-spamassassin-3.1.0 277
 RMD160 2771e3b35b854a26b9a9a3476fb7bc1f7b1378eb files/digest-spamassassin-3.1.0 277
 SHA256 9f18bff4b76ba225ef01a49a7d0c1686cf0c5f037ee6f8296d820af5c9cd60d3 files/digest-spamassassin-3.1.0 277
-MD5 adfd3091f64ba62fc9f715b6022cc2b9 files/digest-spamassassin-3.1.0-r1 277
-RMD160 2771e3b35b854a26b9a9a3476fb7bc1f7b1378eb files/digest-spamassassin-3.1.0-r1 277
-SHA256 9f18bff4b76ba225ef01a49a7d0c1686cf0c5f037ee6f8296d820af5c9cd60d3 files/digest-spamassassin-3.1.0-r1 277
-MD5 d6f2ad1930ee7a36de0443fa6656ec88 files/digest-spamassassin-3.1.0-r2 277
-RMD160 005ad7ec092992819f493d1743a3be5dfb4ed782 files/digest-spamassassin-3.1.0-r2 277
-SHA256 265d522d398492e085649c9af06ab47b0d8dbb099e7684889f285a68bc79c2d4 files/digest-spamassassin-3.1.0-r2 277
-MD5 415094f6195c81f5c47aaee049ff7227 files/digest-spamassassin-3.1.1 274
-RMD160 d824ef6e600dd68cef91d6040369c8cf86f8df2f files/digest-spamassassin-3.1.1 274
-SHA256 27b1a488f7058c7bdbef88fb4db129bf01b41a2be392fb7afa3a151bb7b3fba6 files/digest-spamassassin-3.1.1 274
-MD5 a51abf22e224b87bef9ba74c14af8eba files/digest-spamassassin-3.1.2 274
-RMD160 c29c6fdf772adc8feb7e848e7afe272633da73c4 files/digest-spamassassin-3.1.2 274
-SHA256 968443cdc2caad4550af4a0d9b6066d7e1ad6a7241ebc7f3a9adf90416cdc763 files/digest-spamassassin-3.1.2 274
 MD5 53c722ea7ceaa67ec7f0738d9ea8eb3f files/digest-spamassassin-3.1.3 274
 RMD160 c9b7531ea7eb117ee77733b7a27fb9b692a806cd files/digest-spamassassin-3.1.3 274
 SHA256 f4af93fd5e39b91800c4e6ff5709d6e215b38b6a3497c5564d1249cac437aea8 files/digest-spamassassin-3.1.3 274
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.0.4 b/mail-filter/spamassassin/files/digest-spamassassin-3.0.4
deleted file mode 100644
index 130ab288c688..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba6e1bd95f6f9f3882f73212a11dbe46 Mail-SpamAssassin-3.0.4.tar.bz2 847365
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r1
deleted file mode 100644
index 6b0220b00c9f..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d28bd7e83d01b234144e336bbfde0caa Mail-SpamAssassin-3.1.0.tar.bz2 1012946
-RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
-SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r2 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r2
deleted file mode 100644
index d3361ea51677..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
-SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
-MD5 d28bd7e83d01b234144e336bbfde0caa Mail-SpamAssassin-3.1.0.tar.bz2 1012946
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.1 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.1
deleted file mode 100644
index ed1f2c2ccf4e..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 33bc2bef2619135125ccf3b5a663be1d Mail-SpamAssassin-3.1.1.tar.bz2 974527
-RMD160 811a00bd79bb4d6c35cf107f3a67f60f488795fd Mail-SpamAssassin-3.1.1.tar.bz2 974527
-SHA256 edcb4adca3e28914bb59b44c320e1139f133535928cd6dfaaa50d128ecce812f Mail-SpamAssassin-3.1.1.tar.bz2 974527
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.2 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.2
deleted file mode 100644
index 0d933f48a2da..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e1fb14def1265d6d7351ba27b5940da2 Mail-SpamAssassin-3.1.2.tar.bz2 975060
-RMD160 cde5ee2e9d0e2b4efdbd8b68367ca9508254a4c8 Mail-SpamAssassin-3.1.2.tar.bz2 975060
-SHA256 43b932797494b4d2a299228b5c793181fb335dac6f78c099bd6ae3cda64f85d3 Mail-SpamAssassin-3.1.2.tar.bz2 975060
diff --git a/mail-filter/spamassassin/files/spamassassin-3.1.1-lint-de.diff b/mail-filter/spamassassin/files/spamassassin-3.1.1-lint-de.diff
deleted file mode 100644
index fd13a188455c..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.1.1-lint-de.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- Mail-SpamAssassin-3.1.1/rules/30_text_de.cf.orig	2006-03-10 20:30:02.000000000 +0100
-+++ Mail-SpamAssassin-3.1.1/rules/30_text_de.cf	2006-04-21 21:01:07.582002500 +0200
-@@ -583,6 +583,15 @@
- lang de describe BAYES_80 Spamwahrscheinlichkeit nach Bayes-Test: 80-95%
- lang de describe BAYES_95 Spamwahrscheinlichkeit nach Bayes-Test: 95-99%
- lang de describe BAYES_99 Spamwahrscheinlichkeit nach Bayes-Test: 99-100%
-+lang de describe USER_IN_BLACKLIST Absenderadresse steht in Ihrer persönlichen schwarzen Liste
-+lang de describe USER_IN_WHITELIST Absenderadresse steht in Ihrer persönlichen weißen Liste
-+lang de describe USER_IN_DEF_WHITELIST Absenderadresse steht in der allgemeinen weißen Liste
-+lang de describe USER_IN_BLACKLIST_TO Empfängeradresse steht in Ihrer persönlichen schwarzen Liste
-+lang de describe USER_IN_WHITELIST_TO Empfängeradresse steht in Ihrer persönlichen weißen Liste
-+lang de describe USER_IN_MORE_SPAM_TO Empfängeradresse soll fast alle (Spam-) Nachrichten erhalten
-+lang de describe USER_IN_ALL_SPAM_TO Empfängeradresse soll alle (Spam-) Nachrichten erhalten
-+
-+ifplugin Mail::SpamAssassin::Plugin::Hashcash
- lang de describe HASHCASH_20 Enthält korrekte Hashcash-Kennzeichnung (20 bits)
- lang de describe HASHCASH_21 Enthält korrekte Hashcash-Kennzeichnung (21 bits)
- lang de describe HASHCASH_22 Enthält korrekte Hashcash-Kennzeichnung (22 bits)
-@@ -591,27 +600,30 @@
- lang de describe HASHCASH_25 Enthält korrekte Hashcash-Kennzeichnung (25 bits)
- lang de describe HASHCASH_HIGH Enthält korrekte Hashcash-Kennzeichnung (> 25 bits)
- lang de describe HASHCASH_2SPEND Hashcash-Markierung bereits in anderer Nachricht verwendet
-+endif
-+
-+ifplugin Mail::SpamAssassin::Plugin::SPF
- lang de describe SPF_PASS SPF: Senderechner entspricht SPF-Datensatz
- lang de describe SPF_FAIL SPF: Senderechner entspricht nicht SPF-Datensatz (fail)
- lang de describe SPF_SOFTFAIL Senderechner entspricht nicht SPF-Datensatz (softfail)
- lang de describe SPF_HELO_PASS SPF: HELO-Name entspricht dem SPF-Datensatz
- lang de describe SPF_HELO_FAIL HELO-Name entspricht nicht SPF-Datensatz (fail)
- lang de describe SPF_HELO_SOFTFAIL HELO-Name entspricht nicht SPF-Datensatz (softfail)
-+endif
-+
-+ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
- lang de describe URIBL_SBL Enthält URL in SBL-Liste (http://www.spamhaus.org/sbl/)
- lang de describe URIBL_SC_SURBL Enthält URL in SC-Liste  (www.surbl.org)
- lang de describe URIBL_WS_SURBL Enthält URL in WS-Liste (www.surbl.org)
- lang de describe URIBL_PH_SURBL Enthält URL in PH-Liste (www.surbl.org)
- lang de describe URIBL_OB_SURBL Enthält URL in OB-Liste (www.surbl.org)
- lang de describe URIBL_AB_SURBL Enthält URL in AB-Liste (www.surbl.org)
--lang de describe AWL Absenderadresse in der automatischen weißen Liste
--lang de describe USER_IN_BLACKLIST Absenderadresse steht in Ihrer persönlichen schwarzen Liste
--lang de describe USER_IN_WHITELIST Absenderadresse steht in Ihrer persönlichen weißen Liste
--lang de describe USER_IN_DEF_WHITELIST Absenderadresse steht in der allgemeinen weißen Liste
--lang de describe USER_IN_BLACKLIST_TO Empfängeradresse steht in Ihrer persönlichen schwarzen Liste
--lang de describe USER_IN_WHITELIST_TO Empfängeradresse steht in Ihrer persönlichen weißen Liste
--lang de describe USER_IN_MORE_SPAM_TO Empfängeradresse soll fast alle (Spam-) Nachrichten erhalten
--lang de describe USER_IN_ALL_SPAM_TO Empfängeradresse soll alle (Spam-) Nachrichten erhalten
-+lang de describe URIBL_JP_SURBL Enthält URL in JP-Liste (www.surbl.org)
-+endif
- 
-+ifplugin Mail::SpamAssassin::Plugin::AWL
-+lang de describe AWL Absenderadresse in der automatischen weißen Liste
-+endif
- 
- ifplugin Mail::SpamAssassin::Plugin::AntiVirus
- lang de describe MIME_SUSPECT_NAME MIME-Dateiname entspricht nicht dem MIME-Typ
diff --git a/mail-filter/spamassassin/spamassassin-3.0.4.ebuild b/mail-filter/spamassassin/spamassassin-3.0.4.ebuild
deleted file mode 100644
index 02521f3ddf5f..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.0.4.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.4.ebuild,v 1.15 2006/04/03 18:42:16 halcy0n Exp $
-
-inherit perl-module
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 mips"
-IUSE="berkdb qmail ssl doc"
-
-# To consider (not all may be in tree at this time - mcummings):
-# dev-perl/Net-SMTP
-# dev-perl/Mail-SPF-Query
-# dev-perl/IP-Country-Fast
-# dev-perl/Net-Ident
-# perl-core/Time-HiRes
-# DB support? mysql, postgres, etc.
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	>=virtual/perl-PodParser-1.22
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.34
-	dev-perl/Digest-SHA1
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)"
-
-src_move_doc() {
-	echo "Renaming $1 to $2"
-	mv $1 $2 || die failed to move documentation
-}
-
-src_append_doc() {
-	echo "Appending $1 to $2"
-	cat $1 >> $2 || die failed to append documentation
-}
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Some more files to be installed (README* and Changes are already
-	# included per default)
-	mydoc="NOTICE
-	TRADEMARK
-	LICENSE
-	CREDITS
-	INSTALL
-	UPGRADE
-	BUGS
-	USAGE
-	README.spamd
-	README.sql
-	README.ldap
-	procmailrc.example
-	sample-nonspam.txt
-	sample-spam.txt
-	STATISTICS.set0
-	STATISTICS.set1
-	STATISTICS.set2
-	STATISTICS.set3"
-
-
-	use qmail && mydoc="${mydoc} README.qmail"
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Rename some docu files so they don't clash with others
-	src_move_doc   spamd/README              README.spamd
-	src_move_doc   spamc/README.qmail        README.qmail
-	src_move_doc   sql/README                README.sql
-	src_append_doc sql/README.bayes          README.sql
-	src_append_doc sql/README.awl            README.sql
-	src_move_doc   ldap/README               README.ldap
-	src_move_doc   rules/STATISTICS.txt      STATISTICS.set0
-	src_move_doc   rules/STATISTICS-set1.txt STATISTICS.set1
-	src_move_doc   rules/STATISTICS-set2.txt STATISTICS.set2
-	src_move_doc   rules/STATISTICS-set3.txt STATISTICS.set3
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	if use doc; then
-		make text_html_doc
-	fi
-
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc ${mydoc}
-		dodoc spamd/PROTOCOL
-		dohtml doc/*.html
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf
-	fperms 0400 /etc/mail/spamassassin/secrets.cf
-	echo " ">> ${D}/etc/mail/spamassassin/local.cf
-	echo "# Sensitive data, such as database connection info, should">> ${D}/etc/mail/spamassassin/local.cf
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">> ${D}/etc/mail/spamassassin/local.cf
-	echo "# appropriate permissions">> ${D}/etc/mail/spamassassin/local.cf
-
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-	ewarn
-	ewarn "spamd is not designed to listen to an untrusted network"
-	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
-	ewarn "configured to do so"
-	ewarn
-	ewarn "If you plan on using the -u flag to spamd, please read the notes"
-	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild
deleted file mode 100644
index ad299f86ffbb..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild,v 1.12 2006/03/14 01:55:33 gustavoz Exp $
-
-inherit perl-module
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
-KEYWORDS="~alpha ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc dcc mysql postgres pyzor razor sqlite spf tools"
-
-# To consider (not all may be in tree at this time - mcummings):
-# dev-perl/Net-SMTP
-# dev-perl/IP-Country-Fast
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	>=virtual/perl-PodParser-1.22
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	spf? (
-		dev-perl/Mail-SPF-Query
-	)
-
-	pyzor? (
-		dev-python/pyzor
-	)
-	razor? (
-		mail-filter/razor
-	)
-	dcc? (
-		mail-filter/dcc
-	)"
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf
-	fperms 0400 /etc/mail/spamassassin/secrets.cf
-	echo "">>${D}/etc/mail/spamassassin/local.cf
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-	ewarn
-	ewarn "spamd is not designed to listen to an untrusted network"
-	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
-	ewarn "configured to do so"
-	ewarn
-	ewarn "If you plan on using the -u flag to spamd, please read the notes"
-	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-	einfo "You may also consider installing the following for add on"
-	einfo "benefits: dev-perl/IO-Socket-INET6  dev-perl/Mail-DomainKeys"
-	einfo "dev-perl/Net-Ident dev-perl/IP-Country"
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.0-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.1.0-r2.ebuild
deleted file mode 100644
index 44b4b6f117fa..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.0-r2.ebuild,v 1.10 2006/03/14 01:55:33 gustavoz Exp $
-
-inherit perl-module
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
-KEYWORDS="~alpha ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite spf tools dcc pyzor razor"
-
-# To consider (not all may be in tree at this time - mcummings):
-# dev-perl/Net-SMTP
-# dev-perl/IP-Country-Fast
-	#|| ( >=perl-core/PodParser-1.22 >=dev-lang/perl-5.8.6 )
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	spf? (
-		dev-perl/Mail-SPF-Query
-	)
-
-	pyzor? (
-		dev-python/pyzor
-	)
-	razor? (
-		mail-filter/razor
-	)
-	dcc? (
-		mail-filter/dcc
-	)"
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf
-	fperms 0400 /etc/mail/spamassassin/secrets.cf
-	echo "">>${D}/etc/mail/spamassassin/local.cf
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-	ewarn
-	ewarn "spamd is not designed to listen to an untrusted network"
-	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
-	ewarn "configured to do so"
-	ewarn
-	ewarn "If you plan on using the -u flag to spamd, please read the notes"
-	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-	einfo "You may also consider installing the following for add on"
-	einfo "benefits: dev-perl/IO-Socket-INET6  dev-perl/Mail-DomainKeys"
-	einfo "dev-perl/Net-Ident dev-perl/IP-Country"
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.1.ebuild
deleted file mode 100644
index d62704b609db..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.1.ebuild,v 1.8 2006/04/21 19:08:33 hanno Exp $
-
-inherit perl-module eutils
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	app-crypt/gnupg
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-lint-de.diff
-}
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-	echo "">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-
-	ewarn
-	ewarn "spamd is not designed to listen to an untrusted network"
-	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
-	ewarn "configured to do so"
-	ewarn
-	ewarn "If you plan on using the -u flag to spamd, please read the notes"
-	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-
-	if has_version '>=dev-lang/perl-5.8.8'; then
-		ewarn "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-		ewarn "SpamAssassin (and almost all other reasonably complex pieces of perl"
-		ewarn "code!)."
-		echo ""
-		ewarn "We've worked around this in most places, as far as we know, but there may"
-		ewarn "still be some issues.  In addition, there is a speed hit, which it would"
-		ewarn "be nice to avoid."
-		echo ""
-		ewarn "Setting the LANG environment variable before any invocation of"
-		ewarn "SpamAssassin sometimes seems to help fix it, like so:"
-		echo ""
-		ewarn "  export LANG=en_US"
-		echo ""
-		ewarn "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-		ewarn "have reported that this makes no difference. ;)"
-	fi
-	einfo
-	if ! has_version 'dev-perl/Mail-SPF-Query'; then
-		einfo "For spf support, please emerge dev-perl/Mail-SPF-Query"
-	fi
-	if ! has_version 'mail-filter/dcc'; then
-		einfo "For dcc support, please emerge mail-filter/dcc"
-	fi
-	if ! has_version 'dev-python/pyzor'; then
-		einfo "For pyzor support, please emerge dev-python/pyzor"
-	fi
-	if ! has_version 'mail-filter/razor'; then
-		einfo "For razor support, please emerge mail-filter/razor"
-	fi
-	einfo
-	einfo "For addtional functionality, you may wish to emerge:"
-	einfo "dev-perl/IP-Country       dev-perl/Net-Ident "
-	einfo "dev-perl/Mail-DomainKeys"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.2.ebuild b/mail-filter/spamassassin/spamassassin-3.1.2.ebuild
deleted file mode 100644
index a84591d342f0..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.2.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.2.ebuild,v 1.1 2006/05/26 02:03:11 mcummings Exp $
-
-inherit perl-module eutils
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	app-crypt/gnupg
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-	echo "">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-
-	ewarn
-	ewarn "spamd is not designed to listen to an untrusted network"
-	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
-	ewarn "configured to do so"
-	ewarn
-	ewarn "If you plan on using the -u flag to spamd, please read the notes"
-	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-
-	if has_version '>=dev-lang/perl-5.8.8'; then
-		ewarn "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-		ewarn "SpamAssassin (and almost all other reasonably complex pieces of perl"
-		ewarn "code!)."
-		echo ""
-		ewarn "We've worked around this in most places, as far as we know, but there may"
-		ewarn "still be some issues.  In addition, there is a speed hit, which it would"
-		ewarn "be nice to avoid."
-		echo ""
-		ewarn "Setting the LANG environment variable before any invocation of"
-		ewarn "SpamAssassin sometimes seems to help fix it, like so:"
-		echo ""
-		ewarn "  export LANG=en_US"
-		echo ""
-		ewarn "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-		ewarn "have reported that this makes no difference. ;)"
-	fi
-	einfo
-	if ! has_version 'dev-perl/Mail-SPF-Query'; then
-		einfo "For spf support, please emerge dev-perl/Mail-SPF-Query"
-	fi
-	if ! has_version 'mail-filter/dcc'; then
-		einfo "For dcc support, please emerge mail-filter/dcc"
-	fi
-	if ! has_version 'dev-python/pyzor'; then
-		einfo "For pyzor support, please emerge dev-python/pyzor"
-	fi
-	if ! has_version 'mail-filter/razor'; then
-		einfo "For razor support, please emerge mail-filter/razor"
-	fi
-	einfo
-	einfo "For addtional functionality, you may wish to emerge:"
-	einfo "dev-perl/IP-Country       dev-perl/Net-Ident "
-	einfo "dev-perl/Mail-DomainKeys"
-
-}