Version bumped

12 files changed, 80 insertions, 1168 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 910e88452a5f..a8539c64ce32 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.22 2004/10/28 14:40:36 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.23 2004/11/04 16:33:44 st_lim Exp $
+
+  02 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> -dspam-3.1.0.ebuild,
+  -dspam-3.1.1.ebuild, -dspam-3.2_rc3.ebuild:
+  Version Bump to 3.2.1.
 
   28 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.1.1.ebuild,
   dspam-3.1.2.ebuild, dspam-3.2.0.ebuild, dspam-3.2_beta1.ebuild,
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 4c732606b9a3..9b5b00a327d4 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,18 +1,13 @@
-MD5 8ec5197097fa82976ec935d2aee10148 ChangeLog 5022
+MD5 8a5eca63147191e103ebfa532a3abe2b ChangeLog 5163
 MD5 818341ff579ee7d21ed37a42b91cb945 dspam-3.0.0.ebuild 7029
-MD5 8c2a3c84e374995428805968828b728c dspam-3.1.0.ebuild 9416
-MD5 577b7e5d5e364bf5dc41ba07c0fe84a2 dspam-3.1.1.ebuild 14858
 MD5 b08fbc1616907518bbe03909a57b8b6e dspam-3.1.2.ebuild 14858
-MD5 0e818c5d9f1ac14190d4a34d8668ed45 dspam-3.2.0.ebuild 15152
-MD5 44669aeaf2d1b407343943e61246f4fd dspam-3.2_beta1.ebuild 14861
-MD5 6d6d96f159e956b743db407108fd3492 dspam-3.2_rc3.ebuild 15167
+MD5 2c153540a71f94060eb28b8b99d3ba0b dspam-3.2.0.ebuild 15300
+MD5 adeb993432ac3d7315d2651aaf54c2a7 dspam-3.2.1.ebuild 15996
 MD5 dbfbe5a3bbe3347938107f5f5bd2197e metadata.xml 308
 MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309
 MD5 e0469b961385fda4305602dc2519d319 files/README.qmail 2317
 MD5 cd1bdb75fd86304f9453741a910cb8a2 files/crontab.db4 196
 MD5 f2f86e8f7ab440c8537f40fa18a0ee43 files/crontab.mysql 118
-MD5 98667f3553df911cd92818a1162a95ed files/digest-dspam-3.2_beta1 68
-MD5 e867cb6cbb3196ac407e7dfc765bb327 files/digest-dspam-3.2_rc3 65
 MD5 9a2fda6789f0db17b6a32ca84e9e3884 files/dspam.cron 2501
 MD5 2163ca41de383f09f4d754e2d35cb158 files/logrotate.dspam 156
 MD5 84ec40b77696359ae49560588db9b948 files/mysql.data 52
@@ -24,7 +19,6 @@ MD5 e6d1b8232199f288fe75501251ade317 files/trusted.users 19
 MD5 2cd345708a9889a04c472a9e5be7400e files/untrusted.mailer_args 24
 MD5 8b68501138fbe92e10bbd93a03c9f2ab files/upgrade.sql 807
 MD5 05dce5dc8cf516655657aa2a4cc5f1da files/digest-dspam-3.0.0 63
-MD5 7f1185a1a89bc7c74aafba93afc2b0cf files/digest-dspam-3.1.0 63
 MD5 4b7bb6bbede742676e3e7017210104c5 files/digest-dspam-3.2.0 63
-MD5 1abffcec9dd1aad2db3d68918b4aec05 files/digest-dspam-3.1.1 63
+MD5 4d666bbdf8092d4bd49428ea31eadbfb files/digest-dspam-3.2.1 63
 MD5 a8c089a75fb1ee3c2b4f32ffc04c638e files/digest-dspam-3.1.2 63
