--- /usr/portage/mail-filter/dspam/dspam-3.4.0-r1.ebuild	2005-03-20 18:10:30.000000000 -0600
+++ dspam-3.4.0-r1.ebuild	2005-03-21 13:52:46.000000000 -0600
@@ -85,12 +85,13 @@
 	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} --with-dspam-home=${HOMEDIR}"
+	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!
@@ -107,7 +108,7 @@
 			myconf="${myconf} --enable-daemon"
 		fi
 
-		use virtual-users && myconf="${myconf} --enable-virtual-users-users"
+		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
@@ -120,13 +121,13 @@
 			myconf="${myconf} --enable-daemon"
 		fi
 
-		use virtual-users && myconf="${myconf} --enable-virtual-users-users"
+		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-users"
+		use virtual-users && 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.
@@ -135,10 +136,10 @@
 		fi
 	elif use sqlite3 ; then
 		myconf="${myconf} --with-storage-driver=sqlite3_drv"
-		myconf="${myconf} --enable-virtual-users-users"
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
 	elif use sqlite ; then
 		myconf="${myconf} --with-storage-driver=sqlite_drv"
-		myconf="${myconf} --enable-virtual-users-users"
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
 	else
 		myconf="${myconf} --with-storage-driver=libdb4_drv"
 	fi
@@ -158,7 +159,6 @@
 	# 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
@@ -168,7 +168,7 @@
 	# 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
 	dosym ${LOGDIR}/system.log ${HOMEDIR}/system.log
@@ -177,45 +177,41 @@
 	dosym ${DATADIR} ${HOMEDIR}/data
 
 	# make 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} 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 || sqlite3 ; then
-		dodoc src/tools.sqlite_drv/README
-	fi
 	doman man/dspam*
-	dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
 
 	# build some initial configuration data
 	cp src/dspam.conf ${T}/dspam.conf
 	if use cyrus; then
-		sed -i 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/lib/cyrus/deliver %u\":gI' ${T}/dspam.conf
-		sed -i 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/lib/cyrus/deliver\":gI' ${T}/dspam.conf
+		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 -i 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' ${T}/dspam.conf
-		sed -i 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/exim -oMr spam-scanned %u\":gI' ${T}/dspam.conf
+		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 -i 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/maildrop -d %u\":gI' ${T}/dspam.conf
-		sed -i 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/maildrop\":gI' ${T}/dspam.conf
+		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 -i 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/procmail -d %u\":gI' ${T}/dspam.conf
-		sed -i 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/bin/procmail":gI' ${T}/dspam.conf
+		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 -i 's:^#*\(UntrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/sendmail\":gI' ${T}/dspam.conf
-		sed -i 's:^\(TrustedDeliveryAgent\)[\t ]*.*:\1 \"/usr/sbin/sendmail\":gI' ${T}/dspam.conf
+		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/linux26-headers; then
@@ -225,8 +221,9 @@
 			keepdir /var/run/dspam
 
 			# We use sockets for the deamon instead of tcp port 24
-			sed -i 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/var/run/dspam/dspam.sock\":gI' ${T}/dspam.conf
-			sed -i 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/var/run/dspam/dspam.pid:gI' ${T}/dspam.conf
+			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
@@ -262,7 +259,7 @@
 			-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" \
-			${T}/dspam.conf
+			-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
@@ -272,7 +269,7 @@
 		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_users.sql mysql_virtual-users_users.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
@@ -308,7 +305,7 @@
 		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_users.sql pgsql_virtual-users_users.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
@@ -339,7 +336,7 @@
 		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_users.sql ora_virtual-users_users.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 || sqlite3 ; then
 		insinto ${HOMEDIR}
@@ -347,9 +344,10 @@
 		newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
 	fi
 
-	sed -i "s:^\(Purge.*\):###\1:g" ${T}/dspam.conf
-	sed -i "s:^#\(Purge.*\):\1:g" ${T}/dspam.conf
-	sed -i "s:^###\(Purge.*\):#\1:g" ${T}/dspam.conf
+	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
@@ -358,7 +356,6 @@
 	# -> 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
@@ -373,7 +370,6 @@
 	# 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
@@ -381,7 +377,6 @@
 	# 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
@@ -448,8 +443,10 @@
 			/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-speed.sql
 		fi
 
-		einfo "Creating DSPAM MySQL database for virtual-users users"
-		/usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_virtual-users_users.sql
+		if use virtual-users ; then
+		einfo "Creating DSPAM MySQL database for virtual 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
@@ -476,7 +473,11 @@
 
 		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
-		PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_virtual-users_users.sql 1>/dev/null 2>&1
+
+		if use virtual-users ; then
+		einfo "Creating DSPAM PostgreSQL database for virtual 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
 		[[ -f ${HOMEDIR}/oracle.data ]] && mv -f ${HOMEDIR}/oracle.data ${HOMEDIR}