Drop old

Package-Manager: portage-2.2.0_alpha132/cvs/Linux x86_64

4 files changed, 19 insertions, 459 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 7d7e5babb630..7d85a447ca18 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.153 2012/09/23 08:15:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.154 2012/09/25 11:42:59 eras Exp $
+
+  25 Sep 2012; Eray Aslan <eras@gentoo.org> -dspam-3.10.1-r1.ebuild,
+  -dspam-3.10.2.ebuild:
+  Drop old
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> dspam-3.10.2-r1.ebuild:
   x86 stable wrt bug #433299
@@ -744,4 +748,3 @@
   Initial commit.  Most of the ebuild was thanks to work done by Mark Renouf
   <mark@tweakt.net> on bug #26744.  I just tried harder to be anal about it. :)
   Closing bug.
-
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index e55aa64e22d4..78d47a74019c 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -5,17 +5,24 @@ AUX dspam.confd 299 SHA256 fdc691c71a2518c13f61aa44159f1318b03ba4f9ca004a3f38c3c
 AUX dspam.cron-r4 160 SHA256 ef59ea37a272b3d044a59fc1f30d1c60087e15d5735ba961cc57458cc5026aca SHA512 b00260fb3017c34d6c37ac97139dda82a609740ee751f8e97487e9bbdb27582715adab418fcf4650c34a0b0d04ebad9c2aac14580e29a5cfca78b783b3e8c14c WHIRLPOOL 02745878d432907510f0363f31f17d6d9a10643ae2f6b5fe5cdaa83b5fa6fda98cb39e74b3b257af3faefa1be62a97ea2c24f8a1764103d4b141a8a4adb3213a
 AUX dspam.initd 979 SHA256 4eaf5da3420a6196ce987429bedf3ba25d21616ea1eb2ebc35c58778c0105d7c SHA512 5b16302e841e8144086333817b19fac7b34ac2151b4345e3d55263c7155617ec0ecb8a9ce6ae72d042197d323902a7f6206738c9a4df617d4deba986ee1c1397 WHIRLPOOL ecf7487b804ecd5543ac45e34d3472435224b5e236c5c8e74527338b08a5d7b08215074b2112957509251e4abf4a01a089f2a9e36e63468aa2e3944f81a967ee
 AUX dspam.logrotate 180 SHA256 17285ab0e624ec52124e8f661649ac9549c00e91a2f8d0d6d9de4eabf273d582 SHA512 8178e7ce02ca11171bc5650b70583fa02d2a84a25d184bbee1760618355578826c34a423d76310135f773e37d5ecab565a707ed1d33190005daf1851a756c389 WHIRLPOOL 73860d77d41562ab056091e54ee862cff1eda45d8637561ee548ab7ca8dfe486d2d8312d78074e12087a36f4c4235067a911609604616577d3593cdab6c94ae1
-DIST dspam-3.10.1.tar.gz 1044198 SHA256 359d9f58564a87da131b8390d0eeecae4aa40d22ff74b97256d46835a2474063 SHA512 44c8ee6df058ed6b9c97722201bcd99645f93dd697676b2480a221280d8d1bc64c6eb03d4c69eede7c54028bbfc4583e7bbd7c4607587bcd037a559e868040ee WHIRLPOOL 9e422324150d34295b1dbc4caaaca408711a15d23a4f488c2950921829f5c44f5a719a93ae5160d3f26822efd0f70809697dab0607fde7e25857dc63866faa19
 DIST dspam-3.10.2.tar.gz 1035054 SHA256 ae76569604021f35b741fb95198a1e611a8c64c3838661973a6cf360bba593a9 SHA512 5fe53e1d0d7cabb3983f5c67274b074b7c647c1bae10ebc7ea3805542f99dbfb39abd4697e344e6eb80554522319a1253e1082ed6b389364bbaec1d6ddd43856 WHIRLPOOL 7195f295e786d0b327670ebcb292dc5d9fe98d94e48a5b4e3dd231aae88d55c19dfcf2c04df65bb969fdd8f1210ec125d6aa84d602623cb20964a170f95b880e
-EBUILD dspam-3.10.1-r1.ebuild 6175 SHA256 d2a7a9febb44e5785dd3ff0f587e9201a65a19d11bc692bd37231664a0f7669a SHA512 a2f085923ed1f2e0c2cf4fa6022dbdcc453ac3a61b012ef67842896f881e6c10c87f754320d0cdfacae93cbb5f7b59709a24bebde7078fe295bebaa5b1c549c6 WHIRLPOOL 1e1469c0494a5031c615ed05723d2579ab3d367d82f25338dce4a0c25e858fa2b0df7556bc6215d24e32e0589d89a4d6d1b4c716453fb67c5377c7fafe9ddcc7
 EBUILD dspam-3.10.2-r1.ebuild 6072 SHA256 204033f5c39030265c93b0e351d3965bccc21f9fabbb186dcc71389e2cca8853 SHA512 96be45a999cce5ec2fe53eadaf695f5ef9eeebd364c650fa9e7852745958668f0ea5704f36a3a848a8b271e0023ffeaf9331ce6c9874658ef2e63ee40ab311ae WHIRLPOOL 0664c91ce15af5aec007e3896052ff72dda527934efd62a9735cb54440990d933abe713cf5bec5b945e4f77d79360d9c9caa6095c0d54bee799e313301df690b