diff --git a/mail-filter/dspam/dspam-3.1.0.ebuild b/mail-filter/dspam/dspam-3.1.0.ebuild
deleted file mode 100644
index a9fd93ec2b10..000000000000
--- a/mail-filter/dspam/dspam-3.1.0.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.1.0.ebuild,v 1.6 2004/10/24 15:08:56 st_lim Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-SRC_URI="http://www.nuclearelephant.com/projects/dspam/sources/${P}.tar.gz"
-HOMEPAGE="http://www.nuclearelephant.com/projects/dspam/index.html"
-LICENSE="GPL-2"
-
-IUSE="cyrus debug exim mysql maildrop neural postgres procmail"
-DEPEND="exim? ( >=mail-mta/exim-4.34 )
-		mysql? ( >=dev-db/mysql-3.23 ) || ( >=sys-libs/db-4.0 )
-		maildrop? ( >=mail-filter/maildrop-1.5.3 )
-		postgres? ( >=dev-db/postgresql-7.4.3 )
-		procmail? ( >=mail-filter/procmail-3.22 )
-		x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
-		"
-RDEPEND="virtual/cron
-		app-admin/logrotate"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-
-# some FHS-like structure
-HOMEDIR="/etc/mail/dspam"
-DATADIR="/var/spool/dspam"
-LOGDIR="/var/log/dspam"
-CONFIGDIR="${HOMEDIR}/config"
-
-MYSQL_TABLE_TYPE="space.optimized"
-
-pkg_setup() {
-	if use mysql && use postgres; then
-		echo
-		ewarn "You have both \"mysql\" and \"postgres\" in your USE flags."
-		ewarn "Will default to MySQL as your dspam database backend."
-		ewarn "If you want to build with Postgres support; hit Control-C now."
-		ewarn "Change your USE flag -mysql and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"net-mail/dspam -mysql postgres\" >> /etc/portage/package.use\`"
-		einfo "to build dspam with Postgres database as your dspam backend."
-		)
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	fi
-	id dspam 2>/dev/null || enewgroup dspam 65532
-	id dspam 2>/dev/null || enewuser dspam 65532 /bin/bash ${HOMEDIR} dspam
-}
-
-src_compile() {
-	local myconf
-	local agent
-
-	# these are the default settings
-	myconf="${myconf} --with-signature-life=14"
-	if use cyrus; then
-		agent="/usr/lib/cyrus/deliver %u"
-	elif use exim; then
-		agent="/usr/sbin/exim -oMr spam-scanned %u"
-	elif use maildrop; then
-		agent="/usr/bin/maildrop -d %u"
-	elif use procmail; then
-		agent="/usr/bin/procmail"
-	else
-		agent="/usr/sbin/sendmail"
-	fi
-	myconf="${myconf} --enable-homedir-dotfiles"
-	myconf="${myconf} --enable-spam-subject"
-	myconf="${myconf} --enable-chi-square"
-	myconf="${myconf} --enable-robinson"
-	myconf="${myconf} --enable-robinson-pvalues"
-	myconf="${myconf} --enable-source-address-tracking"
-
-	# ${HOMEDIR}/data is a symlink to ${DATADIR}
-	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
-	myconf="${myconf} --with-dspam-mode=4755"
-	myconf="${myconf} --with-dspam-owner=dspam"
-	myconf="${myconf} --with-dspam-group=dspam"
-	myconf="${myconf} --with-dspam-home-owner=dspam"
-	myconf="${myconf} --with-dspam-home-group=dspam"
-
-	# enables support for debugging (touch /etc/dspam/.debug to turn on)
-	# optional: even MORE debugging output, use with extreme caution!
-	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
-
-	# select storage driver
-	if use mysql ; then
-		myconf="${myconf} --with-storage-driver=mysql_drv"
-		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
-		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
-		myconf="${myconf} --with-client-compression"
-
-		# an experimental feature available with MySQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use postgres ; then
-		myconf="${myconf} --with-storage-driver=pgsql_drv"
-		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
-		myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
-
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-		myconf="${myconf} --with-db4-includes=/usr/include"
-		myconf="${myconf} --with-db4-libraries=/usr/lib"
-	fi
-
-	econf ${myconf} \
-		--with-delivery-agent="${agent}" || die
-	emake || die
-
-}
-
-src_install () {
-	# open up perms on /etc/mail/dspam
-	diropts -m0775 -o dspam -g dspam
-	dodir ${HOMEDIR}
-	keepdir ${HOMEDIR}
-
-	# keeps dspam data in /var
-	diropts -m0775 -o dspam -g dspam
-	dodir ${DATADIR}
-	keepdir ${DATADIR}
-
-	# keeps dspam log in /var/log
-	diropts -m0775 -o dspam -g dspam
-	dodir ${LOGDIR}
-	keepdir ${LOGDIR}
-
-	# make install
-	make DESTDIR=${D} install || die
-	chmod 4755 ${D}/usr/bin/dspam
-
-	# documentation
-	dodoc CHANGELOG LICENSE README RELEASE.NOTES
-	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
-	if use mysql ; then
-		newdoc tools.mysql_drv/README README.MYSQL
-	fi
-
-	# install some initial configuration
-	insinto ${HOMEDIR}
-	insopts -m0664 -o dspam -g dspam
-	[ -f ${HOMEDIR}/trusted.users ] || doins ${FILESDIR}/trusted.users
-	if use cyrus; then
-		echo "/usr/lib/cyrus/deliver %u" > ${T}/untrusted.mailer_args
-	elif use exim; then
-		echo "/usr/sbin/exim -oMr spam-scanned" > ${T}/untrusted.mailer_args
-	elif use maildrop; then
-		echo "/usr/bin/maildrop -d %u" > ${T}/untrusted.mailer_args
-	elif use procmail; then
-		echo "/usr/bin/procmail -d %u" > ${T}/untrusted.mailer_args
-	else
-		echo "/usr/sbin/sendmail" >  ${T}/untrusted.mailer_args
-	fi
-
-	# database related configuration and scripts
-	if use mysql ; then
-		local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-
-		# Replace some variables in the configuration files
-		sed -e "s,@HOMEDIR@,${HOMEDIR},g" \
-			-e "s,@confdir@,${CONFIGDIR},g" \
-			${FILESDIR}/crontab.mysql > ${T}/dspam.cron
-
-		sed -e "s,@password@,${PASSWORD},g" \
-			${FILESDIR}/mysql.data > ${T}/mysql.data
-
-		sed -e "s,@password@,${PASSWORD},g" \
-			${FILESDIR}/mysql_create_user.sql > ${T}/mysql_setup.sql
-		cat ${S}/tools.mysql_drv/mysql_objects.sql.${MYSQL_TABLE_TYPE} >> ${T}/mysql_setup.sql
-
-		sed -e "s,@HOMEDIR@,${HOMEDIR},g" \
-			-e "s,@confdir@,${CONFIGDIR},g" \
-			${FILESDIR}/mysql_install_db > ${T}/mysql_install_db
-
-		sed -e "s,@HOMEDIR@,${HOMEDIR},g" \
-			-e "s,@password@,${PASSWORD},g" \
-			-e "s,@confdir@,${CONFIGDIR},g" \
-			 ${FILESDIR}/mysql_purge_db > ${T}/mysql_purge_db
-
-		insinto ${CONFIGDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/mysql.data
-		doins ${T}/mysql_setup.sql
-		doins ${FILESDIR}/upgrade.sql
-		newins tools.mysql_drv/purge.sql mysql_purge.sql
-
-		exeinto ${CONFIGDIR}
-		exeopts -m755 -o dspam -g dspam
-		doexe ${T}/mysql_install_db
-		doexe ${T}/mysql_purge_db
-
-		einfo "Fresh install: run ${HOMEDIR}/mysql_install_db to setup the dspam database"
-		einfo "Upgrades from 2.x: See the README for instructions on updating your tables for dspam-3.0"
-	elif use postgres ; then
-		local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-
-		# Replace some variables in the configuration files
-		sed -e "s,@HOMEDIR@,${HOMEDIR},g" \
-			-e "s,@confdir@,${CONFIGDIR},g" \
-			${FILESDIR}/crontab.mysql > ${T}/dspam.cron
-
-		sed -e "s,@HOSTNAME@,127.0.0.1,g" \
-			-e "s,@PORT@,5432,g" \
-			-e "s,@USERNAME@,dspam,g" \
-			-e "s,@PASSWORD@,${PASSWORD},g" \
-			-e "s,@DATABASE@,dspam,g" \
-			${FILESDIR}/pgsql.data > ${T}/pgsql.data
-
-		cat ${S}/tools.pgsql_drv/pgsql_objects.sql >> ${T}/pgsql_setup.sql
-
-		sed -e "s,@HOMEDIR@,${HOMEDIR},g" \
-			-e "s,@password@,${PASSWORD},g" \
-			-e "s,@confdir@,${CONFIGDIR},g" \
-			-e "s,mysql_purge,pgsql_purge,g" \
-			 ${FILESDIR}/mysql_purge_db > ${T}/pgsql_purge_db
-
-		insinto ${CONFIGDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/pgsql.data
-		doins ${T}/pgsql_setup.sql
-		doins ${FILESDIR}/upgrade.sql
-		newins tools.pgsql_drv/purge.sql pgsql_purge.sql
-
-		exeinto ${CONFIGDIR}
-		exeopts -m755 -o dspam -g dspam
-		doexe ${T}/pgsql_purge_db
-
-		einfo "Fresh install: You need to set up and install a database called dspam,"
-		einfo "create a user called dspam with rights to the database, and password "
-		einfo "'${PASSWORD}', and then install ${CONFIGDIR}/pgsql_setup.sql on your "
-		einfo "Postgres installation"
-	else
-		cp ${FILESDIR}/crontab.db4 ${T}/dspam.cron
-	fi
-
-	# installs the cron job to the cron directory
-	diropts -m0755 -o dspam -g dspam
-	dodir /etc/cron.daily
-	keepdir /etc/cron.daily
-	exeinto /etc/cron.daily
-	exeopts -m0755 -o dspam -g dspam
-	doexe ${T}/dspam.cron
-
-	# installs the logrotation scripts to the logrotate.d directory
-	diropts -m0755 -o dspam -g dspam
-	dodir /etc/logrotate.d
-	keepdir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	insopts -m0755 -o dspam -g dspam
-	newins ${FILESDIR}/logrotate.dspam dspam
-
-	# Symlinks data to HOMEDIR
-	dosym ${DATADIR} ${HOMEDIR}/data
-
-	# Log files for symlinks
-	diropts -m0755 -o dspam -g dspam
-	dodir ${LOGDIR}
-	keepdir ${LOGDIR}
-	touch ${D}${LOGDIR}/sql.errors
-	touch ${D}${LOGDIR}/system.log
-	touch ${D}${LOGDIR}/dspam.debug
-	touch ${D}${LOGDIR}/dspam.messages
-
-	# dspam still wants to write to a few files in it's home dir
-	dosym ${LOGDIR}/sql.errors ${HOMEDIR}/sql.errors
-	dosym ${LOGDIR}/system.log ${HOMEDIR}/system.log
-	dosym ${LOGDIR}/dspam.debug ${HOMEDIR}/dspam.debug
-	dosym ${LOGDIR}/dspam.messages ${HOMEDIR}/dspam.messages
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		einfo "To setup dspam to run out-of-the-box on your system with a mysql database, run:"
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	fi
-	if use exim ; then
-		echo
-		einfo "To use dspam in conjunction with your exim system, you should read the README"
-	fi
-}
-
-pkg_config () {
-	if use mysql ; then
-		${CONFIGDIR}/mysql_install_db
-		mv ${CONFIGDIR}/mysql.data ${HOMEDIR}
-	fi
-}
diff --git a/mail-filter/dspam/dspam-3.1.1.ebuild b/mail-filter/dspam/dspam-3.1.1.ebuild
deleted file mode 100644
index 0f9a5226ec81..000000000000
--- a/mail-filter/dspam/dspam-3.1.1.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.1.1.ebuild,v 1.9 2004/10/28 14:40:36 st_lim Exp $
-
-inherit eutils
-
-MY_PV=${PV/_beta20/.beta.2}
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-SRC_URI="http://www.nuclearelephant.com/projects/dspam/sources/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://www.nuclearelephant.com/projects/dspam/index.html"
-LICENSE="GPL-2"
-
-IUSE="cyrus debug exim mysql maildrop neural oci8 postgres procmail"
-DEPEND="exim? ( >=mail-mta/exim-4.34 )
-		mysql? ( >=dev-db/mysql-3.23 ) || ( >=sys-libs/db-4.0 )
-		maildrop? ( >=mail-filter/maildrop-1.5.3 )
-		postgres? ( >=dev-db/postgresql-7.4.3 )
-		procmail? ( >=mail-filter/procmail-3.22 )
-		x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
-		"
-RDEPEND="virtual/cron
-		app-admin/logrotate"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-
-# some FHS-like structure
-HOMEDIR="/etc/mail/dspam"
-DATADIR="/var/spool/dspam"
-LOGDIR="/var/log/dspam"
-CONFIGDIR="${HOMEDIR}/config"
-
-pkg_setup() {
-	if (use mysql && use postgres) || \
-		(use mysql && use oci8) || \
-		(use postgres && use oci8); then
-		echo
-		ewarn "You have two of either \"mysql\", \"postgres\" or \"oci\" in your USE flags."
-		ewarn "Will default to MySQL as your dspam database backend."
-		ewarn "If you want to build with Postgres support; hit Control-C now."
-		ewarn "Change your USE flag -mysql and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"net-mail/dspam -mysql postgres\" >> /etc/portage/package.use\`"
-		einfo "to build dspam with Postgres database as your dspam backend."
-		)
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	fi
-	id dspam 2>/dev/null || enewgroup dspam 65532
-	id dspam 2>/dev/null || enewuser dspam 65532 /bin/bash ${HOMEDIR} dspam
-}
-
-src_compile() {
-	local myconf
-	local agent
-
-	# these are the default settings
-	myconf="${myconf} --with-signature-life=14"
-	if use cyrus; then
-		agent="/usr/lib/cyrus/deliver %u"
-	elif use exim; then
-		agent="/usr/sbin/exim -oMr spam-scanned %u"
-	elif use maildrop; then
-		agent="/usr/bin/maildrop -d %u"
-	elif use procmail; then
-		agent="/usr/bin/procmail"
-	else
-		agent="/usr/sbin/sendmail"
-	fi
-	myconf="${myconf} --enable-source-address-tracking"
-	myconf="${myconf} --enable-large-scale"
-	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --enable-spam-subject"
-	myconf="${myconf} --enable-signature-headers"
-	myconf="${myconf} --enable-whitelist"
-	#myconf="${myconf} --enable-chi-square"
-	#myconf="${myconf} --enable-robinson"
-	#myconf="${myconf} --enable-robinson-pvalues"
-
-	# ${HOMEDIR}/data is a symlink to ${DATADIR}
-	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
-	myconf="${myconf} --with-dspam-mode=4755"
-	myconf="${myconf} --with-dspam-owner=dspam"
-	myconf="${myconf} --with-dspam-group=dspam"
-	myconf="${myconf} --with-dspam-home-owner=dspam"
-	myconf="${myconf} --with-dspam-home-group=dspam"
-	myconf="${myconf} --with-dspam-home-mode=4755"
-
-	# enables support for debugging (touch /etc/dspam/.debug to turn on)
-	# optional: even MORE debugging output, use with extreme caution!
-	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
-
-	# select storage driver
-	if use mysql ; then
-		myconf="${myconf} --with-storage-driver=mysql_drv"
-		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
-		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
-		myconf="${myconf} --with-client-compression"
-		myconf="${myconf} --enable-virtual-users"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use postgres ; then
-		myconf="${myconf} --with-storage-driver=pgsql_drv"
-		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
-		myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
-		myconf="${myconf} --enable-virtual-users"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use oci8 ; then
-		myconf="${myconf} --with-storage-driver=ora_drv"
-		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
-		myconf="${myconf} --enable-virtual-users"
-
-		# I am in no way a Oracle specialist. If someone knows
-		# how to query the version of Oracle, then let me know.
-		if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1)
-		then
-			--with-oracle-version=MAJOR
-			myconf="${myconf} --with-oracle-version=10"
-		fi
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-		myconf="${myconf} --with-db4-includes=/usr/include"
-		myconf="${myconf} --with-db4-libraries=/usr/lib"
-	fi
-
-	econf ${myconf} \
-		--with-delivery-agent="${agent}" || die
-	emake || die
-
-}
-
-src_install () {
-	# open up perms on /etc/mail/dspam
-	diropts -m0775 -o dspam -g dspam
-	dodir ${HOMEDIR}
-	keepdir ${HOMEDIR}
-
-	# keeps dspam data in /var
-	diropts -m0775 -o dspam -g dspam
-	dodir ${DATADIR}
-	keepdir ${DATADIR}
-
-	# keeps dspam log in /var/log
-	diropts -m0775 -o dspam -g dspam
-	dodir ${LOGDIR}
-	keepdir ${LOGDIR}
-
-	# make install
-	make DESTDIR=${D} install || die
-	chmod 4755 ${D}/usr/bin/dspam
-
-	# documentation
-	dodoc CHANGELOG LICENSE README RELEASE.NOTES
-	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
-	if use mysql ; then
-		newdoc tools.mysql_drv/README README.MYSQL
-	elif use postgres ; then
-		newdoc tools.pgsql_drv/README README.PGSQL
-	elif use oci8 ; then
-		newdoc tools.ora_drv/README README.ORACLE
-	fi
-
-	# build some initial configuration data
-	(echo "trainingMode=TEFT"
-	echo "spamAction=deliver"
-	echo "spamSubject=[SPAM]"
-	echo "statisticalSedation=5"
-	echo "enableBNR=on"
-	echo "enableWhitelist=on") >${T}/default.prefs
-	echo "groupname:classification:*globaluser" >${T}/group
-	if use cyrus; then
-		echo "/usr/lib/cyrus/deliver %u" > ${T}/untrusted.mailer_args
-	elif use exim; then
-		echo "/usr/sbin/exim -oMr spam-scanned" > ${T}/untrusted.mailer_args
-	elif use maildrop; then
-		echo "/usr/bin/maildrop -d %u" > ${T}/untrusted.mailer_args
-	elif use procmail; then
-		echo "/usr/bin/procmail -d %u" > ${T}/untrusted.mailer_args
-	else
-		echo "/usr/sbin/sendmail" >  ${T}/untrusted.mailer_args
-	fi
-
-	# install some initial configuration
-	insinto ${HOMEDIR}
-	insopts -m0664 -o dspam -g dspam
-	[ ! -f ${HOMEDIR}/trusted.users ] && doins ${FILESDIR}/trusted.users
-	doins ${T}/untrusted.mailer_args
-	doins ${T}/default.prefs
-	doins ${T}/group
-
-	local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-
-	# database related configuration and scripts
-	if use mysql ; then
-		insinto ${CONFIGDIR}
-		insopts -m644 -o dspam -g dspam
-
-		if [ -f ${HOMEDIR}/mysql.data ]; then
-			# Use an existing password
-			PASSWORD="$(tail -n 2 ${HOMEDIR}/mysql.data | head -n 1 )"
-		else
-			# Create the mysql.data file
-			echo "127.0.0.1" >${T}/mysql.data
-			echo "3306" >>${T}/mysql.data
-			echo "dspam" >>${T}/mysql.data
-			echo "${PASSWORD}" >>${T}/mysql.data
-			echo "dspam" >>${T}/mysql.data
-			doins ${T}/mysql.data
-		fi
-
-		newins tools.mysql_drv/mysql_objects.sql.speed.optimized mysql_objects.sql.speed.optimized
-		newins tools.mysql_drv/mysql_objects.sql.space.optimized mysql_objects.sql.space.optimized
-		newins tools.mysql_drv/virtual_users.sql mysql_virtual_users.sql
-		newins tools.mysql_drv/purge.sql mysql_purge.sql
-		newins ${FILESDIR}/upgrade.sql mysql_upgrade.sql
-	elif use postgres ; then
-		insinto ${CONFIGDIR}
-		insopts -m644 -o dspam -g dspam
-
-		if [ -f ${HOMEDIR}/mysql.data ]; then
-			# Use an existing password
-			PASSWORD="$(tail -n 2 ${HOMEDIR}/pgsql.data | head -n 1 )"
-		else
-			# Create the pgsql.data file
-			echo "127.0.0.1" >${T}/pgsql.data
-			echo "5432" >>${T}/pgsql.data
-			echo "dspam" >>${T}/pgsql.data
-			echo "${PASSWORD}" >>${T}/pgsql.data
-			echo "dspam" >>${T}/pgsql.data
-			doins ${T}/pgsql.data
-		fi
-
-		newins tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
-		newins tools.pgsql_drv/virtual_users.sql pgsql_virtual_users.sql
-		newins tools.pgsql_drv/purge.sql pgsql_purge.sql
-
-	elif use oci8 ; then
-		insinto ${CONFIGDIR}
-		insopts -m644 -o dspam -g dspam
-
-		if [ -f ${HOMEDIR}/oracle.data ]; then
-			# Use an existing password
-			PASSWORD="$(tail -n 2 ${HOMEDIR}/oracle.data | head -n 1 )"
-		else
-			# Create the pgsql.data file
-			echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))" >${T}/oracle.data
-			echo "dspam" >>${T}/oracle.data
-			echo "${PASSWORD}" >>${T}/oracle.data
-			echo "dspam" >>${T}/oracle.data
-			doins ${T}/oracle.data
-		fi
-
-		newins tools.ora_drv/oral_objects.sql ora_objects.sql
-		newins tools.ora_drv/virtual_users.sql ora_virtual_users.sql
-		newins tools.ora_drv/purge.sql ora_purge.sql
-	fi
-
-	# installs the cron job to the cron directory
-	diropts -m0755 -o dspam -g dspam
-	dodir /etc/cron.daily
-	keepdir /etc/cron.daily
-	exeinto /etc/cron.daily
-	exeopts -m0755 -o dspam -g dspam
-	doexe ${FILESDIR}/dspam.cron
-
-	# installs the logrotation scripts to the logrotate.d directory
-	diropts -m0755 -o dspam -g dspam
-	dodir /etc/logrotate.d
-	keepdir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	insopts -m0755 -o dspam -g dspam
-	newins ${FILESDIR}/logrotate.dspam dspam
-
-	# Symlinks data to HOMEDIR
-	dosym ${DATADIR} ${HOMEDIR}/data
-
-	# Log files for symlinks
-	diropts -m0755 -o dspam -g dspam
-	dodir ${LOGDIR}
-	keepdir ${LOGDIR}
-	touch ${T}/empty.file
-	newins ${T}/empty.file sql.errors
-	newins ${T}/empty.file system.log
-	newins ${T}/empty.file dspam.debug
-	newins ${T}/empty.file dspam.messages
-
-	# dspam still wants to write to a few files in it's home dir
-	dosym ${LOGDIR}/sql.errors ${HOMEDIR}/sql.errors
-	dosym ${LOGDIR}/system.log ${HOMEDIR}/system.log
-	dosym ${LOGDIR}/dspam.debug ${HOMEDIR}/dspam.debug
-	dosym ${LOGDIR}/dspam.messages ${HOMEDIR}/dspam.messages
-
-	# dspam enviroment
-	echo -ne "CONFIG_PROTECT_MASK=\"${HOMEDIR} ${CONFIGDIR}\"\n\n" > ${T}/40dspam
-	doenvd ${T}/40dspam || die
-}
-
-pkg_postinst() {
-	if use mysql || use postgres; then
-		einfo "To setup dspam to run out-of-the-box on your system with a mysql or pgsql database, run:"
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	fi
-	if use exim ; then
-		echo
-		einfo "To use dspam in conjunction with your exim system, you should read the README"
-	fi
-}
-
-pkg_config () {
-	if use mysql ; then
-		[[ -f ${CONFIGDIR}/mysql.data ]] && mv -f ${CONFIGDIR}/mysql.data ${HOMEDIR}
-		DSPAM_MySQL_USER="$(cat ${HOMEDIR}/mysql.data|head -n 3|tail -n 1)"
-		DSPAM_MySQL_PWD="$(cat ${HOMEDIR}/mysql.data|head -n 4|tail -n 1)"
-		DSPAM_MySQL_DB="$(cat ${HOMEDIR}/mysql.data|head -n 5|tail -n 1)"
-
-		ewarn "When prompted for a password, please enter your MySQL root password"
-		ewarn ""
-
-		einfo "Creating DSPAM MySQL database \"${DSPAM_MySQL_DB}\""
-		/usr/bin/mysqladmin -u root -p create ${DSPAM_MySQL_DB}
-
-		einfo "Creating DSPAM MySQL tables for data objects"
-		einfo "  Please select what kind of object database you like to use."
-		einfo "    [1] Space optimized database"
-		einfo "    [2] Speed optimized database"
-		einfo
-		while true
-		do
-			read -n 1 -s -p "  Press 1 or 2 on the keyboard to select database" DSPAM_MySQL_DB_Type
-			[[ "${DSPAM_MySQL_DB_Type}" == "1" || "${DSPAM_MySQL_DB_Type}" == "2" ]] && break
-		done
-
-		if [ "${DSPAM_MySQL_DB_Type}" == "1" ]
-		then
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFIGDIR}/mysql_objects.sql.space.optimized
-		else
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFIGDIR}/mysql_objects.sql.speed.optimized
-		fi
-
-		einfo "Creating DSPAM MySQL database for virtual users"
-		/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFIGDIR}/mysql_virtual_users.sql
-
-		einfo "Creating DSPAM MySQL user \"${DSPAM_MySQL_USER}\""
-		/usr/bin/mysql -u root -p -e "GRANT SELECT,INSERT,UPDATE,DELETE ON ${DSPAM_MySQL_DB}.* TO ${DSPAM_MySQL_USER}@localhost IDENTIFIED BY '${DSPAM_MySQL_PWD}';FLUSH PRIVILEGES;" -D mysql
-	elif use postgres ; then
-		[[ -f ${CONFIGDIR}/pgsql.data ]] && mv -f ${CONFIGDIR}/pgsql.data ${HOMEDIR}
-		DSPAM_PgSQL_USER="$(cat ${HOMEDIR}/pgsql.data|head -n 3|tail -n 1)"
-		DSPAM_PgSQL_PWD="$(cat ${HOMEDIR}/pgsql.data|head -n 4|tail -n 1)"
-		DSPAM_PgSQL_DB="$(cat ${HOMEDIR}/pgsql.data|head -n 5|tail -n 1)"
-
-		ewarn "When prompted for a password, please enter your PgSQL postgres password"
-		ewarn ""
-
-		einfo "Creating DSPAM PostgreSQL user \"${DSPAM_PgSQL_USER}\""
-		/usr/bin/psql -d template1 -U postgres -c "CREATE USER ${DSPAM_PgSQL_USER} WITH PASSWORD '${DSPAM_PgSQL_PWD}' NOCREATEDB NOCREATEUSER;" 1>/dev/null 2>&1
-
-		einfo "Creating DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\""
-		/usr/bin/psql -d template1 -U postgres -c "CREATE DATABASE ${DSPAM_PgSQL_DB};" 1>/dev/null 2>&1
-
-		einfo "Getting DSPAM PostgreSQL userid for \"${DSPAM_PgSQL_USER}\""
-		DSPAM_PgSQL_USERID=$(/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -t -c "SELECT usesysid FROM pg_user WHERE usename='${DSPAM_PgSQL_USER}';" | head -n1 | sed "s/^[ ]*\([^ ]*\).*/\1/g")
-		einfo "  UserID: ${DSPAM_PgSQL_USERID}"
-
-		einfo "Getting DSPAM PostgreSQL databaseid for \"${DSPAM_PgSQL_DB}\""
-		DSPAM_PgSQL_DBID=$(/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -t -c "SELECT datdba FROM pg_database WHERE datname='${DSPAM_PgSQL_DB}';" | head -n1 | sed "s/^[ ]*\([^ ]*\).*/\1/g")
-		einfo "  DBID: ${DSPAM_PgSQL_DBID}"
-
-		einfo "Changing owner of DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\" to \"${DSPAM_PgSQL_USER}\""
-		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "UPDATE pg_database SET datdba=${DSPAM_PgSQL_USERID} WHERE datname='${DSPAM_PgSQL_DB}';" 1>/dev/null 2>&1
-
-		einfo "Creating DSPAM PostgreSQL tables"
-		PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${CONFIGDIR}/pgsql_objects.sql 1>/dev/null 2>&1
-		PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${CONFIGDIR}/pgsql_virtual_users.sql 1>/dev/null 2>&1
-
-		einfo "Grant privileges to DSPAM PostgreSQL objects to \"${DSPAM_PgSQL_USER}\""
-		for foo in $(/usr/bin/psql -t -d ${DSPAM_PgSQL_DB} -U postgres -c "SELECT tablename FROM pg_tables WHERE tablename LIKE 'dspam\%';")
-		do
-			/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON TABLE ${foo} TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
-		done
-		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ${DSPAM_PgSQL_DB} TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
-		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
-	elif use oci8 ; then
-		[[ -f ${CONFIGDIR}/oracle.data ]] && mv -f ${CONFIGDIR}/oracle.data ${HOMEDIR}
-	fi
-
-}
diff --git a/mail-filter/dspam/dspam-3.2.0.ebuild b/mail-filter/dspam/dspam-3.2.0.ebuild
index d0907ed828f0..81d52602ff07 100644
--- a/mail-filter/dspam/dspam-3.2.0.ebuild
+++ b/mail-filter/dspam/dspam-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.0.ebuild,v 1.3 2004/10/28 14:40:36 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.0.ebuild,v 1.4 2004/11/04 16:33:44 st_lim Exp $
 
 inherit eutils
 
