fix invalid atoms

Package-Manager: portage-2.0.53_rc7

diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 468246325c9dfdbbb45591a345e020e341951f70..76efb45bafe33aebfe943b252de8d9faaf268b60 100644 (file)
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,15 +1,15 @@
-MD5 392cd158b99d8553da925dca65c89a2b dspam-3.4.9.ebuild 19680
-MD5 dbfbe5a3bbe3347938107f5f5bd2197e metadata.xml 308
-MD5 6a40ecd62c1d0a6ecd0b36feced49e94 dspam-3.6.0.ebuild 18479
-MD5 ba82ba9c82d1fc2a39e107b672c55c69 dspam-3.2.7.ebuild 15561
 MD5 eb9331c5ca74c56b437c65a41bba9b5d ChangeLog 12071
-MD5 e2850ede85e459ab5479b7d2e79eeb5a files/dspam.rc 1025
-MD5 34841f2d2c9d6e057b9839bbe354e34a files/dspam.cron 3478
-MD5 2163ca41de383f09f4d754e2d35cb158 files/logrotate.dspam 156
-MD5 f2f86e8f7ab440c8537f40fa18a0ee43 files/crontab.mysql 118
+MD5 ba82ba9c82d1fc2a39e107b672c55c69 dspam-3.2.7.ebuild 15561
+MD5 392cd158b99d8553da925dca65c89a2b dspam-3.4.9.ebuild 19680
+MD5 4436b1ba0680741e1286a0f30c9fe5c5 dspam-3.6.0.ebuild 18449
 MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309
+MD5 e0469b961385fda4305602dc2519d319 files/README.qmail 2317
 MD5 cd1bdb75fd86304f9453741a910cb8a2 files/crontab.db4 196
-MD5 03b69dda833751bdda04e5413a9305e0 files/digest-dspam-3.6.0 129
+MD5 f2f86e8f7ab440c8537f40fa18a0ee43 files/crontab.mysql 118
 MD5 7735956f416bd58bfcbeee99af43bea0 files/digest-dspam-3.2.7 63
-MD5 e0469b961385fda4305602dc2519d319 files/README.qmail 2317
 MD5 bf443ca4bd218fa9d4b8975bf450c347 files/digest-dspam-3.4.9 129
+MD5 03b69dda833751bdda04e5413a9305e0 files/digest-dspam-3.6.0 129
+MD5 34841f2d2c9d6e057b9839bbe354e34a files/dspam.cron 3478
+MD5 e2850ede85e459ab5479b7d2e79eeb5a files/dspam.rc 1025
+MD5 2163ca41de383f09f4d754e2d35cb158 files/logrotate.dspam 156
+MD5 dbfbe5a3bbe3347938107f5f5bd2197e metadata.xml 308

diff --git a/mail-filter/dspam/dspam-3.6.0.ebuild b/mail-filter/dspam/dspam-3.6.0.ebuild
index 78541611c4f92a0bcb4281e35b7133a6f8cc6075..56e1366c709d10e208d1e1ad1fa069e5d0bdb05f 100644 (file)
--- a/mail-filter/dspam/dspam-3.6.0.ebuild
+++ b/mail-filter/dspam/dspam-3.6.0.ebuild
@@ -1,10 +1,9 @@
 # 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.5 2005/11/06 17:22:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.6.0.ebuild,v 1.6 2005/11/07 12:18:42 swegener Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
 SRC_URI="http://dspam.nuclearelephant.com/sources/${P}.tar.gz
                http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
@@ -22,7 +21,7 @@ DEPEND="clamav? ( >=app-antivirus/clamav-0.86 )
 RDEPEND="sys-process/cronbase
                clamav? ( >=app-antivirus/clamav-0.86 )
                mysql? ( >=dev-db/mysql-3.23 )
-               sqlite? ( <dev-db/sqlite-3* )
+               sqlite? ( <dev-db/sqlite-3 )
                sqlite3? ( =dev-db/sqlite-3* )
                postgres? ( >=dev-db/postgresql-7.4.3 )
                >=sys-libs/db-4.0
@@ -84,7 +83,7 @@ pkg_setup() {
                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 "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
@@ -418,7 +417,7 @@ pkg_config () {
                DSPAM_MySQL_DB="${DSPAM_DB_DATA[4]}"
 
                ewarn "When prompted for a password, please enter your MySQL root password"
-               ewarn ""
+               ewarn
 
                einfo "Creating DSPAM MySQL database \"${DSPAM_MySQL_DB}\""
                /usr/bin/mysqladmin -u root -p create ${DSPAM_MySQL_DB}
@@ -462,7 +461,7 @@ pkg_config () {
                DSPAM_PgSQL_DB="${DSPAM_DB_DATA[4]}"
 
                ewarn "When prompted for a password, please enter your PgSQL postgres password"
-               ewarn ""
+               ewarn
 
                einfo "Creating DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\" and user \"${DSPAM_PgSQL_USER}\""
                /usr/bin/psql -h localhost -d template1 -U postgres -c "CREATE USER ${DSPAM_PgSQL_USER} WITH PASSWORD '${DSPAM_PgSQL_PWD}' NOCREATEDB NOCREATEUSER; CREATE DATABASE ${DSPAM_PgSQL_DB}; GRANT ALL PRIVILEGES ON DATABASE ${DSPAM_PgSQL_DB} TO ${DSPAM_PgSQL_USER}; GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER}; UPDATE pg_database SET datdba=(SELECT usesysid FROM pg_shadow WHERE usename='${DSPAM_PgSQL_USER}') WHERE datname='${DSPAM_PgSQL_DB}';"
@@ -478,7 +477,7 @@ pkg_config () {
                einfo "We have not enought Oracle knowledge to configure Oracle"
                einfo "automatically. If you know how, please post a message in"
                einfo "Gentoo Bugzilla."
-               einfo ""
+               einfo
                einfo "You need manually to create the Oracle user for DSPAM and"
                einfo "the necessary database."
                einfo "But the DSPAM configuration file dspam.conf and oracle.data"