Removing old stuff

(Portage version: 2.0.53_rc7)

6 files changed, 0 insertions, 1466 deletions

diff --git a/mail-filter/dspam/dspam-3.4.8.ebuild b/mail-filter/dspam/dspam-3.4.8.ebuild
deleted file mode 100644
index 62d57715fb3c..000000000000
--- a/mail-filter/dspam/dspam-3.4.8.ebuild
+++ /dev/null
@@ -1,518 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.4.8.ebuild,v 1.2 2005/07/09 03:16:34 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-SRC_URI="http://dspam.nuclearelephant.com/sources/${P}.tar.gz
-		http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
-HOMEPAGE="http://dspam.nuclearelephant.com/"
-LICENSE="GPL-2"
-
-IUSE="cyrus debug exim mysql maildrop neural oci8 postgres procmail sqlite sqlite3 large-domain virtual-users"
-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 )
-		sqlite? ( <dev-db/sqlite-3 )
-		sqlite3? ( >=dev-db/sqlite-3 )
-		postgres? ( >=dev-db/postgresql-7.4.3 )
-		procmail? ( >=mail-filter/procmail-3.22 )
-		x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
-		>=sys-libs/db-4.0
-		"
-RDEPEND="sys-process/cronbase
-		app-admin/logrotate"
-KEYWORDS="~x86 ~ppc ~alpha"
-SLOT="0"
-
-# some FHS-like structure
-HOMEDIR="/etc/mail/dspam"
-DATADIR="/var/spool/dspam"
-LOGDIR="/var/log/dspam"
-
-pkg_setup() {
-	local multiple_dbs="0"
-	local supported_dbs="mysql postgres oci8 sqlite sqlite3"
-	for foo in ${supported_dbs}; do
-		if use ${foo}; then
-			let multiple_dbs="((multiple_dbs + 1 ))"
-			einfo " ${foo} database support in your USE flags."
-		fi
-	done
-	if [ "${multiple_dbs}" -ge "2" ]; then
-		echo
-		ewarn "You have multiple database backends active in your USE flags."
-		ewarn "Will default to MySQL as your dspam database backend."
-		ewarn "If you want to build with another database backend; 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 \"mail-filter/dspam -mysql postgres -oci8 -sqlite\" >> /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
-	elif [ "${multiple_dbs}" -eq "0" ]; then
-		echo
-		ewarn "You did not select any SQL based database backend. DSPAM will use"
-		ewarn "Berkeley DB for storing data. If you don't want that, then enable"
-		ewarn "one of the following USE flags:"
-		ewarn "${supported_dbs}"
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	fi
-	has_version ">sys-kernel/linux-headers-2.6" || (
-		einfo "To use the new DSPAM deamon mode, you need to emerge"
-		einfo ">sys-kernel/linux-headers-2.6 and rebuild glibc to support NPTL"
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	)
-	id dspam 2>/dev/null || enewgroup dspam 26
-	id dspam 2>/dev/null || enewuser dspam 26 /bin/bash ${HOMEDIR} dspam
-}
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} --enable-long-username"
-	use large-domain && myconf="${myconf} --enable-large-scale" ||\
-	    myconf="${myconf} --enable-domain-scale"
-
-	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} --sysconfdir=${HOMEDIR}"
-	myconf="${myconf} --with-logdir=${LOGDIR}"
-	use virtual-users || myconf="${myconf} --enable-homedir"
-
-	# 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} --enable-preferences-extension"
-
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			myconf="${myconf} --enable-daemon"
-		fi
-
-		use virtual-users && myconf="${myconf} --enable-virtual-users"
-		# an experimental feature available with MySQL and PgSQL backend
-		use neural && myconf="${myconf} --enable-neural-networking"
-	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-preferences-extension"
-
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			myconf="${myconf} --enable-daemon"
-		fi
-
-		use virtual-users && myconf="${myconf} --enable-virtual-users"
-		# an experimental feature available with MySQL and PgSQL backend
-		use neural && myconf="${myconf} --enable-neural-networking"
-	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
-			myconf="${myconf} --with-oracle-version=10"
-		fi
-	elif use sqlite3 ; then
-		myconf="${myconf} --with-storage-driver=sqlite3_drv"
-		myconf="${myconf} --enable-virtual-users"
-	elif use sqlite ; then
-		myconf="${myconf} --with-storage-driver=sqlite_drv"
-		myconf="${myconf} --enable-virtual-users"
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install () {
-
-	# Fix issues with older dspam configuration
-	CONFIG_PROTECT="${CONFIG_PROTECT} ${DATADIR} /var/run/dspam"
-	CONFIG_PROTECT_MASK="${CONFIG_PROTECTMASK/${HOMEDIR}/}"
-	CONFIG_PROTECT_MASK="${CONFIG_PROTECTMASK/${DATADIR}/}"
-
-	# 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}
-	insinto ${LOGDIR}
-	touch ${T}/empty.file
-	newins ${T}/empty.file system.log
-	chown dspam:dspam ${D}/${LOGDIR}/system.log
-	dosym ${LOGDIR}/system.log ${HOMEDIR}/system.log
-
-	# ${HOMEDIR}/data is a symlink to ${DATADIR}
-	dosym ${DATADIR} ${HOMEDIR}/data
-
-	# make install
-	make DESTDIR=${D} install || die
-	chmod 4755 ${D}/usr/bin/dspam
-	chmod 4755 ${D}/usr/bin/dspam_stats
-
-	# documentation
-	dodoc CHANGELOG LICENSE README* RELEASE.NOTES UPGRADING
-	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
-	docinto doc
-	dodoc doc/*.txt
-	docinto gentoo
-	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
-	if use mysql; then
-		dodoc src/tools.mysql_drv/README
-	elif use postgres ; then
-		dodoc src/tools.pgsql_drv/README
-	elif use oci8 ; then
-		dodoc src/tools.ora_drv/README
-	elif use sqlite || use sqlite3 ; then
-		dodoc src/tools.sqlite_drv/README
-	fi
-	doman man/dspam*
-	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
-
-	# build some initial configuration data
-	[ -f ${HOMEDIR}/dspam.conf ] \
-		&& cp ${HOMEDIR}/dspam.conf ${T}/dspam.conf \
-		|| cp src/dspam.conf ${T}/dspam.conf
-
-	if use cyrus; then
-		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/lib/cyrus/deliver %u\":gI' \
-			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/lib/cyrus/deliver\":gI' \
-			-i ${T}/dspam.conf
-	elif use exim; then
-		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' \
-			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' \
-			-i ${T}/dspam.conf
-	elif use maildrop; then
-		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/maildrop -d %u\":gI' \
-			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/maildrop\":gI' \
-			-i ${T}/dspam.conf
-	elif use procmail; then
-		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/procmail -d %u\":gI' \
-			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/procmail":gI' \
-			-i ${T}/dspam.conf
-	else
-		sed -e 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/sendmail\":gI' \
-			-e 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/sendmail\":gI' \
-			-i ${T}/dspam.conf
-	fi
-	if use mysql || use postgres; then
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			# keeps dspam socket for deamon in /var/run/dspam
-			diropts -m0775 -o dspam -g dspam
-			dodir /var/run/dspam
-			keepdir /var/run/dspam
-
-			# We use sockets for the deamon instead of tcp port 24
-			sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/var/run/dspam/dspam.sock\":gI' \
-				-e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/var/run/dspam/dspam.pid:gI' \
-				-i ${T}/dspam.conf
-
-			# dspam init script
-			exeinto /etc/init.d
-			exeopts -m0755 -o root -g root
-			newexe ${FILESDIR}/dspam.rc dspam
-		fi
-	fi
-
-	# generate random password
-	local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-
-	# database related configuration and scripts
-	if use mysql; then
-		# Use existing configuration if possible
-		if [[ -f ${ROOT}${HOMEDIR}/mysql.data ]]; then
-			DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${HOMEDIR}/mysql.data") )
-			for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-				[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-			done
-		else
-			DSPAM_DB_DATA[0]="/var/run/mysqld/mysqld.sock"
-			DSPAM_DB_DATA[1]=""
-			DSPAM_DB_DATA[2]="dspam"
-			DSPAM_DB_DATA[3]="${PASSWORD}"
-			DSPAM_DB_DATA[4]="dspam"
-			DSPAM_DB_DATA[5]="true"
-		fi
-
-		# Modify configuration and create mysql.data file
-		sed -e "s:^#*\(MySQLServer[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[0]}:gI" \
-			-e "s:^#*\(MySQLPort[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[1]}:gI" \
-			-e "s:^#*\(MySQLUser[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[2]}:gI" \
-			-e "s:^#*\(MySQLPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI" \
-			-e "s:^#*\(MySQLDb[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[4]}:gI" \
-			-e "s:^#*\(MySQLCompress[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[5]}:gI" \
-			-i ${T}/dspam.conf
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/mysql.data
-		done
-		insinto ${HOMEDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/mysql.data
-		newins src/tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql
-		newins src/tools.mysql_drv/mysql_objects-speed.sql mysql_objects-speed.sql
-		newins src/tools.mysql_drv/mysql_objects-4.1.sql mysql_objects-4.1.sql
-		newins src/tools.mysql_drv/virtual_users.sql mysql_virtual_users.sql
-		newins src/tools.mysql_drv/neural.sql mysql_neural.sql
-		newins src/tools.mysql_drv/purge.sql mysql_purge.sql
-		newins src/tools.mysql_drv/purge-4.1.sql mysql_purge-4.1.sql
-
-	elif use postgres ; then
-		# Use existing configuration if possible
-		if [ -f ${ROOT}${HOMEDIR}/pgsql.data ]; then
-			DSPAM_DB_DATA=( $(cat "${ROOT}${HOMEDIR}/pgsql.data") )
-			for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-				[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-			done
-		else
-			DSPAM_DB_DATA[0]="127.0.0.1"
-			DSPAM_DB_DATA[1]="5432"
-			DSPAM_DB_DATA[2]="dspam"
-			DSPAM_DB_DATA[3]="${PASSWORD}"
-			DSPAM_DB_DATA[4]="dspam"
-		fi
-
-		# Modify configuration and create pgsql.data file
-		sed -e "s:^#*\(PgSQLServer[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[0]}:gI" \
-			-e "s:^#*\(PgSQLPort[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[1]}:gI" \
-			-e "s:^#*\(PgSQLUser[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[2]}:gI" \
-			-e "s:^#*\(PgSQLPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI" \
-			-e "s:^#*\(PgSQLDb[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[4]}:gI" \
-			-e "s:^#*\(PgSQLConnectionCache[\t ]*.\):\1:gI" \
-			-i ${T}/dspam.conf
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/pgsql.data
-		done
-
-		insinto ${HOMEDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/pgsql.data
-		newins src/tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
-		newins src/tools.pgsql_drv/virtual_users.sql pgsql_virtual_users.sql
-		newins src/tools.pgsql_drv/purge.sql pgsql_purge.sql
-
-	elif use oci8 ; then
-		# Use existing configuration if possible
-		if [ -f ${ROOT}${HOMEDIR}/oracle.data ]; then
-			DSPAM_DB_DATA=( $(cat "${ROOT}${HOMEDIR}/oracle.data") )
-			for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-				[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-			done
-		else
-			DSPAM_DB_DATA[0]="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))"
-			DSPAM_DB_DATA[1]="dspam"
-			DSPAM_DB_DATA[2]="${PASSWORD}"
-			DSPAM_DB_DATA[3]="dspam"
-		fi
-
-		# Modify configuration and create oracle.data file
-		sed -e "s:^#*\(OraServer[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[0]}:gI" \
-			-e "s:^\(OraUser[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[1]}:gI" \
-			-e "s:^\(OraPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[2]}:gI" \
-			-e "s:^\(OraSchema[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI"\
-		   	-i ${T}/dspam.conf
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/oracle.data
-		done
-
-		insinto ${HOMEDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/oracle.data
-		newins src/tools.ora_drv/oral_objects.sql ora_objects.sql
-		newins src/tools.ora_drv/virtual_users.sql ora_virtual_users.sql
-		newins src/tools.ora_drv/purge.sql ora_purge.sql
-	elif use sqlite || use sqlite3 ; then
-		insinto ${HOMEDIR}
-		insopts -m644 -o dspam -g dspam
-		newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
-	fi
-
-	sed -e "s:^\(Purge.*\):###\1:g" \
-		-e "s:^#\(Purge.*\):\1:g" \
-		-e "s:^###\(Purge.*\):#\1:g" \
-		-i ${T}/dspam.conf
-	insinto ${HOMEDIR}
-	insopts -m644 -o dspam -g dspam
-	doins ${T}/dspam.conf
-
-	# installs the notification messages
-	# -> The documentation is wrong! The files need to be in ./txt
-	diropts -m0775 -o dspam -g dspam
-	dodir ${HOMEDIR}/txt
-	keepdir ${HOMEDIR}/txt
-	insinto ${HOMEDIR}/txt
-	insopts -m644 -o dspam -g dspam
-	doins ${S}/txt/*.txt
-
-	# Create the opt-in / opt-out directories
-	diropts -m0775 -o dspam -g dspam
-	dodir ${HOMEDIR}/opt-in
-	keepdir ${HOMEDIR}/opt-in
-	dodir ${HOMEDIR}/opt-out
-	keepdir ${HOMEDIR}/opt-out
-
-	# logrotation scripts
-	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
-
-	# dspam cron job
-	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
-
-	# dspam enviroment
-	echo -ne "CONFIG_PROTECT=\"${DATADIR} /var/run/dspam\"\n\n" > ${T}/40dspam
-	doenvd ${T}/40dspam || die
-}
-
-pkg_postinst() {
-	env-update
-	if use mysql || use postgres || use oci8; then
-		echo
-		einfo "To setup DSPAM to run out-of-the-box on your system with a MySQL,"
-		einfo "PostgreSQL or Oracle database, run:"
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	fi
-	if use mysql || use postgres; then
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			einfo "If you want to run DSPAM in the new deamon mode. Remember"
-			einfo "to make the DSPAM daemon start durig boot:"
-			einfo "  rc-update add dspam default"
-		fi
-	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
-		DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${HOMEDIR}/mysql.data") )
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-		done
-		DSPAM_MySQL_USER="${DSPAM_DB_DATA[2]}"
-		DSPAM_MySQL_PWD="${DSPAM_DB_DATA[3]}"
-		DSPAM_MySQL_DB="${DSPAM_DB_DATA[4]}"
-
-		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" ]] && echo && break
-		done
-
-		if [ "${DSPAM_MySQL_DB_Type}" == "1" ]
-		then
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-space.sql
-		else
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-speed.sql
-		fi
-
-		if use virtual-users ; then
-			einfo "Creating DSPAM MySQL database for virtual-users users"
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_virtual_users.sql
-		fi
-
-		if use neural ; then
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_neural.sql
-		fi
-
-		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
-		DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${HOMEDIR}/pgsql.data") )
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-		done
-		DSPAM_PgSQL_USER="${DSPAM_DB_DATA[2]}"
-		DSPAM_PgSQL_PWD="${DSPAM_DB_DATA[3]}"
-		DSPAM_PgSQL_DB="${DSPAM_DB_DATA[4]}"
-
-		ewarn "When prompted for a password, please enter your PgSQL postgres password"
-		ewarn ""
-
-		einfo "Creating DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\" and user \"${DSPAM_PgSQL_USER}\""
-		/usr/bin/psql -h localhost -d template1 -U postgres -c "CREATE USER ${DSPAM_PgSQL_USER} WITH PASSWORD '${DSPAM_PgSQL_PWD}' NOCREATEDB NOCREATEUSER; CREATE DATABASE ${DSPAM_PgSQL_DB}; GRANT ALL PRIVILEGES ON DATABASE ${DSPAM_PgSQL_DB} TO ${DSPAM_PgSQL_USER}; GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER}; UPDATE pg_database SET datdba=(SELECT usesysid FROM pg_shadow WHERE usename='${DSPAM_PgSQL_USER}') WHERE datname='${DSPAM_PgSQL_DB}';"
-
-		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 ${HOMEDIR}/pgsql_objects.sql 1>/dev/null 2>&1
-
-		if use virtual-users ; then
-			einfo "Creating DSPAM PostgreSQL database for virtual-users users"
-			PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_virtual-users.sql 1>/dev/null 2>&1
-		fi
-	elif use oci8 ; then
-		einfo "We have not enought Oracle knowledge to configure Oracle"
-		einfo "automatically. If you know how, please post a message in"
-		einfo "Gentoo Bugzilla."
-		einfo ""
-		einfo "You need manually to create the Oracle user for DSPAM and"
-		einfo "the necessary database."
-		einfo "But the DSPAM configuration file dspam.conf and oracle.data"
-		einfo "was already configured with the necessary information to"
-		einfo "access the database."
-		einfo "Please read your dspam.conf, oracle.data and the README for"
-		einfo "more info on how to setup DSPAM with Oracle."
-	elif use sqlite3 ; then
-		einfo "sqlite3_drv will automatically create the necessary database"
-		einfo "objects for each user upon first use of DSPAM by that user."
-	elif use sqlite ; then
-		einfo "sqlite_drv will automatically create the necessary database"
-		einfo "objects for each user upon first use of DSPAM by that user."
-	fi
-
-}
diff --git a/mail-filter/dspam/dspam-3.6_rc1.ebuild b/mail-filter/dspam/dspam-3.6_rc1.ebuild
deleted file mode 100644
index 581414e97e82..000000000000
--- a/mail-filter/dspam/dspam-3.6_rc1.ebuild
+++ /dev/null
@@ -1,471 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.6_rc1.ebuild,v 1.1 2005/09/23 01:45:23 st_lim Exp $
-
-inherit eutils
-
-MY_PV=${PV/_/.}
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-SRC_URI="http://dspam.nuclearelephant.com/sources/${PN}-${MY_PV}.tar.gz
-		http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
-HOMEPAGE="http://dspam.nuclearelephant.com/"
-LICENSE="GPL-2"
-
-IUSE="debug mysql neural oci8 postgres sqlite large-domain logrotate virtual-users"
-DEPEND="mysql? ( >=dev-db/mysql-3.23 ) || ( >=sys-libs/db-4.0 )
-		sqlite? ( dev-db/sqlite )
-		postgres? ( >=dev-db/postgresql-7.4.3 )
-		x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
-		>=sys-libs/db-4.0
-		"
-RDEPEND="sys-process/cronbase
-		logrotate? ( app-admin/logrotate )"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64"
-SLOT="0"
-
-# some FHS-like structure
-HOMEDIR="/var/spool/dspam"
-CONFDIR="/etc/mail/dspam"
-LOGDIR="/var/log/dspam"
-
-pkg_setup() {
-	local multiple_dbs="0"
-	local supported_dbs="mysql postgres oci8 sqlite"
-	for foo in ${supported_dbs}; do
-		if use ${foo}; then
-			let multiple_dbs="((multiple_dbs + 1 ))"
-			einfo " ${foo} database support in your USE flags."
-		fi
-	done
-	if [ "${multiple_dbs}" -ge "2" ]; then
-		echo
-		ewarn "You have multiple database backends active in your USE flags."
-		ewarn "Will default to MySQL as your dspam database backend."
-		ewarn "If you want to build with another database backend; 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 \"mail-filter/dspam -mysql postgres -oci8 -sqlite -sqlite3\" >> /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
-	elif [ "${multiple_dbs}" -eq "0" ]; then
-		echo
-		ewarn "You did not select any SQL based database backend. DSPAM will use"
-		ewarn "Berkeley DB for storing data. If you don't want that, then enable"
-		ewarn "one of the following USE flags:"
-		ewarn "${supported_dbs}"
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	fi
-	has_version ">sys-kernel/linux-headers-2.6" || (
-		einfo "To use the new DSPAM deamon mode, you need to emerge"
-		einfo ">sys-kernel/linux-headers-2.6 and rebuild glibc to support NPTL"
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	)
-	id dspam 2>/dev/null || enewgroup dspam 26
-	id dspam 2>/dev/null || enewuser dspam 26 /bin/bash ${HOMEDIR} dspam
-}
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --with-delivery-agent=/usr/bin/procmail"
-	use large-domain && myconf="${myconf} --enable-large-scale" ||\
-	    myconf="${myconf} --enable-domain-scale"
-
-	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
-	myconf="${myconf} --sysconfdir=${CONFDIR}"
-	use virtual-users || myconf="${myconf} --enable-homedir"
-
-	# 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 sqlite ; then
-		myconf="${myconf} --with-storage-driver=sqlite_drv"
-		myconf="${myconf} --enable-virtual-users"
-	elif 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} --enable-preferences-extension"
-
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			myconf="${myconf} --enable-daemon"
-		fi
-
-		use virtual-users && myconf="${myconf} --enable-virtual-users"
-		# an experimental feature available with MySQL and PgSQL backend
-		use neural && myconf="${myconf} --enable-neural-networking"
-	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-preferences-extension"
-
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			myconf="${myconf} --enable-daemon"
-		fi
-
-		use virtual-users && myconf="${myconf} --enable-virtual-users"
-		# an experimental feature available with MySQL and PgSQL backend
-		use neural && myconf="${myconf} --enable-neural-networking"
-	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
-			myconf="${myconf} --with-oracle-version=10"
-		fi
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install () {
-
-	# Fix issues with older dspam configuration
-	CONFIG_PROTECT="${CONFIG_PROTECT} ${HOMEDIR} ${CONFDIR} /var/run/dspam"
-	CONFIG_PROTECT_MASK="${CONFIG_PROTECTMASK/${HOMEDIR}/}"
-	CONFIG_PROTECT_MASK="${CONFIG_PROTECTMASK/${CONFDIR}/}"
-
-	# open up perms on $HOMEDIR
-	diropts -m0775 -o dspam -g dspam
-	dodir ${HOMEDIR}
-	keepdir ${HOMEDIR}
-
-	# keeps dspam data in $CONFDIR
-	diropts -m0775 -o dspam -g dspam
-	dodir ${CONFDIR}
-	keepdir ${CONFDIR}
-
-	# make install
-	make DESTDIR=${D} install || die
-	chmod o+s ${D}/usr/bin/dspam
-	chmod o+s ${D}/usr/bin/dspam_stats
-
-	# documentation
-	dodoc CHANGELOG LICENSE README* RELEASE.NOTES UPGRADING
-	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
-	docinto doc
-	dodoc doc/*.txt
-	docinto gentoo
-	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
-	if use sqlite; then
-		dodoc src/tools.sqlite_drv/README
-	elif use mysql; then
-		dodoc src/tools.mysql_drv/README
-	elif use postgres ; then
-		dodoc src/tools.pgsql_drv/README
-	elif use oci8 ; then
-		dodoc src/tools.ora_drv/README
-	fi
-	doman man/dspam*
-	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
-
-	# build some initial configuration data
-	[ ! -f ${CONFDIR}/dspam.conf ] \
-		&& cp src/dspam.conf ${T}/dspam.conf
-
-	if use mysql || use postgres; then
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			# keeps dspam socket for deamon in /var/run/dspam
-			diropts -m0775 -o dspam -g dspam
-			dodir /var/run/dspam
-			keepdir /var/run/dspam
-
-			# We use sockets for the deamon instead of tcp port 24
-			sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/var/run/dspam/dspam.sock\":gI' \
-				-e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/var/run/dspam/dspam.pid:gI' \
-				-i ${T}/dspam.conf
-
-			# dspam init script
-			exeinto /etc/init.d
-			exeopts -m0755 -o root -g root
-			newexe ${FILESDIR}/dspam.rc dspam
-		fi
-	fi
-
-	# generate random password
-	local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-
-	# database related configuration and scripts
-	if use sqlite; then
-		insinto ${CONFDIR}
-		insopts -m644 -o dspam -g dspam
-		newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
-	elif use mysql; then
-		# Use existing configuration if possible
-		if [[ -f ${ROOT}${CONFDIR}/mysql.data ]]; then
-			DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${CONFDIR}/mysql.data") )
-			for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-				[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-			done
-		else
-			DSPAM_DB_DATA[0]="/var/run/mysqld/mysqld.sock"
-			DSPAM_DB_DATA[1]=""
-			DSPAM_DB_DATA[2]="dspam"
-			DSPAM_DB_DATA[3]="${PASSWORD}"
-			DSPAM_DB_DATA[4]="dspam"
-			DSPAM_DB_DATA[5]="true"
-		fi
-
-		# Modify configuration and create mysql.data file
-		sed -e "s:^#*\(MySQLServer[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[0]}:gI" \
-			-e "s:^#*\(MySQLPort[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[1]}:gI" \
-			-e "s:^#*\(MySQLUser[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[2]}:gI" \
-			-e "s:^#*\(MySQLPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI" \
-			-e "s:^#*\(MySQLDb[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[4]}:gI" \
-			-e "s:^#*\(MySQLCompress[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[5]}:gI" \
-			-i ${T}/dspam.conf
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/mysql.data
-		done
-		insinto ${CONFDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/mysql.data
-		newins src/tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql
-		newins src/tools.mysql_drv/mysql_objects-speed.sql mysql_objects-speed.sql
-		newins src/tools.mysql_drv/mysql_objects-4.1.sql mysql_objects-4.1.sql
-		newins src/tools.mysql_drv/virtual_users.sql mysql_virtual_users.sql
-		newins src/tools.mysql_drv/neural.sql mysql_neural.sql
-		newins src/tools.mysql_drv/purge.sql mysql_purge.sql
-		newins src/tools.mysql_drv/purge-4.1.sql mysql_purge-4.1.sql
-
-	elif use postgres ; then
-		# Use existing configuration if possible
-		if [ -f ${ROOT}${CONFDIR}/pgsql.data ]; then
-			DSPAM_DB_DATA=( $(cat "${ROOT}${CONFDIR}/pgsql.data") )
-			for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-				[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-			done
-		else
-			DSPAM_DB_DATA[0]="127.0.0.1"
-			DSPAM_DB_DATA[1]="5432"
-			DSPAM_DB_DATA[2]="dspam"
-			DSPAM_DB_DATA[3]="${PASSWORD}"
-			DSPAM_DB_DATA[4]="dspam"
-		fi
-
-		# Modify configuration and create pgsql.data file
-		sed -e "s:^#*\(PgSQLServer[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[0]}:gI" \
-			-e "s:^#*\(PgSQLPort[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[1]}:gI" \
-			-e "s:^#*\(PgSQLUser[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[2]}:gI" \
-			-e "s:^#*\(PgSQLPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI" \
-			-e "s:^#*\(PgSQLDb[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[4]}:gI" \
-			-e "s:^#*\(PgSQLConnectionCache[\t ]*.\):\1:gI" \
-			-i ${T}/dspam.conf
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/pgsql.data
-		done
-
-		insinto ${CONFDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/pgsql.data
-		newins src/tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
-		newins src/tools.pgsql_drv/virtual_users.sql pgsql_virtual_users.sql
-		newins src/tools.pgsql_drv/purge.sql pgsql_purge.sql
-
-	elif use oci8 ; then
-		# Use existing configuration if possible
-		if [ -f ${ROOT}${CONFDIR}/oracle.data ]; then
-			DSPAM_DB_DATA=( $(cat "${ROOT}${CONFDIR}/oracle.data") )
-			for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-				[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-			done
-		else
-			DSPAM_DB_DATA[0]="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))"
-			DSPAM_DB_DATA[1]="dspam"
-			DSPAM_DB_DATA[2]="${PASSWORD}"
-			DSPAM_DB_DATA[3]="dspam"
-		fi
-
-		# Modify configuration and create oracle.data file
-		sed -e "s:^#*\(OraServer[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[0]}:gI" \
-			-e "s:^\(OraUser[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[1]}:gI" \
-			-e "s:^\(OraPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[2]}:gI" \
-			-e "s:^\(OraSchema[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI"\
-		   	-i ${T}/dspam.conf
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/oracle.data
-		done
-
-		insinto ${CONFDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/oracle.data
-		newins src/tools.ora_drv/oral_objects.sql ora_objects.sql
-		newins src/tools.ora_drv/virtual_users.sql ora_virtual_users.sql
-		newins src/tools.ora_drv/purge.sql ora_purge.sql
-	fi
-
-	sed -e "s:^\(Purge.*\):###\1:g" \
-		-e "s:^#\(Purge.*\):\1:g" \
-		-e "s:^###\(Purge.*\):#\1:g" \
-		-i ${T}/dspam.conf
-	insinto ${CONFDIR}
-	insopts -m644 -o dspam -g dspam
-	doins ${T}/dspam.conf
-
-	# installs the notification messages
-	# -> The documentation is wrong! The files need to be in ./txt
-	diropts -m0775 -o dspam -g dspam
-	dodir ${CONFDIR}/txt
-	keepdir ${CONFDIR}/txt
-	insinto ${CONFDIR}/txt
-	insopts -m644 -o dspam -g dspam
-	doins ${S}/txt/*.txt
-
-	# Create the opt-in / opt-out directories
-	diropts -m0775 -o dspam -g dspam
-	dodir ${CONFDIR}/opt-in
-	keepdir ${CONFDIR}/opt-in
-	dodir ${CONFDIR}/opt-out
-	keepdir ${CONFDIR}/opt-out
-
-	# logrotation scripts
-	diropts -m0755 -o dspam -g dspam
-	dodir /etc/logrotate.d
-	keepdir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	insopts -m0644 -o dspam -g dspam
-	newins ${FILESDIR}/logrotate.dspam dspam
-
-	# dspam cron job
-	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
-
-	# dspam enviroment
-	echo -ne "CONFIG_PROTECT=\"${CONFDIR} /var/run/dspam\"\n\n" > ${T}/40dspam
-	doenvd ${T}/40dspam || die
-}
-
-pkg_postinst() {
-	env-update
-	if use mysql || use postgres || use oci8; then
-		echo
-		einfo "To setup DSPAM to run out-of-the-box on your system with a MySQL,"
-		einfo "PostgreSQL or Oracle database, run:"
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	fi
-	if use mysql || use postgres; then
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			einfo "If you want to run DSPAM in the new deamon mode. Remember"
-			einfo "to make the DSPAM daemon start durig boot:"
-			einfo "  rc-update add dspam default"
-		fi
-	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 sqlite ; then
-		einfo "sqlite_drv will automatically create the necessary database"
-	elif use mysql ; then
-		DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${CONFDIR}/mysql.data") )
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-		done
-		DSPAM_MySQL_USER="${DSPAM_DB_DATA[2]}"
-		DSPAM_MySQL_PWD="${DSPAM_DB_DATA[3]}"
-		DSPAM_MySQL_DB="${DSPAM_DB_DATA[4]}"
-
-		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" ]] && echo && break
-		done
-
-		if [ "${DSPAM_MySQL_DB_Type}" == "1" ]
-		then
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFDIR}/mysql_objects-space.sql
-		else
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFDIR}/mysql_objects-speed.sql
-		fi
-
-		if use virtual-users ; then
-			einfo "Creating DSPAM MySQL database for virtual-users users"
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFDIR}/mysql_virtual_users.sql
-		fi
-
-		if use neural ; then
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFDIR}/mysql_neural.sql
-		fi
-
-		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
-		DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${CONFDIR}/pgsql.data") )
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-		done
-		DSPAM_PgSQL_USER="${DSPAM_DB_DATA[2]}"
-		DSPAM_PgSQL_PWD="${DSPAM_DB_DATA[3]}"
-		DSPAM_PgSQL_DB="${DSPAM_DB_DATA[4]}"
-
-		ewarn "When prompted for a password, please enter your PgSQL postgres password"
-		ewarn ""
-
-		einfo "Creating DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\" and user \"${DSPAM_PgSQL_USER}\""
-		/usr/bin/psql -h localhost -d template1 -U postgres -c "CREATE USER ${DSPAM_PgSQL_USER} WITH PASSWORD '${DSPAM_PgSQL_PWD}' NOCREATEDB NOCREATEUSER; CREATE DATABASE ${DSPAM_PgSQL_DB}; GRANT ALL PRIVILEGES ON DATABASE ${DSPAM_PgSQL_DB} TO ${DSPAM_PgSQL_USER}; GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER}; UPDATE pg_database SET datdba=(SELECT usesysid FROM pg_shadow WHERE usename='${DSPAM_PgSQL_USER}') WHERE datname='${DSPAM_PgSQL_DB}';"
-
-		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 ${CONFDIR}/pgsql_objects.sql 1>/dev/null 2>&1
-
-		if use virtual-users ; then
-			einfo "Creating DSPAM PostgreSQL database for virtual-users users"
-			PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${CONFDIR}/pgsql_virtual-users.sql 1>/dev/null 2>&1
-		fi
-	elif use oci8 ; then
-		einfo "We have not enought Oracle knowledge to configure Oracle"
-		einfo "automatically. If you know how, please post a message in"
-		einfo "Gentoo Bugzilla."
-		einfo ""
-		einfo "You need manually to create the Oracle user for DSPAM and"
-		einfo "the necessary database."
-		einfo "But the DSPAM configuration file dspam.conf and oracle.data"
-		einfo "was already configured with the necessary information to"
-		einfo "access the database."
-		einfo "Please read your dspam.conf, oracle.data and the README for"
-		einfo "more info on how to setup DSPAM with Oracle."
-		einfo "objects for each user upon first use of DSPAM by that user."
-	fi
-
-}
diff --git a/mail-filter/dspam/dspam-3.6_rc3.ebuild b/mail-filter/dspam/dspam-3.6_rc3.ebuild
deleted file mode 100644
index 68dc2aa7f643..000000000000
--- a/mail-filter/dspam/dspam-3.6_rc3.ebuild
+++ /dev/null
@@ -1,471 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.6_rc3.ebuild,v 1.1 2005/10/15 15:27:48 st_lim Exp $
-
-inherit eutils
-
-MY_PV=${PV/_/.}
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-SRC_URI="http://dspam.nuclearelephant.com/sources/${PN}-${MY_PV}.tar.gz
-		http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
-HOMEPAGE="http://dspam.nuclearelephant.com/"
-LICENSE="GPL-2"
-
-IUSE="debug mysql neural oci8 postgres sqlite large-domain logrotate virtual-users"
-DEPEND="mysql? ( >=dev-db/mysql-3.23 ) || ( >=sys-libs/db-4.0 )
-		sqlite? ( dev-db/sqlite )
-		postgres? ( >=dev-db/postgresql-7.4.3 )
-		x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
-		>=sys-libs/db-4.0
-		"
-RDEPEND="sys-process/cronbase
-		logrotate? ( app-admin/logrotate )"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64"
-SLOT="0"
-
-# some FHS-like structure
-HOMEDIR="/var/spool/dspam"
-CONFDIR="/etc/mail/dspam"
-LOGDIR="/var/log/dspam"
-
-pkg_setup() {
-	local multiple_dbs="0"
-	local supported_dbs="mysql postgres oci8 sqlite"
-	for foo in ${supported_dbs}; do
-		if use ${foo}; then
-			let multiple_dbs="((multiple_dbs + 1 ))"
-			einfo " ${foo} database support in your USE flags."
-		fi
-	done
-	if [ "${multiple_dbs}" -ge "2" ]; then
-		echo
-		ewarn "You have multiple database backends active in your USE flags."
-		ewarn "Will default to MySQL as your dspam database backend."
-		ewarn "If you want to build with another database backend; 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 \"mail-filter/dspam -mysql postgres -oci8 -sqlite -sqlite3\" >> /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
-	elif [ "${multiple_dbs}" -eq "0" ]; then
-		echo
-		ewarn "You did not select any SQL based database backend. DSPAM will use"
-		ewarn "Berkeley DB for storing data. If you don't want that, then enable"
-		ewarn "one of the following USE flags:"
-		ewarn "${supported_dbs}"
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	fi
-	has_version ">sys-kernel/linux-headers-2.6" || (
-		einfo "To use the new DSPAM deamon mode, you need to emerge"
-		einfo ">sys-kernel/linux-headers-2.6 and rebuild glibc to support NPTL"
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
-	)
-	id dspam 2>/dev/null || enewgroup dspam 26
-	id dspam 2>/dev/null || enewuser dspam 26 /bin/bash ${HOMEDIR} dspam
-}
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --with-delivery-agent=/usr/bin/procmail"
-	use large-domain && myconf="${myconf} --enable-large-scale" ||\
-	    myconf="${myconf} --enable-domain-scale"
-
-	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
-	myconf="${myconf} --sysconfdir=${CONFDIR}"
-	use virtual-users || myconf="${myconf} --enable-homedir"
-
-	# 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 sqlite ; then
-		myconf="${myconf} --with-storage-driver=sqlite_drv"
-		myconf="${myconf} --enable-virtual-users"
-	elif 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} --enable-preferences-extension"
-
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			myconf="${myconf} --enable-daemon"
-		fi
-
-		use virtual-users && myconf="${myconf} --enable-virtual-users"
-		# an experimental feature available with MySQL and PgSQL backend
-		use neural && myconf="${myconf} --enable-neural-networking"
-	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-preferences-extension"
-
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			myconf="${myconf} --enable-daemon"
-		fi
-
-		use virtual-users && myconf="${myconf} --enable-virtual-users"
-		# an experimental feature available with MySQL and PgSQL backend
-		use neural && myconf="${myconf} --enable-neural-networking"
-	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
-			myconf="${myconf} --with-oracle-version=10"
-		fi
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install () {
-
-	# Fix issues with older dspam configuration
-	CONFIG_PROTECT="${CONFIG_PROTECT} ${HOMEDIR} ${CONFDIR} /var/run/dspam"
-	CONFIG_PROTECT_MASK="${CONFIG_PROTECTMASK/${HOMEDIR}/}"
-	CONFIG_PROTECT_MASK="${CONFIG_PROTECTMASK/${CONFDIR}/}"
-
-	# open up perms on $HOMEDIR
-	diropts -m0775 -o dspam -g dspam
-	dodir ${HOMEDIR}
-	keepdir ${HOMEDIR}
-
-	# keeps dspam data in $CONFDIR
-	diropts -m0775 -o dspam -g dspam
-	dodir ${CONFDIR}
-	keepdir ${CONFDIR}
-
-	# make install
-	make DESTDIR=${D} install || die
-	chmod o+s ${D}/usr/bin/dspam
-	chmod o+s ${D}/usr/bin/dspam_stats
-
-	# documentation
-	dodoc CHANGELOG LICENSE README* RELEASE.NOTES UPGRADING
-	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
-	docinto doc
-	dodoc doc/*.txt
-	docinto gentoo
-	dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
-	if use sqlite; then
-		dodoc src/tools.sqlite_drv/README
-	elif use mysql; then
-		dodoc src/tools.mysql_drv/README
-	elif use postgres ; then
-		dodoc src/tools.pgsql_drv/README
-	elif use oci8 ; then
-		dodoc src/tools.ora_drv/README
-	fi
-	doman man/dspam*
-	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
-
-	# build some initial configuration data
-	[ ! -f ${CONFDIR}/dspam.conf ] \
-		&& cp src/dspam.conf ${T}/dspam.conf
-
-	if use mysql || use postgres; then
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			# keeps dspam socket for deamon in /var/run/dspam
-			diropts -m0775 -o dspam -g dspam
-			dodir /var/run/dspam
-			keepdir /var/run/dspam
-
-			# We use sockets for the deamon instead of tcp port 24
-			sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/var/run/dspam/dspam.sock\":gI' \
-				-e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/var/run/dspam/dspam.pid:gI' \
-				-i ${T}/dspam.conf
-
-			# dspam init script
-			exeinto /etc/init.d
-			exeopts -m0755 -o root -g root
-			newexe ${FILESDIR}/dspam.rc dspam
-		fi
-	fi
-
-	# generate random password
-	local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-
-	# database related configuration and scripts
-	if use sqlite; then
-		insinto ${CONFDIR}
-		insopts -m644 -o dspam -g dspam
-		newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
-	elif use mysql; then
-		# Use existing configuration if possible
-		if [[ -f ${ROOT}${CONFDIR}/mysql.data ]]; then
-			DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${CONFDIR}/mysql.data") )
-			for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-				[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-			done
-		else
-			DSPAM_DB_DATA[0]="/var/run/mysqld/mysqld.sock"
-			DSPAM_DB_DATA[1]=""
-			DSPAM_DB_DATA[2]="dspam"
-			DSPAM_DB_DATA[3]="${PASSWORD}"
-			DSPAM_DB_DATA[4]="dspam"
-			DSPAM_DB_DATA[5]="true"
-		fi
-
-		# Modify configuration and create mysql.data file
-		sed -e "s:^#*\(MySQLServer[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[0]}:gI" \
-			-e "s:^#*\(MySQLPort[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[1]}:gI" \
-			-e "s:^#*\(MySQLUser[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[2]}:gI" \
-			-e "s:^#*\(MySQLPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI" \
-			-e "s:^#*\(MySQLDb[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[4]}:gI" \
-			-e "s:^#*\(MySQLCompress[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[5]}:gI" \
-			-i ${T}/dspam.conf
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/mysql.data
-		done
-		insinto ${CONFDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/mysql.data
-		newins src/tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql
-		newins src/tools.mysql_drv/mysql_objects-speed.sql mysql_objects-speed.sql
-		newins src/tools.mysql_drv/mysql_objects-4.1.sql mysql_objects-4.1.sql
-		newins src/tools.mysql_drv/virtual_users.sql mysql_virtual_users.sql
-		newins src/tools.mysql_drv/neural.sql mysql_neural.sql
-		newins src/tools.mysql_drv/purge.sql mysql_purge.sql
-		newins src/tools.mysql_drv/purge-4.1.sql mysql_purge-4.1.sql
-
-	elif use postgres ; then
-		# Use existing configuration if possible
-		if [ -f ${ROOT}${CONFDIR}/pgsql.data ]; then
-			DSPAM_DB_DATA=( $(cat "${ROOT}${CONFDIR}/pgsql.data") )
-			for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-				[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-			done
-		else
-			DSPAM_DB_DATA[0]="127.0.0.1"
-			DSPAM_DB_DATA[1]="5432"
-			DSPAM_DB_DATA[2]="dspam"
-			DSPAM_DB_DATA[3]="${PASSWORD}"
-			DSPAM_DB_DATA[4]="dspam"
-		fi
-
-		# Modify configuration and create pgsql.data file
-		sed -e "s:^#*\(PgSQLServer[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[0]}:gI" \
-			-e "s:^#*\(PgSQLPort[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[1]}:gI" \
-			-e "s:^#*\(PgSQLUser[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[2]}:gI" \
-			-e "s:^#*\(PgSQLPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI" \
-			-e "s:^#*\(PgSQLDb[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[4]}:gI" \
-			-e "s:^#*\(PgSQLConnectionCache[\t ]*.\):\1:gI" \
-			-i ${T}/dspam.conf
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/pgsql.data
-		done
-
-		insinto ${CONFDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/pgsql.data
-		newins src/tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
-		newins src/tools.pgsql_drv/virtual_users.sql pgsql_virtual_users.sql
-		newins src/tools.pgsql_drv/purge.sql pgsql_purge.sql
-
-	elif use oci8 ; then
-		# Use existing configuration if possible
-		if [ -f ${ROOT}${CONFDIR}/oracle.data ]; then
-			DSPAM_DB_DATA=( $(cat "${ROOT}${CONFDIR}/oracle.data") )
-			for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-				[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-			done
-		else
-			DSPAM_DB_DATA[0]="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))"
-			DSPAM_DB_DATA[1]="dspam"
-			DSPAM_DB_DATA[2]="${PASSWORD}"
-			DSPAM_DB_DATA[3]="dspam"
-		fi
-
-		# Modify configuration and create oracle.data file
-		sed -e "s:^#*\(OraServer[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[0]}:gI" \
-			-e "s:^\(OraUser[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[1]}:gI" \
-			-e "s:^\(OraPass[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[2]}:gI" \
-			-e "s:^\(OraSchema[\t ]\{1,\}\).*:\1${DSPAM_DB_DATA[3]}:gI"\
-		   	-i ${T}/dspam.conf
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			echo "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" >> ${T}/oracle.data
-		done
-
-		insinto ${CONFDIR}
-		insopts -m644 -o dspam -g dspam
-		doins ${T}/oracle.data
-		newins src/tools.ora_drv/oral_objects.sql ora_objects.sql
-		newins src/tools.ora_drv/virtual_users.sql ora_virtual_users.sql
-		newins src/tools.ora_drv/purge.sql ora_purge.sql
-	fi
-
-	sed -e "s:^\(Purge.*\):###\1:g" \
-		-e "s:^#\(Purge.*\):\1:g" \
-		-e "s:^###\(Purge.*\):#\1:g" \
-		-i ${T}/dspam.conf
-	insinto ${CONFDIR}
-	insopts -m644 -o dspam -g dspam
-	doins ${T}/dspam.conf
-
-	# installs the notification messages
-	# -> The documentation is wrong! The files need to be in ./txt
-	diropts -m0775 -o dspam -g dspam
-	dodir ${CONFDIR}/txt
-	keepdir ${CONFDIR}/txt
-	insinto ${CONFDIR}/txt
-	insopts -m644 -o dspam -g dspam
-	doins ${S}/txt/*.txt
-
-	# Create the opt-in / opt-out directories
-	diropts -m0775 -o dspam -g dspam
-	dodir ${CONFDIR}/opt-in
-	keepdir ${CONFDIR}/opt-in
-	dodir ${CONFDIR}/opt-out
-	keepdir ${CONFDIR}/opt-out
-
-	# logrotation scripts
-	diropts -m0755 -o dspam -g dspam
-	dodir /etc/logrotate.d
-	keepdir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	insopts -m0644 -o dspam -g dspam
-	newins ${FILESDIR}/logrotate.dspam dspam
-
-	# dspam cron job
-	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
-
-	# dspam enviroment
-	echo -ne "CONFIG_PROTECT=\"${CONFDIR} /var/run/dspam\"\n\n" > ${T}/40dspam
-	doenvd ${T}/40dspam || die
-}
-
-pkg_postinst() {
-	env-update
-	if use mysql || use postgres || use oci8; then
-		echo
-		einfo "To setup DSPAM to run out-of-the-box on your system with a MySQL,"
-		einfo "PostgreSQL or Oracle database, run:"
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	fi
-	if use mysql || use postgres; then
-		if has_version ">sys-kernel/linux-headers-2.6"; then
-			einfo "If you want to run DSPAM in the new deamon mode. Remember"
-			einfo "to make the DSPAM daemon start durig boot:"
-			einfo "  rc-update add dspam default"
-		fi
-	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 sqlite ; then
-		einfo "sqlite_drv will automatically create the necessary database"
-	elif use mysql ; then
-		DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${CONFDIR}/mysql.data") )
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-		done
-		DSPAM_MySQL_USER="${DSPAM_DB_DATA[2]}"
-		DSPAM_MySQL_PWD="${DSPAM_DB_DATA[3]}"
-		DSPAM_MySQL_DB="${DSPAM_DB_DATA[4]}"
-
-		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" ]] && echo && break
-		done
-
-		if [ "${DSPAM_MySQL_DB_Type}" == "1" ]
-		then
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFDIR}/mysql_objects-space.sql
-		else
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFDIR}/mysql_objects-speed.sql
-		fi
-
-		if use virtual-users ; then
-			einfo "Creating DSPAM MySQL database for virtual-users users"
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFDIR}/mysql_virtual_users.sql
-		fi
-
-		if use neural ; then
-			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${CONFDIR}/mysql_neural.sql
-		fi
-
-		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
-		DSPAM_DB_DATA=( $(sed "s:^[\t ]*$:###:gI" "${ROOT}${CONFDIR}/pgsql.data") )
-		for DB_DATA_INDEX in $(seq 0 $((${#DSPAM_DB_DATA[@]} - 1))); do
-			[[ "${DSPAM_DB_DATA[$DB_DATA_INDEX]}" = "###" ]] && DSPAM_DB_DATA[$DB_DATA_INDEX]=""
-		done
-		DSPAM_PgSQL_USER="${DSPAM_DB_DATA[2]}"
-		DSPAM_PgSQL_PWD="${DSPAM_DB_DATA[3]}"
-		DSPAM_PgSQL_DB="${DSPAM_DB_DATA[4]}"
-
-		ewarn "When prompted for a password, please enter your PgSQL postgres password"
-		ewarn ""
-
-		einfo "Creating DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\" and user \"${DSPAM_PgSQL_USER}\""
-		/usr/bin/psql -h localhost -d template1 -U postgres -c "CREATE USER ${DSPAM_PgSQL_USER} WITH PASSWORD '${DSPAM_PgSQL_PWD}' NOCREATEDB NOCREATEUSER; CREATE DATABASE ${DSPAM_PgSQL_DB}; GRANT ALL PRIVILEGES ON DATABASE ${DSPAM_PgSQL_DB} TO ${DSPAM_PgSQL_USER}; GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER}; UPDATE pg_database SET datdba=(SELECT usesysid FROM pg_shadow WHERE usename='${DSPAM_PgSQL_USER}') WHERE datname='${DSPAM_PgSQL_DB}';"
-
-		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 ${CONFDIR}/pgsql_objects.sql 1>/dev/null 2>&1
-
-		if use virtual-users ; then
-			einfo "Creating DSPAM PostgreSQL database for virtual-users users"
-			PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${CONFDIR}/pgsql_virtual-users.sql 1>/dev/null 2>&1
-		fi
-	elif use oci8 ; then
-		einfo "We have not enought Oracle knowledge to configure Oracle"
-		einfo "automatically. If you know how, please post a message in"
-		einfo "Gentoo Bugzilla."
-		einfo ""
-		einfo "You need manually to create the Oracle user for DSPAM and"
-		einfo "the necessary database."
-		einfo "But the DSPAM configuration file dspam.conf and oracle.data"
-		einfo "was already configured with the necessary information to"
-		einfo "access the database."
-		einfo "Please read your dspam.conf, oracle.data and the README for"
-		einfo "more info on how to setup DSPAM with Oracle."
-		einfo "objects for each user upon first use of DSPAM by that user."
-	fi
-
-}
diff --git a/mail-filter/dspam/files/digest-dspam-3.4.8 b/mail-filter/dspam/files/digest-dspam-3.4.8
deleted file mode 100644
index 9716f187edcd..000000000000
--- a/mail-filter/dspam/files/digest-dspam-3.4.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b6930c31fe0940b8ad6d27324f8bab3e dspam-3.4.8.tar.gz 700036
-MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230
diff --git a/mail-filter/dspam/files/digest-dspam-3.6_rc1 b/mail-filter/dspam/files/digest-dspam-3.6_rc1
deleted file mode 100644
index fa3b438411ca..000000000000
--- a/mail-filter/dspam/files/digest-dspam-3.6_rc1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f0e2bdcbc80ec45ba1c4e6201b992dc8 dspam-3.6.rc1.tar.gz 740466
-MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230
diff --git a/mail-filter/dspam/files/digest-dspam-3.6_rc3 b/mail-filter/dspam/files/digest-dspam-3.6_rc3
deleted file mode 100644
index b94a2e14d136..000000000000
--- a/mail-filter/dspam/files/digest-dspam-3.6_rc3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 603698ca748a8e5c88097c14008352bd dspam-3.6.rc3.tar.gz 737148
-MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230