Version bump and housekeeping

(Portage version: 2.0.51.19)

10 files changed, 20 insertions, 680 deletions

diff --git a/www-apps/dspam-web/ChangeLog b/www-apps/dspam-web/ChangeLog
index 9313faf8d7c0..88ca2e32c198 100644
--- a/www-apps/dspam-web/ChangeLog
+++ b/www-apps/dspam-web/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/dspam-web
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.14 2005/02/17 00:16:25 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.15 2005/03/11 04:26:41 st_lim Exp $
+
+*dspam-web-3.4_beta3 (11 Mar 2005)
+
+  11 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> -dspam-web-3.2.4.ebuild,
+  +dspam-web-3.2.7.ebuild, -dspam-web-3.3.11.ebuild,
+  -dspam-web-3.3.8.ebuild, -dspam-web-3.4_beta1.ebuild,
+  -dspam-web-3.4_beta2.ebuild, -dspam-web-3.4_beta3.ebuild,
+  +dspam-web-3.4_rc3.ebuild:
+  Upgraded to 3.2.7 and 3.4_rc3
+  Removed old stuff
 
   17 Feb 2005; Lim Swee Tat <st_lim@gentoo.org> :
   Version bump
diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest
index 366fead37fc1..9d08e24e7dd8 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -1,16 +1,8 @@
 MD5 ee2bcd460d849b9822eb7a72f4eed2c3 ChangeLog 2438
-MD5 200f508058004a98dd2c61761111d363 dspam-web-3.2.4.ebuild 5213
-MD5 fa757721b552f847cd14d1a15885e622 dspam-web-3.3.11.ebuild 4963
-MD5 02b8d404199d28d7c1c185280ced86a8 dspam-web-3.3.8.ebuild 5213
+MD5 200f508058004a98dd2c61761111d363 dspam-web-3.2.7.ebuild 5213
 MD5 f1ea445d6b4ddf81c55a4e886bc04218 metadata.xml 341
-MD5 015276e9399597459156c822f5c004f2 dspam-web-3.4_beta1.ebuild 4977
-MD5 a1613f88505ca2763a8f14b330104afb dspam-web-3.4_beta2.ebuild 4977
-MD5 69f06996690d3ccb8322ad45bcc76b00 dspam-web-3.4_beta3.ebuild 4977
-MD5 b59703cc943f7df3ca77763cc47c59f9 files/digest-dspam-web-3.3.11 64
+MD5 61a8fcc23564eae29bbd128039ae64a2 dspam-web-3.4_rc3.ebuild 4974
 MD5 ffdfc8d816078f4c58b75b9bed07503f files/htaccess 135
 MD5 b4099a94a52af9abd4ade48d82914c3c files/htpasswd 19
-MD5 4dea50acb83ec9cac74817c0ef84a07c files/digest-dspam-web-3.4_beta1 68
-MD5 d2381c80ba8701cbb0711cdaab5d388d files/digest-dspam-web-3.4_beta2 68
-MD5 6f429af99757058b5a6a1019e10e0cfe files/digest-dspam-web-3.4_beta3 68
-MD5 ea56d34fd80be48f9b308655b5620c2f files/digest-dspam-web-3.2.4 63
-MD5 ad704c9a2372dd9ab4d112a8c687873e files/digest-dspam-web-3.3.8 63
+MD5 8518bd049104dded248d771b3238a776 files/digest-dspam-web-3.4_rc3 65
+MD5 7735956f416bd58bfcbeee99af43bea0 files/digest-dspam-web-3.2.7 63
diff --git a/www-apps/dspam-web/dspam-web-3.2.4.ebuild b/www-apps/dspam-web/dspam-web-3.2.7.ebuild
index ae252a5b5ac5..4cff6f04351c 100644
--- a/www-apps/dspam-web/dspam-web-3.2.4.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.2.7.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/www-apps/dspam-web/dspam-web-3.2.4.ebuild,v 1.1 2005/01/05 01:11:53 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.2.7.ebuild,v 1.1 2005/03/11 04:26:41 st_lim Exp $
 
 inherit webapp eutils
 
