Cleanup. Kill ~mips (#177144)

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

16 files changed, 23 insertions, 2938 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 019c44191c05..86fe6b44d467 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.169 2010/01/02 15:18:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.170 2010/01/07 08:44:59 tove Exp $
+
+  07 Jan 2010; Torsten Veller <tove@gentoo.org>
+  -files/3.1.8-archive-iterator.patch, -spamassassin-3.1.8.ebuild,
+  -spamassassin-3.1.8-r1.ebuild, -spamassassin-3.2.0.ebuild,
+  -spamassassin-3.2.0-r1.ebuild, -spamassassin-3.2.1.ebuild,
+  -spamassassin-3.2.1-r1.ebuild, -spamassassin-3.2.2.ebuild,
+  -spamassassin-3.2.3.ebuild, -spamassassin-3.2.4.ebuild,
+  -spamassassin-3.2.5.ebuild, -spamassassin-3.2.5-r1.ebuild,
+  -files/3.2.2-upstream-5574-fix.patch,
+  -files/3.2.2-upstream-5574-testcase.patch:
+  Cleanup. Kill ~mips (#177144)
 
   02 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   spamassassin-3.2.1-r2.ebuild:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 3c23580ed979..c7aa476d2fe0 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,30 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.0.0-spamd.conf 1527 RMD160 8075268aecdf6f41f5cdacb683fe92567d860dae SHA1 01623333cecb1ef38b25a130d3b5afe016e70f1c SHA256 ea61041e8b6b1616ec096cc42245ab8442b962f72c318695f5acff1fd794ee34
 AUX 3.0.0-spamd.init 891 RMD160 d8f80c02238e22704cd588f0fee5d198f787df38 SHA1 2ed966512c79a016f8bf2242c76879434367942c SHA256 09bcdf5287b2464e754f78647c939b0de86c135433eaa3ca45d89ab2b68a79ac
-AUX 3.1.8-archive-iterator.patch 501 RMD160 6eb7ef7c73d8f207d04e5cffe59e8d924d13c06e SHA1 0b3fbbeb778daffa72094a68d91a48073438ef0a SHA256 244fa7e6af21998f7ba1d7632c618b50924401effb84db79070b9c7c24e41215
-AUX 3.2.2-upstream-5574-fix.patch 1271 RMD160 4b8a47313b220701f2fb74d4c2c8f552f90a9c82 SHA1 6a1a42770f30eeef76d29fa38e5f19817b68b827 SHA256 ac262a3950e0d6c00619488d14be34859e774ff3b7b3bd6cf97ce556c36f660d
-AUX 3.2.2-upstream-5574-testcase.patch 1611 RMD160 e94baa4f60c825777744ffcd58fdcda2951721f6 SHA1 1a4e7947bb46d2e475d9db33e682136295075c91 SHA256 9d5439c465418c89c10bd10b0802c80f73332fc47d5ce7df3e506696f6cb559e
 AUX FH_DATE_PAST_20XX.patch 416 RMD160 85ccd5fce6faa70ceb16bbdc98cf0c710dd15847 SHA1 c97166533adcfe5c75cd6df9ae07632ea98e7306 SHA256 682668c68d0765cddda23f731c2d83a4da0852c38557a1406e4e74b18f5100c3
 AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139
 AUX spamassassin-3.2.5-DESTDIR.patch 8856 RMD160 c7aa95f1ddc21e7668266fe3eb00342ba5569c8c SHA1 045a446362b8b0491164a53cff18391c49fe6786 SHA256 f73e3d63b7fd79c364799cd1e3525369ac483019e55c079f33529b6ce81c9264
-DIST Mail-SpamAssassin-3.1.8.tar.bz2 1003128 RMD160 90a9cc31795493c194932141d88daa7cc4d7386c SHA1 0d092c4de6e6df66f1d0fb0ca8589147ee4096cb SHA256 ff6ad3d06719859e7bb47bbfd360750bf561bf3bfb6c8443064e73eb05dcb2ea
-DIST Mail-SpamAssassin-3.2.0.tar.bz2 1067316 RMD160 45766a196f2154b08c16ed54a9a72446075a2d30 SHA1 2fb864f01fc1c287e6f6e62fab8338f32cd20fb1 SHA256 d3ff42ba43b4eec51adac9031256cd480d495d6f5d8eb724c8a24d3ed508aa45
 DIST Mail-SpamAssassin-3.2.1.tar.bz2 981918 RMD160 508e9aae2705d1caaeba78720ba78b6385a6e237 SHA1 3095b38d90d0362c4e47e117fb612778a2ac362b SHA256 bccd0ecf00c3bc6bbcbe4a5eaa486e0db7dc755076130a66c935ec50b3fa8b3c
-DIST Mail-SpamAssassin-3.2.2.tar.bz2 989555 RMD160 663a4e21e824bbdaa99f34c5155869a9cb3f098a SHA1 6dfaa36eb8e500f9315cf2461fbd3229ae92a2c7 SHA256 32797587da66214c7453bc0ae102b53cec9a0f5dc27a326cfab5bf96f6e0d69a
-DIST Mail-SpamAssassin-3.2.3.tar.bz2 993369 RMD160 208671bcfe6ccfffb79072991bbf3893928a40cf SHA1 53199e0218d2f93043fcdca4db3f164f1f9f7cbc SHA256 a675c91bd005a739891aeb9d6138bb43ba4e9b31407d9d69e41e6a6980f7a680
-DIST Mail-SpamAssassin-3.2.4.tar.bz2 1007497 RMD160 9523a5d3fad86b65743c3818b8a10b6af66a6323 SHA1 876fc328a2b6192fa0bb8d7f6926214716178417 SHA256 29f7bdac4a535b4ea668112d0d85e14befed618b21d770f2065be197bcedf7b2
 DIST Mail-SpamAssassin-3.2.5.tar.bz2 1011883 RMD160 444baab6d966d4366834b82cde34c81e3e521144 SHA1 32b701ffc68f7975eded107c456b902bc710d8b2 SHA256 baaab5e4da7d3b0e04c0db579bdb44bbd6be916d29540682346eccead23f6c8a
-EBUILD spamassassin-3.1.8-r1.ebuild 8091 RMD160 6c1ea12df2bce76996a8431f614885b9bd2421e1 SHA1 564d7b73c7525efba47fdb0c054ae67db5920903 SHA256 ab38381d6df1bc292b93e63ab9c56335b26efb83a5ca75d621f988b578b92fa7
-EBUILD spamassassin-3.1.8.ebuild 7939 RMD160 7d44c9a36ef1496a45587d215c844b75b41d1d4d SHA1 fca85e6b6cae5b9b16257a5ffe46ceb08df7fed1 SHA256 788e3de0e15878c59947929f45b49410a28f3d2118c523b59ae8b6976a6dce69
-EBUILD spamassassin-3.2.0-r1.ebuild 7954 RMD160 6ab5793e3b37217fd3a0045abdbdee39475d042e SHA1 885dd3ae170c4044b8c2317c37ab2cec20b88a88 SHA256 b90168f57d48d0f4dd00daa0dfee27e1de494f9547b9d02e304215dbed98d428
-EBUILD spamassassin-3.2.0.ebuild 7940 RMD160 74b758e766eb5727fb068212c4a4ffc2a4b4d20f SHA1 5fa75ad40d42646f62ba7510b7cb252a120b9ef2 SHA256 4b39ac7d3514e2fa218d179e803d5f7977e20cdc8d7f989b2c6304406a530e0a
-EBUILD spamassassin-3.2.1-r1.ebuild 7963 RMD160 e3078fdc008a51d559f94d733a54915dfa55eb50 SHA1 1ba5dfc4ce3486004cc4b63e806e1b1881c8a204 SHA256 e80856d7173ec980278e607c01f16296709bbc1c11ec6c7d97342528dc1cdc9b
 EBUILD spamassassin-3.2.1-r2.ebuild 8050 RMD160 7f275770c6a20e6a68fdf04757be5db88a72b929 SHA1 918ec7a51eb35f79e1d9f73a50b7d3bedb1d7fd1 SHA256 1671f927661a80b047a1d4afddee2726a1f30d577950c3799531f36771f916e8
-EBUILD spamassassin-3.2.1.ebuild 7916 RMD160 56dbb2b0cf22c15395b39d83b0a219c22cef002f SHA1 aee39a96b89ca2d9011551f460556316402789d6 SHA256 2beb389f58e15dc107437424b4e47874f7aa48ff5cc1625833023ea9dcb1373f
-EBUILD spamassassin-3.2.2.ebuild 8168 RMD160 23d6405016bcff93aa809339e169af5cd7e72ccd SHA1 8aad3b988d093b5c5dee753d1ccd9fd4aa6afedd SHA256 c8a7e9cad43df234de2fe383ef522992f7af328f988a05c3f9c0d1bb4f988ae0
-EBUILD spamassassin-3.2.3.ebuild 7997 RMD160 5aada8f3c4070001165447cc6175ef83cc4af110 SHA1 28e825fa40b8427fa3a8f65d0a7d1eadeda06c59 SHA256 789464cbcaed25be17aaf54b2f0fd4579a517e61f303a72e7da9047ad410e8a9
-EBUILD spamassassin-3.2.4.ebuild 7997 RMD160 dd825387ee0ba720ddc32886901451422c17031d SHA1 9750c67ff839b2b8de79475bb576242a4dfd79a0 SHA256 08de1dd68d1491de86a7f760612f9854c06a280b8f8e9df137815bd468cb418d
-EBUILD spamassassin-3.2.5-r1.ebuild 8034 RMD160 5a2dae1564c43f17963f6f32f66ef6f7b4f0ba67 SHA1 d3acc5eab188eeff14b5ce1b6b394372fe62955d SHA256 1533b2792e1587360a8e6acc8d026191eeaca6f6b66f257f611b43fa377e48ad
 EBUILD spamassassin-3.2.5-r2.ebuild 8069 RMD160 0c5f487c5d0c0d4223b0de56afcde393229c8f5b SHA1 fa050743e2eb32fc1d53f72aad4dc3257d6295b9 SHA256 07c24e281780847292b35cb99251f2311748e32de177f3e5e94e64c9c0a92e82
-EBUILD spamassassin-3.2.5.ebuild 8008 RMD160 0b625d821ed735c6accb57077252989f2f26f279 SHA1 3bf3b736a723407bda10bab847bea72b823e52d4 SHA256 6fc719e87f9e6628e32adbf7f4ce8030088c630ea161bd684ae0b5e2da5e3636
-MISC ChangeLog 35356 RMD160 080f2c0fcd1da173d01f13aefb23640f8e2ccbc7 SHA1 86c2e2a9ddef07a7bdf4a359464dfe0582ed7c94 SHA256 b37628e364e6597c25c869160f29108a317b55a5dac457487928b573a713d718
+MISC ChangeLog 35888 RMD160 64659cfb3722af96ce1a3a2a898a68fac5cc4dc9 SHA1 ddd2d8ac0017bfd1db43ee41e1c18fc07328ebe5 SHA256 24ecaf44cb8813f275666516de547acee1098195b5f35da3c274330c55c4cc20
 MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktFnxEACgkQV3J2n04EauwB5wCgmP6yRUyyTYP5Y3bd7mv/yp9A
+GBsAn3zwgFuxS6+8GIpakolf/1zfge2s
+=9NPX
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/3.1.8-archive-iterator.patch b/mail-filter/spamassassin/files/3.1.8-archive-iterator.patch
deleted file mode 100644
index b4007f099025..000000000000
--- a/mail-filter/spamassassin/files/3.1.8-archive-iterator.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sa-learn.raw
-===================================================================
---- sa-learn.raw	(revision 507745)
-+++ sa-learn.raw	(working copy)
-@@ -402,7 +402,10 @@
- 
-     # make sure the target list is in the normal AI format
-     if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) {
--      $targets[$elem] = target($targets[$elem]);
-+      my $item = splice @targets, $elem, 1;
-+      $elem--; # go back to this element again
-+      target($item); # add back to the list
-+      next;
-     }
-   }
- 
diff --git a/mail-filter/spamassassin/files/3.2.2-upstream-5574-fix.patch b/mail-filter/spamassassin/files/3.2.2-upstream-5574-fix.patch
deleted file mode 100644
index 41335394326c..000000000000
--- a/mail-filter/spamassassin/files/3.2.2-upstream-5574-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: spamd/spamd.raw
-===================================================================
---- spamd/spamd.raw	(revision 559081)
-+++ spamd/spamd.raw	(working copy)
-@@ -1024,10 +1024,11 @@
-       # use the POSIX functions to hide the platform specific workarounds 
-       POSIX::setgid($ugid);  # set effective and real gid
-       POSIX::setuid($uuid);  # set effective and real UID
-+      $< = $uuid; $> = $uuid;   # bug 5574
- 
-       # keep the sanity check to catch problems like bug 3900 just in case
-       if ( $> != $uuid and $> != ( $uuid - 2**32 ) ) {
--        die "spamd: setuid to uid $uuid failed\n";
-+        die "spamd: setuid to uid $uuid failed (> = $>, < = $<)\n";
-       }
-     }
- 
-Index: lib/Mail/SpamAssassin/Util.pm
-===================================================================
---- lib/Mail/SpamAssassin/Util.pm	(revision 559081)
-+++ lib/Mail/SpamAssassin/Util.pm	(working copy)
-@@ -1336,6 +1336,7 @@
-     # bug 3586: kludges needed to work around platform dependent behavior assigning to $<
-     #  The POSIX functions deal with that so just use it here
-     POSIX::setuid($touid);
-+    $< = $touid; $> = $touid;       # bug 5574
- 
-     # Check that we have now accomplished the setuid: catch bug 3586 if it comes back
-     if ($< != $touid) {
diff --git a/mail-filter/spamassassin/files/3.2.2-upstream-5574-testcase.patch b/mail-filter/spamassassin/files/3.2.2-upstream-5574-testcase.patch
deleted file mode 100644
index 67379769f26d..000000000000
--- a/mail-filter/spamassassin/files/3.2.2-upstream-5574-testcase.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: MANIFEST
-===================================================================
---- MANIFEST	(revision 559081)
-+++ MANIFEST	(working copy)
-@@ -504,3 +504,4 @@
- t/root_spamd_x_u.t
- t/spamc_x_E_R.t
- t/spamc_x_e.t
-+t/root_spamd_u.t
-Index: t/root_spamd_u.t
-===================================================================
---- t/root_spamd_u.t	(revision 0)
-+++ t/root_spamd_u.t	(revision 0)
-@@ -0,0 +1,42 @@
-+#!/usr/bin/perl
-+
-+# run with:   sudo prove -v t/root_spamd*
-+
-+use lib '.'; use lib 't';
-+use SATest; sa_t_init("root_spamd_u");
-+use Test;
-+
-+use constant TEST_ENABLED => conf_bool('run_root_tests');
-+use constant IS_ROOT => eval { ($> == 0); };
-+use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-+
-+BEGIN { plan tests => (RUN_TESTS ? 14 : 0) };
-+exit unless RUN_TESTS;
-+
-+# ---------------------------------------------------------------------------
-+
-+%patterns = (
-+
-+q{ Return-Path: sb55sb55@yahoo.com}, 'firstline',
-+q{ Subject: There yours for FREE!}, 'subj',
-+q{ X-Spam-Status: Yes, score=}, 'status',
-+q{ X-Spam-Flag: YES}, 'flag',
-+q{ X-Spam-Level: **********}, 'stars',
-+q{ TEST_ENDSNUMS}, 'endsinnums',
-+q{ TEST_NOREALNAME}, 'noreal',
-+q{ This must be the very last line}, 'lastline',
-+
-+);
-+
-+# run spamc as unpriv uid
-+$spamc = "sudo -u nobody $spamc";
-+
-+ok(start_spamd("-L -u nobody"));
-+
-+$SIG{ALRM} = sub { die "timed out"; };
-+alarm 10;
-+ok(spamcrun("< data/spam/001", \&patterns_run_cb));
-+alarm 0;
-+ok_all_patterns();
-+
-+ok(stop_spamd());
-
-Property changes on: t/root_spamd_u.t
-___________________________________________________________________
-Name: svn:executable
-   + *
-
diff --git a/mail-filter/spamassassin/spamassassin-3.1.8-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.8-r1.ebuild
deleted file mode 100644
index 1b3c6bc32d52..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.8-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.8-r1.ebuild,v 1.6 2008/11/18 16:13:26 tove 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="http://archive.apache.org/dist/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
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	virtual/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}
-	cd ${S}
-
-	# - bug #167515 - should be fixed by upstream in 3.1.9
-	epatch ${FILESDIR}/3.1.8-archive-iterator.patch
-}
-
-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
-	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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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.8.ebuild b/mail-filter/spamassassin/spamassassin-3.1.8.ebuild
deleted file mode 100644
index 007baec49fe4..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.8.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.8.ebuild,v 1.11 2008/11/18 16:13:26 tove 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="http://archive.apache.org/dist/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
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	virtual/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
-	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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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.2.0-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.2.0-r1.ebuild
deleted file mode 100644
index 2747cd3653c7..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.0-r1.ebuild,v 1.6 2008/11/18 16:13:26 tove 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="http://archive.apache.org/dist/spamassassin/source/${MY_P}.tar.bz2"
-
-SRC_TEST="do"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~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
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	virtual/perl-IO-Zlib
-	>=dev-util/re2c-0.12.0
-	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
-	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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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-DKIM"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.2.0.ebuild b/mail-filter/spamassassin/spamassassin-3.2.0.ebuild
deleted file mode 100644
index 49afc6e8d21d..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.0.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.0.ebuild,v 1.3 2008/11/18 16:13:26 tove 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="http://archive.apache.org/dist/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
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	virtual/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
-	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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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-DKIM"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.2.1-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.2.1-r1.ebuild
deleted file mode 100644
index 4f12c4930317..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.1-r1.ebuild,v 1.14 2009/05/16 00:24:46 halcy0n 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://gentoo/${MY_P}.tar.bz2"
-
-#SRC_TEST="do"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-#KEYWORDS="~amd64 ~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.43
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	>=virtual/perl-IO-Zlib-1.04
-	>=dev-util/re2c-0.12.0
-	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 INSTALL in"
-		einfo "  /usr/share/doc/${PF}/"
-		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 UPGRADE in"
-		einfo "  /usr/share/doc/${PF}/"
-		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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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-DKIM"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.2.1.ebuild b/mail-filter/spamassassin/spamassassin-3.2.1.ebuild
deleted file mode 100644
index 894122477cc6..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.1.ebuild,v 1.5 2008/11/18 16:13:26 tove 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://gentoo/${MY_P}.tar.bz2"
-
-SRC_TEST="do"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~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
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	virtual/perl-IO-Zlib
-	>=dev-util/re2c-0.12.0
-	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
-	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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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-DKIM"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.2.2.ebuild b/mail-filter/spamassassin/spamassassin-3.2.2.ebuild
deleted file mode 100644
index 2e4b7d3ef48d..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.2.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.2.ebuild,v 1.4 2008/11/18 16:13:26 tove 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://gentoo/${MY_P}.tar.bz2"
-
-SRC_TEST="do"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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.43
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	>=virtual/perl-IO-Zlib-1.04
-	>=dev-util/re2c-0.12.0
-	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}
-	cd ${S}
-	# - Bug #186668 - new setuid code broken under perl 5.6.x and 5.8.x
-	# (spamassassin 3.2.2)
-	epatch ${FILESDIR}/3.2.2-upstream-5574-testcase.patch
-	epatch ${FILESDIR}/3.2.2-upstream-5574-fix.patch
-}
-
-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
-	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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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-DKIM"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.2.3.ebuild b/mail-filter/spamassassin/spamassassin-3.2.3.ebuild
deleted file mode 100644
index 73779eb105cc..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.3.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.3.ebuild,v 1.3 2008/11/18 16:13:26 tove 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="http://archive.apache.org/dist/spamassassin/source/${MY_P}.tar.bz2 mirror://gentoo/${MY_P}.tar.bz2"
-
-SRC_TEST="do"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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.43
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	>=virtual/perl-IO-Zlib-1.04
-	>=dev-util/re2c-0.12.0
-	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
-	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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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-DKIM"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.2.4.ebuild b/mail-filter/spamassassin/spamassassin-3.2.4.ebuild
deleted file mode 100644
index b87fbe3851d1..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.4.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.4.ebuild,v 1.2 2008/11/18 16:13:26 tove 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="http://archive.apache.org/dist/spamassassin/source/${MY_P}.tar.bz2 mirror://gentoo/${MY_P}.tar.bz2"
-
-SRC_TEST="do"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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.43
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	>=virtual/perl-IO-Zlib-1.04
-	>=dev-util/re2c-0.12.0
-	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
-	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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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-DKIM"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.2.5-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.2.5-r1.ebuild
deleted file mode 100644
index 0c996f6cb77d..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.5-r1.ebuild,v 1.1 2009/10/27 07:22:18 loki_val 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="http://archive.apache.org/dist/spamassassin/source/${MY_P}.tar.bz2 mirror://gentoo/${MY_P}.tar.bz2"
-
-SRC_TEST="do"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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.43
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	>=virtual/perl-IO-Zlib-1.04
-	>=dev-util/re2c-0.12.0
-	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
-	)"
-
-PATCHES=( "${FILESDIR}/${PN}-3.2.5-DESTDIR.patch" )
-
-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_test() {
-	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 INSTALL.VMS UPGRADE USAGE \
-		sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamassassin.spec spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-		# 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 INSTALL in"
-		einfo "  /usr/share/doc/${PF}/"
-		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 UPGRADE in"
-		einfo "  /usr/share/doc/${PF}/"
-		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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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-DKIM"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.2.5.ebuild b/mail-filter/spamassassin/spamassassin-3.2.5.ebuild
deleted file mode 100644
index 347d8b959680..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.5.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.5.ebuild,v 1.3 2009/05/16 00:24:46 halcy0n 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="http://archive.apache.org/dist/spamassassin/source/${MY_P}.tar.bz2 mirror://gentoo/${MY_P}.tar.bz2"
-
-SRC_TEST="do"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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.43
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	>=virtual/perl-IO-Zlib-1.04
-	>=dev-util/re2c-0.12.0
-	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 INSTALL in"
-		einfo "  /usr/share/doc/${PF}/"
-		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 UPGRADE in"
-		einfo "  /usr/share/doc/${PF}/"
-		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
-	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
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-	einfo
-
-	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-DKIM"
-
-}