Use Python 2 (bug #315327).

(Portage version: 2.2.0_alpha26_p16/cvs/Linux x86_64)

3 files changed, 34 insertions, 11 deletions

diff --git a/net-mail/archivemail/ChangeLog b/net-mail/archivemail/ChangeLog
index f0b1f232b9ea..3db3232bcd7c 100644
--- a/net-mail/archivemail/ChangeLog
+++ b/net-mail/archivemail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/archivemail
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/ChangeLog,v 1.16 2010/08/31 06:18:39 radhermit Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/ChangeLog,v 1.17 2011/03/12 13:47:11 arfrever Exp $
+
+  12 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  archivemail-0.7.2-r1.ebuild, archivemail-0.8.0.ebuild:
+  Use Python 2 (bug #315327).
 
 *archivemail-0.8.0 (31 Aug 2010)
 
diff --git a/net-mail/archivemail/archivemail-0.7.2-r1.ebuild b/net-mail/archivemail/archivemail-0.7.2-r1.ebuild
index 81bf1cb88c46..769dae1071c5 100644
--- a/net-mail/archivemail/archivemail-0.7.2-r1.ebuild
+++ b/net-mail/archivemail/archivemail-0.7.2-r1.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/archivemail-0.7.2-r1.ebuild,v 1.2 2008/07/09 08:28:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/archivemail-0.7.2-r1.ebuild,v 1.3 2011/03/12 13:47:11 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit distutils eutils
 
@@ -12,12 +15,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc x86"
 IUSE=""
-DEPEND=">=dev-lang/python-2.3"
+
+DEPEND=""
+RDEPEND=""
 
 DOCS="examples/* FAQ"
 
-src_unpack() {
-	distutils_src_unpack
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	distutils_src_prepare
 	epatch "${FILESDIR}/0.7.2-empty_maildir-r266.patch"
 }
 
diff --git a/net-mail/archivemail/archivemail-0.8.0.ebuild b/net-mail/archivemail/archivemail-0.8.0.ebuild
index a2ffb6a35bbf..b278dec84299 100644
--- a/net-mail/archivemail/archivemail-0.8.0.ebuild
+++ b/net-mail/archivemail/archivemail-0.8.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/archivemail-0.8.0.ebuild,v 1.1 2010/08/31 06:18:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/archivemail-0.8.0.ebuild,v 1.2 2011/03/12 13:47:11 arfrever Exp $
 
 EAPI="3"
-
 PYTHON_DEPEND="2"
-inherit distutils python
+
+inherit distutils
 
 DESCRIPTION="Tool written in Python for archiving and compressing old email in mailboxes."
 HOMEPAGE="http://archivemail.sourceforge.net/"
@@ -16,9 +16,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
+DEPEND=""
+RDEPEND=""
+
 DOCS="examples/* FAQ"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
+	distutils_src_prepare
 	# Fix tests for python-2.7
 	sed -i -e 's:\(fp_archive = \)FixedGzipFile:\1gzip.GzipFile:' \
 		test_archivemail || die "sed failed"