@@ -172,24 +172,27 @@ src_install () {
 	fi
 
 	# build some initial configuration data
-	if use cyrus; then
-		echo "UntrustedDeliveryAgent /usr/lib/cyrus/deliver %u" >> ${D}${HOMEDIR}/dspam.conf
-		sed -e 's:/usr/bin/procmail:/usr/lib/cyrus/deliver %u:g' \
-			-i ${D}${HOMEDIR}/dspam.conf
-	elif use exim; then
-		echo "UntrustedDeliveryAgent /usr/sbin/exim -oMr spam-scanned %u" >> ${D}${HOMEDIR}/dspam.conf
-		sed -e 's:/usr/bin/procmail:/usr/sbin/exim -oMr spam-scanned %u:g' \
-			-i ${D}${HOMEDIR}/dspam.conf
-	elif use maildrop; then
-		echo "UntrustedDeliveryAgent /usr/bin/maildrop -d %u" >> ${D}${HOMEDIR}/dspam.conf
-		sed -e 's:/usr/bin/procmail:/usr/bin/maildrop -d %u:g' \
-			-i ${D}${HOMEDIR}/dspam.conf
-	elif use procmail; then
-		echo "UntrustedDeliveryAgent /usr/bin/procmail" >> ${D}${HOMEDIR}/dspam.conf
-	else
-		echo "UntrustedDeliveryAgent /usr/sbin/sendmail" >> ${D}${HOMEDIR}/dspam.conf
-		sed -e 's:/usr/bin/procmail:/usr/sbin/sendmail:g' \
-			-i ${D}${HOMEDIR}/dspam.conf
+	[ -f ${HOMEDIR}/dspam.conf ] && cp ${HOMEDIR}/dspam.conf ${D}${HOMEDIR}/dspam.conf
+	if [ ! -f ${HOMEDIR}/dspam.conf ]; then
+		if use cyrus; then
+			echo "UntrustedDeliveryAgent /usr/lib/cyrus/deliver %u" >> ${D}${HOMEDIR}/dspam.conf
+			sed -e 's:/usr/bin/procmail:/usr/lib/cyrus/deliver %u:g' \
+				-i ${D}${HOMEDIR}/dspam.conf
+		elif use exim; then
+			echo "UntrustedDeliveryAgent /usr/sbin/exim -oMr spam-scanned %u" >> ${D}${HOMEDIR}/dspam.conf
+			sed -e 's:/usr/bin/procmail:/usr/sbin/exim -oMr spam-scanned %u:g' \
+				-i ${D}${HOMEDIR}/dspam.conf
+		elif use maildrop; then
+			echo "UntrustedDeliveryAgent /usr/bin/maildrop -d %u" >> ${D}${HOMEDIR}/dspam.conf
+			sed -e 's:/usr/bin/procmail:/usr/bin/maildrop -d %u:g' \
+				-i ${D}${HOMEDIR}/dspam.conf
+		elif use procmail; then
+			echo "UntrustedDeliveryAgent /usr/bin/procmail" >> ${D}${HOMEDIR}/dspam.conf
+		else
+			echo "UntrustedDeliveryAgent /usr/sbin/sendmail" >> ${D}${HOMEDIR}/dspam.conf
+			sed -e 's:/usr/bin/procmail:/usr/sbin/sendmail:g' \
+				-i ${D}${HOMEDIR}/dspam.conf
+		fi
 	fi
 
 	local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
diff --git a/mail-filter/dspam/dspam-3.2_rc3.ebuild b/mail-filter/dspam/dspam-3.2.1.ebuild
index bddcfec06ee6..e8ae6d889f84 100644
--- a/mail-filter/dspam/dspam-3.2_rc3.ebuild
+++ b/mail-filter/dspam/dspam-3.2.1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2_rc3.ebuild,v 1.3 2004/10/28 14:40:36 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.1.ebuild,v 1.1 2004/11/04 16:33:44 st_lim Exp $
 
 inherit eutils
 
-MY_PV=${PV/_rc3/.pr1}
-S=${WORKDIR}/${PN}-${MY_PV}
+S=${WORKDIR}/${PN}-${PV}
 DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-SRC_URI="http://www.nuclearelephant.com/projects/dspam/sources/${PN}-${MY_PV}.tar.gz"
+SRC_URI="http://www.nuclearelephant.com/projects/dspam/sources/${PN}-${PV}.tar.gz"
 HOMEPAGE="http://www.nuclearelephant.com/projects/dspam/index.html"
 LICENSE="GPL-2"
 
@@ -65,7 +64,6 @@ src_compile() {
 	# these are the default settings
 	myconf="${myconf} --with-signature-life=14"
 	myconf="${myconf} --enable-broken-return-codes"
-	myconf="${myconf} --enable-preferences-extension"
 	myconf="${myconf} --enable-experimental"
 	myconf="${myconf} --enable-long-username"
 	myconf="${myconf} --enable-robinson"
@@ -93,6 +91,7 @@ src_compile() {
 		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
 		myconf="${myconf} --with-client-compression"
 		myconf="${myconf} --enable-virtual-users"
+		myconf="${myconf} --enable-preferences-extension"
 
 		# an experimental feature available with MySQL and PgSQL backend
 		if use neural ; then
@@ -103,6 +102,7 @@ src_compile() {
 		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
 		myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
 		myconf="${myconf} --enable-virtual-users"
+		myconf="${myconf} --enable-preferences-extension"
 
 		# an experimental feature available with MySQL and PgSQL backend
 		if use neural ; then
@@ -112,6 +112,7 @@ src_compile() {
 		myconf="${myconf} --with-storage-driver=ora_drv"
 		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
 		myconf="${myconf} --enable-virtual-users"
+		myconf="${myconf} --enable-preferences-extension"
 
 		# I am in no way a Oracle specialist. If someone knows
 		# how to query the version of Oracle, then let me know.
@@ -123,15 +124,13 @@ src_compile() {
 	elif use sqlite ; then
 		myconf="${myconf} --with-storage-driver=sqlite_drv"
 		myconf="${myconf} --enable-virtual-users"
+		myconf="${myconf} --enable-preferences-extension"
 
 	else
 		myconf="${myconf} --with-storage-driver=libdb4_drv"
-		myconf="${myconf} --with-db4-includes=/usr/include"
-		myconf="${myconf} --with-db4-libraries=/usr/lib"
 	fi
 
-	econf ${myconf} \
-		--with-delivery-agent="${agent}" || die
+	econf ${myconf} || die
 	emake || die
 
 }
@@ -156,7 +155,7 @@ src_install () {
 	sed -e 's/rm -f ..mandir.\(.*\)/rm -f ${D}${mandir}\1/g' \
 		-e 's/ln -s ..mandir.\(.*\) ..mandir.\(.*3\)/ln -s ${mandir}\1.gz ${D}${mandir}\2.gz/g' \
 		-i Makefile
-	make DESTDIR=${D} etcdest=${D}${HOMEDIR} sysconfdir=${D}${HOMEDIR} install || die
+	make DESTDIR=${D} install || die
 	chmod 4755 ${D}/usr/bin/dspam
 
 	# documentation
@@ -173,24 +172,27 @@ src_install () {
 	fi
 
 	# build some initial configuration data
-	if use cyrus; then
-		echo "UntrustedDeliveryAgent /usr/lib/cyrus/deliver %u" >> ${D}${HOMEDIR}/dspam.conf
-		sed -e 's:/usr/bin/procmail:/usr/lib/cyrus/deliver %u:g' \
-			-i ${D}${HOMEDIR}/dspam.conf
-	elif use exim; then
-		echo "UntrustedDeliveryAgent /usr/sbin/exim -oMr spam-scanned %u" >> ${D}${HOMEDIR}/dspam.conf
-		sed -e 's:/usr/bin/procmail:/usr/sbin/exim -oMr spam-scanned %u:g' \
-			-i ${D}${HOMEDIR}/dspam.conf
-	elif use maildrop; then
-		echo "UntrustedDeliveryAgent /usr/bin/maildrop -d %u" >> ${D}${HOMEDIR}/dspam.conf
-		sed -e 's:/usr/bin/procmail:/usr/bin/maildrop -d %u:g' \
-			-i ${D}${HOMEDIR}/dspam.conf
-	elif use procmail; then
-		echo "UntrustedDeliveryAgent /usr/bin/procmail" >> ${D}${HOMEDIR}/dspam.conf
-	else
-		echo "UntrustedDeliveryAgent /usr/sbin/sendmail" >> ${D}${HOMEDIR}/dspam.conf
-		sed -e 's:/usr/bin/procmail:/usr/sbin/sendmail:g' \
-			-i ${D}${HOMEDIR}/dspam.conf
+	[ -f ${HOMEDIR}/dspam.conf ] && cp ${HOMEDIR}/dspam.conf ${D}${HOMEDIR}/dspam.conf
+	if [ ! -f ${HOMEDIR}/dspam.conf ]; then
+		if use cyrus; then
+			echo "UntrustedDeliveryAgent /usr/lib/cyrus/deliver %u" >> ${D}${HOMEDIR}/dspam.conf
+			sed -e 's:/usr/bin/procmail:/usr/lib/cyrus/deliver %u:g' \
+				-i ${D}${HOMEDIR}/dspam.conf
+		elif use exim; then
+			echo "UntrustedDeliveryAgent /usr/sbin/exim -oMr spam-scanned %u" >> ${D}${HOMEDIR}/dspam.conf
+			sed -e 's:/usr/bin/procmail:/usr/sbin/exim -oMr spam-scanned %u:g' \
+				-i ${D}${HOMEDIR}/dspam.conf
+		elif use maildrop; then
+			echo "UntrustedDeliveryAgent /usr/bin/maildrop -d %u" >> ${D}${HOMEDIR}/dspam.conf
+			sed -e 's:/usr/bin/procmail:/usr/bin/maildrop -d %u:g' \
+				-i ${D}${HOMEDIR}/dspam.conf
+		elif use procmail; then
+			echo "UntrustedDeliveryAgent /usr/bin/procmail" >> ${D}${HOMEDIR}/dspam.conf
+		else
+			echo "UntrustedDeliveryAgent /usr/sbin/sendmail" >> ${D}${HOMEDIR}/dspam.conf
+			sed -e 's:/usr/bin/procmail:/usr/sbin/sendmail:g' \
+				-i ${D}${HOMEDIR}/dspam.conf
+		fi
 	fi
 
 	local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
@@ -205,12 +207,14 @@ src_install () {
 			PASSWORD="$(tail -n 2 ${HOMEDIR}/mysql.data | head -n 1 )"
 		else
 			# Create the mysql.data file
-			echo "127.0.0.1" >${T}/mysql.data
-			echo "3306" >>${T}/mysql.data
-			echo "dspam" >>${T}/mysql.data
-			echo "${PASSWORD}" >>${T}/mysql.data
-			echo "dspam" >>${T}/mysql.data
+			echo "MySQLServer    /var/run/mysqld/mysqld.sock" >> ${T}/mysql.data
+			echo "MySQLPort"                                  >> ${T}/mysql.data
+			echo "MySQLUser      dspam"                       >> ${T}/mysql.data
+			echo "MySQLPass      ${PASSWORD}"                 >> ${T}/mysql.data
+			echo "MySQLDb        dspam"                       >> ${T}/mysql.data
+			echo "MySQLCompress  true"                        >> ${T}/mysql.data
 			doins ${T}/mysql.data
+			[ -z "`grep '^MySQL' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/mysql.data >> ${D}/${HOMEDIR}/dspam.conf
 		fi
 
 		newins tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql
@@ -230,12 +234,13 @@ src_install () {
 			PASSWORD="$(tail -n 2 ${HOMEDIR}/pgsql.data | head -n 1 )"
 		else
 			# Create the pgsql.data file
-			echo "127.0.0.1" >${T}/pgsql.data
-			echo "5432" >>${T}/pgsql.data
-			echo "dspam" >>${T}/pgsql.data
-			echo "${PASSWORD}" >>${T}/pgsql.data
-			echo "dspam" >>${T}/pgsql.data
+			echo "PgSQLServer    127.0.0.1"    >> ${T}/mysql.data
+			echo "PgSQLPort      5432"         >> ${T}/mysql.data
+			echo "PgSQLUser      dspam"        >> ${T}/mysql.data
+			echo "PgSQLPass      ${PASSWORD}"  >> ${T}/mysql.data
+			echo "PgSQLDb        dspam"        >> ${T}/mysql.data
 			doins ${T}/pgsql.data
+			[ -z "`grep '^PgSQL' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/pgsql.data >> ${D}/${HOMEDIR}/dspam.conf
 		fi
 
 		newins tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
@@ -251,11 +256,12 @@ src_install () {
 			PASSWORD="$(tail -n 2 ${HOMEDIR}/oracle.data | head -n 1 )"
 		else
 			# Create the pgsql.data file
-			echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))" >${T}/oracle.data
-			echo "dspam" >>${T}/oracle.data
-			echo "${PASSWORD}" >>${T}/oracle.data
-			echo "dspam" >>${T}/oracle.data
+			echo "OraServer      (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))" >>${T}/oracle.data
+			echo "OraUser        dspam" >>${T}/oracle.data
+			echo "OraPass        ${PASSWORD}" >>${T}/oracle.data
+			echo "OraSchema      dspam" >>${T}/oracle.data
 			doins ${T}/oracle.data
+			[ -z "`grep '^Ora' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/oracle.data >> ${D}/${HOMEDIR}/dspam.conf
 		fi
 
 		newins tools.ora_drv/oral_objects.sql ora_objects.sql
diff --git a/mail-filter/dspam/dspam-3.2_beta1.ebuild b/mail-filter/dspam/dspam-3.2_beta1.ebuild
deleted file mode 100644
index 814c73ea895e..000000000000
--- a/mail-filter/dspam/dspam-3.2_beta1.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2_beta1.ebuild,v 1.5 2004/10/28 14:40:36 st_lim Exp $
-
-inherit eutils
-
-MY_PV=${PV/_beta1/.beta-1}
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-SRC_URI="http://www.nuclearelephant.com/projects/dspam/sources/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://www.nuclearelephant.com/projects/dspam/index.html"
-LICENSE="GPL-2"
-
-IUSE="cyrus debug exim mysql maildrop neural oci8 postgres procmail"
-DEPEND="exim? ( >=mail-mta/exim-4.34 )
-		mysql? ( >=dev-db/mysql-3.23 ) || ( >=sys-libs/db-4.0 )
-		maildrop? ( >=mail-filter/maildrop-1.5.3 )
-		postgres? ( >=dev-db/postgresql-7.4.3 )
-		procmail? ( >=mail-filter/procmail-3.22 )
-		x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
-		"
-RDEPEND="virtual/cron
-		app-admin/logrotate"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-
-# some FHS-like structure
-HOMEDIR="/etc/mail/dspam"
-DATADIR="/var/spool/dspam"
-LOGDIR="/var/log/dspam"
-CONFIGDIR="${HOMEDIR}/config"
-
-pkg_setup() {
-	if (use mysql && use postgres) || \
-		(use mysql && use oci8) || \
-		(use postgres && use oci8); then
-		echo
-		ewarn "You have two of either \"mysql\", \"postgres\" or \"oci\" in your USE flags."
-		ewarn "Will default to MySQL as your dspam database backend."
-		ewarn "If you want to build with Postgres support; hit Control-C now."
-		ewarn "Change your USE flag -mysql and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"net-mail/dspam -mysql postgres\" >> /etc/portage/package.use\`"
-		einfo "to build dspam with Postgres database as your dspam backend."
-		)
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	fi
-	id dspam 2>/dev/null || enewgroup dspam 65532
-	id dspam 2>/dev/null || enewuser dspam 65532 /bin/bash ${HOMEDIR} dspam
-}
-
-src_compile() {
-	local myconf
-	local agent
-
-	# these are the default settings
-	myconf="${myconf} --with-signature-life=14"
-	if use cyrus; then
-		agent="/usr/lib/cyrus/deliver %u"
-	elif use exim; then
-		agent="/usr/sbin/exim -oMr spam-scanned %u"
-	elif use maildrop; then
-		agent="/usr/bin/maildrop -d %u"
-	elif use procmail; then
-		agent="/usr/bin/procmail"
-	else
-		agent="/usr/sbin/sendmail"
-	fi
-	myconf="${myconf} --enable-source-address-tracking"
-	myconf="${myconf} --enable-large-scale"
-	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --enable-spam-subject"
-	myconf="${myconf} --enable-signature-headers"
-	myconf="${myconf} --enable-whitelist"
-	#myconf="${myconf} --enable-chi-square"
-	#myconf="${myconf} --enable-robinson"
-	#myconf="${myconf} --enable-robinson-pvalues"
-
-	# ${HOMEDIR}/data is a symlink to ${DATADIR}
-	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
-	myconf="${myconf} --with-dspam-mode=4755"
-	myconf="${myconf} --with-dspam-owner=dspam"
-	myconf="${myconf} --with-dspam-group=dspam"
-	myconf="${myconf} --with-dspam-home-owner=dspam"
-	myconf="${myconf} --with-dspam-home-group=dspam"
-	myconf="${myconf} --with-dspam-home-mode=4755"
-
-	# enables support for debugging (touch /etc/dspam/.debug to turn on)
-	# optional: even MORE debugging output, use with extreme caution!
-	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
-
-	# select storage driver
-	if use mysql ; then
-		myconf="${myconf} --with-storage-driver=mysql_drv"
-		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
-		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
-		myconf="${myconf} --with-client-compression"
-		myconf="${myconf} --enable-virtual-users"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use postgres ; then
-		myconf="${myconf} --with-storage-driver=pgsql_drv"
-		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
-		myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
-		myconf="${myconf} --enable-virtual-users"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use oci8 ; then
-		myconf="${myconf} --with-storage-driver=ora_drv"
-		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
-		myconf="${myconf} --enable-virtual-users"
-
-		# I am in no way a Oracle specialist. If someone knows
-		# how to query the version of Oracle, then let me know.
-		if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1)
-		then
-			--with-oracle-version=MAJOR
-			myconf="${myconf} --with-oracle-version=10"
-		fi
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-		myconf="${myconf} --with-db4-includes=/usr/include"
-		myconf="${myconf} --with-db4-libraries=/usr/lib"
-	fi
-
-	econf ${myconf} \
-		--with-delivery-agent="${agent}" || die
-	emake || die
-
-}
-
-src_install () {
-	# open up perms on /etc/mail/dspam
-	diropts -m0775 -o dspam -g dspam
-	dodir ${HOMEDIR}
-	keepdir ${HOMEDIR}
-
-	# keeps dspam data in /var
-	diropts -m0775 -o dspam -g dspam
-	dodir ${DATADIR}
-	keepdir ${DATADIR}
-
-	# keeps dspam log in /var/log
-	diropts -m0775 -o dspam -g dspam
-	dodir ${LOGDIR}
-	keepdir ${LOGDIR}
-
-	# make install
-	make DESTDIR=${D} install || die
-	chmod 4755 ${D}/usr/bin/dspam
-
-	# documentation
-	dodoc CHANGELOG LICENSE README RELEASE.NOTES
-	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
-	if use mysql ; then
-		newdoc tools.mysql_drv/README README.MYSQL
-	elif use postgres ; then
-		newdoc tools.pgsql_drv/README README.PGSQL
-	elif use oci8 ; then
-		newdoc tools.ora_drv/README README.ORACLE
-	fi
-
-	# build some initial configuration data
-	(echo "trainingMode=TEFT"
-	echo "spamAction=deliver"
-	echo "spamSubject=[SPAM]"
-	echo "statisticalSedation=5"
-	echo "enableBNR=on"
-	echo "enableWhitelist=on") >${T}/default.prefs
-	echo "groupname:classification:*globaluser" >${T}/group
-	if use cyrus; then
-		echo "/usr/lib/cyrus/deliver %u" > ${T}/untrusted.mailer_args
-	elif use exim; then
-		echo "/usr/sbin/exim -oMr spam-scanned" > ${T}/untrusted.mailer_args
-	elif use maildrop; then
-		echo "/usr/bin/maildrop -d %u" > ${T}/untrusted.mailer_args
-	elif use procmail; then
-		echo "/usr/bin/procmail -d %u" > ${T}/untrusted.mailer_args
-	else
-		echo "/usr/sbin/sendmail" >  ${T}/untrusted.mailer_args
-	fi
-
-	# install some initial configuration
-	insinto ${HOMEDIR}
-	insopts -m0664 -o dspam -g dspam
-	[ ! -f ${HOMEDIR}/trusted.users ] && doins ${FILESDIR}/trusted.users
-	doins ${T}/untrusted.mailer_args
-	doins ${T}/default.prefs
-	doins ${T}/group
-
-	local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-
-	# database related configuration and scripts
-	if use mysql ; then
-		insinto ${CONFIGDIR}
-		insopts -m644 -o dspam -g dspam
-
-		if [ -f ${HOMEDIR}/mysql.data ]; then
-			# Use an existing password
-			PASSWORD="$(tail -n 2 ${HOMEDIR}/mysql.data | head -n 1 )"
-		else
-			# Create the mysql.data file
-			echo "127.0.0.1" >${T}/mysql.data
-			echo "3306" >>${T}/mysql.data
-			echo "dspam" >>${T}/mysql.data
-			echo "${PASSWORD}" >>${T}/mysql.data
-			echo "dspam" >>${T}/mysql.data
-			doins ${T}/mysql.data
-		fi
-
-		newins tools.mysql_drv/mysql_objects.sql.speed.optimized mysql_objects.sql.speed.optimized
-		newins tools.mysql_drv/mysql_objects.sql.space.optimized mysql_objects.sql.space.optimized
-		newins tools.mysql_drv/virtual_users.sql mysql_virtual_users.sql
-		newins tools.mysql_drv/purge.sql mysql_purge.sql
-		newins ${FILESDIR}/upgrade.sql mysql_upgrade.sql
-	elif use postgres ; then
-		insinto ${CONFIGDIR}
-		insopts -m644 -o dspam -g dspam
-
-		if [ -f ${HOMEDIR}/mysql.data ]; then
-			# Use an existing password
-			PASSWORD="$(tail -n 2 ${HOMEDIR}/pgsql.data | head -n 1 )"
-		else
-			# Create the pgsql.data file
-			echo "127.0.0.1" >${T}/pgsql.data
-			echo "5432" >>${T}/pgsql.data
-			echo "dspam" >>${T}/pgsql.data
-			echo "${PASSWORD}" >>${T}/pgsql.data
-			echo "dspam" >>${T}/pgsql.data
-			doins ${T}/pgsql.data
-		fi
-
-		newins tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
-		newins tools.pgsql_drv/virtual_users.sql pgsql_virtual_users.sql
-		newins tools.pgsql_drv/purge.sql pgsql_purge.sql
-
-	elif use oci8 ; then
-		insinto ${CONFIGDIR}
-		insopts -m644 -o dspam -g dspam
-
-		if [ -f ${HOMEDIR}/oracle.data ]; then
-			# Use an existing password
-			PASSWORD="$(tail -n 2 ${HOMEDIR}/oracle.data | head -n 1 )"
-		else
-			# Create the pgsql.data file
-			echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))" >${T}/oracle.data
-			echo "dspam" >>${T}/oracle.data
-			echo "${PASSWORD}" >>${T}/oracle.data
-			echo "dspam" >>${T}/oracle.data
-			doins ${T}/oracle.data
-		fi
-
-		newins tools.ora_drv/oral_objects.sql ora_objects.sql
-		newins tools.ora_drv/virtual_users.sql ora_virtual_users.sql
-		newins tools.ora_drv/purge.sql ora_purge.sql
-	fi
-
-	# installs the cron job to the cron directory
-	diropts -m0755 -o dspam -g dspam
-	dodir /etc/cron.daily
-	keepdir /etc/cron.daily
-	exeinto /etc/cron.daily
-	exeopts -m0755 -o dspam -g dspam
-	doexe ${FILESDIR}/dspam.cron
-
-	# installs the logrotation scripts to the logrotate.d directory
-	diropts -m0755 -o dspam -g dspam
-	dodir /etc/logrotate.d
-	keepdir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	insopts -m0755 -o dspam -g dspam
-	newins ${FILESDIR}/logrotate.dspam dspam
-
-	# Symlinks data to HOMEDIR
-	dosym ${DATADIR} ${HOMEDIR}/data
-
-	# Log files for symlinks
-	diropts -m0755 -o dspam -g dspam
-	dodir ${LOGDIR}
-	keepdir ${LOGDIR}
-	touch ${T}/empty.file
-	newins ${T}/empty.file sql.errors
-	newins ${T}/empty.file system.log
-	newins ${T}/empty.file dspam.debug
-	newins ${T}/empty.file dspam.messages
-
-	# dspam still wants to write to a few files in it's home dir
-	dosym ${LOGDIR}/sql.errors ${HOMEDIR}/sql.errors
-	dosym ${LOGDIR}/system.log ${HOMEDIR}/system.log
-	dosym ${LOGDIR}/dspam.debug ${HOMEDIR}/dspam.debug
-	dosym ${LOGDIR}/dspam.messages ${HOMEDIR}/dspam.messages
-
-	# dspam enviroment
-	echo -ne "CONFIG_PROTECT_MASK=\"${HOMEDIR} ${CONFIGDIR}\"\n\n" > ${T}/40dspam
-	doenvd ${T}/40dspam || die
-}
-
-pkg_postinst() {
-	if use mysql || use postgres; then
-		einfo "To setup dspam to run out-of-the-box on your system with a mysql or pgsql database, run:"
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	fi
-	if use exim ; then
-		echo
-		einfo "To use dspam in conjunction with your exim system, you should read the README"
-	fi
-}
-
-pkg_config () {
-	if use mysql ; then
-		[[ -f ${CONFIGDIR}/mysql.data ]] && mv -f ${CONFIGDIR}/mysql.data ${HOMEDIR}
-		DSPAM_MySQL_USER="$(cat ${HOMEDIR}/mysql.data|head -n 3|tail -n 1)"
-		DSPAM_MySQL_PWD="$(cat ${HOMEDIR}/mysql.data|head -n 4|tail -n 1)"
-		DSPAM_MySQL_DB="$(cat ${HOMEDIR}/mysql.data|head -n 5|tail -n 1)"
-
-		ewarn "When prompted for a password, please enter your MySQL root password"
-		ewarn ""
-
-		einfo "Creating DSPAM MySQL database \"${DSPAM_MySQL_DB}\""
-		/usr/bin/mysqladmin -u root -p create ${DSPAM_MySQL_DB}
-
-		einfo "Creating DSPAM MySQL tables for data objects"
-		einfo "  Please select what kind of object database you like to use."
-		einfo "    [1] Space optimized database"
-		einfo "    [2] Speed optimized database"
-		einfo
-		while true
-		do
-			read -n 1 -s -p "  Press 1 or 2 on the keyboard to select database" DSPAM_MySQL_DB_Type
-			[[ "${DSPAM_MySQL_DB_Type}" == "1" || "${DSPAM_MySQL_DB_Type}" == "2" ]] && break
-		done
-
-		if [ "${DSPAM_MySQL_DB_Type}" == "1" ]
-		then
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFIGDIR}/mysql_objects.sql.space.optimized
-		else
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFIGDIR}/mysql_objects.sql.speed.optimized
-		fi
-
-		einfo "Creating DSPAM MySQL database for virtual users"
-		/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFIGDIR}/mysql_virtual_users.sql
-
-		einfo "Creating DSPAM MySQL user \"${DSPAM_MySQL_USER}\""
-		/usr/bin/mysql -u root -p -e "GRANT SELECT,INSERT,UPDATE,DELETE ON ${DSPAM_MySQL_DB}.* TO ${DSPAM_MySQL_USER}@localhost IDENTIFIED BY '${DSPAM_MySQL_PWD}';FLUSH PRIVILEGES;" -D mysql
-	elif use postgres ; then
-		[[ -f ${CONFIGDIR}/pgsql.data ]] && mv -f ${CONFIGDIR}/pgsql.data ${HOMEDIR}
-		DSPAM_PgSQL_USER="$(cat ${HOMEDIR}/pgsql.data|head -n 3|tail -n 1)"
-		DSPAM_PgSQL_PWD="$(cat ${HOMEDIR}/pgsql.data|head -n 4|tail -n 1)"
-		DSPAM_PgSQL_DB="$(cat ${HOMEDIR}/pgsql.data|head -n 5|tail -n 1)"
-
-		ewarn "When prompted for a password, please enter your PgSQL postgres password"
-		ewarn ""
-
-		einfo "Creating DSPAM PostgreSQL user \"${DSPAM_PgSQL_USER}\""
-		/usr/bin/psql -d template1 -U postgres -c "CREATE USER ${DSPAM_PgSQL_USER} WITH PASSWORD '${DSPAM_PgSQL_PWD}' NOCREATEDB NOCREATEUSER;" 1>/dev/null 2>&1
-
-		einfo "Creating DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\""
-		/usr/bin/psql -d template1 -U postgres -c "CREATE DATABASE ${DSPAM_PgSQL_DB};" 1>/dev/null 2>&1
-
-		einfo "Getting DSPAM PostgreSQL userid for \"${DSPAM_PgSQL_USER}\""
-		DSPAM_PgSQL_USERID=$(/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -t -c "SELECT usesysid FROM pg_user WHERE usename='${DSPAM_PgSQL_USER}';" | head -n1 | sed "s/^[ ]*\([^ ]*\).*/\1/g")
-		einfo "  UserID: ${DSPAM_PgSQL_USERID}"
-
-		einfo "Getting DSPAM PostgreSQL databaseid for \"${DSPAM_PgSQL_DB}\""
-		DSPAM_PgSQL_DBID=$(/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -t -c "SELECT datdba FROM pg_database WHERE datname='${DSPAM_PgSQL_DB}';" | head -n1 | sed "s/^[ ]*\([^ ]*\).*/\1/g")
-		einfo "  DBID: ${DSPAM_PgSQL_DBID}"
-
-		einfo "Changing owner of DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\" to \"${DSPAM_PgSQL_USER}\""
-		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "UPDATE pg_database SET datdba=${DSPAM_PgSQL_USERID} WHERE datname='${DSPAM_PgSQL_DB}';" 1>/dev/null 2>&1
-
-		einfo "Creating DSPAM PostgreSQL tables"
-		PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${CONFIGDIR}/pgsql_objects.sql 1>/dev/null 2>&1
-		PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${CONFIGDIR}/pgsql_virtual_users.sql 1>/dev/null 2>&1
-
-		einfo "Grant privileges to DSPAM PostgreSQL objects to \"${DSPAM_PgSQL_USER}\""
-		for foo in $(/usr/bin/psql -t -d ${DSPAM_PgSQL_DB} -U postgres -c "SELECT tablename FROM pg_tables WHERE tablename LIKE 'dspam\%';")
-		do
-			/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON TABLE ${foo} TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
-		done
-		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ${DSPAM_PgSQL_DB} TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
-		/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
-	elif use oci8 ; then
-		[[ -f ${CONFIGDIR}/oracle.data ]] && mv -f ${CONFIGDIR}/oracle.data ${HOMEDIR}
-	fi
-
-}
diff --git a/mail-filter/dspam/files/digest-dspam-3.1.0 b/mail-filter/dspam/files/digest-dspam-3.1.0
deleted file mode 100644
index 5ae37a5f154d..000000000000
--- a/mail-filter/dspam/files/digest-dspam-3.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 217c622c8eba132756ebc3cac8396897 dspam-3.1.0.tar.gz 611220
diff --git a/mail-filter/dspam/files/digest-dspam-3.1.1 b/mail-filter/dspam/files/digest-dspam-3.1.1
deleted file mode 100644
index d5be6906884e..000000000000
--- a/mail-filter/dspam/files/digest-dspam-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2e316ca905af86dd73d2abe5ba69b82 dspam-3.1.1.tar.gz 612267
diff --git a/mail-filter/dspam/files/digest-dspam-3.2.1 b/mail-filter/dspam/files/digest-dspam-3.2.1
new file mode 100644
index 000000000000..619daf44be2e
--- /dev/null
+++ b/mail-filter/dspam/files/digest-dspam-3.2.1
@@ -0,0 +1 @@
+MD5 a4357c02ca39a68480719adf47fca67a dspam-3.2.1.tar.gz 618780
diff --git a/mail-filter/dspam/files/digest-dspam-3.2_beta1 b/mail-filter/dspam/files/digest-dspam-3.2_beta1
deleted file mode 100644
index 83f00742888d..000000000000
--- a/mail-filter/dspam/files/digest-dspam-3.2_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b176025be4f0ff0bf2498b0808284f6 dspam-3.2.beta-1.tar.gz 616958
diff --git a/mail-filter/dspam/files/digest-dspam-3.2_rc3 b/mail-filter/dspam/files/digest-dspam-3.2_rc3
deleted file mode 100644
index 3704cecc84df..000000000000
--- a/mail-filter/dspam/files/digest-dspam-3.2_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e096266381684e44ae9cc8793ea72ab3 dspam-3.2.pr1.tar.gz 608734