Use Python 2 (bug #313983).

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

4 files changed, 32 insertions, 13 deletions

diff --git a/media-video/arista/ChangeLog b/media-video/arista/ChangeLog
index bd8c44e49ec1..f21f87039309 100644
--- a/media-video/arista/ChangeLog
+++ b/media-video/arista/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/arista
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/arista/ChangeLog,v 1.8 2011/02/01 05:48:04 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/arista/ChangeLog,v 1.9 2011/03/11 20:21:19 arfrever Exp $
+
+  11 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  arista-0.9.3-r1.ebuild, arista-0.9.5.ebuild:
+  Use Python 2 (bug #313983).
 
   01 Feb 2011; Arun Raghavan <ford_prefect@gentoo.org> arista-0.9.3-r1.ebuild,
   arista-0.9.5.ebuild:
diff --git a/media-video/arista/Manifest b/media-video/arista/Manifest
index a37575bfe30c..758e3f6fe8b5 100644
--- a/media-video/arista/Manifest
+++ b/media-video/arista/Manifest
@@ -1,6 +1,6 @@
 DIST arista-0.9.3.tar.gz 195937 RMD160 c4137b589b40a21753f85435758bfd2d98565064 SHA1 724b01956a5e3f94f9b4f37adf4c24aaa29303fd SHA256 1749b3ea5b46d69f728ef79cb5ed81e91df514f12bb77c99584998ad4d1eca5c
 DIST arista-0.9.5.tar.gz 307390 RMD160 c7943f732bda0d9aebf3e7fe58eaac69f50d6b35 SHA1 e5356a1729b8fdb7965f745f4f5b3c4dd484c3f6 SHA256 2d9b7d664225c9f4f9e2d7c365d40ed4673f87a673373cfb5612e4abe6285bd7
-EBUILD arista-0.9.3-r1.ebuild 1480 RMD160 9c13816fcd69451fdf40a3597511fd01157288b0 SHA1 4960a40a80e0f2ce4361f87d4e63748574cfad17 SHA256 3dc52cd3f76ca2c28baa9b83d65ffa237cf3119bfbbf92f68761c4328c3fc5bd
-EBUILD arista-0.9.5.ebuild 1767 RMD160 b60f4a405d14dd3790e6f24641eba80820f80482 SHA1 81e1d8a375843e4a9c2f48cc0bfced7895253836 SHA256 3b9fd5158b786c101da3746ed94a6fdc41c990d04bff3cc89c10d66d2a7663a9
-MISC ChangeLog 1432 RMD160 ddf3cf37b800fa9ccc5339c3b45c4f1269d8055e SHA1 8b9b8413d91bf9c400ff911f31744fc48a70959d SHA256 d74ce0fc2800d9b82bc2bbe46e84f69868f4f85e52ca90483c152dcaa4e71cf9
+EBUILD arista-0.9.3-r1.ebuild 1585 RMD160 02bd2a6b67447706384870bf0238eda1f20728bf SHA1 88b284192261499dd47ba2f4ba6783d65d402aba SHA256 51b0412e26e14b06b473a51ccc161fed971a926c6fa1e7e2aae24f3b537fcce8
+EBUILD arista-0.9.5.ebuild 1823 RMD160 ef0675c683bf24a6db30b31154b44769716551da SHA1 39e4dee4542ec2937dc6e1594be5958f6a7e86f8 SHA256 8b71c8f9873512f8a7a8cbac32f61c0724e45cf8b254a2f8facd74f5cf5caddb
+MISC ChangeLog 1579 RMD160 8bb8d262cd590fb23603faaea7cdf3de0e12515d SHA1 5cf71869d23bfcb54b0379b738d7d9912c1b8fde SHA256 6a94d326f2bc338998f400658c8bffd3870079b4cad83ffdbaaa3ca92e85782b
 MISC metadata.xml 477 RMD160 a205456d4ae48cf938c217cb13bf4bcb74e6bdaf SHA1 768cfe3cadd0f9f7c0eb4916c55201bae407767d SHA256 a885fedc1991223ef7d09915b3b0f3033dea6b7228d8455ac4fc629432f88ceb
diff --git a/media-video/arista/arista-0.9.3-r1.ebuild b/media-video/arista/arista-0.9.3-r1.ebuild
index 5ec9d82d9332..e50c4abc48bc 100644
--- a/media-video/arista/arista-0.9.3-r1.ebuild
+++ b/media-video/arista/arista-0.9.3-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/arista/arista-0.9.3-r1.ebuild,v 1.6 2011/02/01 05:48:04 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/arista/arista-0.9.3-r1.ebuild,v 1.7 2011/03/11 20:21:19 arfrever Exp $
 
-EAPI=2
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
 
 inherit distutils
 
@@ -19,8 +21,7 @@ KEYWORDS="amd64 x86"
 IUSE="+faac +xvid"
 
 DEPEND="dev-python/setuptools"
-RDEPEND="dev-lang/python[xml]
-	>=x11-libs/gtk+-2.16
+RDEPEND=">=x11-libs/gtk+-2.16
 	>=dev-python/pygtk-2.14
 	dev-python/pygobject
 	dev-python/pycairo
@@ -36,7 +37,14 @@ RDEPEND="dev-lang/python[xml]
 	faac? ( media-plugins/gst-plugins-faac:0.10 )
 	xvid? ( media-plugins/gst-plugins-xvid:0.10 )"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 pkg_postinst() {
+	distutils_pkg_postinst
+
 	einfo "If you find that a format you want is not supported in Arista,"
 	einfo "please make sure that you have the corresponding USE-flag enabled"
 	einfo "media-plugins/gst-plugins-meta"
diff --git a/media-video/arista/arista-0.9.5.ebuild b/media-video/arista/arista-0.9.5.ebuild
index 9475392e0013..eca299fdde25 100644
--- a/media-video/arista/arista-0.9.5.ebuild
+++ b/media-video/arista/arista-0.9.5.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/arista/arista-0.9.5.ebuild,v 1.2 2011/02/01 05:48:04 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/arista/arista-0.9.5.ebuild,v 1.3 2011/03/11 20:21:19 arfrever Exp $
 
-EAPI=2
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
 
 inherit distutils
 
@@ -20,9 +22,7 @@ IUSE="+faac kde nautilus +x264 +xvid"
 
 DEPEND="dev-python/setuptools"
 RDEPEND=">=x11-libs/gtk+-2.16
-	|| ( >=dev-lang/python-2.6[xml]
-		( dev-lang/python:2.5[xml] dev-python/simplejson )
-		( dev-lang/python:2.4[xml] dev-python/simplejson ) )
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
 	>=dev-python/pygtk-2.16
 	dev-python/pygobject
 	dev-python/pycairo
@@ -42,7 +42,14 @@ RDEPEND=">=x11-libs/gtk+-2.16
 	x264? ( media-plugins/gst-plugins-x264:0.10 )
 	xvid? ( media-plugins/gst-plugins-xvid:0.10 )"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 pkg_postinst() {
+	distutils_pkg_postinst
+
 	einfo "If you find that a format you want is not supported in Arista,"
 	einfo "please make sure that you have the corresponding USE-flag enabled"
 	einfo "media-plugins/gst-plugins-meta"