6 files changed, 19 insertions, 78 deletions
diff --git a/net-mail/tmda/ChangeLog b/net-mail/tmda/ChangeLog
index aca1daadceba..2e86ce3088a7 100644
--- a/net-mail/tmda/ChangeLog
+++ b/net-mail/tmda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/tmda
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/ChangeLog,v 1.27 2003/02/12 08:17:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/ChangeLog,v 1.28 2003/02/23 08:14:16 agenkin Exp $
+
+*tmda-0.70 ( 23 Feb 2003 )
+
+  23 Feb 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Updated to 0.70.
+  New contrib scripts for vpomail users.
+  Now packaging all of the the contrib stuff into /usr/lib/tmda/contrib.
 
 *tmda-0.69 ( 05 Feb 2003 )
 
diff --git a/net-mail/tmda/files/digest-tmda-0.68 b/net-mail/tmda/files/digest-tmda-0.68
deleted file mode 100644
index a03ac844c79d..000000000000
--- a/net-mail/tmda/files/digest-tmda-0.68
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f0403bc845ab20335323cb8f22fdbfd tmda-0.68.tgz 295679
diff --git a/net-mail/tmda/files/digest-tmda-0.69 b/net-mail/tmda/files/digest-tmda-0.69
deleted file mode 100644
index a535b9ec6358..000000000000
--- a/net-mail/tmda/files/digest-tmda-0.69
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b224d73ac75947fea00bd2c9fa9fbad tmda-0.69.tgz 316036
diff --git a/net-mail/tmda/files/digest-tmda-0.70 b/net-mail/tmda/files/digest-tmda-0.70
new file mode 100644
index 000000000000..922d50df2172
--- /dev/null
+++ b/net-mail/tmda/files/digest-tmda-0.70
@@ -0,0 +1 @@
+MD5 68e093c05e31f58c9e5685b5ab5518bc tmda-0.70.tgz 322251
diff --git a/net-mail/tmda/tmda-0.69.ebuild b/net-mail/tmda/tmda-0.69.ebuild
deleted file mode 100644
index 9bb16ed8b451..000000000000
--- a/net-mail/tmda/tmda-0.69.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.69.ebuild,v 1.1 2003/02/05 16:17:15 agenkin Exp $
-
-DESCRIPTION="Python-based SPAM reduction system"
-HOMEPAGE="http://www.tmda.net/"
-LICENSE="GPL-2"
-
-DEPEND=">=dev-lang/python-2.1
-	virtual/mta"
-
-SRC_URI="http://tmda.net/releases/${P}.tgz
-	http://tmda.net/releases/old/${P}.tgz"
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-
-S="${WORKDIR}/${P}"
-
-src_compile () {
-	./compileall || die
-}
-
-src_install () {
-	# Figure out python version
-	# below hack should be replaced w/ pkg-config, when we get it working
-	local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
-
-	# Executables
-	dobin bin/tmda-*
-
-	# The Python TMDA module
-	insinto "/usr/lib/python${pv}/site-packages/TMDA"
-	doins TMDA/*.py*
-	insinto "/usr/lib/python${pv}/site-packages/TMDA/pythonlib/email"
-	doins TMDA/pythonlib/email/*.py*
-
-	# The templates
-	insinto /etc/tmda
-	doins templates/*.txt
-	
-	# Documentation
-	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
-	dodoc contrib/tmda.spec contrib/sample.config
-	dohtml -r htdocs/*.html
-
-	# Contributed binaries and stuff
-	cd ${S}/contrib
-
-	exeinto /usr/lib/tmda/bin
-	doexe printcdb printdbm collectaddys def2html
-	insinto /usr/lib/tmda/lisp
-	doins tmda.el
-
-	# Not sure what's the best thing to do with tmda-cgi.
-	# For now, installing it in a tarball under /usr/lib/tmda.
-	cd ${S}/contrib
-	tar cjf ${D}/usr/lib/tmda/tmda-cgi.tar.bz2 cgi
-}
-
-pkg_postinst () {
-	einfo
-	einfo "The tmda-cgi stuff has been installed in /usr/lib/tmda-cgi.tar.bz2."
-	einfo "Refer to the README file, included in the tarball."
-	einfo
-}
diff --git a/net-mail/tmda/tmda-0.68.ebuild b/net-mail/tmda/tmda-0.70.ebuild
index 2c0e5d5fa188..4414b4692bdd 100644
--- a/net-mail/tmda/tmda-0.68.ebuild
+++ b/net-mail/tmda/tmda-0.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.68.ebuild,v 1.1 2003/01/10 18:43:08 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.70.ebuild,v 1.1 2003/02/23 08:14:16 agenkin Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -41,21 +41,22 @@ src_install () {
 	
 	# Documentation
 	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
-	dodoc contrib/tmda.spec contrib/sample.config
 	dohtml -r htdocs/*.html
 
 	# Contributed binaries and stuff
 	cd ${S}/contrib
 
-	exeinto /usr/lib/tmda/bin
-	doexe printcdb printdbm collectaddys def2html
-	insinto /usr/lib/tmda/lisp
-	doins tmda.el
+	exeinto /usr/lib/tmda/contrib
+	doexe printcdb printdbm collectaddys def2html \
+	      vadduser-tmda vipmap-to-authmap vmailmgr-vdir.sh vpopmail-vdir.sh
 
+	insinto /usr/lib/tmda/contrib
+	doins vtmdarc tmda.el sample.config tmda.spec
+	
 	# Not sure what's the best thing to do with tmda-cgi.
-	# For now, installing it in a tarball under /usr/lib/tmda.
-	cd ${S}/contrib
-	tar cjf ${D}/usr/lib/tmda/tmda-cgi.tar.bz2 cgi
+	# For now, installing it in a tarball under /usr/lib/tmda/contrib.
+	tar cjf cgi.tar.bz2 cgi
+	doins cgi.tar.bz2
 }
 
 pkg_postinst () {