Fixed bug #68526.

3 files changed, 18 insertions, 9 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 28522419915f..8f0a2b2561e7 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,15 @@
 # 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.20 2004/10/24 15:08:56 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.21 2004/10/27 15:47:55 st_lim Exp $
+
+  27 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild:
+  Fixed bug #68526. Noted that preference-extensions only work when using
+  mysql and not when using db4.
+
+*dspam-3.2.0 (27 Oct 2004)
+
+  27 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild:
+  Removed the agent, and removed some lines for db4
 
 *dspam-3.2_rc3 (24 Oct 2004)
 
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 78c58fb7354e..aae362edb13a 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,9 +1,9 @@
-MD5 af62485d0755dc66523b4fb9506ca798 ChangeLog 4437
+MD5 fdf115ff5faea1dad93ef5aea7b22fd8 ChangeLog 4761
 MD5 818341ff579ee7d21ed37a42b91cb945 dspam-3.0.0.ebuild 7029
 MD5 8c2a3c84e374995428805968828b728c dspam-3.1.0.ebuild 9416
 MD5 08d93cfcdf4a026cf3d601c983b4dda7 dspam-3.1.1.ebuild 15437
 MD5 c4aada851b1ac0ae8e9a68cae991a062 dspam-3.1.2.ebuild 15437
-MD5 9d8b890d744a6377e24cb99a56868e8d dspam-3.2.0.ebuild 15716
+MD5 b00375d9a135641bd031495aff9a7780 dspam-3.2.0.ebuild 15731
 MD5 2110aa1bd6e825d66915921312870092 dspam-3.2_beta1.ebuild 15440
 MD5 1ec21263446b31fa4eaa197d48748a60 dspam-3.2_rc3.ebuild 15746
 MD5 dbfbe5a3bbe3347938107f5f5bd2197e metadata.xml 308
diff --git a/mail-filter/dspam/dspam-3.2.0.ebuild b/mail-filter/dspam/dspam-3.2.0.ebuild
index f4a6fb3ea465..85e560eb25e6 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.1 2004/10/24 15:08:56 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.0.ebuild,v 1.2 2004/10/27 15:47:55 st_lim Exp $
 
 inherit eutils
 
@@ -64,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"
@@ -92,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
@@ -102,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
@@ -111,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.
@@ -122,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
 
 }