summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-11 20:47:12 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-11 20:47:12 +0000
commit3a467f0de035236587ae0d0bd8b4cff3348575b3 (patch)
treec06ba9d40f8ffec520fe4eadcdfa78ce31f6f8c5 /media-video/miro
parentFix dependencies. (diff)
downloadgentoo-2-3a467f0de035236587ae0d0bd8b4cff3348575b3.tar.gz
gentoo-2-3a467f0de035236587ae0d0bd8b4cff3348575b3.tar.bz2
gentoo-2-3a467f0de035236587ae0d0bd8b4cff3348575b3.zip
Use Python 2 (bug #315055).
(Portage version: 2.2.0_alpha26_p15/cvs/Linux x86_64)
Diffstat (limited to 'media-video/miro')
-rw-r--r--media-video/miro/ChangeLog6
-rw-r--r--media-video/miro/miro-2.5.4.ebuild16
2 files changed, 16 insertions, 6 deletions
diff --git a/media-video/miro/ChangeLog b/media-video/miro/ChangeLog
index dde20ea1e8a5..2f375bab723e 100644
--- a/media-video/miro/ChangeLog
+++ b/media-video/miro/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/miro
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.8 2011/03/11 20:38:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.9 2011/03/11 20:47:12 arfrever Exp $
+
+ 11 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ miro-2.5.4.ebuild:
+ Use Python 2 (bug #315055).
11 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-miro-2.5.3.ebuild, -files/miro-2.5.3-fix-locale.patch:
diff --git a/media-video/miro/miro-2.5.4.ebuild b/media-video/miro/miro-2.5.4.ebuild
index 0fbca842e3a6..7eb6eeacc795 100644
--- a/media-video/miro/miro-2.5.4.ebuild
+++ b/media-video/miro/miro-2.5.4.ebuild
@@ -1,10 +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/media-video/miro/miro-2.5.4.ebuild,v 1.2 2010/06/26 07:49:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-2.5.4.ebuild,v 1.3 2011/03/11 20:47:12 arfrever Exp $
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
-inherit eutils fdo-mime gnome2-utils python distutils
+inherit eutils fdo-mime gnome2-utils distutils
DESCRIPTION="Open source video player and podcast client"
HOMEPAGE="http://www.getmiro.com/"
@@ -28,7 +29,7 @@ CDEPEND="
RDEPEND="${CDEPEND}
gstreamer? ( dev-python/gst-python:0.10 )
libnotify? ( dev-python/notify-python )
- || ( dev-lang/python[sqlite] dev-python/pysqlite:2 )
+ || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-python/pysqlite:2 )
dev-python/dbus-python
dev-python/gconf-python
dev-python/gtkmozembed-python
@@ -48,6 +49,11 @@ S="${WORKDIR}/${P}/platform/gtk-x11"
# create a real test suite, upstream bug 12369
# try to have a real xine/gstreamer choice, upstream bug 12371
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
src_prepare() {
# fix debug mode
epatch "${FILESDIR}"/${PN}-2.5.3-fix-debug.patch