pitivi fix for python 2.6

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 58 insertions, 8 deletions

diff --git a/media-video/pitivi/ChangeLog b/media-video/pitivi/ChangeLog
index b8642f691cc6..814653b3e3db 100644
--- a/media-video/pitivi/ChangeLog
+++ b/media-video/pitivi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/pitivi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/ChangeLog,v 1.14 2009/03/24 18:50:14 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/ChangeLog,v 1.15 2009/04/14 18:50:19 hanno Exp $
+
+  14 Apr 2009; Hanno Boeck <hanno@gentoo.org>
+  +files/pitivi-0.11.3-reserved-word.patch, pitivi-0.11.3.ebuild:
+  Fix for python 2.6.
+
+  14 Apr 2009; Hanno Boeck <hanno@gentoo.org>
+  +files/pitivi-0.11.3-reserved-word.patch, pitivi-0.11.3.ebuild:
+  Fix for python 2.6.
 
   24 Mar 2009; Hanno Boeck <hanno@gentoo.org> pitivi-0.11.3.ebuild:
   Add dep to dbus-pyhton, fixes #263587.
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 031ccab55564..cfde75446841 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pitivi-0.11.3-reserved-word.patch 1619 RMD160 0522af286af741ee4f83a3be2cc6180cf5ac6a51 SHA1 bbe1ed1715ca74392dc85d58ead92e723ba84e7b SHA256 cb06fc46e86cf1649ada4873a824c113e91a24090b88fdb046b3469bff4ce62b
 DIST pitivi-0.10.3.tar.bz2 308152 RMD160 a33c8684b4db294f8266d23f349750edf7047774 SHA1 debf5da60ce2b6212c8297f23a998777f8ca3c47 SHA256 cfb703fccf01f61112a7065ddb119886692deb75074a7faab0f039c275b88f39
 DIST pitivi-0.11.1.tar.bz2 350216 RMD160 2f875ce55affcf77013dbe911d2c4a06b0b33a4c SHA1 7378de147684c5f5c6c2b2b5cf7953e458343975 SHA256 76f8331c3e49466838344494e72873a03b84752b3686d34e35f627860424c82a
 DIST pitivi-0.11.3.tar.bz2 431581 RMD160 ed07c2989e90163513f000211849cf8afae4dc0d SHA1 5206a73409e072ad1ddc9e22dc1228d377f9e9fc SHA256 bc9af6a1b8a20d90171c5c147e5e18cff8e4469bbbf37f054c80c1d23bfe52a7
 EBUILD pitivi-0.10.3.ebuild 1090 RMD160 905c643ef50e0a531c1730333127814aa99e16a5 SHA1 008547690a67860f2a374fd85a0020c4ce9e89fb SHA256 0f13eb12469e66283f0dfb74275cf6d94ca9829752f02b615e1774a3555812ab
 EBUILD pitivi-0.11.1.ebuild 1469 RMD160 e034131f179a674f3805aada9cdc917a010a0b85 SHA1 571a04c201b7b22a9a94cc746f2af52885cc5f7b SHA256 f0706be8a3aa90cccaf783315ea49cbeb0976e7212ee320eed9b1119f764b9b0
-EBUILD pitivi-0.11.3.ebuild 1547 RMD160 cb7dff79b51232b840f0aae167ac5740ac7b2fb2 SHA1 218f63cc7ce2eae1aa6f4d9f57a9927ed5f18215 SHA256 e8bd3516ff187aefd30fc501616926e58ed5a9ba62824c4d39994827626a248a
-MISC ChangeLog 1851 RMD160 3c48ae71b0df206b6843a5d4060868b2629f3c5c SHA1 315230bb29a1a619e0e4b26f5a11791facc9c78c SHA256 3507fb9d24dad140a9e88d44f3ca06cf2fe451cb110a679f8a21f0b9096b2d37
+EBUILD pitivi-0.11.3.ebuild 1625 RMD160 e1f59ec0c9f3eccfbc8863cf6d71bcf8fa6ecf96 SHA1 d17d4495a9987bba67a8db021b541f667ca3f91c SHA256 c4e8e5b72a4a2aa6d0a7759a05069162c928a8a34fa89418603d4629a8c413e6
+MISC ChangeLog 2121 RMD160 166ed6ecf820930fd81845f459a5f62346d20af7 SHA1 efee0be97701ec22f473d468548bd38511397c92 SHA256 750662ab35ce25ae222550be11491877d0a56af283eb0315184f43f2e3283493
 MISC metadata.xml 219 RMD160 c3357aa8edfab7033261267720250a36fc96e7f8 SHA1 fef872e700565309235dbfe0f45d81a1692829c0 SHA256 c76952c442b16a3d2efe40e95e84f1110ec9b13775882012b30a25ca3b063ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknJK2oACgkQr2QksT29OyAJdwCgmHdZxic0bEb4XU6UJVXkU0uT
