From 94cc8fa94efa4904f2a7ccb88cc4b41c0b484385 Mon Sep 17 00:00:00 2001
From: Jesus Rivero <neurogeek@gentoo.org>
Date: Fri, 29 Jul 2011 16:07:58 +0000
Subject: [PATCH] Python related improvements wrt bug #315061

Package-Manager: portage-2.2.0_alpha46/cvs/Linux i686
---
 media-video/pymp/ChangeLog       |  7 +++++--
 media-video/pymp/Manifest        | 14 ++++++++++++--
 media-video/pymp/pymp-1.1.ebuild | 17 +++++++++++------
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/media-video/pymp/ChangeLog b/media-video/pymp/ChangeLog
index c0edbdb0467a..87887f3380a6 100644
--- a/media-video/pymp/ChangeLog
+++ b/media-video/pymp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/pymp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pymp/ChangeLog,v 1.6 2009/07/16 08:08:58 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/pymp/ChangeLog,v 1.7 2011/07/29 16:07:58 neurogeek Exp $
+
+  29 Jul 2011; Jesus Rivero <neurogeek@gentoo.org> pymp-1.1.ebuild:
+  Python related improvements wrt bug #315061
 
 *pymp-1.1 (16 Jul 2009)
 
diff --git a/media-video/pymp/Manifest b/media-video/pymp/Manifest
index e516625d3e45..345afde535b5 100644
--- a/media-video/pymp/Manifest
+++ b/media-video/pymp/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pymp-1.0.tar.bz2 131084 RMD160 302bb040aa4bd6971660013a05d5565ca857364c SHA1 2032ea99c3ded6beaaf53d1bf0ab5528c8b1a207 SHA256 1de66273fbfec3af8db7a3846122dfb3522c0b3304b531a5a8323305bb0ebda3
 DIST pymp-1.1.tar.bz2 132710 RMD160 1f478f0ef3fd929c09b0ba7fda9ebfd79dc1c57a SHA1 1b687d7b2fcb7c53817ea3b43fdf4df06551ba9d SHA256 924c7d0a40d349f4dfc9a0bae2126a432185dc210f740dfc6ab68fd3ec892cd8
 EBUILD pymp-1.0.ebuild 766 RMD160 d224ae1a169f9c0cf58d53f4ac71659edf467a68 SHA1 725661efb9e9a39160e0afc6df9165fa82c65847 SHA256 8991cb3bab6488115409887f9c3b949321f407083dbb95d04891233203bcce37
-EBUILD pymp-1.1.ebuild 1026 RMD160 7eaf79d5aab22744eca2863bbfc1d6d0042df417 SHA1 546b8342e2298de6499fb04fbe044925374943ff SHA256 521121b80dc1da7b5f6c9c01bf9a6372de02107c7f6a04576dbb480fceafb435
-MISC ChangeLog 789 RMD160 45e34091df35bb420024c9a22d4538082438b622 SHA1 b6dd154d24f7f71e6a763f701057d8bbd9295850 SHA256 bc79a79aa31d61fa4a729d0b030678de08b1ba7567a256f1e7cdcf8a6664b840
+EBUILD pymp-1.1.ebuild 1112 RMD160 3cc4c83167c606fe060e8e28046f5378b12db2a8 SHA1 9b8524cc7083d2e3b23d7f9c421f2aea7d1ee522 SHA256 1bf5e69a932838cb5accbc80845dccb033f7e7f9b926010092259e1389ba700a
+MISC ChangeLog 904 RMD160 ce6fa927ae4d9d90326b4e2994c47b45c0c607fb SHA1 4dba28b80cae24bebc6e6e583b16eb3c4cadcb7e SHA256 9659a80ddf676c2bb1f903896f8c6f789e33f2157478902837e4731a515113b5
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk4y2x8ACgkQdIssYB9vBoP6BQCfdgDxQiJ/9FehPrJMPPpCEb8a
++IUAniIE7ljEePqC7pavdNx6yQadw7C3
+=1oUv
+-----END PGP SIGNATURE-----
diff --git a/media-video/pymp/pymp-1.1.ebuild b/media-video/pymp/pymp-1.1.ebuild
index 0e99fad2d75c..e0fd411ef272 100644
--- a/media-video/pymp/pymp-1.1.ebuild
+++ b/media-video/pymp/pymp-1.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-video/pymp/pymp-1.1.ebuild,v 1.1 2009/07/16 08:08:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/pymp/pymp-1.1.ebuild,v 1.2 2011/07/29 16:07:58 neurogeek Exp $
 
-EAPI=2
+EAPI=3
+PYTHON_DEPEND="2:2.5"
 inherit eutils multilib python
 
 DESCRIPTION="a lean, flexible frontend to mplayer written in python"
@@ -15,12 +16,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-video/mplayer
-	dev-python/pygtk
-	>=dev-lang/python-2.5"
+	dev-python/pygtk"
 DEPEND="sys-apps/sed"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
-	sed -i -e "s:PREFIX/lib:/usr/$(get_libdir):" pymp || die "sed failed"
+	sed -i -e "s/python/python2/" -e "s:PREFIX/lib:/usr/$(get_libdir):" pymp || die "sed failed"
 }
 
 src_compile() { :; }
-- 
2.26.2