Fix python 2.6 support by Steven Robertson <nihilismwow@gmail.com>, bug #240188

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 47 insertions, 8 deletions

diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index 42ad8326a047..6db3390473bc 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/quodlibet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.59 2008/12/19 15:18:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.60 2008/12/19 15:23:34 aballier Exp $
+
+  19 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/quodlibet-2.0-python26.patch, quodlibet-2.0.ebuild:
+  Fix python 2.6 support by Steven Robertson <nihilismwow@gmail.com>, bug
+  #240188
 
   19 Dec 2008; Alexis Ballier <aballier@gentoo.org> -quodlibet-1.0.ebuild:
   remove old
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index e24bb889aba0..c663b80b4ae6 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX quodlibet-2.0-python26.patch 998 RMD160 b9d5eb6f8a80cad840ee432e256b2d4041c40283 SHA1 3a2a0bc9e97fad56ab8b948c0895ba9825574aa9 SHA256 f024e0c6054b96ef396695d3709cd2174b82081b3a494f95accf0a2c5b21c6f2
 DIST quodlibet-2.0.tar.gz 842921 RMD160 f2276a52abb947741c1c519d696de66a92b7c6de SHA1 93d378234feae798c65452085add0b46a2440be4 SHA256 1c1e28a58e0a52055fc0f0ecb833088be6b9bcfbebb6c8ef9ff9e11ea3f1393a
-EBUILD quodlibet-2.0.ebuild 4847 RMD160 2043445f4955c335a2fd22f031e6ddba2cdb8a01 SHA1 eb63d85cba01abc9c546b00aaf8536ef336dd227 SHA256 6d655d6afda20810a1fa9a5e9eee189ffe59ec11a3d3221f0d177ceeec1d9e54
-MISC ChangeLog 10668 RMD160 a61297095d5cbeb021b96ed2d342985bdfdd8be2 SHA1 4c1bb7b934f1cbe2d07ebfa38410224a66e9f66f SHA256 816f0a83248c99a4f5a915a511ac9212ffb76af4f70b83d8881e2394fd97b2dd
+EBUILD quodlibet-2.0.ebuild 4904 RMD160 29fa494c5690137c91633b4870be4ef017bcce36 SHA1 87b02c5a8e465509801d8c65c33afcee57964cb0 SHA256 69a47527f54b798b2c46d6c978df097452c670ba5dfbbbb0e2da034978a07001
+MISC ChangeLog 10866 RMD160 4ed90218e50c1eefc2af4cbfb45660a2e8aab023 SHA1 b40ed9f029f067e758f9c265517a1a9c10d21d9d SHA256 8490f0ae248dfa191982257be3b8dc42f9c2fd9b3686d650d966fe62ce03f8c6
 MISC metadata.xml 882 RMD160 31c7791dd21bdc9ae4a7a8ca9acfa8ec32cdc738 SHA1 793a5d2de067c1f1755dc0cca6b3cdec7c58b5a1 SHA256 f62060ee5add9b3ad5b737bd621b6cde66a7adae5d97b5f204db3359c34da23d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklLu0sACgkQvFcC4BYPU0pbPwCfZwfWck4dYkvP995fKvr53194
-Yv8AoLsV7l9gLKujcEjmchvB0rDdeVjM
-=cbls
+iEYEARECAAYFAklLvHwACgkQvFcC4BYPU0pg2ACdFnI7L0eXDkXXKuK5ZzCc4tpp
+1CEAnjThA5QBO+YxBcUU5IJcypD69ddA
+=dk3v
 -----END PGP SIGNATURE-----
diff --git a/media-sound/quodlibet/files/quodlibet-2.0-python26.patch b/media-sound/quodlibet/files/quodlibet-2.0-python26.patch
new file mode 100644
index 000000000000..9d2a9fadca40
--- /dev/null
+++ b/media-sound/quodlibet/files/quodlibet-2.0-python26.patch
@@ -0,0 +1,32 @@
+Steven Robertson <nihilismwow@gmail.com>
+https://bugs.gentoo.org/show_bug.cgi?id=240188
+http://code.google.com/p/quodlibet/issues/detail?id=27
+
+
+Index: quodlibet/gdist/core.py
+===================================================================
+--- quodlibet/gdist/core.py	(revision 4331)
++++ quodlibet/gdist/core.py	(working copy)
+@@ -10,7 +10,7 @@
+ This module exists to avoid circular imports within gdist.
+ """
+ 
+-import os
++import os, subprocess
+ 
+ from distutils.core import Command
+ 
+@@ -26,8 +26,11 @@
+         self.po_directory = self.distribution.po_directory
+ 
+     def capture(self, args):
+-        write, read = os.popen2(args, mode="r")
+-        return read.read()
++        p = subprocess.Popen(args, stdout=subprocess.PIPE)
++        ret = p.wait()
++        if ret != 0:
++            raise SystemExit("External program %s exited with error %d." % (args[0], ret))
++        return p.stdout.read()
+ 
+     def check_po(self):
+         """Exit if translation is needed and not available"""
diff --git a/media-sound/quodlibet/quodlibet-2.0.ebuild b/media-sound/quodlibet/quodlibet-2.0.ebuild
index e6607687ec17..2df0f7e3f2b1 100644
--- a/media-sound/quodlibet/quodlibet-2.0.ebuild
+++ b/media-sound/quodlibet/quodlibet-2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.0.ebuild,v 1.2 2008/10/05 17:46:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.0.ebuild,v 1.3 2008/12/19 15:23:34 aballier Exp $
 
 NEED_PYTHON=2.4.4
 
-inherit distutils python
+inherit distutils python eutils
 
 DESCRIPTION="Quod Libet is a GTK+-based audio player written in Python."
 HOMEPAGE="http://code.google.com/p/${PN}/"
@@ -94,6 +94,7 @@ src_unpack() {
 
 		sed -i -e "s,^          \"pipeline\": \"\",          \"pipeline\": \"${sinktype}\"," quodlibet/config.py
 	fi
+	epatch "${FILESDIR}/${P}-python26.patch" #240188
 }
 
 src_install() {