Update EAPI. Use Python 2, call python_mod_optimize() and python_mod_cleanup() (bug #313481). Don't install nonexistent documentation files (bug #300511).

Package-Manager: portage-2.2.0_alpha4_p11/cvs/Linux x86_64

3 files changed, 50 insertions, 38 deletions

diff --git a/mail-filter/tmda/ChangeLog b/mail-filter/tmda/ChangeLog
index 179283b1accb..f919e131e0b8 100644
--- a/mail-filter/tmda/ChangeLog
+++ b/mail-filter/tmda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/tmda
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.17 2010/01/07 14:37:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.18 2010/11/07 14:46:36 arfrever Exp $
+
+  07 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  tmda-1.1.12.ebuild:
+  Update EAPI. Use Python 2, call python_mod_optimize() and
+  python_mod_cleanup() (bug #313481). Don't install nonexistent
+  documentation files (bug #300511).
 
 *tmda-1.1.12 (07 Jan 2010)
 
diff --git a/mail-filter/tmda/Manifest b/mail-filter/tmda/Manifest
index d6c44fd54395..a83f5e968572 100644
--- a/mail-filter/tmda/Manifest
+++ b/mail-filter/tmda/Manifest
@@ -4,7 +4,7 @@ DIST tmda-1.0.3.tgz 392608 RMD160 826738deae3dd48084b7dd5bb5535ed11aa36e50 SHA1
 DIST tmda-1.1.12.tgz 1427638 RMD160 8a674f312fe9612fe204d081e7fd3d38d802cdba SHA1 0b175d01cd03cb4046d41c62ede2268d4eb12b03 SHA256 93c3d7a5baa7af366f82089b2f99c58d3fb4b5c259f78a0c7fe90d4b39c4a6c3
 DIST tmda-1.1.4.tgz 391723 RMD160 8ea4e660e47b1d087d349ada8c166f834a64601a SHA1 469ee28b21ce5e40fe5b0fd4f3f71c634c4a3cda SHA256 d26f5cd59af6e39421f8197fff9397c647f86745efe0c3a541130c969d6cd90f
 EBUILD tmda-1.0.3-r3.ebuild 1788 RMD160 830a26165fed84c4b1b95e81c5d04a6eaf391baa SHA1 4e99eae4d1886d9436ceee47ea25e90d631e2ff7 SHA256 14deaa57df0bfb799001bcb21ae238013d5a732b5da9ecba3ce76369c31e5870
-EBUILD tmda-1.1.12.ebuild 1905 RMD160 5b872e02aad01f93ed84326253fbb18a5c50d036 SHA1 15712ed1e04e41db198e78a2be5ca5830a67001d SHA256 35e394aadc23f2873f00da72aca02683612ca98509a594b006bcdf865acaafc4
+EBUILD tmda-1.1.12.ebuild 1820 RMD160 a9d42f488b93f764457b28396e6b58e3621daf33 SHA1 2fc16f6ceb956ea688c8286a56de7b202c2bfebb SHA256 bdc33412668767b87d07ab698a710f4a61982bf2320ecfcc8e903aa9360b8752
 EBUILD tmda-1.1.4.ebuild 1833 RMD160 b8f50ad09ece6461447c3c770cd601085f0af21f SHA1 760ccfe6dc62f2e88e5a4c1725defa36e48e6711 SHA256 2385b24faaa1405959b82bb380004314f4659cd39f41c6c515f52c6cdac7f9d0
-MISC ChangeLog 9008 RMD160 05527cb86c1aee1305608e508ff04eb6f0f07278 SHA1 d2195e7615c62bf668661077c84c42a6dfae3d6a SHA256 5ebaab0578d5b7f20ec300ce353e57b031e232313e08a81aebd6d9f686b26234
+MISC ChangeLog 9266 RMD160 9791c6a0ec283f9e02c24ba6e312b82a87d8760d SHA1 373469394293cb4c8e3da1f7a7748773f5ea7627 SHA256 40d38f39680a889e172560ea6a5bf72e66ef4e010794e382aff5a2bf3176d2cf
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/mail-filter/tmda/tmda-1.1.12.ebuild b/mail-filter/tmda/tmda-1.1.12.ebuild
index 56cd830a3c14..264045d1f948 100644
--- a/mail-filter/tmda/tmda-1.1.12.ebuild
+++ b/mail-filter/tmda/tmda-1.1.12.ebuild
@@ -1,67 +1,73 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.1.12.ebuild,v 1.1 2010/01/07 14:37:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.1.12.ebuild,v 1.2 2010/11/07 14:46:36 arfrever Exp $
 
-inherit eutils
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils multilib python
 
 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=""
 
-src_compile () {
-	# Do not open /dev/tty when in batch mode. (bug #67150) -ticho
-	epatch ${FILESDIR}/tmda-1.0-non-interactive-tty.patch
+DEPEND="virtual/mta"
+RDEPEND="${DEPEND}"
 
-	./compileall || die "tmda compilation failed"
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
 }
 
-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:'`
+src_prepare() {
+	# Do not open /dev/tty when in batch mode. (bug #67150) -ticho
+	epatch "${FILESDIR}/tmda-1.0-non-interactive-tty.patch"
+
+	python_convert_shebangs -r $(python_get_version) bin
+}
 
+src_install() {
 	# Executables
-	dobin bin/tmda-*
+	dobin bin/tmda-* || die "dobin failed"
 
 	# The Python TMDA module
-	insinto "/usr/lib/python${pv}/site-packages/TMDA"
-	doins TMDA/*.py*
-	insinto "/usr/lib/python${pv}/site-packages/TMDA/Queue"
-	doins TMDA/Queue/*.py*
-	insinto "/usr/lib/python${pv}/site-packages/TMDA/pythonlib/email"
-	doins TMDA/pythonlib/email/*.py*
-	insinto "/usr/lib/python${pv}/site-packages/TMDA/pythonlib/email/mime"
-	doins TMDA/pythonlib/email/mime/*.py*
+	insinto $(python_get_sitedir)
+	doins -r TMDA || die "doins failed"
 
 	# The templates
 	insinto /etc/tmda
-	doins templates/*.txt
+	doins templates/*.txt || die "doins failed"
 
 	# Documentation
-	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
-	dohtml -r htdocs/*.html
-	dohtml -r htdocs/img
+	dodoc ChangeLog CODENAMES CRYPTO NEWS README THANKS UPGRADE || die "dodoc failed"
+	dohtml -r doc/html/* || die "dohtml failed"
 
 	# Contributed binaries and stuff
-	cd ${S}/contrib
+	pushd contrib > /dev/null
 
-	exeinto /usr/lib/tmda/contrib
+	exeinto /usr/$(get_libdir)/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 "doexe failed"
 
-	insinto /usr/lib/tmda/contrib
+	insinto /usr/$(get_libdir)/tmda/contrib
 	doins ChangeLog tmda.el tmda.spec \
-	      tofmipd.init tofmipd.sysconfig vtmdarc
+	      tofmipd.init tofmipd.sysconfig vtmdarc || die "doins failed"
+
+	insinto /usr/$(get_libdir)/tmda/contrib/dot-tmda
+	doins dot-tmda/* || die "doins failed"
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	python_mod_optimize TMDA
+}
 
-	insinto /usr/lib/tmda/contrib/dot-tmda
-	doins dot-tmda/*
+pkg_postrm() {
+	python_mod_cleanup TMDA
 }