Readded sqlite3 as a use flag

Package-Manager: portage-2.0.53_rc7

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 1224882b294fc12a774a1934d111a5e2ad202bb0..400dcbef6a95d6a7105029cb8211e64ae37eec6d 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.63 2005/11/05 15:21:58 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.64 2005/11/05 15:49:25 st_lim Exp $
+
+  05 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.6.0.ebuild:
+  Enabling sqlite3 again
 
   05 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.6.0.ebuild:
   Added use flag for clamav

diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 6368ff5c6923081cd5f9c1803353dd4eb50750b2..471278057f0156213de5589dcadda66d3ee1dde2 100644 (file)
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,8 +1,8 @@
-MD5 f634297f5129fa8f0ee8563be95994d5 ChangeLog 11763
+MD5 a95e840ff33b8aa5c9107bac9534442b ChangeLog 11857
 MD5 ba82ba9c82d1fc2a39e107b672c55c69 dspam-3.2.7.ebuild 15561
 MD5 7dab4d4f38c0ff375151cb290d4821a7 dspam-3.4.8.ebuild 19650
 MD5 392cd158b99d8553da925dca65c89a2b dspam-3.4.9.ebuild 19680
-MD5 3ba5ae3d8780e92a34e7bf2cb0997e22 dspam-3.6.0.ebuild 17808
+MD5 9b3e3a9e4b33ea23cb1305e4839f7582 dspam-3.6.0.ebuild 18155
 MD5 fdc9c985d20f6faab1364ca18425efdb dspam-3.6_rc1.ebuild 17659
 MD5 efd8999118988e78bf1ccc41603e1f2d dspam-3.6_rc3.ebuild 17659
 MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309

diff --git a/mail-filter/dspam/dspam-3.6.0.ebuild b/mail-filter/dspam/dspam-3.6.0.ebuild
index 2f589f262f240c96adc72efe616a69105a403752..9d484a12b6741c5e761b138c1993b86cf9b2d037 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.2 2005/11/05 15:21:58 st_lim Exp $
+# $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 $
 
 inherit eutils
 
@@ -14,14 +14,16 @@ LICENSE="GPL-2"
 IUSE="clamav debug large-domain logrotate mysql neural oci8 postgres sqlite virtual-users"
 DEPEND="clamav? ( >=app-antivirus/clamav-0.86 )
                mysql? ( >=dev-db/mysql-3.23 )
-               sqlite? ( dev-db/sqlite )
+               sqlite? ( <dev-db/sqlite-3* )
+               sqlite3? ( =dev-db/sqlite-3* )
                postgres? ( >=dev-db/postgresql-7.4.3 )
                >=sys-libs/db-4.0
                "
 RDEPEND="sys-process/cronbase
                clamav? ( >=app-antivirus/clamav-0.86 )
                mysql? ( >=dev-db/mysql-3.23 )
-               sqlite? ( dev-db/sqlite )
+               sqlite? ( <dev-db/sqlite-3* )
+               sqlite3? ( =dev-db/sqlite-3* )
                postgres? ( >=dev-db/postgresql-7.4.3 )
                >=sys-libs/db-4.0
                logrotate? ( app-admin/logrotate )"
@@ -35,7 +37,7 @@ LOGDIR="/var/log/dspam"
 
 pkg_setup() {
        local multiple_dbs="0"
-       local supported_dbs="mysql postgres oci8 sqlite"
+       local supported_dbs="mysql postgres oci8 sqlite sqlite3"
        for foo in ${supported_dbs}; do
                if use ${foo}; then
                        let multiple_dbs="((multiple_dbs + 1 ))"
@@ -103,6 +105,9 @@ src_compile() {
        if use sqlite ; then
                myconf="${myconf} --with-storage-driver=sqlite_drv"
                myconf="${myconf} --enable-virtual-users"
+       elif use sqlite3 ; then
+               myconf="${myconf} --with-storage-driver=sqlite3_drv"
+               myconf="${myconf} --enable-virtual-users"
        elif use mysql; then
                myconf="${myconf} --with-storage-driver=mysql_drv"
                myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
@@ -218,7 +223,11 @@ src_install () {
        if use sqlite; then
                insinto ${CONFDIR}
                insopts -m644 -o dspam -g dspam
-               newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
+               newins src/tools.sqlite_drv/purge-2.sql sqlite_purge.sql
+       elif use sqlite3; then
+               insinto ${CONFDIR}
+               insopts -m644 -o dspam -g dspam
+               newins src/tools.sqlite_drv/purge-3.sql sqlite3_purge.sql
        elif use mysql; then
                # Use existing configuration if possible
                if [[ -f ${ROOT}${CONFDIR}/mysql.data ]]; then