diff --git a/www-apps/dspam-web/dspam-web-3.3.11.ebuild b/www-apps/dspam-web/dspam-web-3.3.11.ebuild
deleted file mode 100644
index e57a4390b5e7..000000000000
--- a/www-apps/dspam-web/dspam-web-3.3.11.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.3.11.ebuild,v 1.2 2005/01/18 02:58:25 st_lim Exp $
-
-inherit webapp eutils
-
-MY_PN=${PN/-web/}
-MY_PV=${PV/_rc3/.pr1}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Web based administration and user controls for dspam"
-SRC_URI="http://dspam.nuclearelephant.com/sources/${MY_P}.tar.gz"
-
-HOMEPAGE="http://dspam.nuclearelephant.com/"
-LICENSE="GPL-2"
-DEPEND=">=mail-filter/dspam-3.2_rc3
-	>=net-www/apache-1.3
-	>=dev-lang/perl-5.8.2
-	>=dev-perl/GD-2.0
-	dev-perl/GD-Graph3d
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil"
-KEYWORDS="-*"
-S=${WORKDIR}/${MY_P}
-HOMEDIR=/etc/mail/dspam
-
-src_compile() {
-	local myconf
-
-	# these are the default settings
-	myconf="${myconf} --enable-daemon"
-	#myconf="${myconf} --enable-nodalcore"
-	myconf="${myconf} --enable-homedir"
-	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --enable-robinson"
-	#myconf="${myconf} --enable-chi-square"
-	#myconf="${myconf} --enable-robinson-pvalues"
-	use large-domain && myconf="${myconf} --enable-large-scale" ||\
-		myconf="${myconf} --enable-domain-scale"
-
-	myconf="${myconf} --with-dspam-mode=4755"
-	myconf="${myconf} --with-dspam-owner=dspam"
-	myconf="${myconf} --with-dspam-group=dspam"
-	myconf="${myconf} --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}"
-	myconf="${myconf} --with-logdir=${LOGDIR}"
-
-	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
-
-	# select storage driver
-	if use mysql || use mysql41; then
-		myconf="${myconf} --with-storage-driver=mysql_drv"
-		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
-		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
-		myconf="${myconf} --with-client-compression"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use postgres ; then
-		myconf="${myconf} --with-storage-driver=pgsql_drv"
-		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
-		myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use oci8 ; then
-		myconf="${myconf} --with-storage-driver=ora_drv"
-		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# I am in no way a Oracle specialist. If someone knows
-		# how to query the version of Oracle, then let me know.
-		if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1)
-		then
-			--with-oracle-version=MAJOR
-			myconf="${myconf} --with-oracle-version=10"
-		fi
-	elif use sqlite ; then
-		myconf="${myconf} --with-storage-driver=sqlite_drv"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-	fi
-
-	econf ${myconf} || die
-	cd ${S}/cgi
-	make
-}
-
-src_install () {
-	cd ${S}/cgi
-	webapp_src_preinst
-
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i admin.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i dspam.cgi
-
-	insinto ${MY_HTDOCSDIR}
-	insopts -m644 -o apache -g apache
-	doins *.css
-	doins *.gif
-	doins rgb.txt
-	doins default.prefs
-	doins admins
-	doins configure.pl
-
-	newins ${FILESDIR}/htaccess .htaccess
-	newins ${FILESDIR}/htpasswd .htpasswd
-
-	insopts -m755 -o apache -g apache
-	doins *.cgi
-
-	for CGI_SCRIPT in admin.cgi  admingraph.cgi  dspam.cgi  graph.cgi; do
-		webapp_runbycgibin perl ${MY_HTDOCSDIR}/${CGI_SCRIPT}
-	done
-
-	dodir ${MY_HTDOCSDIR}/templates
-
-	insinto ${MY_HTDOCSDIR}/templates
-	doins templates/*.html
-
-	#All files must be owned by server
-	cd ${D}${MY_HTDOCSDIR}
-	for x in `find . -type f -print` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	webapp_src_install
-}
-
-pkg_config () {
-	# add apache to the dspam group so the CGIs can access the data
-
-	local groups
-	groups=`groups apache`
-	groups=`echo ${groups} | sed -e 's/ /,/g'`
-	usermod -G "${groups},dspam" apache
-}
-
-pkg_postinst () {
-	einfo "The CGIs need to be executed as group dspam in order to write"
-	einfo "to the dspam data directory. You will need to configure apache"
-	einfo "manually to do this. Another option is to add the user apache"
-	einfo "to the dspam group. You can do this automatically by running:"
-	echo
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	echo
-	einfo "This app requires basic auth in order to operate properly."
-	einfo "You will need to add dspam users to the .htpasswd file or"
-	einfo "configure a different authentication mechanism for the user"
-	einfo "accounts."
-}
diff --git a/www-apps/dspam-web/dspam-web-3.3.8.ebuild b/www-apps/dspam-web/dspam-web-3.3.8.ebuild
deleted file mode 100644
index ad3edf63e894..000000000000
--- a/www-apps/dspam-web/dspam-web-3.3.8.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.3.8.ebuild,v 1.1 2005/01/05 01:11:53 st_lim Exp $
-
-inherit webapp eutils
-
-MY_PN=${PN/-web/}
-MY_PV=${PV/_rc3/.pr1}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Web based administration and user controls for dspam"
-SRC_URI="http://dspam.nuclearelephant.com/sources/${MY_P}.tar.gz"
-
-HOMEPAGE="http://dspam.nuclearelephant.com/"
-LICENSE="GPL-2"
-DEPEND=">=mail-filter/dspam-3.2_rc3
-	>=net-www/apache-1.3
-	>=dev-lang/perl-5.8.2
-	>=dev-perl/GD-2.0
-	dev-perl/GD-Graph3d
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
-S=${WORKDIR}/${MY_P}
-HOMEDIR=/etc/mail/dspam
-
-src_compile() {
-	local myconf
-
-	# these are the default settings
-	myconf="${myconf} --with-signature-life=14"
-	myconf="${myconf} --enable-broken-return-codes"
-	myconf="${myconf} --enable-experimental"
-	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --enable-robinson"
-	#myconf="${myconf} --enable-chi-square"
-	myconf="${myconf} --enable-robinson-pvalues"
-	#myconf="${myconf} --enable-broken-mta"
-	myconf="${myconf} --enable-large-scale"
-	#myconf="${myconf} --enable-domain-scale"
-
-	# ${HOMEDIR}/data is a symlink to ${DATADIR}
-	myconf="${myconf} --with-dspam-mode=4755"
-	myconf="${myconf} --with-dspam-owner=dspam"
-	myconf="${myconf} --with-dspam-group=dspam"
-	myconf="${myconf} --enable-homedir --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}"
-	myconf="${myconf} --with-logdir=/var/log/dspam"
-
-	# enables support for debugging (touch /etc/dspam/.debug to turn on)
-	# optional: even MORE debugging output, use with extreme caution!
-	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
-
-	# select storage driver
-	if use mysql || use mysql41; then
-		myconf="${myconf} --with-storage-driver=mysql_drv"
-		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
-		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
-		myconf="${myconf} --with-client-compression"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use postgres ; then
-		myconf="${myconf} --with-storage-driver=pgsql_drv"
-		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
-		myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use oci8 ; then
-		myconf="${myconf} --with-storage-driver=ora_drv"
-		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# I am in no way a Oracle specialist. If someone knows
-		# how to query the version of Oracle, then let me know.
-		if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1)
-		then
-			--with-oracle-version=MAJOR
-			myconf="${myconf} --with-oracle-version=10"
-		fi
-	elif use sqlite ; then
-		myconf="${myconf} --with-storage-driver=sqlite_drv"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-	fi
-
-	econf ${myconf} || die
-	cd ${S}/cgi
-	make
-}
-
-src_install () {
-	cd ${S}/cgi
-	webapp_src_preinst
-
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i admin.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i dspam.cgi
-
-	insinto ${MY_HTDOCSDIR}
-	insopts -m644 -o apache -g apache
-	doins *.css
-	doins *.gif
-	doins rgb.txt
-	doins default.prefs
-	doins admins
-	doins configure.pl
-
-	newins ${FILESDIR}/htaccess .htaccess
-	newins ${FILESDIR}/htpasswd .htpasswd
-
-	insopts -m755 -o apache -g apache
-	doins *.cgi
-
-	for CGI_SCRIPT in admin.cgi  admingraph.cgi  dspam.cgi  graph.cgi; do
-		webapp_runbycgibin perl ${MY_HTDOCSDIR}/${CGI_SCRIPT}
-	done
-
-	dodir ${MY_HTDOCSDIR}/templates
-
-	insinto ${MY_HTDOCSDIR}/templates
-	doins templates/*.html
-
-	#All files must be owned by server
-	cd ${D}${MY_HTDOCSDIR}
-	for x in `find . -type f -print` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	webapp_src_install
-}
-
-pkg_config () {
-	# add apache to the dspam group so the CGIs can access the data
-
-	local groups
-	groups=`groups apache`
-	groups=`echo ${groups} | sed -e 's/ /,/g'`
-	usermod -G "${groups},dspam" apache
-}
-
-pkg_postinst () {
-	einfo "The CGIs need to be executed as group dspam in order to write"
-	einfo "to the dspam data directory. You will need to configure apache"
-	einfo "manually to do this. Another option is to add the user apache"
-	einfo "to the dspam group. You can do this automatically by running:"
-	echo
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	echo
-	einfo "This app requires basic auth in order to operate properly."
-	einfo "You will need to add dspam users to the .htpasswd file or"
-	einfo "configure a different authentication mechanism for the user"
-	einfo "accounts."
-}
diff --git a/www-apps/dspam-web/dspam-web-3.4_beta1.ebuild b/www-apps/dspam-web/dspam-web-3.4_beta1.ebuild
deleted file mode 100644
index 44ed9a0050b5..000000000000
--- a/www-apps/dspam-web/dspam-web-3.4_beta1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4_beta1.ebuild,v 1.2 2005/02/14 04:49:38 st_lim Exp $
-
-inherit webapp eutils
-
-MY_PN=${PN/-web/}
-MY_PV=${PV/_beta/.beta.}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Web based administration and user controls for dspam"
-SRC_URI="http://dspam.nuclearelephant.com/sources/${MY_P}.tar.gz"
-
-HOMEPAGE="http://dspam.nuclearelephant.com/"
-LICENSE="GPL-2"
-DEPEND=">=mail-filter/dspam-3.2_rc3
-	>=net-www/apache-1.3
-	>=dev-lang/perl-5.8.2
-	>=dev-perl/GD-2.0
-	dev-perl/GD-Graph3d
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
-S=${WORKDIR}/${MY_P}
-HOMEDIR=/etc/mail/dspam
-
-src_compile() {
-	local myconf
-
-	# these are the default settings
-	#myconf="${myconf} --enable-daemon"
-	#myconf="${myconf} --enable-nodalcore"
-	myconf="${myconf} --enable-homedir"
-	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --enable-robinson"
-	#myconf="${myconf} --enable-chi-square"
-	#myconf="${myconf} --enable-robinson-pvalues"
-	use large-domain && myconf="${myconf} --enable-large-scale" ||\
-		myconf="${myconf} --enable-domain-scale"
-
-	myconf="${myconf} --with-dspam-mode=4755"
-	myconf="${myconf} --with-dspam-owner=dspam"
-	myconf="${myconf} --with-dspam-group=dspam"
-	myconf="${myconf} --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}"
-	myconf="${myconf} --with-logdir=${LOGDIR}"
-
-	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
-
-	# select storage driver
-	if use mysql || use mysql41; then
-		myconf="${myconf} --with-storage-driver=mysql_drv"
-		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
-		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
-		myconf="${myconf} --with-client-compression"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use postgres ; then
-		myconf="${myconf} --with-storage-driver=pgsql_drv"
-		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
-		myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use oci8 ; then
-		myconf="${myconf} --with-storage-driver=ora_drv"
-		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# I am in no way a Oracle specialist. If someone knows
-		# how to query the version of Oracle, then let me know.
-		if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1)
-		then
-			--with-oracle-version=MAJOR
-			myconf="${myconf} --with-oracle-version=10"
-		fi
-	elif use sqlite ; then
-		myconf="${myconf} --with-storage-driver=sqlite_drv"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-	fi
-
-	econf ${myconf} || die
-	cd ${S}/cgi
-	make
-}
-
-src_install () {
-	cd ${S}/cgi
-	webapp_src_preinst
-
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i admin.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i dspam.cgi
-
-	insinto ${MY_HTDOCSDIR}
-	insopts -m644 -o apache -g apache
-	doins *.css
-	doins *.gif
-	doins rgb.txt
-	doins default.prefs
-	doins admins
-	doins configure.pl
-
-	newins ${FILESDIR}/htaccess .htaccess
-	newins ${FILESDIR}/htpasswd .htpasswd
-
-	insopts -m755 -o apache -g apache
-	doins *.cgi
-
-	for CGI_SCRIPT in admin.cgi  admingraph.cgi  dspam.cgi  graph.cgi; do
-		webapp_runbycgibin perl ${MY_HTDOCSDIR}/${CGI_SCRIPT}
-	done
-
-	dodir ${MY_HTDOCSDIR}/templates
-
-	insinto ${MY_HTDOCSDIR}/templates
-	doins templates/*.html
-
-	#All files must be owned by server
-	cd ${D}${MY_HTDOCSDIR}
-	for x in `find . -type f -print` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	webapp_src_install
-}
-
-pkg_config () {
-	# add apache to the dspam group so the CGIs can access the data
-
-	local groups
-	groups=`groups apache`
-	groups=`echo ${groups} | sed -e 's/ /,/g'`
-	usermod -G "${groups},dspam" apache
-}
-
-pkg_postinst () {
-	einfo "The CGIs need to be executed as group dspam in order to write"
-	einfo "to the dspam data directory. You will need to configure apache"
-	einfo "manually to do this. Another option is to add the user apache"
-	einfo "to the dspam group. You can do this automatically by running:"
-	echo
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	echo
-	einfo "This app requires basic auth in order to operate properly."
-	einfo "You will need to add dspam users to the .htpasswd file or"
-	einfo "configure a different authentication mechanism for the user"
-	einfo "accounts."
-}
diff --git a/www-apps/dspam-web/dspam-web-3.4_beta3.ebuild b/www-apps/dspam-web/dspam-web-3.4_beta3.ebuild
deleted file mode 100644
index 3b7fb7d043a1..000000000000
--- a/www-apps/dspam-web/dspam-web-3.4_beta3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4_beta3.ebuild,v 1.1 2005/02/17 00:16:25 st_lim Exp $
-
-inherit webapp eutils
-
-MY_PN=${PN/-web/}
-MY_PV=${PV/_beta/.beta.}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Web based administration and user controls for dspam"
-SRC_URI="http://dspam.nuclearelephant.com/sources/${MY_P}.tar.gz"
-
-HOMEPAGE="http://dspam.nuclearelephant.com/"
-LICENSE="GPL-2"
-DEPEND=">=mail-filter/dspam-3.2_rc3
-	>=net-www/apache-1.3
-	>=dev-lang/perl-5.8.2
-	>=dev-perl/GD-2.0
-	dev-perl/GD-Graph3d
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
-S=${WORKDIR}/${MY_P}
-HOMEDIR=/etc/mail/dspam
-
-src_compile() {
-	local myconf
-
-	# these are the default settings
-	#myconf="${myconf} --enable-daemon"
-	#myconf="${myconf} --enable-nodalcore"
-	myconf="${myconf} --enable-homedir"
-	myconf="${myconf} --enable-long-username"
-	myconf="${myconf} --enable-robinson"
-	#myconf="${myconf} --enable-chi-square"
-	#myconf="${myconf} --enable-robinson-pvalues"
-	use large-domain && myconf="${myconf} --enable-large-scale" ||\
-		myconf="${myconf} --enable-domain-scale"
-
-	myconf="${myconf} --with-dspam-mode=4755"
-	myconf="${myconf} --with-dspam-owner=dspam"
-	myconf="${myconf} --with-dspam-group=dspam"
-	myconf="${myconf} --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}"
-	myconf="${myconf} --with-logdir=${LOGDIR}"
-
-	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
-
-	# select storage driver
-	if use mysql || use mysql41; then
-		myconf="${myconf} --with-storage-driver=mysql_drv"
-		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
-		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
-		myconf="${myconf} --with-client-compression"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use postgres ; then
-		myconf="${myconf} --with-storage-driver=pgsql_drv"
-		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
-		myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# an experimental feature available with MySQL and PgSQL backend
-		if use neural ; then
-			myconf="${myconf} --enable-neural-networking"
-		fi
-	elif use oci8 ; then
-		myconf="${myconf} --with-storage-driver=ora_drv"
-		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-		# I am in no way a Oracle specialist. If someone knows
-		# how to query the version of Oracle, then let me know.
-		if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1)
-		then
-			--with-oracle-version=MAJOR
-			myconf="${myconf} --with-oracle-version=10"
-		fi
-	elif use sqlite ; then
-		myconf="${myconf} --with-storage-driver=sqlite_drv"
-		myconf="${myconf} --enable-virtual-users"
-		myconf="${myconf} --enable-preferences-extension"
-
-	else
-		myconf="${myconf} --with-storage-driver=libdb4_drv"
-	fi
-
-	econf ${myconf} || die
-	cd ${S}/cgi
-	make
-}
-
-src_install () {
-	cd ${S}/cgi
-	webapp_src_preinst
-
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i admin.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i dspam.cgi
-
-	insinto ${MY_HTDOCSDIR}
-	insopts -m644 -o apache -g apache
-	doins *.css
-	doins *.gif
-	doins rgb.txt
-	doins default.prefs
-	doins admins
-	doins configure.pl
-
-	newins ${FILESDIR}/htaccess .htaccess
-	newins ${FILESDIR}/htpasswd .htpasswd
-
-	insopts -m755 -o apache -g apache
-	doins *.cgi
-
-	for CGI_SCRIPT in admin.cgi  admingraph.cgi  dspam.cgi  graph.cgi; do
-		webapp_runbycgibin perl ${MY_HTDOCSDIR}/${CGI_SCRIPT}
-	done
-
-	dodir ${MY_HTDOCSDIR}/templates
-
-	insinto ${MY_HTDOCSDIR}/templates
-	doins templates/*.html
-
-	#All files must be owned by server
-	cd ${D}${MY_HTDOCSDIR}
-	for x in `find . -type f -print` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	webapp_src_install
-}
-
-pkg_config () {
-	# add apache to the dspam group so the CGIs can access the data
-
-	local groups
-	groups=`groups apache`
-	groups=`echo ${groups} | sed -e 's/ /,/g'`
-	usermod -G "${groups},dspam" apache
-}
-
-pkg_postinst () {
-	einfo "The CGIs need to be executed as group dspam in order to write"
-	einfo "to the dspam data directory. You will need to configure apache"
-	einfo "manually to do this. Another option is to add the user apache"
-	einfo "to the dspam group. You can do this automatically by running:"
-	echo
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	echo
-	einfo "This app requires basic auth in order to operate properly."
-	einfo "You will need to add dspam users to the .htpasswd file or"
-	einfo "configure a different authentication mechanism for the user"
-	einfo "accounts."
-}
diff --git a/www-apps/dspam-web/dspam-web-3.4_beta2.ebuild b/www-apps/dspam-web/dspam-web-3.4_rc3.ebuild
index 51f3a45e8fa9..20cb74c3a0fe 100644
--- a/www-apps/dspam-web/dspam-web-3.4_beta2.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.4_rc3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4_beta2.ebuild,v 1.1 2005/02/14 04:49:38 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4_rc3.ebuild,v 1.1 2005/03/11 04:26:41 st_lim Exp $
 
 inherit webapp eutils
 
 MY_PN=${PN/-web/}
-MY_PV=${PV/_beta/.beta.}
+MY_PV=${PV/_rc3/.pr1}
 MY_P=${MY_PN}-${MY_PV}
 
 DESCRIPTION="Web based administration and user controls for dspam"
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.2.7 b/www-apps/dspam-web/files/digest-dspam-web-3.2.7
new file mode 100644
index 000000000000..b4002f859213
--- /dev/null
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.2.7
@@ -0,0 +1 @@
+MD5 f2bc9fb56ab6f21ef0b0ec7a3d453121 dspam-3.2.7.tar.gz 621245
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.4_rc3 b/www-apps/dspam-web/files/digest-dspam-web-3.4_rc3
new file mode 100644
index 000000000000..1c2ddc5284e3
--- /dev/null
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.4_rc3
@@ -0,0 +1 @@
+MD5 6fd75bee56adbff457ef9bae7dcf6bc8 dspam-3.4.pr1.tar.gz 684032