Use Python 2 (bug #313979).

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

3 files changed, 39 insertions, 14 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/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."