Version bump, removed old stuff

Package-Manager: portage-2.0.53_rc7

12 files changed, 527 insertions, 29 deletions

diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest
index efac71b3b0a9..83ceaa78271a 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -1,24 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 88a1c377fe7dd2728f9de77b7f6532e7 dspam-web-3.4.0.ebuild 5061
-MD5 8ba96f46000343aa2447d73ce7a94767 dspam-web-3.4_rc3.ebuild 5020
-MD5 0fa451a93eecd4a291c0ce828642f4cd dspam-web-3.4.2.ebuild 5061
-MD5 40839a8020eda166d17eee718211561c dspam-web-3.4.1.ebuild 5061
-MD5 e60a79564e1994dbb9cc17a0f35b7b69 dspam-web-3.2.7.ebuild 5248
 MD5 6ce7bcd554633c8d80ff5a4ef7a562ca ChangeLog 3080
-MD5 f1ea445d6b4ddf81c55a4e886bc04218 metadata.xml 341
-MD5 ffdfc8d816078f4c58b75b9bed07503f files/htaccess 135
-MD5 b4099a94a52af9abd4ade48d82914c3c files/htpasswd 19
-MD5 8518bd049104dded248d771b3238a776 files/digest-dspam-web-3.4_rc3 65
+MD5 03096ac1ea250450da7db871a098de1a dspam-web-3.2.7.ebuild 5253
+MD5 f3ce713e3832067ec9574e1829e41217 dspam-web-3.4.0.ebuild 5066
+MD5 eac634fe96d676d21e4466b052e30504 dspam-web-3.4.1.ebuild 5066
+MD5 54b6e3e5e0b941362a5d1f4b19a67909 dspam-web-3.4.2.ebuild 5066
+MD5 b03f7e094bd7bedf29e20baff13ca420 dspam-web-3.4.9.ebuild 5064
+MD5 92f4add27ff58e5e4b89ee696cb5cadc dspam-web-3.4_rc3.ebuild 5025
+MD5 bd6ad2a128be68aeaadad50c28985fb2 dspam-web-3.6.0.ebuild 5674
+MD5 869da16ed1df98bc8fd4f3b026ae1d3c dspam-web-3.6_rc3.ebuild 5032
 MD5 7735956f416bd58bfcbeee99af43bea0 files/digest-dspam-web-3.2.7 63
 MD5 75c7634845fababdfe9dbbd4be1b613a files/digest-dspam-web-3.4.0 63
 MD5 bd9de6b83d0fbae03ae313c8e47ecfe2 files/digest-dspam-web-3.4.1 63
 MD5 e55d4d9a62cca078d010363f6ded4585 files/digest-dspam-web-3.4.2 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCz+xsBXaUFmZvwyMRAm1tAJ9yK5xEKJFXTskxaSjSJFCSud2xWgCg0Udm
-F83CII5uqng9ENHmG/q+Wm0=
-=n8uu
------END PGP SIGNATURE-----
+MD5 c26bf920b2afa7ae432ac6b6d96fb9b4 files/digest-dspam-web-3.4.9 63
+MD5 8518bd049104dded248d771b3238a776 files/digest-dspam-web-3.4_rc3 65
+MD5 03b69dda833751bdda04e5413a9305e0 files/digest-dspam-web-3.6.0 129
+MD5 b3152c85d6d769654385e85a37249a25 files/digest-dspam-web-3.6_rc3 65
+MD5 ffdfc8d816078f4c58b75b9bed07503f files/htaccess 135
+MD5 b4099a94a52af9abd4ade48d82914c3c files/htpasswd 19
+MD5 f1ea445d6b4ddf81c55a4e886bc04218 metadata.xml 341
diff --git a/www-apps/dspam-web/dspam-web-3.2.7.ebuild b/www-apps/dspam-web/dspam-web-3.2.7.ebuild
index 1a7b68b6e69d..84393eb8ace8 100644
--- a/www-apps/dspam-web/dspam-web-3.2.7.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.7.ebuild,v 1.2 2005/07/09 15:24:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.2.7.ebuild,v 1.3 2005/11/05 15:53:55 st_lim Exp $
 
 inherit webapp eutils
 
@@ -20,7 +20,7 @@ DEPEND=">=mail-filter/dspam-3.2_rc3
 	dev-perl/GD-Graph3d
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="debug mysql neural oci8 postgres sqlite"
 S=${WORKDIR}/${MY_P}
 HOMEDIR=/etc/mail/dspam
