Remove old.
authorTim Harder <radhermit@gentoo.org>
Fri, 26 Aug 2011 09:20:14 +0000 (09:20 +0000)
committerTim Harder <radhermit@gentoo.org>
Fri, 26 Aug 2011 09:20:14 +0000 (09:20 +0000)
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

mail-filter/dspam/ChangeLog
mail-filter/dspam/Manifest
mail-filter/dspam/dspam-3.10.0-r1.ebuild [deleted file]
mail-filter/dspam/dspam-3.10.0.ebuild [deleted file]
mail-filter/dspam/dspam-3.10.1.ebuild [deleted file]

index 7ccc809e6a4f17ed3c262839551b2e39e9e642a4..572a6203c6bd6b8011bd1a2265fcdaaa1e03119f 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.138 2011/08/24 08:54:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.139 2011/08/26 09:20:14 radhermit Exp $
+
+  26 Aug 2011; Tim Harder <radhermit@gentoo.org> -dspam-3.10.0.ebuild,
+  -dspam-3.10.0-r1.ebuild, -dspam-3.10.1.ebuild:
+  Remove old.
 
 *dspam-3.10.1-r1 (24 Aug 2011)
 
index 7cdfecac40350f241d4620ffb13b6f0a28b05279..409b4467da25a4faa8373cef9addb0dc7b2210ef 100644 (file)
@@ -12,26 +12,22 @@ AUX dspam.rc 1025 RMD160 d223977cf390b1e89392462f06b31b0722810fa3 SHA1 6b243ffac
 AUX logrotate.dspam 155 RMD160 17e0f5401843ccac1d349b938b1e9b755f847108 SHA1 7462edc16642aa3b43263f8a7ce093de7f4a2ade SHA256 dd5bce638b92936e02ff02faf781cbf903faac7b73c61c1c666eb06cfb56bfac
 AUX pgsql_createdb.py 4520 RMD160 bcabe6298a0e97c4b3c10c48f98c5d09eb4a063b SHA1 0fe09f67a4f431dd9bf57a3e6c9ef6662f837403 SHA256 dc107ae72a3832b6ebce1066c5e84a0b164bcc01be74bb7dc1ee28c9135e9768
 AUX pgsql_purge.py 1236 RMD160 0fcc6154527932ded25397b093d40d113bb44335 SHA1 198add2080c5d229c77c518ff49b372a6f6f2b93 SHA256 3e996ed8ed5fdbdf3a65504ead870c742be7c0d05f4760e3d7d798205b6cdc1b
-DIST dspam-3.10.0.tar.gz 1027188 RMD160 87c0ea034557a1fce47a5b9e2c8ae0154b5dbb81 SHA1 68eb4e961898275a74a627a364ff0e7fe292ac76 SHA256 9195f584bbfdf8d55efe6b383aac551c1ebbd2024305502f1fd7491da5f7e29b
 DIST dspam-3.10.1.tar.gz 1044198 RMD160 f7022c10c7555d8a05e5bacb5804b3dc29f96066 SHA1 dfd78c9f696470077d4e2e2b52f1f42f90ac52cc SHA256 359d9f58564a87da131b8390d0eeecae4aa40d22ff74b97256d46835a2474063
 DIST dspam-3.8.0-patches-20091202.tar.gz 16009 RMD160 7dfff3091f4c8ccdd8feda0af8292c5b755e76e2 SHA1 e836d49679e07659775756cd504142d8d194a9b8 SHA256 c72f7e624ceafcf43f0402430eaeaaa47c7a1507192e696dadbc7f0957ca5d5b
 DIST dspam-3.8.0.tar.gz 726160 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 SHA1 d1de7ee2134522adaf52f49167accecf1589fa96 SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7
 DIST dspam_sa_trainer.tar.gz 1230 RMD160 c3d0fca7169d23ecf9d44c850ee255b42d97d818 SHA1 71a002f26a888bdfe47759cf1f780cd6478dacac SHA256 8fb6b1ebe592acf00a028737ef8e174544af166768b987d29048b2319bc5a215
