Force python2 since the build system is broken on python3

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 34 insertions, 10 deletions

diff --git a/dev-python/zsi/ChangeLog b/dev-python/zsi/ChangeLog
index 8c68266d5664..ad1ee44867ea 100644
--- a/dev-python/zsi/ChangeLog
+++ b/dev-python/zsi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/zsi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/ChangeLog,v 1.11 2009/05/23 15:51:17 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/ChangeLog,v 1.12 2010/05/25 21:01:39 angelos Exp $
+
+  25 May 2010; Christoph Mende <angelos@gentoo.org> zsi-2.0.ebuild,
+  zsi-2.1_alpha1.ebuild:
+  Force python2 since the build system is broken on python3
 
 *zsi-2.1_alpha1 (23 May 2009)
 
diff --git a/dev-python/zsi/Manifest b/dev-python/zsi/Manifest
index 3255c0fd72f1..8c1f2537ec23 100644
--- a/dev-python/zsi/Manifest
+++ b/dev-python/zsi/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ZSI-2.0.tar.gz 805956 RMD160 9fc0171e03f759cbab89046916d979c5505ba5b8 SHA1 e691d9610f04afad9cf62f7990cfd3b4df47ff01 SHA256 368059c92c1afa6ae027d5aea6985caf0bbb890c5589c7d4564e59219ffa0f50
 DIST ZSI-2.1-a1.tar.gz 932958 RMD160 f515a8b702018d75f7bdf73e2f52fdcae8caa621 SHA1 e0a375201396ef32e9607e6ceea5d2920950a7cb SHA256 253cd6968bc52e66121ee370831b93be385d65563a0e71c9c704db83901bf244
-EBUILD zsi-2.0.ebuild 1104 RMD160 f21357d048d57b0b7f7d6f4eb6af8141fa1e21cb SHA1 6c02124f857ab6cdc8e2523076279b1c0ef0a49a SHA256 f0cdd229d820fbb9d3d191d9a5b0a963f0e27382dc91b917fc92c630f85335d8
-EBUILD zsi-2.1_alpha1.ebuild 1095 RMD160 706ae65f887e088bf84aec9311337dae363d5547 SHA1 3e896234bfa8fd7a048e7be19b9d95bc0074a06e SHA256 3eb762bb3489c276897c730ae2cd46b61e4591d232f5cf13c0ca6861681b76a5
-MISC ChangeLog 1331 RMD160 cf5de4d14cf706519342ade08e2978794732be47 SHA1 d6efcb52675dea1f89034d441d6bc33f52dd156a SHA256 3f69b1af1facd0500b32f425c2fc310820446723a468e6b789498518ffca60ad
+EBUILD zsi-2.0.ebuild 1174 RMD160 3cc80bd1c0147f6a88a2b1ced543da3cb3942791 SHA1 b03d33f4dc999ab917b567e3917ad8b18ec7ceb6 SHA256 a4852fce37d5a0efde76bf7c2e7d93e6af68b81aa30258795f947876ed3ee671
+EBUILD zsi-2.1_alpha1.ebuild 1145 RMD160 acf9bb7c142bcaca817a472f753bab75a4bc0cc0 SHA1 b93565727e33694038a4920191efdeeb25e9ea01 SHA256 4285c97ead7c2503e58ea2580a57f5dc573fb8cdb19c42f8a7c21e8e1f8492d6
+MISC ChangeLog 1483 RMD160 f1cfb46987aeafabd117ed6e8dba72084752d0ec SHA1 ef95641fb0b7977cd4c37a054972678f9a9ae9f2 SHA256 2af9c2f12c6ffe7d93952636b0d852cab28a67e0a9f0ab6bc11b87115e3ebc42
 MISC metadata.xml 348 RMD160 e210ab4ac4e4d6b3047bf40b516ef5996d153ae5 SHA1 f8d5ea842c27b3c19afa77d4073873951b8e2d93 SHA256 79218ac601767174ad2319853be5d74731001432bf1e655eed21365d0bf9017c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkv8Or0ACgkQmWq1bYTyC0MDjwD/W3ZIPLai6k4wlnzL/5L/HNJD
+u5neM7vn0xDTeEzKyQMBALPvRuHSgVI0dec9lEkjyLtn9P/hWStzC14x2/uq82Vt
+=7si2
+-----END PGP SIGNATURE-----
diff --git a/dev-python/zsi/zsi-2.0.ebuild b/dev-python/zsi/zsi-2.0.ebuild
index b433e23dc76f..aef44578f533 100644
--- a/dev-python/zsi/zsi-2.0.ebuild
+++ b/dev-python/zsi/zsi-2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.0.ebuild,v 1.8 2009/03/13 16:26:36 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.0.ebuild,v 1.9 2010/05/25 21:01:39 angelos Exp $
+
+PYTHON_DEPEND="2:2.4"
 
 inherit distutils
 
@@ -26,6 +28,10 @@ DEPEND=">=dev-python/pyxml-0.8.3
 S="${WORKDIR}/${MY_P}"
 PYTHON_MODNAME=${MY_PN}
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/dev-python/zsi/zsi-2.1_alpha1.ebuild b/dev-python/zsi/zsi-2.1_alpha1.ebuild
index 04f5570efbeb..af29e53b9217 100644
--- a/dev-python/zsi/zsi-2.1_alpha1.ebuild
+++ b/dev-python/zsi/zsi-2.1_alpha1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1.ebuild,v 1.2 2009/05/23 16:00:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1.ebuild,v 1.3 2010/05/25 21:01:39 angelos Exp $
 
 EAPI=2
-NEED_PYTHON=2.4
+PYTHON_DEPEND="2:2.4"
 inherit distutils
 
 MY_PN=ZSI
@@ -26,6 +26,10 @@ DEPEND=">=dev-python/pyxml-0.8.3
 S=${WORKDIR}/${MY_P}
 PYTHON_MODNAME=${MY_PN}
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	if ! use twisted; then
 		sed -i \