Use Python 2 (bug #313979).

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

4 files changed, 42 insertions, 17 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index 2f5cb11e7123..540482726513 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/freevo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.68 2011/02/28 18:09:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.69 2011/03/11 19:57:50 arfrever Exp $
+
+  11 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  freevo-1.7.6.1.ebuild, freevo-1.9.0.ebuild:
+  Use Python 2 (bug #313979).
 
   28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> freevo-1.9.0.ebuild:
   Use virtual/jpeg.
diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest
index a5911a599772..b2be6094745e 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -5,7 +5,7 @@ AUX freevo.desktop 126 RMD160 bab4ae937c10d2a1d895bfadefa80d999a979692 SHA1 e95f
 AUX xbox-lircrc 1690 RMD160 8472024be1e467c69346ce0ea87033d76f389a2e SHA1 4856c57582e83514f4dccd3489a7076a6b2a4aa9 SHA256 91e726a9a99c705067931d1361352a8200a03cebb0d9e1e79187098ae1dd1070
 DIST freevo-1.7.6.1.tar.gz 20856412 RMD160 a2151d64ee0a75c405a85d89ba1193c4ddaf3fe5 SHA1 b1867392796b7f8ce1caf980e9f2052290bb44e5 SHA256 1a0392a858ef428b3a511107322921eb9f45ad0ed02f7f05543486aafba0221e
 DIST freevo-1.9.0.tar.gz 27182867 RMD160 03252a5e596a474325b9a4c903032511d09088aa SHA1 0533a2d4ff8a7b09b3b233fdf303ff56bda22d16 SHA256 e3c97e1404bc5a171350d0c0edf8decaa6d4eb3eaa9e42112a903d375aaf8722
-EBUILD freevo-1.7.6.1.ebuild 5346 RMD160 083f37599f8dcd8b49f9c1558baea80406e1f8d6 SHA1 5b667e211f8ef759d80e8748eab469f945c3b41c SHA256 5ce7fa3c56c3c1cf6b9b5a53cdfbf589cbd7ca96af8eb7301b5421c4b734ba93
-EBUILD freevo-1.9.0.ebuild 5680 RMD160 572b553102458404beb8e529b15f35b16342b7f4 SHA1 4eb22ba9ff7644768a41a23d572d60b7460d3f7d SHA256 591b2e57c795463a2600c77a92ee5aa84ca6cdd700901ec66f5eb8163534b269
-MISC ChangeLog 11352 RMD160 4f48996b4dd821fa8998482975eaa50f5f039d6f SHA1 6ce549f3d0889bfbb94e439aaec7e8a7fc96bc12 SHA256 2c6616e9f6c0c9cb463a2f1a0297eb182f6ff1852e1e72b4b7dfe095d90a75df
+EBUILD freevo-1.7.6.1.ebuild 5514 RMD160 f2cfd5f799a5b6e25b65afa36bafbce9de410551 SHA1 0a514c0b13532c24ae3e02cfce0cd9adb9543fa0 SHA256 42b1e09d684300a4b6fbbcb0a777800563ba371545f4a4f81dac60b77c3463b2
+EBUILD freevo-1.9.0.ebuild 5841 RMD160 c1aa0ec260135adcaa49b8483095d6d79fb62e7d SHA1 57c6ec43f5f163cfd096fc985c6096c218fba26a SHA256 1ce2bf7f94df13ce48f8d4192236aa73e3f6b75cb3d99b5d193b05ab4ec63fb3
+MISC ChangeLog 11501 RMD160 d78402be95cc39deb2fc64846723e40972f641a9 SHA1 536a0afd83934334dfdc74913db39ec66ff290d6 SHA256 4942d4d44cf29dc7167add8158c8f4c3c8bc0ddac4a6f4473810f407805c371c
 MISC metadata.xml 929 RMD160 b4ded639e489b5d341613c1f3d6ff5b2116afb64 SHA1 c5440b84d37650c2fed833bb6e9652413e8baeea SHA256 d52edf7b011bfd40b50ba822625bd2d925f98dd9a4238e6bff0d66536a5dc266
diff --git a/media-tv/freevo/freevo-1.7.6.1.ebuild b/media-tv/freevo/freevo-1.7.6.1.ebuild
index d9499198d528..9e9c327c8c2f 100644
--- a/media-tv/freevo/freevo-1.7.6.1.ebuild
+++ b/media-tv/freevo/freevo-1.7.6.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.6.1.ebuild,v 1.5 2009/03/08 14:16:36 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.6.1.ebuild,v 1.6 2011/03/11 19:57:50 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit distutils
 
@@ -52,6 +53,14 @@ pkg_setup() {
 		ewarn "support (X11, fbcon, directfb, etc) you plan on using."
 		echo
 	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
 }
 
 src_install() {
@@ -107,10 +116,12 @@ src_install() {
 		myconf="${myconf} --geometry=800x600 --display=fbdev"
 	fi
 	sed -i "s:/etc/freevo/freevo.conf:${D}/etc/freevo/freevo.conf:g" setup_freevo.py || die "Could not fix setup_freevo.py"
-	python setup_freevo.py ${myconf} || die "Could not create new freevo.conf"
+	"$(PYTHON)" setup_freevo.py ${myconf} || die "Could not create new freevo.conf"
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
+
 	echo
 	einfo "Please check /etc/freevo/freevo.conf and"
 	einfo "/etc/freevo/local_conf.py before starting Freevo."
diff --git a/media-tv/freevo/freevo-1.9.0.ebuild b/media-tv/freevo/freevo-1.9.0.ebuild
index f670857260fc..4229e9c6f42a 100644
--- a/media-tv/freevo/freevo-1.9.0.ebuild
+++ b/media-tv/freevo/freevo-1.9.0.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-tv/freevo/freevo-1.9.0.ebuild,v 1.6 2011/02/28 18:09:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0.ebuild,v 1.7 2011/03/11 19:57:50 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="xml"
 
 inherit distutils eutils
 
@@ -10,16 +12,14 @@ DESCRIPTION="Digital video jukebox (PVR, DVR)."
 HOMEPAGE="http://www.freevo.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-IUSE="directfb cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls sqlite tv tvtime vorbis xine X"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="directfb cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls sqlite tv tvtime vorbis xine X"
 
-RDEPEND=">=dev-lang/python-2.5[xml]
-	dev-python/pygame
+RDEPEND="dev-python/beautifulsoup
 	dev-python/imaging
-	dev-python/beautifulsoup
+	dev-python/pygame
 	>=dev-python/twisted-2.5
 	>=dev-python/twisted-web-0.6
 	net-zope/zope-interface
@@ -48,7 +48,7 @@ RDEPEND=">=dev-lang/python-2.5[xml]
 	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )
 	matrox? ( >=media-video/matroxset-0.3 )
 	mixer? ( media-sound/aumix )
-	sqlite? ( ~dev-python/pysqlite-1.0.1 )
+	sqlite? ( dev-python/pysqlite:0 )
 	tv? (	media-tv/xmltv
 		tvtime? ( media-tv/tvtime ) )
 	xine? ( media-video/xine-ui )
@@ -62,6 +62,14 @@ pkg_setup() {
 		ewarn "support (X11, fbcon, directfb, etc) you plan on using."
 		echo
 	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
 }
 
 src_install() {
@@ -117,10 +125,12 @@ src_install() {
 		myconf="${myconf} --geometry=800x600 --display=fbdev"
 	fi
 	sed -i "s:/etc/freevo/freevo.conf:${D}/etc/freevo/freevo.conf:g" setup_freevo.py || die "Could not fix setup_freevo.py"
-	python setup_freevo.py ${myconf} || die "Could not create new freevo.conf"
+	"$(PYTHON)" setup_freevo.py ${myconf} || die "Could not create new freevo.conf"
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
+
 	echo
 	einfo "Please check /etc/freevo/freevo.conf and"
 	einfo "/etc/freevo/local_conf.py before starting Freevo."