--- /media/repos/gentoo-x86-sync/mail-filter/spamassassin/spamassassin-3.1.8-r1.ebuild	2007-02-25 13:38:45.000000000 +0100
+++ devel/repos/flame-overlay/mail-filter/spamassassin/spamassassin-3.1.8-r1.ebuild	2007-04-08 16:30:41.133397039 +0200
@@ -143,25 +143,33 @@
 	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
 
 	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
+	newinitd "${FILESDIR}"/3.1.8-spamd.init spamd
 	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
 
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
+	use postgres && \
+		sed -i -e 's:@USEPOSTGRES@::' "${D}/etc/init.d/spamd" || \
+		sed -i -e '/@USEPOSTGRES@/d' "${D}/etc/init.d/spamd"
+
+	use mysql && \
+		sed -i -e 's:@USEMYSQL@::' "${D}/etc/init.d/spamd" || \
+		sed -i -e '/@USEMYSQL@/d' "${D}/etc/init.d/spamd"
+
+	dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
+		README.ldap procmailrc.example \
 		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
 		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
 		spamd/PROTOCOL
 
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
+	# Rename some docu files so they don't clash with others
+	newdoc spamd/README README.spamd
+	newdoc ldap/README README.ldap
+	use qmail && newdoc spamc/README.qmail README.qmail
+
+	dohtml doc/*.html
 
-		dohtml doc/*.html
+	if use postgres || use mysql || use sqlite; then
 		docinto sql
-		dodoc sql/*.sql
+		dodoc sql/*
 	fi
 
 	# Install provided tools. See bug 108168
@@ -181,7 +189,13 @@
 pkg_postinst() {
 	perl-module_pkg_postinst
 
-	if ! has_version "perl-core/DB_File"; then
+	if use postgres || use mysql || use sqlite; then
+		elog "You need to configure your database to be able to use Bayes filter"
+		elog "with database backend, otherwise it will still use (and need) the"
+		elog "Berkeley DB support."
+		elog "Look at the sql/README.bayes file in the documentation directory"
+		elog "for how to configure it."
+	elif ! has_version "perl-core/DB_File"; then
 		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
 		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
 	fi
@@ -197,17 +211,15 @@
 		fi
 	fi
 
-	if use doc; then
-		einfo
-		einfo "Please read the file"
-		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-		einfo "to find out which optional modules you need to install to enable"
-		einfo "additional features which depend on them."
-		einfo
-		einfo "If upgraded from 2.x, please read the file"
-		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-		einfo
-	fi
+	elog
+	elog "Please read the file"
+	elog "	 /usr/share/doc/${PF}/INSTALL"
+	elog "to find out which optional modules you need to install to enable"
+	elog "additional features which depend on them."
+	elog
+	elog "If upgraded from 2.x, please read the file"
+	elog "	 /usr/share/doc/${PF}/UPGRADE"
+	elog
 
 	ewarn
 	ewarn "spamd is not designed to listen to an untrusted network"