-EBUILD dspam-3.10.0-r1.ebuild 5908 RMD160 29a67f5fac8ef1c6c1c5787a7a1b1633ee9d629b SHA1 b418139c23bf1aa3bd086f5e962e09d5f37b5fce SHA256 48f3926b64ad9a6e1f9e236bcc327350601eba0385203cf0dd9e6c5e8584fc82
-EBUILD dspam-3.10.0.ebuild 6153 RMD160 6bf5922ab9822aad7acab4c927e6b71cdae57e04 SHA1 a181b49c423a901d93ef89d605fbb6bd3d3ede63 SHA256 35c85a297f2740e07ba6a4a91d5ad4b4b5bd39afaf4d580d5f33a32752813bf2
 EBUILD dspam-3.10.1-r1.ebuild 6188 RMD160 b8287b57d48ea802a36b3b7decf398f361c4b522 SHA1 b89803896aaca7856abba10400a934ce8dcf460b SHA256 ad0b491f8bf1fea6defa66cd996a08a717af78bfabc71ae0bd6745e5eba06a48
-EBUILD dspam-3.10.1.ebuild 6032 RMD160 e006e49b67e8a4c00f2c5bbc7d6f5dfbac8e28e2 SHA1 51eabebbe694d4a4b2d9faf63be6114df9dba7eb SHA256 fa6d8b0ee89f0895c524029a58914d02b0c6fdab9b161f7dc46ed1692b88c06c
 EBUILD dspam-3.8.0-r15.ebuild 19692 RMD160 dbfc9ae12e751cc0ade8608f3073c284fd6f7fe4 SHA1 3beff2e7820d8a3a7e35d2ca871e042d8fc0c100 SHA256 6002f6e9db1e6e2de4296596297e7ea91d59b7090652d428df53301737fcd4a7