-CywAnjDVt7DD/Bx2rdUVadm1tgriqq8l
-=GBfX
+iEYEARECAAYFAknk2uwACgkQr2QksT29OyADugCcDFQr/dl6UAcMU4BWbSY0XpSN
+3YYAn2gG4fBtyauaU7f923dKPHXcpafr
+=iGy7
 -----END PGP SIGNATURE-----
diff --git a/media-video/pitivi/files/pitivi-0.11.3-reserved-word.patch b/media-video/pitivi/files/pitivi-0.11.3-reserved-word.patch
new file mode 100644
index 000000000000..ca2eebd56ba7
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-0.11.3-reserved-word.patch
@@ -0,0 +1,39 @@
+diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
+index 0a8e6c2..8bce91e 100644
+--- a/pitivi/timeline/timeline.py
++++ b/pitivi/timeline/timeline.py
+@@ -194,22 +194,22 @@ class Timeline(Serializable, Signallable):
+         self.emit("start-duration-changed", self.start, self.duration)
+ 
+     def getAutoSettings(self):
+-        vs = self.videocomp._getAutoSettings()
+-        as = self.audiocomp._getAutoSettings()
+-        if not vs and not as:
++        vcvs = self.videocomp._getAutoSettings()
++        acas = self.audiocomp._getAutoSettings()
++        if not vcvs and not acas:
+             return None
+         # return an ExportSettings containing the combination of
+         # the autosettings from the audio and video composition.
+         settings = ExportSettings()
+-        if vs:
+-            settings.videowidth = vs.videowidth
+-            settings.videoheight = vs.videoheight
+-            settings.videorate = vs.videorate
+-            settings.videopar = vs.videopar
+-        if as:
+-            settings.audiochannels = as.audiochannels
+-            settings.audiorate = as.audiorate
+-            settings.audiodepth = as.audiodepth
++        if vcvs:
++            settings.videowidth = vcvs.videowidth
++            settings.videoheight = vcvs.videoheight
++            settings.videorate = vcvs.videorate
++            settings.videopar = vcvs.videopar
++        if acas:
++            settings.audiochannels = acas.audiochannels
++            settings.audiorate = acas.audiorate
++            settings.audiodepth = acas.audiodepth
+         return settings
+ 
+     def getDuration(self):
diff --git a/media-video/pitivi/pitivi-0.11.3.ebuild b/media-video/pitivi/pitivi-0.11.3.ebuild
index e94d1762ebe0..94b54dcc4701 100644
--- a/media-video/pitivi/pitivi-0.11.3.ebuild
+++ b/media-video/pitivi/pitivi-0.11.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.11.3.ebuild,v 1.3 2009/03/24 18:50:14 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.11.3.ebuild,v 1.4 2009/04/14 18:50:19 hanno Exp $
 
-inherit gnome2 python
+inherit gnome2 python eutils
 
 DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
 HOMEPAGE="http://www.pitivi.org"
@@ -36,6 +36,8 @@ DOCS="AUTHORS ChangeLog NEWS RELEASE"
 src_unpack() {
 	gnome2_src_unpack
 
+	epatch "${FILESDIR}/${P}-reserved-word.patch" || die "epatch failed"
+
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile