--- tmda-1.1.12.ebuild.orig	2010-03-02 21:06:49.000000000 +0100
+++ tmda-1.1.12.ebuild	2010-03-02 21:26:15.000000000 +0100
@@ -6,19 +6,19 @@
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
-LICENSE="GPL-2"
-
-DEPEND=">=dev-lang/python-2.2
-	virtual/mta"
-
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
+DEPEND="dev-lang/python
+	virtual/mta"
+
 src_compile () {
 	# Do not open /dev/tty when in batch mode. (bug #67150) -ticho
-	epatch ${FILESDIR}/tmda-1.0-non-interactive-tty.patch
+	epatch "${FILESDIR}"/tmda-1.0-non-interactive-tty.patch
 
 	./compileall || die "tmda compilation failed"
 }
@@ -29,39 +29,38 @@
 	local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
 
 	# Executables
-	dobin bin/tmda-*
+	dobin bin/tmda-* || die
 
 	# The Python TMDA module
 	insinto "/usr/lib/python${pv}/site-packages/TMDA"
-	doins TMDA/*.py*
+	doins TMDA/*.py* || die
 	insinto "/usr/lib/python${pv}/site-packages/TMDA/Queue"
-	doins TMDA/Queue/*.py*
+	doins TMDA/Queue/*.py* || die
 	insinto "/usr/lib/python${pv}/site-packages/TMDA/pythonlib/email"
-	doins TMDA/pythonlib/email/*.py*
+	doins TMDA/pythonlib/email/*.py* || die
 	insinto "/usr/lib/python${pv}/site-packages/TMDA/pythonlib/email/mime"
-	doins TMDA/pythonlib/email/mime/*.py*
+	doins TMDA/pythonlib/email/mime/*.py* || die
 
 	# The templates
 	insinto /etc/tmda
-	doins templates/*.txt
+	doins templates/*.txt || die
 
 	# Documentation
-	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
-	dohtml -r htdocs/*.html
-	dohtml -r htdocs/img
+	dodoc ChangeLog CODENAMES CRYPTO INSTALL NEWS README THANKS UPGRADE || die
+	dohtml -r doc/html/* || die
 
 	# Contributed binaries and stuff
-	cd ${S}/contrib
+	cd "${S}"/contrib
 
 	exeinto /usr/lib/tmda/contrib
 	doexe collectaddys def2html printcdb printdbm \
 	      sendit.sh smtp-check-sender update-internaldomains vadduser-tmda \
-	      vmailmgr-vdir.sh vpopmail-vdir.sh wrapfd3.sh
+	      vmailmgr-vdir.sh vpopmail-vdir.sh wrapfd3.sh || die
 
 	insinto /usr/lib/tmda/contrib
 	doins ChangeLog tmda.el tmda.spec \
-	      tofmipd.init tofmipd.sysconfig vtmdarc
+	      tofmipd.init tofmipd.sysconfig vtmdarc || die
 
 	insinto /usr/lib/tmda/contrib/dot-tmda
-	doins dot-tmda/*
+	doins dot-tmda/* || die
 }