Fixed multipart-handling patch and made it apply to 1.0 (1.0-r1) as well. Removed a non-existent contrib script from doexe in src_install().

8 files changed, 89 insertions, 17 deletions

diff --git a/mail-filter/tmda/ChangeLog b/mail-filter/tmda/ChangeLog
index 3d47d6f96bb9..29f93f294e22 100644
--- a/mail-filter/tmda/ChangeLog
+++ b/mail-filter/tmda/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-filter/tmda
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.7 2004/09/22 09:06:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.8 2004/09/25 19:25:26 ticho Exp $
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/tmda-1.0-multipart-handling.patch,
+  -files/tmda-1.0.3-multipart-handling.patch, tmda-1.0.3-r1.ebuild,
+  tmda-1.0.3.ebuild, tmda-1.0.ebuild, +tmda-1.0-r1.ebuild:
+  Apply multipart-handling patch to 1.0 as well (1.0-r1). Do not install
+  contrib/getuserinfo-vpopmail.sh, as it doesn't exist. Renamed
+  multipart-handling patch filename and modified it, so it doesn't change
+  files in live system (nasty one, sorry).
 
   22 Sep 2004; Andrej Kacian <ticho@gentoo.org> tmda-0.92.ebuild,
   tmda-1.0.3-r1.ebuild, tmda-1.0.3.ebuild, tmda-1.0.ebuild:
diff --git a/mail-filter/tmda/Manifest b/mail-filter/tmda/Manifest
index badef7808930..c861d6dff9dc 100644
--- a/mail-filter/tmda/Manifest
+++ b/mail-filter/tmda/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a5c4a29dcd6cd3b169ab4e4deccec1a6 ChangeLog 6970
-MD5 911e80b3ca747a70aa0c21f7e88c0794 tmda-1.0.3-r1.ebuild 1688
+MD5 75f6abc814c6b93fd4da6b21685e3107 ChangeLog 7444
+MD5 952475b22dac3406d5d71fdd44c6cde2 tmda-1.0-r1.ebuild 1634
+MD5 477c54625aa12fe135542e36d6939d51 tmda-1.0.3-r1.ebuild 1662
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 20739f02e1090e5de1e95ad374601d3f tmda-1.0.ebuild 1527
+MD5 427a0665420e32bc6408c1f67db8f374 tmda-1.0.ebuild 1503
 MD5 0067fa6df94b5c5f0dc272e72ff7d0d0 tmda-0.92.ebuild 1529
-MD5 1449fdc809e9f988a9000cb603e627de tmda-1.0.3.ebuild 1555
+MD5 16661ae384785cab84b49f1edeaf6ea6 tmda-1.0.3.ebuild 1531
 MD5 5953212bfef29b28dc63d4602b7fb9fc files/digest-tmda-1.0 57
+MD5 5953212bfef29b28dc63d4602b7fb9fc files/digest-tmda-1.0-r1 57
 MD5 7bb9e7641e04129bd8f857fb7feb59e3 files/digest-tmda-0.92 58
 MD5 c7e7e04f751268e6e20f08b217c81e47 files/digest-tmda-1.0.3 59
-MD5 95fc93384aae13c11bc76f901580e6ee files/tmda-1.0.3-multipart-handling.patch 940
 MD5 c7e7e04f751268e6e20f08b217c81e47 files/digest-tmda-1.0.3-r1 59
+MD5 644add9bcbc9a3492abd25dfbe1b7a3b files/tmda-1.0-multipart-handling.patch 918
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBUUCS10xuJSrg3/sRAlRZAJ49CU5h5cs0E6yWD5eXii5ITa6obACbBtMW
-AFXxvP60CRCgTPr8nQnW2/U=
-=QyB1
+iD8DBQFBVcYx10xuJSrg3/sRAhupAJ9hG2UaM6v/M3yXGMpPLhUfmnL/TgCfWBls
+XWp/+6YPO2a+PJS5Ihk0jPI=
+=mmcs
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/tmda/files/digest-tmda-1.0-r1 b/mail-filter/tmda/files/digest-tmda-1.0-r1
new file mode 100644
index 000000000000..7f6892e8dabe
--- /dev/null
+++ b/mail-filter/tmda/files/digest-tmda-1.0-r1
@@ -0,0 +1 @@
+MD5 6823af3edeffcf390ec4dc630a46f8c0 tmda-1.0.tgz 399384
diff --git a/mail-filter/tmda/files/tmda-1.0.3-multipart-handling.patch b/mail-filter/tmda/files/tmda-1.0-multipart-handling.patch
index ea6fde654418..cfd6362e222a 100644
--- a/mail-filter/tmda/files/tmda-1.0.3-multipart-handling.patch
+++ b/mail-filter/tmda/files/tmda-1.0-multipart-handling.patch
@@ -1,5 +1,5 @@
 --- tmda-1.0/TMDA/pythonlib/email/Generator.py  2003-07-30 13:32:54.000000000 -0600