-MISC ChangeLog 23830 RMD160 7934d8d76dc976abbebc9384d4b9620100ad14f4 SHA1 a690f919348c17dc87abf8774cfbc9643c35e075 SHA256 16e20227fd7e640bc3ea5d34996e381d8c95393aa33b8c31508ab0e63aff5e6e
+MISC ChangeLog 23965 RMD160 aae58ab2c4fc083238840cbd09c6f65c9ced10a7 SHA1 836f88dcc48644001b4650f944380f4e21340f0e SHA256 ef9a7f2cdfc299d7fa66b3bdf78372435462c910ca4afa1a64db7279e6c53a52
 MISC metadata.xml 1429 RMD160 40b71e8574ed33364dd81fae8f6f510c9dadbe5f SHA1 727dcfbe77e781fb4ad6b45837d70acace16e4bb SHA256 797884e76db42660b78b292db1436cf3154c74cd71a891ea482f9a68264d1560
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOVLxjAAoJEEqz6FtPBkyjGakIAIvmDasLmPe4ssGVKewt31ed
-ITz7rueCSrZGG5/vzc+S/5kw4xAdELij5hsaQQ5MX8oKfe1Vlhfvgyc+SLQGFKyr
-2ek/H4+Otqn80YOpQCcgt7I5rMihNVvZFiX4lXzYvlDS/emWEzY6RY9JZntAx6gO
-Pk6LP6QvuevGt40nExsEpAOJFku5R30VOQahbFqV+TjvnWd7V/B1hBOEwkRTM4Qj
-rxaj518XB944295EMhW0tu3m23euXFHkq5q/jyTNIM/Q4VSYoUbD/CuEWia8JZni
-PYTMkS4KmTpIBDhMMktTvk3W65Zg14CiLUliGR9KzfVtWUWayJIbxaKwKXCRFts=
-=pMb3
+iQEcBAEBCgAGBQJOV2VUAAoJEEqz6FtPBkyj8E0H/2nihKxRDVd/pRxSWnVyEo3t
+C7RjoeDfZuTAK09ig+DZAYhr7UeNc5CjFj2Hu8yTf+tEpVScJiCnqakGMbW0ZUGw
+PqWd2vDnAwx3apNrX4jehtiOc69Pef/0CNyQWJvAB19MtaIVj+ox+CICaLmVM4Uf
+4iFbprhQJzagKzawYDoeiScV+OYLtU3Lxur+DAMJrpKP1Zo6hMj388zw8F7yBRFh
+tVDQAVTV3D9v6IE01NrFjoq2F8TtHX8yZ7rk+6Ovxpf4Y/82uVWkPZq1CfF+UgX/
+WdkdaBDLpDo5FkOanEo3QBwhxc/Ro5J7MtwoQdoBmcIluo2vv+CjT2SicPxsYIM=
+=bo3E
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/dspam-3.10.0-r1.ebuild b/mail-filter/dspam/dspam-3.10.0-r1.ebuild
deleted file mode 100644 (file)
index 22c2416..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.0-r1.ebuild,v 1.2 2011/08/07 14:49:51 eras Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-HOMEPAGE="http://dspam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-DRIVERS_IUSE="+hash mysql postgres sqlite"
-SCALES_IUSE="small-scale +domain-scale large-scale"
-IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
-
-DEPEND="
-       ldap? ( net-nds/openldap )
-       mysql? ( >=virtual/mysql-5.0 )
-       postgres? ( dev-db/postgresql-base )
-       sqlite? ( dev-db/sqlite:3 )
-"
-
-RDEPEND="
-       ${DEPEND}
-       clamav? ( app-antivirus/clamav )
-       syslog? ( virtual/logger )
-"
-
-# Demands on sane USE flags:
-# - find out what driver to use: select at least one
-# - if static-libs is set, only one driver may be selected
-# - find out what scale to use: select exactly one
-# - user-homedirs does not work with virtual-users
-# - virtual-users does not work with hash or sqlite
-REQUIRED_USE="
-       || ( ${DRIVERS_IUSE//+} )
-       static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) )
-       ^^ ( ${SCALES_IUSE//+} )
-       virtual-users? ( !user-homedirs )
-       hash? ( !virtual-users )
-       sqlite? ( !virtual-users )
-"
-
-# dspam setup defaults
-DSPAM_HOME=/var/spool/dspam
-DSPAM_CONF=/etc/dspam
-DSPAM_LOG=/var/log/dspam
-DSPAM_MODE=2510
-DSPAM_DRIVERS=
-DSPAM_DRIVERS_EXTRAS=
-
-pkg_setup() {
-       # setup storage, this sets DSPAM_DRIVERS
-       dspam_setup_storage_drivers
-
-       # create dspam user and group
-       dspam_setup_user
-}
-
-src_configure() {
-       econf \
-       --sysconfdir=${DSPAM_CONF} \
-       --with-dspam-home=${DSPAM_HOME} \
-       --with-dspam-home-group=dspam \
-       --with-dspam-mode=${DSPAM_MODE} \
-       --with-dspam-group=dspam \
-       --with-logdir=${DSPAM_LOG} \
-       --enable-external-lookup \
-       --enable-long-usernames \
-       --enable-split-configuration \
-       $(use_enable clamav) \
-       $(use_enable daemon) \
-       $(use_enable debug) \
-       $(use_enable debug bnr-debug) \
-       $(use_enable debug verbose-debug) \
-       $(use_enable domain-scale) \
-       $(use_enable large-scale) \
-       $(use_enable static-libs static) \
-       $(use_enable syslog) \
-       $(use_enable user-homedirs homedir) \
-       $(use_enable virtual-users) \
-       --with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
-       $(use mysql || use postgres && echo "--enable-preferences-extension") \
-       $(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log")
-}
-
-dspam_setup_user() {
-       # DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user
-       # under suexec in apache, so DSPAM user/group need to be regular users too
-
-       local euid egid
-       for euid in {1000..5000} ; do
-               [ -z "$(egetent passwd ${euid})" ] && break
-       done
-       for egid in {1000..5000} ; do
-               [ -z "$(egetent group ${egid})" ] && break
-       done
-       enewgroup dspam ${egid}
-       enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail
-}
-
-dspam_setup_storage_drivers() {
-       # Find out which storage drivers need to be enabled, and set some
-       # variables so that src_configure can pick them up
-
-       if use hash; then
-               DSPAM_DRIVERS+=",hash_drv"
-       fi
-
-       if use mysql; then
-               DSPAM_DRIVERS+=",mysql_drv"
-               DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql "
-       fi
-
-       if use postgres; then
-               DSPAM_DRIVERS+=",pgsql_drv"
-       fi
-
-       if use sqlite; then
-               DSPAM_DRIVERS+=",sqlite3_drv"
-       fi
-
-       if ! use static-libs; then
-               # set the driver name twice to avoid a static build
-               DSPAM_DRIVERS+=${DSPAM_DRIVERS}
-       fi
-
-       # remove first comma separator
-       DSPAM_DRIVERS=${DSPAM_DRIVERS:1}
-       einfo "Building with drivers: ${DSPAM_DRIVERS}"
-       #echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS
-}
-
-src_install() {
-       default
-
-       if use daemon; then
-               newinitd "${FILESDIR}/dspam.initd" dspam
-               newconfd "${FILESDIR}/dspam.confd" dspam
-       fi
-
-       if use mysql; then
-               insinto "/usr/share/${PN}/mysql"
-
-               local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql"
-               if use virtual-users; then
-                       files+=" virtual_user_aliases.sql virtual_users.sql"
-               fi
-
-               for file in $files; do
-                       doins src/tools.mysql_drv/${file}
-               done
-       fi
-
-       if use postgres; then
-               insinto "/usr/share/${PN}/pgsql"
-
-               local files="pgsql_objects.sql purge-pe.sql purge.sql"
-               if use virtual-users; then
-                       files+=" virtual_users.sql"
-               fi
-
-               for file in $files; do
-                       doins src/tools.pgsql_drv/${file}
-               done
-       fi
-
-       if use sqlite; then
-               insinto "/usr/share/${PN}/sqlite"
-               newins src/tools.sqlite_drv/purge-3.sql purge.sql
-       fi
-
-       insinto "${DSPAM_HOME}/txt"
-       doins txt/*.txt
-       for i in spam nonspam; do
-               echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}"
-               doins "${T}/msgtag.${i}"
-       done
-
-       exeinto /usr/bin
-       newexe contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance
-       exeinto /etc/cron.daily
-       newexe "${FILESDIR}/dspam.cron-r4" dspam
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/dspam.logrotate" dspam
-
-       dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt
-}
-
-pkg_preinst() {
-       # dspam-3.10.0: config dir change, should be removed at some later point
-       ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
-       if [ -d "${ROOT}/etc/mail/dspam" ]; then
-               if [ -h "${ROOT}${DSPAM_CONF}" ]; then
-                       # symlink, this is the setup in older ebuilds
-                       ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-                       rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-                       eend $?
-
-               elif [ -d "${ROOT}${DSPAM_CONF}" ]; then
-                       # directory and no symlink, do it manually since we cannot decide.
-                       ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former."
-
-               else
-                       # nothing interesting in /etc/dspam
-                       ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-                       mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-                       eend $?
-               fi
-       fi
-}
diff --git a/mail-filter/dspam/dspam-3.10.0.ebuild b/mail-filter/dspam/dspam-3.10.0.ebuild
deleted file mode 100644 (file)
index 42c2da7..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.0.ebuild,v 1.3 2011/08/06 03:45:01 radhermit Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-HOMEPAGE="http://dspam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-DRIVERS_IUSE="+hash mysql postgres sqlite"
-SCALES_IUSE="domain-scale large-scale"
-IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
-
-DEPEND="
-       ldap? ( net-nds/openldap )
-       mysql? ( >=virtual/mysql-5.0 )
-       postgres? ( dev-db/postgresql-base )
-       sqlite? ( dev-db/sqlite:3 )
-"
-
-RDEPEND="
-       ${DEPEND}
-       clamav? ( app-antivirus/clamav )
-       syslog? ( virtual/logger )
-"
-
-# Demands on sane USE flags:
-# - find out what driver to use: select at least one
-# - if static-libs is set, only one driver may be selected
-# - find out what scale to use: choose at most one (default to domain-scale if
-# both not selected)
-# - user-homedirs does not work with virtual-users
-# - virtual-users does not work with hash or sqlite
-REQUIRED_USE="
-       || ( ${DRIVERS_IUSE//+} )
-       static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) )
-       domain-scale? ( !large-scale )
-       large-scale? ( !domain-scale )
-       virtual-users? ( !user-homedirs )
-       hash? ( !virtual-users )
-       sqlite? ( !virtual-users )
-"
-
-# dspam setup defaults
-DSPAM_HOME=/var/spool/dspam
-DSPAM_CONF=/etc/dspam
-DSPAM_LOG=/var/log/dspam
-DSPAM_MODE=2510
-DSPAM_DRIVERS=
-DSPAM_DRIVERS_EXTRAS=
-
-pkg_setup() {
-       # setup storage, this sets DSPAM_DRIVERS
-       dspam_setup_storage_drivers
-
-       # create dspam user and group
-       dspam_setup_user
-}
-
-src_configure() {
-       local myconf=""
-       if ! use large-scale && ! use domain-scale ; then
-               # default to domain-scale
-               myconf="--disable-large-scale --enable-domain-scale"
-       fi
-
-       econf \
-       --sysconfdir=${DSPAM_CONF} \
-       --with-dspam-home=${DSPAM_HOME} \
-       --with-dspam-home-group=dspam \
-       --with-dspam-mode=${DSPAM_MODE} \
-       --with-dspam-group=dspam \
-       --with-logdir=${DSPAM_LOG} \
-       --enable-external-lookup \
-       --enable-long-usernames \
-       --enable-split-configuration \
-       $(use_enable clamav) \
-       $(use_enable daemon) \
-       $(use_enable debug) \
-       $(use_enable debug bnr-debug) \
-       $(use_enable debug verbose-debug) \
-       $(use_enable domain-scale) \
-       $(use_enable large-scale) \
-       $(use_enable static-libs static) \
-       $(use_enable syslog) \
-       $(use_enable user-homedirs homedir) \
-       $(use_enable virtual-users) \
-       --with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
-       $(use mysql || use postgres && echo "--enable-preferences-extension") \
-       $(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log") \
-       ${myconf}
-}
-
-dspam_setup_user() {
-       # DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user
-       # under suexec in apache, so DSPAM user/group need to be regular users too
-
-       local euid egid
-       for euid in {1000..5000} ; do
-               [ -z "$(egetent passwd ${euid})" ] && break
-       done
-       for egid in {1000..5000} ; do
-               [ -z "$(egetent group ${egid})" ] && break
-       done
-       enewgroup dspam ${egid}
-       enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail
-}
-
-dspam_setup_storage_drivers() {
-       # Find out which storage drivers need to be enabled, and set some
-       # variables so that src_configure can pick them up
-
-       if use hash; then
-               DSPAM_DRIVERS+=",hash_drv"
-       fi
-
-       if use mysql; then
-               DSPAM_DRIVERS+=",mysql_drv"
-               DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql "
-       fi
-
-       if use postgres; then
-               DSPAM_DRIVERS+=",pgsql_drv"
-       fi
-
-       if use sqlite; then
-               DSPAM_DRIVERS+=",sqlite3_drv"
-       fi
-
-       if ! use static-libs; then
-               # set the driver name twice to avoid a static build
-               DSPAM_DRIVERS+=${DSPAM_DRIVERS}
-       fi
-
-       # remove first comma separator
-       DSPAM_DRIVERS=${DSPAM_DRIVERS:1}
-       einfo "Building with drivers: ${DSPAM_DRIVERS}"
-       #echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS
-}
-
-src_install() {
-       default
-
-       if use daemon; then
-               newinitd "${FILESDIR}/dspam.initd" dspam
-               newconfd "${FILESDIR}/dspam.confd" dspam
-       fi
-
-       if use mysql; then
-               insinto "/usr/share/${PN}/mysql"
-
-               local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql"
-               if use virtual-users; then
-                       files+=" virtual_user_aliases.sql virtual_users.sql"
-               fi
-
-               for file in $files; do
-                       doins src/tools.mysql_drv/${file}
-               done
-       fi
-
-       if use postgres; then
-               insinto "/usr/share/${PN}/pgsql"
-
-               local files="pgsql_objects.sql purge-pe.sql purge.sql"
-               if use virtual-users; then
-                       files+=" virtual_users.sql"
-               fi
-
-               for file in $files; do
-                       doins src/tools.pgsql_drv/${file}
-               done
-       fi
-
-       if use sqlite; then
-               insinto "/usr/share/${PN}/sqlite"
-               newins src/tools.sqlite_drv/purge-3.sql purge.sql
-       fi
-
-       insinto "${DSPAM_HOME}/txt"
-       doins txt/*.txt
-       for i in spam nonspam; do
-               echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}"
-               doins "${T}/msgtag.${i}"
-       done
-
-       exeinto /usr/bin
-       newexe contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance
-       exeinto /etc/cron.daily
-       newexe "${FILESDIR}/dspam.cron-r4" dspam
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/dspam.logrotate" dspam
-
-       dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt
-}
-
-pkg_preinst() {
-       # dspam-3.10.0: config dir change, should be removed at some later point
-       ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
-       if [ -d "${ROOT}/etc/mail/dspam" ]; then
-               if [ -h "${ROOT}${DSPAM_CONF}" ]; then
-                       # symlink, this is the setup in older ebuilds
-                       ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-                       rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-                       eend $?
-
-               elif [ -d "${ROOT}${DSPAM_CONF}" ]; then
-                       # directory and no symlink, do it manually since we cannot decide.
-                       ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former."
-
-               else
-                       # nothing interesting in /etc/dspam
-                       ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-                       mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-                       eend $?
-               fi
-       fi
-}
diff --git a/mail-filter/dspam/dspam-3.10.1.ebuild b/mail-filter/dspam/dspam-3.10.1.ebuild
deleted file mode 100644 (file)
index 923271f..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.1.ebuild,v 1.2 2011/08/13 04:19:26 eras Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-HOMEPAGE="http://dspam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-DRIVERS_IUSE="+hash mysql postgres sqlite"
-SCALES_IUSE="small-scale +domain-scale large-scale"
-IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
-
-DEPEND="
-       ldap? ( net-nds/openldap )
-       mysql? ( >=virtual/mysql-5.0 )
-       postgres? ( dev-db/postgresql-base )
-       sqlite? ( dev-db/sqlite:3 )
-"
-
-RDEPEND="
-       ${DEPEND}
-       clamav? ( app-antivirus/clamav )
-       syslog? ( virtual/logger )
-"
-
-# Demands on sane USE flags:
-# - find out what driver to use: select at least one
-# - if static-libs is set, only one driver may be selected
-# - find out what scale to use: select exactly one
-# - user-homedirs does not work with virtual-users
-# - virtual-users does not work with hash or sqlite
-REQUIRED_USE="
-       || ( ${DRIVERS_IUSE//+} )
-       static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) )
-       ^^ ( ${SCALES_IUSE//+} )
-       virtual-users? ( !user-homedirs )
-       hash? ( !virtual-users )
-       sqlite? ( !virtual-users )
-"
-
-# dspam setup defaults
-DSPAM_HOME=/var/spool/dspam
-DSPAM_CONF=/etc/dspam
-DSPAM_LOG=/var/log/dspam
-DSPAM_MODE=2510
-DSPAM_DRIVERS=
-DSPAM_DRIVERS_EXTRAS=
-
-pkg_setup() {
-       # setup storage, this sets DSPAM_DRIVERS
-       dspam_setup_storage_drivers
-
-       # create dspam user and group
-       dspam_setup_user
-}
-
-src_configure() {
-       econf \
-       --sysconfdir=${DSPAM_CONF} \
-       --with-dspam-home=${DSPAM_HOME} \
-       --with-dspam-home-group=dspam \
-       --with-dspam-mode=${DSPAM_MODE} \
-       --with-dspam-group=dspam \
-       --with-logdir=${DSPAM_LOG} \
-       --enable-external-lookup \
-       --enable-long-usernames \
-       --enable-split-configuration \
-       $(use_enable clamav) \
-       $(use_enable daemon) \
-       $(use_enable debug) \
-       $(use_enable debug bnr-debug) \
-       $(use_enable debug verbose-debug) \
-       $(use_enable domain-scale) \
-       $(use_enable large-scale) \
-       $(use_enable static-libs static) \
-       $(use_enable syslog) \
-       $(use_enable user-homedirs homedir) \
-       $(use_enable virtual-users) \
-       --with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
-       $(use mysql || use postgres && echo "--enable-preferences-extension") \
-       $(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log")
-}
-
-dspam_setup_user() {
-       # DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user
-       # under suexec in apache, so DSPAM user/group need to be regular users too
-
-       local euid egid
-       for euid in {1000..5000} ; do
-               [ -z "$(egetent passwd ${euid})" ] && break
-       done
-       for egid in {1000..5000} ; do
-               [ -z "$(egetent group ${egid})" ] && break
-       done
-       enewgroup dspam ${egid}
-       enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail
-}
-
-dspam_setup_storage_drivers() {
-       # Find out which storage drivers need to be enabled, and set some
-       # variables so that src_configure can pick them up
-
-       if use hash; then
-               DSPAM_DRIVERS+=",hash_drv"
-       fi
-
-       if use mysql; then
-               DSPAM_DRIVERS+=",mysql_drv"
-               DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql "
-       fi
-
-       if use postgres; then
-               DSPAM_DRIVERS+=",pgsql_drv"
-       fi
-
-       if use sqlite; then
-               DSPAM_DRIVERS+=",sqlite3_drv"
-       fi
-
-       if ! use static-libs; then
-               # set the driver name twice to avoid a static build
-               DSPAM_DRIVERS+=${DSPAM_DRIVERS}
-       fi
-
-       # remove first comma separator
-       DSPAM_DRIVERS=${DSPAM_DRIVERS:1}
-       einfo "Building with drivers: ${DSPAM_DRIVERS}"
-       #echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS
-}
-
-src_install() {
-       default
-
-       if use daemon; then
-               newinitd "${FILESDIR}/dspam.initd" dspam
-               newconfd "${FILESDIR}/dspam.confd" dspam
-       fi
-
-       if use mysql; then
-               insinto "/usr/share/${PN}/mysql"
-
-               local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql"
-               if use virtual-users; then
-                       files+=" virtual_user_aliases.sql virtual_users.sql"
-               fi
-
-               for file in $files; do
-                       doins src/tools.mysql_drv/${file}
-               done
-       fi
-
-       if use postgres; then
-               insinto "/usr/share/${PN}/pgsql"
-
-               local files="pgsql_objects.sql purge-pe.sql purge.sql"
-               if use virtual-users; then
-                       files+=" virtual_users.sql"
-               fi
-
-               for file in $files; do
-                       doins src/tools.pgsql_drv/${file}
-               done
-       fi
-
-       if use sqlite; then
-               insinto "/usr/share/${PN}/sqlite"
-               newins src/tools.sqlite_drv/purge-3.sql purge.sql
-       fi
-
-       insinto "${DSPAM_HOME}/txt"
-       doins txt/*.txt
-       for i in spam nonspam; do
-               echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}"
-               doins "${T}/msgtag.${i}"
-       done
-
-       exeinto /usr/bin
-       newexe contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance
-       exeinto /etc/cron.daily
-       newexe "${FILESDIR}/dspam.cron-r4" dspam
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/dspam.logrotate" dspam
-
-       dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt
-
-       # stop logrotate-3.8 from complaining
-       dodir /var/log/dspam
-       fowners dspam:dspam /var/log/dspam
-       fperms 0750 /var/log/dspam
-}
-
-pkg_preinst() {
-       # dspam-3.10.0: config dir change, should be removed at some later point
-       if [ -d "${ROOT}/etc/mail/dspam" ]; then
-               ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
-               if [ -h "${ROOT}${DSPAM_CONF}" ]; then
-                       # symlink, this is the setup in older ebuilds
-                       ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-                       rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-                       eend $?
-
-               elif [ -d "${ROOT}${DSPAM_CONF}" ]; then
-                       # directory and no symlink, do it manually since we cannot decide.
-                       ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former."
-
-               else
-                       # nothing interesting in /etc/dspam
-                       ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-                       mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-                       eend $?
-               fi
-       fi
-}