Cleanup
authorChristian Hartmann <ian@gentoo.org>
Thu, 22 Feb 2007 22:08:21 +0000 (22:08 +0000)
committerChristian Hartmann <ian@gentoo.org>
Thu, 22 Feb 2007 22:08:21 +0000 (22:08 +0000)
Package-Manager: portage-2.1.2-r10

17 files changed:
mail-filter/spamassassin/ChangeLog
mail-filter/spamassassin/Manifest
mail-filter/spamassassin/files/digest-spamassassin-3.1.3 [deleted file]
mail-filter/spamassassin/files/digest-spamassassin-3.1.3-r1 [deleted file]
mail-filter/spamassassin/files/digest-spamassassin-3.1.4 [deleted file]
mail-filter/spamassassin/files/digest-spamassassin-3.1.5 [deleted file]
mail-filter/spamassassin/files/digest-spamassassin-3.1.6 [deleted file]
mail-filter/spamassassin/files/digest-spamassassin-3.1.7 [deleted file]
mail-filter/spamassassin/files/spamassassin-3.1.3-bug-4930.diff [deleted file]
mail-filter/spamassassin/files/spamd.conf [deleted file]
mail-filter/spamassassin/files/spamd.init [deleted file]
mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild [deleted file]
mail-filter/spamassassin/spamassassin-3.1.3.ebuild [deleted file]
mail-filter/spamassassin/spamassassin-3.1.4.ebuild [deleted file]
mail-filter/spamassassin/spamassassin-3.1.5.ebuild [deleted file]
mail-filter/spamassassin/spamassassin-3.1.6.ebuild [deleted file]
mail-filter/spamassassin/spamassassin-3.1.7.ebuild [deleted file]

index 59e80b6e7e58c07df39de3ab59b894c15eca7c27..d0c32dcb88a6c6a5a84f4c7b7ac7a5491ced6305 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.129 2007/02/19 20:54:45 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.130 2007/02/22 22:08:21 ian Exp $
+
+  22 Feb 2007; Christian Hartmann <ian@gentoo.org>
+  -files/spamassassin-3.1.3-bug-4930.diff, -files/spamd.conf,
+  -files/spamd.init, -spamassassin-3.1.3.ebuild,
+  -spamassassin-3.1.3-r1.ebuild, -spamassassin-3.1.4.ebuild,
+  -spamassassin-3.1.5.ebuild, -spamassassin-3.1.6.ebuild,
+  -spamassassin-3.1.7.ebuild:
+  Cleanup
 
   19 Feb 2007; <malc@gentoo.org> spamassassin-3.1.8.ebuild:
   Stable on amd64 wrt bug #166969
index ccd464ee2c4a38ddf6b667cf8f36c8fa611e1e6b..45016d23e0216eef33859dc184e8a6796e226008 100644 (file)
@@ -10,78 +10,19 @@ 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.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
-SHA256 b9615710931f259956b878eb1f5c6edfe90fd4d591df90b5fe67fe3102a61c2d files/spamassassin-3.1.3-bug-4930.diff 627
-AUX spamd.conf 604 RMD160 b93b367d735801e0d6c30ba41daa749555238e00 SHA1 43c719187a6d9be1e19f1da668a381db1f7b6e29 SHA256 2d91fde46ccc70fc157824e9fca564f398ddf8e7d75526bc26d390df02b389cc
-MD5 66f6531ea3b0a382b4d97bd1234c43a1 files/spamd.conf 604
-RMD160 b93b367d735801e0d6c30ba41daa749555238e00 files/spamd.conf 604
-SHA256 2d91fde46ccc70fc157824e9fca564f398ddf8e7d75526bc26d390df02b389cc files/spamd.conf 604
-AUX spamd.init 617 RMD160 4624c79222ba863dc68e88a13f3de6bb0d579f89 SHA1 dc90ac2f561e33bf50740888e5e962325d911808 SHA256 8b5abf70f7aac3ddcf7b258ce693f01dd4691048bb4f40a19c25a92e985321a8
-MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617
-RMD160 4624c79222ba863dc68e88a13f3de6bb0d579f89 files/spamd.init 617
-SHA256 8b5abf70f7aac3ddcf7b258ce693f01dd4691048bb4f40a19c25a92e985321a8 files/spamd.init 617
-DIST Mail-SpamAssassin-3.1.3.tar.bz2 975274 RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 SHA1 e1f4489ec8805985e0ca79765bde586bf0286725 SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4
-DIST Mail-SpamAssassin-3.1.4.tar.bz2 979302 RMD160 c5c0543827431a1ec0f157c8f09d23fa4f2ac64b SHA1 c764e94a4666c9bcb30b0540183b71e8edef6bb9 SHA256 646a8bc8b7ad70ea9abe003c7b0cad78955bf59558b9900f4249a9b0808ab395
-DIST Mail-SpamAssassin-3.1.5.tar.bz2 992013 RMD160 1afb28b30d5c10b1b34bf6cfb6216b5570dbd36c SHA1 9c9bcf4098c2b3418d5ea9ba69d1dcdfa255a819 SHA256 3265de94a2ca758a584a726630724f2bf1cfdfa8a0088149ad26ab2cf2daa1ed
-DIST Mail-SpamAssassin-3.1.6.tar.bz2 998136 RMD160 e852f311695b5f0a932f6b0fbf2f2fe40c2ed555 SHA1 16575633e60177733069c1681d6bf9528c076274 SHA256 66f13606d66d079def2c48173e3afaaac606af018536ec6786a694774cbd8890
-DIST Mail-SpamAssassin-3.1.7.tar.bz2 997771 RMD160 0dab3498e674d73face722fa61e1e38d6af897ef SHA1 6660dd3aa87f4ddd3ba9b19cf232dd006c6e8219 SHA256 3cf1755aaa48a38b91f2b223fa998cb5f9a0c1e524b1266068b08a7151a0aa68
 DIST Mail-SpamAssassin-3.1.8.tar.bz2 1003128 RMD160 90a9cc31795493c194932141d88daa7cc4d7386c SHA1 0d092c4de6e6df66f1d0fb0ca8589147ee4096cb SHA256 ff6ad3d06719859e7bb47bbfd360750bf561bf3bfb6c8443064e73eb05dcb2ea
-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
-SHA256 063a0f24b41cf3dfd2053afe642d0c98699386c24d8916f896784eddbdb9d1a2 spamassassin-3.1.3-r1.ebuild 8057
-EBUILD spamassassin-3.1.3.ebuild 7832 RMD160 102c5d01a6782487854552e6432bdab13f8acc5b SHA1 ab0a6fb424b5978bde1f36684c7ac087c065c5ae SHA256 f44cf259ece5216f3c67ac0ea92cc85daa4b5c3ce1392abc5f9a965b53e16c0b
-MD5 974aebcec7db66378215d616b57252eb spamassassin-3.1.3.ebuild 7832
-RMD160 102c5d01a6782487854552e6432bdab13f8acc5b spamassassin-3.1.3.ebuild 7832
-SHA256 f44cf259ece5216f3c67ac0ea92cc85daa4b5c3ce1392abc5f9a965b53e16c0b spamassassin-3.1.3.ebuild 7832
-EBUILD spamassassin-3.1.4.ebuild 7838 RMD160 a02cdd7bf2f78bd49a0b8027f823c18350e5ac75 SHA1 76cc19316f6c1dbd0c763236eabc5a1de8b87ca4 SHA256 1b926cee4a4a89e782493a0dbd6655d3f940035b2fd2623b304777f3e4195573
-MD5 12c62d899d666b8c713a01fbb981538a spamassassin-3.1.4.ebuild 7838
-RMD160 a02cdd7bf2f78bd49a0b8027f823c18350e5ac75 spamassassin-3.1.4.ebuild 7838
-SHA256 1b926cee4a4a89e782493a0dbd6655d3f940035b2fd2623b304777f3e4195573 spamassassin-3.1.4.ebuild 7838
-EBUILD spamassassin-3.1.5.ebuild 7860 RMD160 0cab473622c3e4a95c2fa091751de3799b7975b4 SHA1 03540d0d505c4421e9840b0e6ffd78aba8d10bcd SHA256 a4ad244d1336d7d9d77de6fa8f48df1260e5e69f69fba58d4d4a0b20827a7f39
-MD5 10175736a0c3a354963903df2ea7de06 spamassassin-3.1.5.ebuild 7860
-RMD160 0cab473622c3e4a95c2fa091751de3799b7975b4 spamassassin-3.1.5.ebuild 7860
-SHA256 a4ad244d1336d7d9d77de6fa8f48df1260e5e69f69fba58d4d4a0b20827a7f39 spamassassin-3.1.5.ebuild 7860
-EBUILD spamassassin-3.1.6.ebuild 7860 RMD160 c589c6324a114313c560578f3fddf4bbee98709b SHA1 d93e89acf828d17ee284446908306aa511e24540 SHA256 b10eb11d27bd323f3b0e295ba98c365f6a5476f673d87d669c02a030a00d5691
-MD5 bb22fd505c649ec035c359b60e770d7f spamassassin-3.1.6.ebuild 7860
-RMD160 c589c6324a114313c560578f3fddf4bbee98709b spamassassin-3.1.6.ebuild 7860
-SHA256 b10eb11d27bd323f3b0e295ba98c365f6a5476f673d87d669c02a030a00d5691 spamassassin-3.1.6.ebuild 7860
-EBUILD spamassassin-3.1.7.ebuild 7914 RMD160 110573f0fe62ac948eac030bfbd358db0e06df9c SHA1 77582e48483ba77dee798c120d68d2a009c3ed56 SHA256 0c08545b84648f7686a69b08cd88e72d1ea3b395e22b1b25e0de283d2b133e04
-MD5 3173431562ea5a27854c3167f1f0a07c spamassassin-3.1.7.ebuild 7914
-RMD160 110573f0fe62ac948eac030bfbd358db0e06df9c spamassassin-3.1.7.ebuild 7914
-SHA256 0c08545b84648f7686a69b08cd88e72d1ea3b395e22b1b25e0de283d2b133e04 spamassassin-3.1.7.ebuild 7914
 EBUILD spamassassin-3.1.8.ebuild 7902 RMD160 238b1880847cd632a641050fb0c79aa020e34259 SHA1 555a564a667eac9b789ea311189f7f79ed2a5bd9 SHA256 a23f0d15d88a744d87005ada532a4c25f1659f9107a9a55158aa7fcfcd43e2b8
 MD5 5db435779b0a0ac85ab58482663b117f spamassassin-3.1.8.ebuild 7902
 RMD160 238b1880847cd632a641050fb0c79aa020e34259 spamassassin-3.1.8.ebuild 7902
 SHA256 a23f0d15d88a744d87005ada532a4c25f1659f9107a9a55158aa7fcfcd43e2b8 spamassassin-3.1.8.ebuild 7902
-MISC ChangeLog 28844 RMD160 d10e63e48d4d9f99786f521d5061bae0ebe13beb SHA1 969b91115327423053307ac24d70ae9e71fc530f SHA256 7400de3e2f73a54e7ae37fed528022010fa22d0bab9e36e6f2e49981633934d3
-MD5 dafd742685d0adb9b98a2b42f44dd5c0 ChangeLog 28844
-RMD160 d10e63e48d4d9f99786f521d5061bae0ebe13beb ChangeLog 28844
-SHA256 7400de3e2f73a54e7ae37fed528022010fa22d0bab9e36e6f2e49981633934d3 ChangeLog 28844
+MISC ChangeLog 29165 RMD160 1b41d7859dcb0037323e9d08c677d032d0e084e7 SHA1 c5fbc0a0129ae24e4a374f87fdf7d096822b4626 SHA256 1af8bf23f51f2268ef1622a4c2f632272c094dc0384792848faa9bcb6d694304
+MD5 ed08502ccef905f7e386fbffd81cd037 ChangeLog 29165
+RMD160 1b41d7859dcb0037323e9d08c677d032d0e084e7 ChangeLog 29165
+SHA256 1af8bf23f51f2268ef1622a4c2f632272c094dc0384792848faa9bcb6d694304 ChangeLog 29165
 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 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
