Use Python 2 (bug #315327).

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

4 files changed, 37 insertions, 28 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/Manifest b/net-mail/archivemail/Manifest
index c78b34f0538f..8ce6539cc6fd 100644
--- a/net-mail/archivemail/Manifest
+++ b/net-mail/archivemail/Manifest
@@ -1,21 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.7.2-empty_maildir-r266.patch 593 RMD160 23461245c502722ee28a0952450404406ce5ad08 SHA1 4ab3329527f6f6ea6a251d300440982f41330212 SHA256 f5a9a3dc0af87262d8fe43682aa664e8167aac10a1f1c9b0db410522d38e2118
 DIST archivemail-0.7.2.tar.gz 46070 RMD160 da85dff5114100d76f8f5ac19172d8a557801455 SHA1 0ff9b8991b04f09cf9536c45b6f9e05d2427a459 SHA256 0bd8072dc4f1f470fbd9797d599357bac24b5218031eaee29d2497f932e1b894
 DIST archivemail-0.8.0.tar.gz 56638 RMD160 28244775df602bcfa74a33a597fe5f3bc0124ad2 SHA1 ca0486fb5f8d3f2ee44909fc0a563dd7c4fc9f89 SHA256 d43ebf065445e514dac8bea232b8d274721fe4a5f1971cd3597a4ba400e4b117
-EBUILD archivemail-0.7.2-r1.ebuild 898 RMD160 482599fced25268ca20f346fc22df910dd39116a SHA1 c97521c73d00efbfeae087d2a0676f384d460921 SHA256 f3038a4575d4fef507a99df5ecfb4eb88ab65a97cef4ea34cc3732c8224a25e1
-EBUILD archivemail-0.8.0.ebuild 900 RMD160 7c613a5e1ba6f9f12968bf372a877f28e4954227 SHA1 fb427ecf0c75174fa219cb5d1a262173f9919c60 SHA256 debb6156dd9ae8f6020eaf2e2a6faf82e18b92d4efaf7e791789f203ebcbe327
-MISC ChangeLog 2535 RMD160 ed0799db9be161f0354a618f68f20fcef5697cdd SHA1 20f0c30d79cae514d63511fd9f616ef7121289cf SHA256 5c61c7b7039bcb15297f5250ad4e63dafcb9ecc3776b1d7f9198e41160c322f0
+EBUILD archivemail-0.7.2-r1.ebuild 986 RMD160 9e2447c360e868ce70c8bb056f3fe691f7499014 SHA1 ee640fef23b6a75fb76614ced00b29c71d0756ac SHA256 7f695c446e546ed5fb82b2cb993deb5b691c5a54293905856c54dcff1d1e5de1
+EBUILD archivemail-0.8.0.ebuild 1001 RMD160 62f62206334a69615172520d7a285df615d92899 SHA1 bb6f24bee69862f1fa195d65b4e2ab1a5d993ba4 SHA256 2d9875039c473633b30f8cad3def4669ce613598313331b06b08c587ab7dd745
+MISC ChangeLog 2695 RMD160 4613e2e9998d684e8a569edc6dfdb0a3b6407c95 SHA1 1671a6299f4254d59f5dc94879dea412f93ff5d5 SHA256 9bec4aec97b2e9753cd9897348b5edd4aaa3c62600ee1942305e493e352ce32f
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJMfJ7NAAoJEEqz6FtPBkyjfqUH/0pv7lArS4aTS0qRJyCZ6JJp
-Oi72lTr+n+RFOWXdtXHndtWfLPzpD5CLoMuOs87Cj1wqwjGnFNRM2po3V7tT0L9h
-DJNFEFqHL9noQJl0f6/kxk8hXgSmBHMfvRu2PpZ4crR61v9EnM21IsvtX+yMgei/
-zlaAbq3Woa5pm+9B1rKRae3HcINd3rkqavxp3EtP8krw7EUyO89tPSTAJpzjK97H
-oE48VXC8z13UXVtoRecEYiJ1n7Hvc0WptQ5w5BSRwgYHWTRgdmlMN43IYbgbw68c
-oIVN2vH836lAZ9P1WRBKPRmhapC8go9ZEUVKiTn5wovcZ9If/3iubfoR0w+5fTY=
-=wIDS
------END PGP SIGNATURE-----
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"