diff --git a/www-apps/dspam-web/dspam-web-3.4.0.ebuild b/www-apps/dspam-web/dspam-web-3.4.0.ebuild
index 77e018b39ce3..9b0e1224f43e 100644
--- a/www-apps/dspam-web/dspam-web-3.4.0.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.4.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/www-apps/dspam-web/dspam-web-3.4.0.ebuild,v 1.3 2005/07/09 15:24:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4.0.ebuild,v 1.4 2005/11/05 15:53:55 st_lim Exp $
 
 inherit webapp eutils
 
@@ -19,7 +19,7 @@ DEPEND=">=mail-filter/dspam-3.2_rc3
 	dev-perl/GD-Graph3d
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 S=${WORKDIR}/${MY_P}
 HOMEDIR=/etc/mail/dspam
 IUSE="debug large-domain mysql neural oci8 postgres sqlite sqlite3 virtual-users"
diff --git a/www-apps/dspam-web/dspam-web-3.4.1.ebuild b/www-apps/dspam-web/dspam-web-3.4.1.ebuild
index 3ceb3be609ae..ad2f35e73a8b 100644
--- a/www-apps/dspam-web/dspam-web-3.4.1.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.4.1.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.4.1.ebuild,v 1.2 2005/07/09 15:24:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4.1.ebuild,v 1.3 2005/11/05 15:53:55 st_lim Exp $
 
 inherit webapp eutils
 
@@ -19,7 +19,7 @@ DEPEND=">=mail-filter/dspam-3.2_rc3
 	dev-perl/GD-Graph3d
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 S=${WORKDIR}/${MY_P}
 HOMEDIR=/etc/mail/dspam
 IUSE="debug large-domain mysql neural oci8 postgres sqlite sqlite3 virtual-users"
diff --git a/www-apps/dspam-web/dspam-web-3.4.2.ebuild b/www-apps/dspam-web/dspam-web-3.4.2.ebuild
index 25e375a1b2ce..6f9e42aa4cc1 100644
--- a/www-apps/dspam-web/dspam-web-3.4.2.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.4.2.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.4.2.ebuild,v 1.2 2005/07/09 15:24:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4.2.ebuild,v 1.3 2005/11/05 15:53:55 st_lim Exp $
 
 inherit webapp eutils
 
@@ -19,7 +19,7 @@ DEPEND=">=mail-filter/dspam-3.2_rc3
 	dev-perl/GD-Graph3d
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 S=${WORKDIR}/${MY_P}
 HOMEDIR=/etc/mail/dspam
 IUSE="debug large-domain mysql neural oci8 postgres sqlite sqlite3 virtual-users"
diff --git a/www-apps/dspam-web/dspam-web-3.4.9.ebuild b/www-apps/dspam-web/dspam-web-3.4.9.ebuild
new file mode 100644
index 000000000000..765fe4890687
--- /dev/null
+++ b/www-apps/dspam-web/dspam-web-3.4.9.ebuild
@@ -0,0 +1,162 @@
+# 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.9.ebuild,v 1.1 2005/11/05 15:53:55 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PN=${PN/-web/}
+MY_P=${MY_PN}-${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-${PV}
+	>=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 ~amd64"
+S=${WORKDIR}/${MY_P}
+HOMEDIR=/etc/mail/dspam
+IUSE="debug large-domain mysql neural oci8 postgres sqlite sqlite3 virtual-users"
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} --enable-long-username"
+	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} --sysconfdir=${HOMEDIR}"
+	myconf="${myconf} --with-logdir=${LOGDIR}"
+	use virtual-users || myconf="${myconf} --with-dspam-home=${HOMEDIR}"
+
+	# 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; 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} --enable-preferences-extension"
+
+		if has_version sys-kernel/linux26-headers; then
+			myconf="${myconf} --enable-daemon"
+		fi
+
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
+		# an experimental feature available with MySQL and PgSQL backend
+		use neural && myconf="${myconf} --enable-neural-networking"
+	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-preferences-extension"
+
+		if has_version sys-kernel/linux26-headers; then
+			myconf="${myconf} --enable-daemon"
+		fi
+
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
+		# an experimental feature available with MySQL and PgSQL backend
+		use neural && myconf="${myconf} --enable-neural-networking"
+	elif use oci8 ; then
+		myconf="${myconf} --with-storage-driver=ora_drv"
+		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
+		myconf="${myconf} --enable-virtual-users"
+
+		# 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
+			myconf="${myconf} --with-oracle-version=10"
+		fi
+	elif use sqlite3 ; then
+		myconf="${myconf} --with-storage-driver=sqlite3_drv"
+		myconf="${myconf} --enable-virtual-users"
+	elif use sqlite ; then
+		myconf="${myconf} --with-storage-driver=sqlite_drv"
+		myconf="${myconf} --enable-virtual-users"
+	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_rc3.ebuild b/www-apps/dspam-web/dspam-web-3.4_rc3.ebuild
index c55107875bcd..5bcd666ff370 100644
--- a/www-apps/dspam-web/dspam-web-3.4_rc3.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.4_rc3.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.4_rc3.ebuild,v 1.2 2005/07/09 15:24:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4_rc3.ebuild,v 1.3 2005/11/05 15:53:55 st_lim Exp $
 
 inherit webapp eutils
 
