diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/miro/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/miro/Manifest | 4 | ||||
| -rw-r--r-- | media-video/miro/miro-2.5.4.ebuild | 16 |
3 files changed, 18 insertions, 8 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/Manifest b/media-video/miro/Manifest index 515870cb987b..ba6c4c82ed3a 100644 --- a/media-video/miro/Manifest +++ b/media-video/miro/Manifest @@ -4,6 +4,6 @@ AUX miro-2.5.3-fix-debug.patch 472 RMD160 0cee057c074004a4c8662f19fba0d49247a5ba AUX miro-2.5.3-remove-pkg-config-list-all.patch 2880 RMD160 7aa0300eda840a9662df172c53397c19aab9967a SHA1 1298447816b3e06a4d5c309f66c2916eec1ae2c4 SHA256 ac28c97c1ca3051c3d0c2f7b17eca78a3e45e02c589cda813e98c166a3a21f55 AUX miro-2.5.3-remove-unittest-option.patch 538 RMD160 f29c534b28ac453cb72d18cb3e0810f6744c38b6 SHA1 4f86a65c368ced0b7a37d091a3705cd2f80d2628 SHA256 889e8480faee3af86d9c2dbfa9375eeb102ca01df6c71b07fcb4b62b326cbe6a DIST miro-2.5.4.tar.gz 10032329 RMD160 38e5bf42db323b54803ce12ab1e8dec8192aac51 SHA1 4fd6cb48ed1fb3a9588c4af9f2da55f88654f194 SHA256 43f18abfc8cc7cdbb84fb5de2136397080e4c153881498b18970c81a671b0f67 -EBUILD miro-2.5.4.ebuild 3416 RMD160 6e6959357cc8776e53e4f91e2488b8d72e0830a1 SHA1 914ce6128634b57be7da0c57e01931af18353fbf SHA256 ce2a95f2867b6457e444d135757343b3aabe783408acf7c557d062e02c9525b4 -MISC ChangeLog 1685 RMD160 eb1e0ff66cd38ff4c5db6a1a330d5af8cb6eaf6e SHA1 e434d47696f2a930dbc971f61f48b33c165f3feb SHA256 1df66a7b8b505c566471839b749cf3a3f9c39e36b92a28963b8f19935065ce5f +EBUILD miro-2.5.4.ebuild 3526 RMD160 2abb4a0d381f3dd88a71485beec9c8e32abf562b SHA1 46b7bb0ea1f8ddda64515daed388827a15598eb3 SHA256 3d32842e342a3d8735f203cd62076757b8cfbbf147d929c4f7832b2411a06b5a +MISC ChangeLog 1810 RMD160 a3f626a56c9b55312d0b555c54c302076b9792ba SHA1 d431722c74755e16c0e94a77c23bf46cfbcc72ba SHA256 0dac83e270a0602b3a29ae1c6660308e7fc797e385e0c1a238968bf000f5441e MISC metadata.xml 257 RMD160 224ee82bfe66c5da4a2dc1dd697b1782e7f03cb9 SHA1 6b583c76750b206bd133403d1a4685a14f8e6b95 SHA256 45f231de4d8bc5ed6309ba83d2eb9a06b8e13f828d7b74e909a144439356cd62 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 |