Add syslog use-flag and sanitize flags processing.

Package-Manager: portage-2.1.3.9

3 files changed, 40 insertions, 38 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index cf62c511ffc1..a8e3c7a179aa 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.98 2007/09/30 11:38:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.99 2007/10/02 05:19:47 mrness Exp $
+
+  02 Oct 2007; Alin Năstac <mrness@gentoo.org> dspam-3.8.0-r7.ebuild:
+  Add syslog use-flag and sanitize flags processing.
 
 *dspam-3.8.0-r7 (30 Sep 2007)
 
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index d62f25ea8ac0..401322f592cd 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -41,14 +41,14 @@ EBUILD dspam-3.8.0-r6.ebuild 15494 RMD160 25252277c031b38c97aaf06b2330828824bc62
 MD5 43410b42a63c498118fdf872486dcb4b dspam-3.8.0-r6.ebuild 15494
 RMD160 25252277c031b38c97aaf06b2330828824bc62d1 dspam-3.8.0-r6.ebuild 15494
 SHA256 55e3698d7aea37a792bb5f4bd538496050d78eab5d231717ebfa2485f9018c03 dspam-3.8.0-r6.ebuild 15494
-EBUILD dspam-3.8.0-r7.ebuild 19619 RMD160 534572e5cc17625d4df08e578d5dd935529ca147 SHA1 6ae7f3026b269605f02cbb0067b1107caef60875 SHA256 1c23700940890ae5e7a7fe30ba2aa1caebbdd5c92334dc50704ad263266187e0
-MD5 0cb245e67d086b901a9e8300b7e818f5 dspam-3.8.0-r7.ebuild 19619
-RMD160 534572e5cc17625d4df08e578d5dd935529ca147 dspam-3.8.0-r7.ebuild 19619
-SHA256 1c23700940890ae5e7a7fe30ba2aa1caebbdd5c92334dc50704ad263266187e0 dspam-3.8.0-r7.ebuild 19619
-MISC ChangeLog 17769 RMD160 5351501cd0cd9a98ed18fb56f81ab008953e1abd SHA1 db216406c36f3d68edcf3472be6e22599bee3542 SHA256 562c471f833b871e0a9ea76143339520bb3d46cc2eada2d7119366fb98aa056d
-MD5 325f9fd465ba9eba510f791d2a326b10 ChangeLog 17769
-RMD160 5351501cd0cd9a98ed18fb56f81ab008953e1abd ChangeLog 17769
-SHA256 562c471f833b871e0a9ea76143339520bb3d46cc2eada2d7119366fb98aa056d ChangeLog 17769
+EBUILD dspam-3.8.0-r7.ebuild 19836 RMD160 4a5c0153c620ddd74174e74f31bb1a9d7dcb1dbb SHA1 35e63ff17afc01b286cdae4bf5814f6721d116df SHA256 9a4cbc129663ced9ae74ba8933720817fcac9c4f0922f6166add7ccae309e977
+MD5 029c0700c1a5c1e1616076dd43bfb909 dspam-3.8.0-r7.ebuild 19836
+RMD160 4a5c0153c620ddd74174e74f31bb1a9d7dcb1dbb dspam-3.8.0-r7.ebuild 19836
+SHA256 9a4cbc129663ced9ae74ba8933720817fcac9c4f0922f6166add7ccae309e977 dspam-3.8.0-r7.ebuild 19836
+MISC ChangeLog 17894 RMD160 7673523ac9b92d55fce88c5dc49176ebabef52d6 SHA1 8aedb6e6390e0493f820fb8b094bef065c24bbc9 SHA256 306f922dacca00368f8f7a77fdc9e52c6cee6b3046f237e250e6f71682449de6
+MD5 23b4dcf3f98823352ca5f3f329eb1477 ChangeLog 17894
+RMD160 7673523ac9b92d55fce88c5dc49176ebabef52d6 ChangeLog 17894
+SHA256 306f922dacca00368f8f7a77fdc9e52c6cee6b3046f237e250e6f71682449de6 ChangeLog 17894
 MISC metadata.xml 335 RMD160 acb18f015dcada8300ffce56be0c4a285ce2a215 SHA1 87ddabb196434e9e9363ba4b5b5596b78aa463f1 SHA256 23816215482cfc089c2e3fe9ae75547c364ad01fbb2a98886ad91d28f5971e17
 MD5 47349dfc68ef142782e134a2e7696a37 metadata.xml 335
 RMD160 acb18f015dcada8300ffce56be0c4a285ce2a215 metadata.xml 335
