Fixed bug #81596

Package-Manager: portage-2.0.53_rc7

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 5aeee8cd15d0ca7469a4d675259a5ddee84c9628..f85d4332f6d7d8cb9998443ec531c4383c937ecd 100644 (file)
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.65 2005/11/05 15:55:32 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.66 2005/11/06 04:42:01 st_lim Exp $
+
+  06 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.6.0.ebuild:
+  Fixed bug #81596.  Late. :(
 
   05 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> ChangeLog:
   Added sqlite3 as a use flag, and removed older stuff

diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index e623fe5149e21c3ce3a90d1f6ff6b24f64d946c9..b4a8f93f26ae2a3bfac97027b8c91895149ebf26 100644 (file)
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,7 +1,7 @@
-MD5 51572dce2e6df2f75d670bd6016c55bc ChangeLog 11972
+MD5 eb9331c5ca74c56b437c65a41bba9b5d ChangeLog 12071
 MD5 ba82ba9c82d1fc2a39e107b672c55c69 dspam-3.2.7.ebuild 15561
 MD5 392cd158b99d8553da925dca65c89a2b dspam-3.4.9.ebuild 19680
-MD5 9b3e3a9e4b33ea23cb1305e4839f7582 dspam-3.6.0.ebuild 18155
+MD5 4c653af1e07404fa6aaa8ea609e1b63b dspam-3.6.0.ebuild 18477
 MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309
 MD5 e0469b961385fda4305602dc2519d319 files/README.qmail 2317
 MD5 cd1bdb75fd86304f9453741a910cb8a2 files/crontab.db4 196

diff --git a/mail-filter/dspam/dspam-3.6.0.ebuild b/mail-filter/dspam/dspam-3.6.0.ebuild
index 9d484a12b6741c5e761b138c1993b86cf9b2d037..cbd546b0260a38136fa358b1d054cc4c29df368e 100644 (file)
--- a/mail-filter/dspam/dspam-3.6.0.ebuild
+++ b/mail-filter/dspam/dspam-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.3 2005/11/05 15:49:25 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.6.0.ebuild,v 1.4 2005/11/06 04:42:01 st_lim Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://dspam.nuclearelephant.com/sources/${P}.tar.gz
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 LICENSE="GPL-2"
 
-IUSE="clamav debug large-domain logrotate mysql neural oci8 postgres sqlite virtual-users"
+IUSE="clamav debug large-domain logrotate mysql neural oci8 postgres sqlite virtual-users user-homedirs"
 DEPEND="clamav? ( >=app-antivirus/clamav-0.86 )
                mysql? ( >=dev-db/mysql-3.23 )
                sqlite? ( <dev-db/sqlite-3* )
@@ -80,6 +80,13 @@ pkg_setup() {
                ewarn "(Control-C to abort)..."
                epause 30
        )
+       if use virtual-users && use user-homedirs ; then 
+               ewarn "If the users are virtual, then they probably should not have home directories."
+       fi
+       if use user-homedirs ; then
+               ewarn "WARNING: dspam-web will not work with user-homedirs.  Disable this USE flag "
+               ewarn "if you intend on using dspam-web."
+       fi
        id dspam 2>/dev/null || enewgroup dspam 26
        id dspam 2>/dev/null || enewuser dspam 26 /bin/bash ${HOMEDIR} dspam
 }
@@ -94,7 +101,7 @@ src_compile() {
 
        myconf="${myconf} --with-dspam-home=${HOMEDIR}"
        myconf="${myconf} --sysconfdir=${CONFDIR}"
-       use virtual-users || myconf="${myconf} --enable-homedir"
+       use user-homedirs || myconf="${myconf} --enable-homedir"
        use clamav || myconf="${myconf} --enable-clamav"
 
        # enables support for debugging (touch /etc/dspam/.debug to turn on)