@@ -20,7 +20,7 @@ DEPEND=">=mail-filter/dspam-3.2_rc3
 	dev-perl/GD-Graph3d
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="debug large-domain mysql neural oci8 postgres sqlite"
 S=${WORKDIR}/${MY_P}
 HOMEDIR=/etc/mail/dspam
diff --git a/www-apps/dspam-web/dspam-web-3.6.0.ebuild b/www-apps/dspam-web/dspam-web-3.6.0.ebuild
new file mode 100644
index 000000000000..dc5cda68d430
--- /dev/null
+++ b/www-apps/dspam-web/dspam-web-3.6.0.ebuild
@@ -0,0 +1,174 @@
+# 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.6.0.ebuild,v 1.1 2005/11/05 15:53:55 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PN=${PN/-web/}
+MY_P=${MY_PN}-${PV}
+
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Web based administration and user controls for dspam"
+SRC_URI="http://dspam.nuclearelephant.com/sources/${MY_P}.tar.gz
+		http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
+HOMEPAGE="http://dspam.nuclearelephant.com/"
+LICENSE="GPL-2"
+
+IUSE="clamav debug large-domain logrotate mysql neural oci8 postgres sqlite virtual-users"
+DEPEND=">=mail-filter/dspam-${PV}
+		clamav? ( >=app-antivirus/clamav-0.86 )
+		mysql? ( >=dev-db/mysql-3.23 )
+		sqlite? ( dev-db/sqlite )
+		postgres? ( >=dev-db/postgresql-7.4.3 )
+		>=sys-libs/db-4.0
+		>=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 ~amd64"
+
+# some FHS-like structure
+HOMEDIR="/var/spool/dspam"
+CONFDIR="/etc/mail/dspam"
+LOGDIR="/var/log/dspam"
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} --enable-long-username"
+	myconf="${myconf} --with-delivery-agent=/usr/bin/procmail"
+	use large-domain && myconf="${myconf} --enable-large-scale" ||\
+	    myconf="${myconf} --enable-domain-scale"
+
+	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
+	myconf="${myconf} --sysconfdir=${CONFDIR}"
+	use virtual-users || myconf="${myconf} --enable-homedir"
+	use clamav || myconf="${myconf} --enable-clamav"
+
+	# 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 sqlite ; then
+		myconf="${myconf} --with-storage-driver=sqlite_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"
+		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
+		myconf="${myconf} --enable-preferences-extension"
+
+		if has_version ">sys-kernel/linux-headers-2.6"; then
+			myconf="${myconf} --enable-daemon"
+		fi
+
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
+		# an experimental feature available with MySQL and PgSQL backend
+		use neural && myconf="${myconf} --enable-neural-networking"
+	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-preferences-extension"
+
+		if has_version ">sys-kernel/linux-headers-2.6"; then
+			myconf="${myconf} --enable-daemon"
+		fi
+
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
+		# an experimental feature available with MySQL and PgSQL backend
+		use neural && myconf="${myconf} --enable-neural-networking"
+	elif use oci8 ; then
+		myconf="${myconf} --with-storage-driver=ora_drv"
+		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
+		myconf="${myconf} --enable-virtual-users"
+
+		# 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
+			myconf="${myconf} --with-oracle-version=10"
+		fi
+	else
+		myconf="${myconf} --with-storage-driver=libdb4_drv"
+	fi
+
+	econf ${myconf} || die
+	cd ${S}/webui
+	make
+}
+
+src_install () {
+	cd ${S}/webui
+	webapp_src_preinst
+
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i ${S}/webui/cgi-bin/admin.cgi
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i ${S}/webui/cgi-bin/admingraph.cgi
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i ${S}/webui/cgi-bin/dspam.cgi
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i ${S}/webui/cgi-bin/graph.cgi
+
+	insinto ${MY_HTDOCSDIR}
+	insopts -m644 -o apache -g apache
+	doins ${S}/webui/htdocs/base.css
+	doins ${S}/webui/htdocs/dspam-logo-small.gif
+	doins ${S}/webui/cgi-bin/rgb.txt
+	doins ${S}/webui/cgi-bin/default.prefs
+	doins ${S}/webui/cgi-bin/admins
+	doins ${S}/webui/cgi-bin/configure.pl
+
+	newins ${FILESDIR}/htaccess .htaccess
+	newins ${FILESDIR}/htpasswd .htpasswd
+
+	insopts -m755 -o apache -g apache
+	doins ${S}/webui/cgi-bin/*.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 ${S}/webui/cgi-bin/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.6_rc3.ebuild b/www-apps/dspam-web/dspam-web-3.6_rc3.ebuild
new file mode 100644
index 000000000000..e48a68249320
--- /dev/null
+++ b/www-apps/dspam-web/dspam-web-3.6_rc3.ebuild
@@ -0,0 +1,162 @@
+# 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.6_rc3.ebuild,v 1.1 2005/11/05 15:53:55 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PN=${PN/-web/}
+MY_PV=${PV/_/.}
+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-${PV}
+	>=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 ~amd64"
+S=${WORKDIR}/${MY_P}
+IUSE="debug large-domain mysql neural oci8 postgres sqlite sqlite3 virtual-users"
+
+# some FHS-like structure
+HOMEDIR="/var/spool/dspam"
+CONFDIR="/etc/mail/dspam"
+LOGDIR="/var/log/dspam"
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} --enable-long-username"
+	myconf="${myconf} --with-delivery-agent=/usr/bin/procmail"
+	use large-domain && myconf="${myconf} --enable-large-scale" ||\
+	    myconf="${myconf} --enable-domain-scale"
+
+	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
+	myconf="${myconf} --sysconfdir=${CONFDIR}"
+	use virtual-users || myconf="${myconf} --enable-homedir"
+
+	# 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 sqlite ; then
+		myconf="${myconf} --with-storage-driver=sqlite_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"
+		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
+		myconf="${myconf} --enable-preferences-extension"
+
+		if has_version ">sys-kernel/linux-headers-2.6"; then
+			myconf="${myconf} --enable-daemon"
+		fi
+
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
+		# an experimental feature available with MySQL and PgSQL backend
+		use neural && myconf="${myconf} --enable-neural-networking"
+	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-preferences-extension"
+
+		if has_version ">sys-kernel/linux-headers-2.6"; then
+			myconf="${myconf} --enable-daemon"
+		fi
+
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
+		# an experimental feature available with MySQL and PgSQL backend
+		use neural && myconf="${myconf} --enable-neural-networking"
+	elif use oci8 ; then
+		myconf="${myconf} --with-storage-driver=ora_drv"
+		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
+		myconf="${myconf} --enable-virtual-users"
+
+		# 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
+			myconf="${myconf} --with-oracle-version=10"
+		fi
+	else
+		myconf="${myconf} --with-storage-driver=libdb4_drv"
+	fi
+
+	econf ${myconf} || die
+	cd ${S}/webui
+	make
+}
+
+src_install () {
+	cd ${S}/webui
+	webapp_src_preinst
+
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i ${S}/webui/cgi-bin/admin.cgi
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i ${S}/webui/cgi-bin/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 ${S}/webui/cgi-bin/*.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/files/digest-dspam-web-3.4.9 b/www-apps/dspam-web/files/digest-dspam-web-3.4.9
new file mode 100644
index 000000000000..732c6a77fc09
--- /dev/null
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.4.9
@@ -0,0 +1 @@
+MD5 ef7ceba47e63edb02a59be3c36cf0f6f dspam-3.4.9.tar.gz 701069
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.6.0 b/www-apps/dspam-web/files/digest-dspam-web-3.6.0
new file mode 100644
index 000000000000..b8336e809380
--- /dev/null
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.6.0
@@ -0,0 +1,2 @@
+MD5 d9ee63a8cf67ea933d711b00851ce916 dspam-3.6.0.tar.gz 732042
+MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.6_rc3 b/www-apps/dspam-web/files/digest-dspam-web-3.6_rc3
new file mode 100644
index 000000000000..a15fddbec5b2
--- /dev/null
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.6_rc3
@@ -0,0 +1 @@
+MD5 603698ca748a8e5c88097c14008352bd dspam-3.6.rc3.tar.gz 737148