@@ -62,7 +62,7 @@ SHA256 7d246780db478b88b78983ec7ed7f5a95daaab1860f517a863605cbfb241f92f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG/4rGVSA5X31g7/gRAtSuAJ0ZEzJrCZwt7YDjL1cgy//6sTtpOgCgqiBe
-08sS1t9xthzxzFTObG+bOOw=
-=uOYa
+iD8DBQFHAdT9VSA5X31g7/gRAtVdAJ0aHHI5e/S8W85/+iG85ObMU9LkZQCgqk0u
+kTiYn6zxnAn224ZwPrSGT8c=
+=zWxc
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/dspam-3.8.0-r7.ebuild b/mail-filter/dspam/dspam-3.8.0-r7.ebuild
index 7f24cee625e9..c3b2eb055b74 100644
--- a/mail-filter/dspam/dspam-3.8.0-r7.ebuild
+++ b/mail-filter/dspam/dspam-3.8.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r7.ebuild,v 1.2 2007/09/30 11:38:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r7.ebuild,v 1.3 2007/10/02 05:19:47 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -16,7 +16,7 @@ SRC_URI="http://dspam.nuclearelephant.com/sources/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="clamav daemon debug ldap mysql postgres sqlite \
+IUSE="clamav daemon debug ldap mysql postgres sqlite syslog \
 	large-domain virtual-users user-homedirs"
 
 COMMON_DEPEND="clamav?		( >=app-antivirus/clamav-0.90.2 )
@@ -51,11 +51,6 @@ create_dspam_usergroup() {
 }
 
 pkg_setup() {
-	if use virtual-users && use user-homedirs ; then
-		eerror "If the users are virtual, then they probably should not have home directories."
-		die "Incompatible USE flag selection"
-	fi
-
 	# Delete these lines some time after -r6 removal
 	if has_version "<=mail-filter/dspam-3.8.0-r6" &&
 		built_with_use "<=mail-filter/dspam-3.8.0-r6" sqlite &&
@@ -83,23 +78,20 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="--enable-long-usernames --enable-syslog"
-
-	use large-domain && myconf="${myconf} --enable-large-scale" || \
-			    myconf="${myconf} --enable-domain-scale"
-
-	use user-homedirs && myconf="${myconf} --enable-homedir"
-
-	use debug && myconf="${myconf} --enable-debug --enable-bnr-debug"
+	local myconf=""
 
-	if use virtual-users ; then
-		if use mysql || use postgres ; then
-			myconf="${myconf} --enable-virtual-users"
+	if use mysql || use postgres; then
+		myconf="${myconf} $(use_enable virtual-users) --enable-preferences-extension"
+		if use virtual-users; then
+			myconf="${myconf} --disable-homedir"
+			use user-homedirs && ewarn "user-homedirs support has been disabled (not compatible with --enable-virtual-users)"
+		else
+			myconf="${myconf} $(use_enable user-homedirs homedir)"
 		fi
-	fi
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-preferences-extension"
+	else
+		myconf="${myconf} --disable-virtual-users --disable-preferences-extension \
+			 $(use_enable user-homedirs homedir)"
+		use virtual-users && ewarn "virtual-users support has been disabled (available only for mysql and postgres storage drivers)"
 	fi
 
 	local STORAGE="hash_drv"
@@ -118,16 +110,23 @@ src_compile() {
 		myconf="${myconf} --with-pgsql-libraries=/usr/$(get_libdir)/postgresql"
 	fi
 
-	econf ${myconf} --with-storage-driver=${STORAGE} \
+	econf --with-storage-driver=${STORAGE} \
 			--with-dspam-home="${DSPAM_HOMEDIR}" \
 			--sysconfdir="${DSPAM_CONFDIR}" \
 			$(use_enable daemon) \
 			$(use_enable ldap) \
 			$(use_enable clamav) \
+			$(use_enable large-domain large-scale) \
+			$(use_enable !large-domain domain-scale) \
+			$(use_enable syslog) \
+			$(use_enable debug) \
+			$(use_enable debug bnr-debug) \
+			--enable-long-usernames \
 			--with-dspam-group=dspam \
 			--with-dspam-home-group=dspam \
 			--with-dspam-mode=${DSPAM_MODE} \
-			--with-logdir="${DSPAM_LOGDIR}" || die "econf failed"
+			--with-logdir="${DSPAM_LOGDIR}" \
+			${myconf} || die "econf failed"
 	emake || die "emake failed"
 }
 
@@ -149,8 +148,8 @@ src_install () {
 	diropts -m0755 -o dspam -g dspam
 	dodir /var/run/dspam
 
-	# create logdir (used only when build with debug useflag)
-	if use debug ; then
+	# create logdir (used only when syslog support has been disabled or build with --enable-debug)
+	if ! use syslog || use debug ; then
 		diropts -m0770 -o dspam -g dspam
 		dodir "${DSPAM_LOGDIR}"
 		diropts -m0755