Cleanup

(Portage version: 2.1.2-r10)

16 files changed, 9 insertions, 1574 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 59e80b6e7e58..d0c32dcb88a6 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.129 2007/02/19 20:54:45 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.130 2007/02/22 22:08:21 ian Exp $
+
+  22 Feb 2007; Christian Hartmann <ian@gentoo.org>
+  -files/spamassassin-3.1.3-bug-4930.diff, -files/spamd.conf,
+  -files/spamd.init, -spamassassin-3.1.3.ebuild,
+  -spamassassin-3.1.3-r1.ebuild, -spamassassin-3.1.4.ebuild,
+  -spamassassin-3.1.5.ebuild, -spamassassin-3.1.6.ebuild,
+  -spamassassin-3.1.7.ebuild:
+  Cleanup
 
   19 Feb 2007; <malc@gentoo.org> spamassassin-3.1.8.ebuild:
   Stable on amd64 wrt bug #166969
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.3 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.3
deleted file mode 100644
index d9ab784fb6f6..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5f049f0b9fc63585a85593a3c68409bb Mail-SpamAssassin-3.1.3.tar.bz2 975274
-RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 Mail-SpamAssassin-3.1.3.tar.bz2 975274
-SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4 Mail-SpamAssassin-3.1.3.tar.bz2 975274
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.3-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.3-r1
deleted file mode 100644
index d9ab784fb6f6..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5f049f0b9fc63585a85593a3c68409bb Mail-SpamAssassin-3.1.3.tar.bz2 975274
-RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 Mail-SpamAssassin-3.1.3.tar.bz2 975274
-SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4 Mail-SpamAssassin-3.1.3.tar.bz2 975274
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.4 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.4
deleted file mode 100644
index 985ebe0d5c76..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c620b0a20791999a8f8091b0888e0195 Mail-SpamAssassin-3.1.4.tar.bz2 979302
-RMD160 c5c0543827431a1ec0f157c8f09d23fa4f2ac64b Mail-SpamAssassin-3.1.4.tar.bz2 979302
-SHA256 646a8bc8b7ad70ea9abe003c7b0cad78955bf59558b9900f4249a9b0808ab395 Mail-SpamAssassin-3.1.4.tar.bz2 979302
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.5 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.5
deleted file mode 100644
index b91309fb4725..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ae8734220ef82bbb1872f64dbf9c0995 Mail-SpamAssassin-3.1.5.tar.bz2 992013
-RMD160 1afb28b30d5c10b1b34bf6cfb6216b5570dbd36c Mail-SpamAssassin-3.1.5.tar.bz2 992013
-SHA256 3265de94a2ca758a584a726630724f2bf1cfdfa8a0088149ad26ab2cf2daa1ed Mail-SpamAssassin-3.1.5.tar.bz2 992013
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.6 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.6
deleted file mode 100644
index a4a755e5b4e8..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1cf43cea76e30aec6983cdbfe2e08316 Mail-SpamAssassin-3.1.6.tar.bz2 998136
-RMD160 e852f311695b5f0a932f6b0fbf2f2fe40c2ed555 Mail-SpamAssassin-3.1.6.tar.bz2 998136
-SHA256 66f13606d66d079def2c48173e3afaaac606af018536ec6786a694774cbd8890 Mail-SpamAssassin-3.1.6.tar.bz2 998136
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.7 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.7
deleted file mode 100644
index 5924b41550d8..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 77242e45baa7e2b418e4d3f22a86a69e Mail-SpamAssassin-3.1.7.tar.bz2 997771
-RMD160 0dab3498e674d73face722fa61e1e38d6af897ef Mail-SpamAssassin-3.1.7.tar.bz2 997771
-SHA256 3cf1755aaa48a38b91f2b223fa998cb5f9a0c1e524b1266068b08a7151a0aa68 Mail-SpamAssassin-3.1.7.tar.bz2 997771
diff --git a/mail-filter/spamassassin/files/spamassassin-3.1.3-bug-4930.diff b/mail-filter/spamassassin/files/spamassassin-3.1.3-bug-4930.diff
deleted file mode 100644
index 356aad046253..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.1.3-bug-4930.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: spamassassin.raw
-===================================================================
---- spamassassin.raw	(revision 411851)
-+++ spamassassin.raw	(working copy)
-@@ -336,7 +336,10 @@
- }
- 
- # Go run the messages!
--eval { $exitvalue ||= !$iter->run(@targets); };
-+# bug 4930: use a temp variable since "||=" decides whether or not to set the
-+# value before the RHS is actually run, so if the RHS separately sets the LHS
-+# variable, things don't work right.  Stupid global variables. ;)
-+eval { my $runreturn = !$iter->run(@targets);  $exitvalue ||= $runreturn; };
- 
- $progress->final() if ($opt{progress} && $progress);
- 
diff --git a/mail-filter/spamassassin/files/spamd.conf b/mail-filter/spamassassin/files/spamd.conf
deleted file mode 100644
index f2f0ee6084ed..000000000000
--- a/mail-filter/spamassassin/files/spamd.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/spamd
-
-
-# ***WARNING***
-# spamd was not designed to listed to an untrusted network. spamd
-# is vulnerable to DoS attacks (and eternal doom) if used to listen
-# to an untrusted network.
-#
-
-
-# Some options:
-#
-# -a for auto-white-list
-# -c to create a per user configuration file
-# -L if you want to suppress DNS lookup 
-# -u USER to run as a user other than root
-#
-# for more help look in man spamd
-
-SPAMD_OPTS="-a -c"
-
-# spamd stores its pid in this file. If you use the -u option to
-# run spamd under another user, you might need to adjust it.
-
-PIDFILE="/var/run/spamd.pid"
diff --git a/mail-filter/spamassassin/files/spamd.init b/mail-filter/spamassassin/files/spamd.init
deleted file mode 100644
index 7ca2f52d182d..000000000000
--- a/mail-filter/spamassassin/files/spamd.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/spamd.init,v 1.3 2005/05/10 01:24:59 swegener Exp $
-
-# NB: Config is in /etc/conf.d/spamd.conf
-
-depend() {
-	need net
-	before mta
-}
-
-start() {
-	ebegin "Starting spamd"
-	start-stop-daemon --start --quiet \
-		--exec /usr/bin/spamd -- -d -r ${PIDFILE} \
-			${SPAMD_OPTS}
-	eend $? "Failed to start spamd"
-}
-
-stop() {
-	ebegin "Stopping spamd"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $? "Failed to stop spamd"
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild
deleted file mode 100644
index d246d0966ceb..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild,v 1.1 2006/06/20 19:26:47 ian Exp $
-
-inherit perl-module eutils
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	app-crypt/gnupg
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-
-src_compile() {
-	# Fix upstream bug causing 0 returns. (spam is being marked nonspam)
-	# See bug #135940
-	# Upstream: http://issues.apache.org/SpamAssassin/show_bug.cgi?id=4930
-	epatch ${FILESDIR}/spamassassin-3.1.3-bug-4930.diff
-
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-	echo "">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-
-	ewarn
-	ewarn "spamd is not designed to listen to an untrusted network"
-	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
-	ewarn "configured to do so"
-	ewarn
-	ewarn "If you plan on using the -u flag to spamd, please read the notes"
-	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-
-	if has_version '>=dev-lang/perl-5.8.8'; then
-		ewarn "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-		ewarn "SpamAssassin (and almost all other reasonably complex pieces of perl"
-		ewarn "code!)."
-		echo ""
-		ewarn "We've worked around this in most places, as far as we know, but there may"
-		ewarn "still be some issues.  In addition, there is a speed hit, which it would"
-		ewarn "be nice to avoid."
-		echo ""
-		ewarn "Setting the LANG environment variable before any invocation of"
-		ewarn "SpamAssassin sometimes seems to help fix it, like so:"
-		echo ""
-		ewarn "  export LANG=en_US"
-		echo ""
-		ewarn "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-		ewarn "have reported that this makes no difference. ;)"
-	fi
-	einfo
-	if ! has_version 'dev-perl/Mail-SPF-Query'; then
-		einfo "For spf support, please emerge dev-perl/Mail-SPF-Query"
-	fi
-	if ! has_version 'mail-filter/dcc'; then
-		einfo "For dcc support, please emerge mail-filter/dcc"
-	fi
-	if ! has_version 'dev-python/pyzor'; then
-		einfo "For pyzor support, please emerge dev-python/pyzor"
-	fi
-	if ! has_version 'mail-filter/razor'; then
-		einfo "For razor support, please emerge mail-filter/razor"
-	fi
-	einfo
-	einfo "For addtional functionality, you may wish to emerge:"
-	einfo "dev-perl/IP-Country       dev-perl/Net-Ident "
-	einfo "dev-perl/Mail-DomainKeys"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.3.ebuild b/mail-filter/spamassassin/spamassassin-3.1.3.ebuild
deleted file mode 100644
index 69b0e2c3da45..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.3.ebuild,v 1.9 2006/11/08 16:31:01 iluxa Exp $
-
-inherit perl-module eutils
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	app-crypt/gnupg
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-	echo "">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-
-	ewarn
-	ewarn "spamd is not designed to listen to an untrusted network"
-	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
-	ewarn "configured to do so"
-	ewarn
-	ewarn "If you plan on using the -u flag to spamd, please read the notes"
-	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-
-	if has_version '>=dev-lang/perl-5.8.8'; then
-		ewarn "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-		ewarn "SpamAssassin (and almost all other reasonably complex pieces of perl"
-		ewarn "code!)."
-		echo ""
-		ewarn "We've worked around this in most places, as far as we know, but there may"
-		ewarn "still be some issues.  In addition, there is a speed hit, which it would"
-		ewarn "be nice to avoid."
-		echo ""
-		ewarn "Setting the LANG environment variable before any invocation of"
-		ewarn "SpamAssassin sometimes seems to help fix it, like so:"
-		echo ""
-		ewarn "  export LANG=en_US"
-		echo ""
-		ewarn "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-		ewarn "have reported that this makes no difference. ;)"
-	fi
-	einfo
-	if ! has_version 'dev-perl/Mail-SPF-Query'; then
-		einfo "For spf support, please emerge dev-perl/Mail-SPF-Query"
-	fi
-	if ! has_version 'mail-filter/dcc'; then
-		einfo "For dcc support, please emerge mail-filter/dcc"
-	fi
-	if ! has_version 'dev-python/pyzor'; then
-		einfo "For pyzor support, please emerge dev-python/pyzor"
-	fi
-	if ! has_version 'mail-filter/razor'; then
-		einfo "For razor support, please emerge mail-filter/razor"
-	fi
-	einfo
-	einfo "For addtional functionality, you may wish to emerge:"
-	einfo "dev-perl/IP-Country       dev-perl/Net-Ident "
-	einfo "dev-perl/Mail-DomainKeys"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.4.ebuild b/mail-filter/spamassassin/spamassassin-3.1.4.ebuild
deleted file mode 100644
index 17aeb5d8688e..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.4.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.4.ebuild,v 1.1 2006/08/06 13:07:26 mcummings Exp $
-
-inherit perl-module eutils
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	app-crypt/gnupg
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-	echo "">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-
-	ewarn
-	ewarn "spamd is not designed to listen to an untrusted network"
-	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
-	ewarn "configured to do so"
-	ewarn
-	ewarn "If you plan on using the -u flag to spamd, please read the notes"
-	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-
-	if has_version '>=dev-lang/perl-5.8.8'; then
-		ewarn "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-		ewarn "SpamAssassin (and almost all other reasonably complex pieces of perl"
-		ewarn "code!)."
-		echo ""
-		ewarn "We've worked around this in most places, as far as we know, but there may"
-		ewarn "still be some issues.  In addition, there is a speed hit, which it would"
-		ewarn "be nice to avoid."
-		echo ""
-		ewarn "Setting the LANG environment variable before any invocation of"
-		ewarn "SpamAssassin sometimes seems to help fix it, like so:"
-		echo ""
-		ewarn "  export LANG=en_US"
-		echo ""
-		ewarn "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-		ewarn "have reported that this makes no difference. ;)"
-	fi
-	einfo
-	if ! has_version 'dev-perl/Mail-SPF-Query'; then
-		elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
-	fi
-	if ! has_version 'mail-filter/dcc'; then
-		elog "For dcc support, please emerge mail-filter/dcc"
-	fi
-	if ! has_version 'dev-python/pyzor'; then
-		elog "For pyzor support, please emerge dev-python/pyzor"
-	fi
-	if ! has_version 'mail-filter/razor'; then
-		elog "For razor support, please emerge mail-filter/razor"
-	fi
-	einfo
-	elog "For addtional functionality, you may wish to emerge:"
-	elog "dev-perl/IP-Country       dev-perl/Net-Ident "
-	elog "dev-perl/Mail-DomainKeys"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.5.ebuild b/mail-filter/spamassassin/spamassassin-3.1.5.ebuild
deleted file mode 100644
index e79cf61cfd50..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.5.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.5.ebuild,v 1.2 2006/11/18 21:45:38 mcummings Exp $
-
-inherit perl-module eutils
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	app-crypt/gnupg
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-	echo "">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-
-	ewarn
-	elog "spamd is not designed to listen to an untrusted network"
-	elog "and is vulnerable to DoS attacks (and eternal doom) if"
-	elog "configured to do so"
-	ewarn
-	elog "If you plan on using the -u flag to spamd, please read the notes"
-	elog "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	elog "If you build ${PN} with optional dependancy support,"
-	elog "you can enable them in /etc/mail/spamassassin/init.pre"
-
-	if has_version '>=dev-lang/perl-5.8.8'; then
-		elog "A note from the SA developers:"
-		elog "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-		elog "SpamAssassin (and almost all other reasonably complex pieces of perl"
-		elog "code!)."
-		elog ""
-		elog "We've worked around this in most places, as far as we know, but there may"
-		elog "still be some issues.  In addition, there is a speed hit, which it would"
-		elog "be nice to avoid."
-		elog ""
-		elog "Setting the LANG environment variable before any invocation of"
-		elog "SpamAssassin sometimes seems to help fix it, like so:"
-		elog ""
-		elog "  export LANG=en_US"
-		elog ""
-		elog "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-		elog "have reported that this makes no difference. ;)"
-	fi
-	einfo
-	if ! has_version 'dev-perl/Mail-SPF-Query'; then
-		elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
-	fi
-	if ! has_version 'mail-filter/dcc'; then
-		elog "For dcc support, please emerge mail-filter/dcc"
-	fi
-	if ! has_version 'dev-python/pyzor'; then
-		elog "For pyzor support, please emerge dev-python/pyzor"
-	fi
-	if ! has_version 'mail-filter/razor'; then
-		elog "For razor support, please emerge mail-filter/razor"
-	fi
-	einfo
-	elog "For addtional functionality, you may wish to emerge:"
-	elog "dev-perl/IP-Country       dev-perl/Net-Ident "
-	elog "dev-perl/Mail-DomainKeys"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.6.ebuild b/mail-filter/spamassassin/spamassassin-3.1.6.ebuild
deleted file mode 100644
index ebb7be578816..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.6.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.6.ebuild,v 1.2 2006/11/18 21:45:38 mcummings Exp $
-
-inherit perl-module eutils
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	app-crypt/gnupg
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-	echo "">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-
-	ewarn
-	elog "spamd is not designed to listen to an untrusted network"
-	elog "and is vulnerable to DoS attacks (and eternal doom) if"
-	elog "configured to do so"
-	ewarn
-	elog "If you plan on using the -u flag to spamd, please read the notes"
-	elog "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	elog "If you build ${PN} with optional dependancy support,"
-	elog "you can enable them in /etc/mail/spamassassin/init.pre"
-
-	if has_version '>=dev-lang/perl-5.8.8'; then
-		elog "A note from the SA developers:"
-		elog "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-		elog "SpamAssassin (and almost all other reasonably complex pieces of perl"
-		elog "code!)."
-		elog ""
-		elog "We've worked around this in most places, as far as we know, but there may"
-		elog "still be some issues.  In addition, there is a speed hit, which it would"
-		elog "be nice to avoid."
-		elog ""
-		elog "Setting the LANG environment variable before any invocation of"
-		elog "SpamAssassin sometimes seems to help fix it, like so:"
-		elog ""
-		elog "  export LANG=en_US"
-		elog ""
-		elog "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-		elog "have reported that this makes no difference. ;)"
-	fi
-	einfo
-	if ! has_version 'dev-perl/Mail-SPF-Query'; then
-		elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
-	fi
-	if ! has_version 'mail-filter/dcc'; then
-		elog "For dcc support, please emerge mail-filter/dcc"
-	fi
-	if ! has_version 'dev-python/pyzor'; then
-		elog "For pyzor support, please emerge dev-python/pyzor"
-	fi
-	if ! has_version 'mail-filter/razor'; then
-		elog "For razor support, please emerge mail-filter/razor"
-	fi
-	einfo
-	elog "For addtional functionality, you may wish to emerge:"
-	elog "dev-perl/IP-Country       dev-perl/Net-Ident "
-	elog "dev-perl/Mail-DomainKeys"
-
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.1.7.ebuild b/mail-filter/spamassassin/spamassassin-3.1.7.ebuild
deleted file mode 100644
index 31430ffe88d4..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.7.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.7.ebuild,v 1.2 2007/02/02 17:32:57 gustavoz Exp $
-
-inherit perl-module eutils
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-SRC_TEST="do"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	app-crypt/gnupg
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-
-src_compile() {
-	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	#   (just to be sure, nobody knows how it could happen in the first place).
-	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-	# If ssl is enabled, spamc can be built with ssl support
-	if use ssl; then
-		myconf="${myconf} ENABLE_SSL=yes"
-	else
-		myconf="${myconf} ENABLE_SSL=no"
-	fi
-
-	# Set the path to the Perl executable explictly.  This will be used to
-	# create the initial sharpbang line in the scripts and might cause
-	# a versioned app name end in there, see
-	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-	myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-	# If you are going to enable taint mode, make sure that the bug where
-	# spamd doesn't start when the PATH contains . is addressed, and make
-	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
-	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-	# <http://spamassassin.org/released/Razor2.patch>.
-	myconf="${myconf} PERL_TAINT=no"
-
-	# No settings needed for 'make all'.
-	mymake=""
-
-	# Neither for 'make install'.
-	myinst=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	version_str="${PV//_/-}-${version_tag}"
-
-	# Create the Gentoo config file before Makefile.PL is called so it
-	# is copied later on.
-	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-	# Setting the following env var ensures that no questions are asked.
-	export PERL_MM_USE_DEFAULT=1
-	perl-module_src_prep
-	# Run the autoconf stuff now, just to make the build sequence look more
-	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
-	# calls to Perl.
-	make spamc/Makefile VERSION_STRING="${version_str}"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-	if use qmail; then
-		make spamc/qmail-spamc || die building qmail-spamc failed
-	fi
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-src_install () {
-	perl-module_src_test
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-	echo "">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
-
-	ewarn
-	elog "spamd is not designed to listen to an untrusted network"
-	elog "and is vulnerable to DoS attacks (and eternal doom) if"
-	elog "configured to do so"
-	ewarn
-	elog "If you plan on using the -u flag to spamd, please read the notes"
-	elog "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	elog "If you build ${PN} with optional dependancy support,"
-	elog "you can enable them in /etc/mail/spamassassin/init.pre"
-
-	if has_version '>=dev-lang/perl-5.8.8'; then
-		elog "A note from the SA developers:"
-		elog "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
-		elog "SpamAssassin (and almost all other reasonably complex pieces of perl"
-		elog "code!)."
-		elog ""
-		elog "We've worked around this in most places, as far as we know, but there may"
-		elog "still be some issues.  In addition, there is a speed hit, which it would"
-		elog "be nice to avoid."
-		elog ""
-		elog "Setting the LANG environment variable before any invocation of"
-		elog "SpamAssassin sometimes seems to help fix it, like so:"
-		elog ""
-		elog "  export LANG=en_US"
-		elog ""
-		elog "Notably, the LANG setting must not include \"utf8\".   However, some folks"
-		elog "have reported that this makes no difference. ;)"
-	fi
-	einfo
-	if ! has_version 'dev-perl/Mail-SPF-Query'; then
-		elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
-	fi
-	if ! has_version 'mail-filter/dcc'; then
-		elog "For dcc support, please emerge mail-filter/dcc"
-	fi
-	if ! has_version 'dev-python/pyzor'; then
-		elog "For pyzor support, please emerge dev-python/pyzor"
-	fi
-	if ! has_version 'mail-filter/razor'; then
-		elog "For razor support, please emerge mail-filter/razor"
-	fi
-	einfo
-	elog "For addtional functionality, you may wish to emerge:"
-	elog "dev-perl/IP-Country       dev-perl/Net-Ident "
-	elog "dev-perl/Mail-DomainKeys"
-
-}