-MD5 53c722ea7ceaa67ec7f0738d9ea8eb3f files/digest-spamassassin-3.1.3-r1 274
-RMD160 c9b7531ea7eb117ee77733b7a27fb9b692a806cd files/digest-spamassassin-3.1.3-r1 274
-SHA256 f4af93fd5e39b91800c4e6ff5709d6e215b38b6a3497c5564d1249cac437aea8 files/digest-spamassassin-3.1.3-r1 274
-MD5 1670ace34a902f78bc5124fdc57fe9f5 files/digest-spamassassin-3.1.4 274
-RMD160 56e00caa82804a31b6eaf0722d32ab84d4e069a6 files/digest-spamassassin-3.1.4 274
-SHA256 16d403fee5dc471053eee15a8a047599c7edb0314cd7a88d96cac256b8dba2c1 files/digest-spamassassin-3.1.4 274
-MD5 5382ba9b92ffa6df15ece36ae91f3213 files/digest-spamassassin-3.1.5 274
-RMD160 00180e2f0179a76e1156a0100a24bd6f5397bdc9 files/digest-spamassassin-3.1.5 274
-SHA256 063333e6900b289796b0814057ac9683e27f868301ab7e7f53d44b9672896ad6 files/digest-spamassassin-3.1.5 274
-MD5 de68a80ed6f0393376bd4738ebb72b90 files/digest-spamassassin-3.1.6 274
-RMD160 98a1753d48728ea77ffda63b72316f2bb2edf235 files/digest-spamassassin-3.1.6 274
-SHA256 7f56d9f43f1a9a417d438e9b824e4c38990dd6fbb08192e0406c2981d75974f6 files/digest-spamassassin-3.1.6 274
-MD5 b656a45f47a5c60d8df90925f1215e86 files/digest-spamassassin-3.1.7 274
-RMD160 617cbac6436484db47c90c92b1cad06f629e29f7 files/digest-spamassassin-3.1.7 274
-SHA256 75568ec0019ac02b2f075fe6bacec77fa856af25cfc7caf33d02e25e6218684a files/digest-spamassassin-3.1.7 274
 MD5 3ed550c9011e8b5585b3d4f5ee51f558 files/digest-spamassassin-3.1.8 277
 RMD160 95897db0012cb8e4031e17b7d6c6379b8c5922e8 files/digest-spamassassin-3.1.8 277
 SHA256 53352d4d2cc381c308dc166a6d9652317e7f16f27926280ffd8907bde2e526c8 files/digest-spamassassin-3.1.8 277
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.3 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.3
deleted file mode 100644 (file)
index d9ab784..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5f049f0b9fc63585a85593a3c68409bb Mail-SpamAssassin-3.1.3.tar.bz2 975274
-RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 Mail-SpamAssassin-3.1.3.tar.bz2 975274
-SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4 Mail-SpamAssassin-3.1.3.tar.bz2 975274
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.3-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.3-r1
deleted file mode 100644 (file)
index d9ab784..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5f049f0b9fc63585a85593a3c68409bb Mail-SpamAssassin-3.1.3.tar.bz2 975274
-RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 Mail-SpamAssassin-3.1.3.tar.bz2 975274
-SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4 Mail-SpamAssassin-3.1.3.tar.bz2 975274
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.4 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.4
deleted file mode 100644 (file)
index 985ebe0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c620b0a20791999a8f8091b0888e0195 Mail-SpamAssassin-3.1.4.tar.bz2 979302
-RMD160 c5c0543827431a1ec0f157c8f09d23fa4f2ac64b Mail-SpamAssassin-3.1.4.tar.bz2 979302
-SHA256 646a8bc8b7ad70ea9abe003c7b0cad78955bf59558b9900f4249a9b0808ab395 Mail-SpamAssassin-3.1.4.tar.bz2 979302
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.5 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.5
deleted file mode 100644 (file)
index b91309f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ae8734220ef82bbb1872f64dbf9c0995 Mail-SpamAssassin-3.1.5.tar.bz2 992013
-RMD160 1afb28b30d5c10b1b34bf6cfb6216b5570dbd36c Mail-SpamAssassin-3.1.5.tar.bz2 992013
-SHA256 3265de94a2ca758a584a726630724f2bf1cfdfa8a0088149ad26ab2cf2daa1ed Mail-SpamAssassin-3.1.5.tar.bz2 992013
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.6 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.6
deleted file mode 100644 (file)
index a4a755e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1cf43cea76e30aec6983cdbfe2e08316 Mail-SpamAssassin-3.1.6.tar.bz2 998136
-RMD160 e852f311695b5f0a932f6b0fbf2f2fe40c2ed555 Mail-SpamAssassin-3.1.6.tar.bz2 998136
-SHA256 66f13606d66d079def2c48173e3afaaac606af018536ec6786a694774cbd8890 Mail-SpamAssassin-3.1.6.tar.bz2 998136
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.7 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.7
deleted file mode 100644 (file)
index 5924b41..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 77242e45baa7e2b418e4d3f22a86a69e Mail-SpamAssassin-3.1.7.tar.bz2 997771
-RMD160 0dab3498e674d73face722fa61e1e38d6af897ef Mail-SpamAssassin-3.1.7.tar.bz2 997771
-SHA256 3cf1755aaa48a38b91f2b223fa998cb5f9a0c1e524b1266068b08a7151a0aa68 Mail-SpamAssassin-3.1.7.tar.bz2 997771
diff --git a/mail-filter/spamassassin/files/spamassassin-3.1.3-bug-4930.diff b/mail-filter/spamassassin/files/spamassassin-3.1.3-bug-4930.diff
deleted file mode 100644 (file)
index 356aad0..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: spamassassin.raw
-===================================================================
---- spamassassin.raw   (revision 411851)
-+++ spamassassin.raw   (working copy)
-@@ -336,7 +336,10 @@
- }
- # Go run the messages!
--eval { $exitvalue ||= !$iter->run(@targets); };
-+# bug 4930: use a temp variable since "||=" decides whether or not to set the
-+# value before the RHS is actually run, so if the RHS separately sets the LHS
-+# variable, things don't work right.  Stupid global variables. ;)
-+eval { my $runreturn = !$iter->run(@targets);  $exitvalue ||= $runreturn; };
- $progress->final() if ($opt{progress} && $progress);
diff --git a/mail-filter/spamassassin/files/spamd.conf b/mail-filter/spamassassin/files/spamd.conf
deleted file mode 100644 (file)
index f2f0ee6..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/spamd
-
-
-# ***WARNING***
-# spamd was not designed to listed to an untrusted network. spamd
-# is vulnerable to DoS attacks (and eternal doom) if used to listen
-# to an untrusted network.
-#
-
-
-# Some options:
-#
-# -a for auto-white-list
-# -c to create a per user configuration file
-# -L if you want to suppress DNS lookup 
-# -u USER to run as a user other than root
-#
-# for more help look in man spamd
-
-SPAMD_OPTS="-a -c"
-
-# spamd stores its pid in this file. If you use the -u option to
-# run spamd under another user, you might need to adjust it.
-
-PIDFILE="/var/run/spamd.pid"
diff --git a/mail-filter/spamassassin/files/spamd.init b/mail-filter/spamassassin/files/spamd.init
deleted file mode 100644 (file)
index 7ca2f52..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/spamd.init,v 1.3 2005/05/10 01:24:59 swegener Exp $
-
-# NB: Config is in /etc/conf.d/spamd.conf
-
-depend() {
-       need net
-       before mta
-}
-
-start() {
-       ebegin "Starting spamd"
-       start-stop-daemon --start --quiet \
-               --exec /usr/bin/spamd -- -d -r ${PIDFILE} \
-                       ${SPAMD_OPTS}
-       eend $? "Failed to start spamd"
-}
-
-stop() {
-       ebegin "Stopping spamd"
-       start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-       eend $? "Failed to stop spamd"
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild
deleted file mode 100644 (file)
index d246d09..0000000
+++ /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.3-r1.ebuild,v 1.1 2006/06/20 19:26:47 ian 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() {
-       # Fix upstream bug causing 0 returns. (spam is being marked nonspam)
-       # See bug #135940
-       # Upstream: http://issues.apache.org/SpamAssassin/show_bug.cgi?id=4930
-       epatch ${FILESDIR}/spamassassin-3.1.3-bug-4930.diff
-
-       # - 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.3.ebuild b/mail-filter/spamassassin/spamassassin-3.1.3.ebuild
deleted file mode 100644 (file)
index 69b0e2c..0000000
+++ /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.3.ebuild,v 1.9 2006/11/08 16:31:01 iluxa 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"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.4.ebuild b/mail-filter/spamassassin/spamassassin-3.1.4.ebuild
deleted file mode 100644 (file)
index 17aeb5d..0000000
+++ /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.4.ebuild,v 1.1 2006/08/06 13:07:26 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
-               elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
-       fi
-       if ! has_version 'mail-filter/dcc'; then
-               elog "For dcc support, please emerge mail-filter/dcc"
-       fi
-       if ! has_version 'dev-python/pyzor'; then
-               elog "For pyzor support, please emerge dev-python/pyzor"
-       fi
-       if ! has_version 'mail-filter/razor'; then
-               elog "For razor support, please emerge mail-filter/razor"
-       fi
-       einfo
-       elog "For addtional functionality, you may wish to emerge:"
-       elog "dev-perl/IP-Country       dev-perl/Net-Ident "
-       elog "dev-perl/Mail-DomainKeys"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.5.ebuild b/mail-filter/spamassassin/spamassassin-3.1.5.ebuild
deleted file mode 100644 (file)
index e79cf61..0000000
+++ /dev/null
@@ -1,247 +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.5.ebuild,v 1.2 2006/11/18 21:45:38 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
-       elog "spamd is not designed to listen to an untrusted network"
-       elog "and is vulnerable to DoS attacks (and eternal doom) if"
-       elog "configured to do so"
-       ewarn
-       elog "If you plan on using the -u flag to spamd, please read the notes"
-       elog "in /etc/conf.d/spamd regarding the location of the pid file."
-
-       einfo
-       elog "If you build ${PN} with optional dependancy support,"
-       elog "you can enable them in /etc/mail/spamassassin/init.pre"
-
-       if has_version '>=dev-lang/perl-5.8.8'; then
-               elog "A note from the SA developers:"
-               elog "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-               elog "SpamAssassin (and almost all other reasonably complex pieces of perl"
-               elog "code!)."
-               elog ""
-               elog "We've worked around this in most places, as far as we know, but there may"
-               elog "still be some issues.  In addition, there is a speed hit, which it would"
-               elog "be nice to avoid."
-               elog ""
-               elog "Setting the LANG environment variable before any invocation of"
-               elog "SpamAssassin sometimes seems to help fix it, like so:"
-               elog ""
-               elog "  export LANG=en_US"
-               elog ""
-               elog "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-               elog "have reported that this makes no difference. ;)"
-       fi
-       einfo
-       if ! has_version 'dev-perl/Mail-SPF-Query'; then
-               elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
-       fi
-       if ! has_version 'mail-filter/dcc'; then
-               elog "For dcc support, please emerge mail-filter/dcc"
-       fi
-       if ! has_version 'dev-python/pyzor'; then
-               elog "For pyzor support, please emerge dev-python/pyzor"
-       fi
-       if ! has_version 'mail-filter/razor'; then
-               elog "For razor support, please emerge mail-filter/razor"
-       fi
-       einfo
-       elog "For addtional functionality, you may wish to emerge:"
-       elog "dev-perl/IP-Country       dev-perl/Net-Ident "
-       elog "dev-perl/Mail-DomainKeys"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.6.ebuild b/mail-filter/spamassassin/spamassassin-3.1.6.ebuild
deleted file mode 100644 (file)
index ebb7be5..0000000
+++ /dev/null
@@ -1,247 +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.6.ebuild,v 1.2 2006/11/18 21:45:38 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
-       elog "spamd is not designed to listen to an untrusted network"
-       elog "and is vulnerable to DoS attacks (and eternal doom) if"
-       elog "configured to do so"
-       ewarn
-       elog "If you plan on using the -u flag to spamd, please read the notes"
-       elog "in /etc/conf.d/spamd regarding the location of the pid file."
-
-       einfo
-       elog "If you build ${PN} with optional dependancy support,"
-       elog "you can enable them in /etc/mail/spamassassin/init.pre"
-
-       if has_version '>=dev-lang/perl-5.8.8'; then
-               elog "A note from the SA developers:"
-               elog "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-               elog "SpamAssassin (and almost all other reasonably complex pieces of perl"
-               elog "code!)."
-               elog ""
-               elog "We've worked around this in most places, as far as we know, but there may"
-               elog "still be some issues.  In addition, there is a speed hit, which it would"
-               elog "be nice to avoid."
-               elog ""
-               elog "Setting the LANG environment variable before any invocation of"
-               elog "SpamAssassin sometimes seems to help fix it, like so:"
-               elog ""
-               elog "  export LANG=en_US"
-               elog ""
-               elog "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-               elog "have reported that this makes no difference. ;)"
-       fi
-       einfo
-       if ! has_version 'dev-perl/Mail-SPF-Query'; then
-               elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
-       fi
-       if ! has_version 'mail-filter/dcc'; then
-               elog "For dcc support, please emerge mail-filter/dcc"
-       fi
-       if ! has_version 'dev-python/pyzor'; then
-               elog "For pyzor support, please emerge dev-python/pyzor"
-       fi
-       if ! has_version 'mail-filter/razor'; then
-               elog "For razor support, please emerge mail-filter/razor"
-       fi
-       einfo
-       elog "For addtional functionality, you may wish to emerge:"
-       elog "dev-perl/IP-Country       dev-perl/Net-Ident "
-       elog "dev-perl/Mail-DomainKeys"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.7.ebuild b/mail-filter/spamassassin/spamassassin-3.1.7.ebuild
deleted file mode 100644 (file)
index 31430ff..0000000
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.7.ebuild,v 1.2 2007/02/02 17:32:57 gustavoz 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"
-
-SRC_TEST="do"
-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_test
-}
-
-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
-       elog "spamd is not designed to listen to an untrusted network"
-       elog "and is vulnerable to DoS attacks (and eternal doom) if"
-       elog "configured to do so"
-       ewarn
-       elog "If you plan on using the -u flag to spamd, please read the notes"
-       elog "in /etc/conf.d/spamd regarding the location of the pid file."
-
-       einfo
-       elog "If you build ${PN} with optional dependancy support,"
-       elog "you can enable them in /etc/mail/spamassassin/init.pre"
-
-       if has_version '>=dev-lang/perl-5.8.8'; then
-               elog "A note from the SA developers:"
-               elog "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-               elog "SpamAssassin (and almost all other reasonably complex pieces of perl"
-               elog "code!)."
-               elog ""
-               elog "We've worked around this in most places, as far as we know, but there may"
-               elog "still be some issues.  In addition, there is a speed hit, which it would"
-               elog "be nice to avoid."
-               elog ""
-               elog "Setting the LANG environment variable before any invocation of"
-               elog "SpamAssassin sometimes seems to help fix it, like so:"
-               elog ""
-               elog "  export LANG=en_US"
-               elog ""
-               elog "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-               elog "have reported that this makes no difference. ;)"
-       fi
-       einfo
-       if ! has_version 'dev-perl/Mail-SPF-Query'; then
-               elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
-       fi
-       if ! has_version 'mail-filter/dcc'; then
-               elog "For dcc support, please emerge mail-filter/dcc"
-       fi
-       if ! has_version 'dev-python/pyzor'; then
-               elog "For pyzor support, please emerge dev-python/pyzor"
-       fi
-       if ! has_version 'mail-filter/razor'; then
-               elog "For razor support, please emerge mail-filter/razor"
-       fi
-       einfo
-       elog "For addtional functionality, you may wish to emerge:"
-       elog "dev-perl/IP-Country       dev-perl/Net-Ident "
-       elog "dev-perl/Mail-DomainKeys"
-
-}