-+++ /usr/lib/python2.3/site-packages/TMDA/pythonlib/email/Generator.py  2004-08-14 15:32:21.000000000 -0600
++++ tmda-1.0mp/TMDA/pythonlib/email/Generator.py  2004-08-14 15:32:21.000000000 -0600
 @@ -197,7 +197,14 @@
          if cset is not None:
              payload = cset.body_encode(payload)
diff --git a/mail-filter/tmda/tmda-1.0-r1.ebuild b/mail-filter/tmda/tmda-1.0-r1.ebuild
new file mode 100644
index 000000000000..aa48aaeea862
--- /dev/null
+++ b/mail-filter/tmda/tmda-1.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0-r1.ebuild,v 1.1 2004/09/25 19:25:26 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="Python-based SPAM reduction system"
+HOMEPAGE="http://www.tmda.net/"
+LICENSE="GPL-2"
+
+DEPEND=">=dev-lang/python-2.2
+	virtual/mta"
+
+SRC_URI="http://www.tmda.net/releases/stable/${P}.tgz"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE=""
+
+src_compile () {
+	# Fix multipart mail handling. (See bug #60367)		-ticho
+	epatch ${FILESDIR}/tmda-1.0-multipart-handling.patch
+
+	./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
+	dohtml -r htdocs/*.html
+	dohtml -r htdocs/img
+
+	# Contributed binaries and stuff
+	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
+
+	insinto /usr/lib/tmda/contrib
+	doins ChangeLog sample.config tmda.el tmda.spec \
+	      tofmipd.init tofmipd.sysconfig vtmdarc
+}
diff --git a/mail-filter/tmda/tmda-1.0.3-r1.ebuild b/mail-filter/tmda/tmda-1.0.3-r1.ebuild
index f98d0880d23b..845d3729f20f 100644
--- a/mail-filter/tmda/tmda-1.0.3-r1.ebuild
+++ b/mail-filter/tmda/tmda-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0.3-r1.ebuild,v 1.2 2004/09/22 09:06:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0.3-r1.ebuild,v 1.3 2004/09/25 19:25:26 ticho Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ IUSE=""
 
 src_compile () {
 	# Fix multipart mail handling. (See bug #60367)		-ticho
-	epatch ${FILESDIR}/tmda-1.0.3-multipart-handling.patch
+	epatch ${FILESDIR}/tmda-1.0-multipart-handling.patch
 
 	./compileall || die "tmda compilation failed"
 }
@@ -50,7 +50,7 @@ src_install () {
 	cd ${S}/contrib
 
 	exeinto /usr/lib/tmda/contrib
-	doexe collectaddys def2html getuserinfo-vpopmail.sh printcdb printdbm \
+	doexe collectaddys def2html printcdb printdbm \
 	      sendit.sh smtp-check-sender update-internaldomains vadduser-tmda \
 	      vmailmgr-vdir.sh vpopmail-vdir.sh wrapfd3.sh
 
diff --git a/mail-filter/tmda/tmda-1.0.3.ebuild b/mail-filter/tmda/tmda-1.0.3.ebuild
index 28d26f7f4f57..78ac5c62b826 100644
--- a/mail-filter/tmda/tmda-1.0.3.ebuild
+++ b/mail-filter/tmda/tmda-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0.3.ebuild,v 1.2 2004/09/22 09:06:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0.3.ebuild,v 1.3 2004/09/25 19:25:26 ticho Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -45,7 +45,7 @@ src_install () {
 	cd ${S}/contrib
 
 	exeinto /usr/lib/tmda/contrib
-	doexe collectaddys def2html getuserinfo-vpopmail.sh printcdb printdbm \
+	doexe collectaddys def2html printcdb printdbm \
 	      sendit.sh smtp-check-sender update-internaldomains vadduser-tmda \
 	      vmailmgr-vdir.sh vpopmail-vdir.sh wrapfd3.sh
 
diff --git a/mail-filter/tmda/tmda-1.0.ebuild b/mail-filter/tmda/tmda-1.0.ebuild
index efb707f07f3a..4753ad40fd4c 100644
--- a/mail-filter/tmda/tmda-1.0.ebuild
+++ b/mail-filter/tmda/tmda-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0.ebuild,v 1.5 2004/09/22 09:06:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0.ebuild,v 1.6 2004/09/25 19:25:26 ticho Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -45,7 +45,7 @@ src_install () {
 	cd ${S}/contrib
 
 	exeinto /usr/lib/tmda/contrib
-	doexe collectaddys def2html getuserinfo-vpopmail.sh printcdb printdbm \
+	doexe collectaddys def2html printcdb printdbm \
 	      sendit.sh smtp-check-sender update-internaldomains vadduser-tmda \
 	      vmailmgr-vdir.sh vpopmail-vdir.sh wrapfd3.sh