-EBUILD dspam-3.10.2.ebuild 6175 SHA256 29e2b37cfa89595f047e7879208eea872affdfeac6dd8888f9082ee29c363431 SHA512 7806510a414cc66cb6b0b9735166a86f35060b78536bc783ec797fd83fb409782e80e79019b7df68287edab459bfe75df6191e833add936d11878212b39500dd WHIRLPOOL a71fb33e7e2646a66ed378763243a61b665ac1939944a2a562d326f67300e6f6eb4dfcfbe6923a482cd9a132b12b205cfa9b39b79428db2c5bcac3ce5d544e1a
-MISC ChangeLog 25891 SHA256 454a9c5d7b9f4e06d207ecb1ac90a64807b31a902cf9a6d95c276f88f19b4785 SHA512 8034cf3a6818be8cb2566ec3ba1a881f4ede0f749fe26e253e7ba698bbc25887a5ebf19a096c1a273f96c2b0b8435214bbb81dae47310c34e55d479fefc53d26 WHIRLPOOL a209aa50a2fdbec995ba5390b074cacecdb40e4121c52403d75fb6bf6fda6e95630160c66ae3476021b8ffb166acce68a08f82bbaf711b5632552ce1009f7668
+MISC ChangeLog 25989 SHA256 1fbec8c9b9aeb7049e223971ee2d2cc0dfea262c1787de69ad85add332743d5d SHA512 f67cc91da92c764bfceff5b906aa5b23d6077d79f79d7790d0dac0629d52eca70d781ecb99a336c682735e0beb8286875dc6be0c4b9e75af0c02e50b998b28fd WHIRLPOOL bc4baa6ae7ad3848101cacc3092629311d8dd6ab9ed93b76d44ddea5dbf41d54b082110dc250a57fc60beb004270a9143847842750726b1e9f29d46fceb702db
 MISC metadata.xml 988 SHA256 f4e606cfc13e00ee42e46fdc32059610d9927605bc4e55c10c02fcb71fa65916 SHA512 6f61b430938b38a7146c94d8a582d527634da55f4d2aec61518fcb259b7e1c83780d38e4c93409dc7b4582f998c2dae428f3796950b37c4ce98fd3c42a5875df WHIRLPOOL afe38ca6ddc7a69bcd2f57cf9e8b162f3b6eaf332ef920dd4528feed7372acfbec8926c8e2e4766669c82c842e2af84098197716825bfbd774107fd21c511e55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBexTAACgkQuUQtlDBCeQKjNQCfcQUUMPhctzEiq5EqH6ja6+nY
-CWYAnRaLuwuydsB7sDtPevTHLzb4/W7e
-=WfmB
+iQIcBAEBCAAGBQJQYZjJAAoJEHfx8XVYajsfpkoP/jnpRxB4C1CH6s5cSKnZcqdl
+sXw5V/EhyoCDZb1GMTgUW2UflN7YaUZsX/4VZ5wyi5vbk4B5TxpQE+vNHM+Pqrur
+Qmwq/5xvsagXWJJzxTWu/vQ+HepBDArV+nKJ+1yEGYRvXWhLaNrA8wFRM+aBVZaM
+mcWyJTgjhvs4INYVDM80sYE/c9emQItwlSx03rlTd50CeK/tVeHlBbCEPs5q1qQ+
+ngSR0V+qATSvhaLLsfS7dPNdvKnu5uFidY3Pve8FE4WJ3mPZqYjYE2hM4scHcEoc
+NLTmMbtK/1aYvnxBjkNgRCkm4RIroTQJH0r2pYtEekPx4K1Hm1WKDIX/GslvYd/4
+7SSQkwRpI3p5rlEN5Yh9c8ekJI/TeFXx/mXsrVfxgSo6K6TRrm+R5ZBdlf7jug9m
+zXBukpe3HKl7vm/yRybSlGSx1lIIqrzou6/Ae8fLZkrj7xAmVh1Rz8ruXEJPh0Z/
+amW1BH0q1e5WANEvlxs0qVKx5TD5zuNSWXtN7H5uw0h+EU21DhlEdl1j3nFwq9ec
+56ERoAZvI/gnIzbwnRCRqskXhvr9LcWjaQa/8n4A7oFVECLDHozIdGP0ebXRsFuY
+UMZWJ+fhi2zcyiW9POOIiSkxqS7YpktuGKU59DWJSDGOfm1gukBnal4Xdw4tRzBg
+z0cVQd5Qq62dIIAwPyBO
+=DAnx
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/dspam-3.10.1-r1.ebuild b/mail-filter/dspam/dspam-3.10.1-r1.ebuild
deleted file mode 100644
index e09ad9d9856f..000000000000
--- a/mail-filter/dspam/dspam-3.10.1-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.5 2012/06/04 23:51:12 zmedico Exp $
-
-EAPI=4
-
-inherit eutils user
-
-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="amd64 ~ppc 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
-
-	# Install dspamc setgid
-	fowners root:dspam /usr/bin/dspamc &&
-		fperms g+s /usr/bin/dspamc ||
-		die "failed to alter dspamc owner:group or mode"
-}
-
-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
-}
diff --git a/mail-filter/dspam/dspam-3.10.2.ebuild b/mail-filter/dspam/dspam-3.10.2.ebuild
deleted file mode 100644
index bf34537706cc..000000000000
--- a/mail-filter/dspam/dspam-3.10.2.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.2.ebuild,v 1.4 2012/06/08 11:43:02 phajdan.jr Exp $
-
-EAPI=4
-
-inherit eutils user
-
-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="amd64 ~ppc 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
-
-	# Install dspamc setgid
-	fowners root:dspam /usr/bin/dspamc &&
-		fperms g+s /usr/bin/dspamc ||
-		die "failed to alter dspamc owner:group or mode"
-}
-
-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
-}