Force python2 since the build system is broken on python3

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

diff --git a/media-sound/sonata/ChangeLog b/media-sound/sonata/ChangeLog
index 2930b3aa3e17f455626e52b1f02aaedea5e37834..988e824fb43fd80eac23bd0b87e7300b6935c042 100644 (file)
--- a/media-sound/sonata/ChangeLog
+++ b/media-sound/sonata/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/sonata
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/ChangeLog,v 1.49 2010/05/21 20:10:03 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/ChangeLog,v 1.50 2010/05/25 20:55:53 angelos Exp $
+
+  25 May 2010; Christoph Mende <angelos@gentoo.org> sonata-1.6.2.1.ebuild:
+  Force python2 since the build system is broken on python3
 
   21 May 2010; Christoph Mende <angelos@gentoo.org> -sonata-1.6.2-r1.ebuild:
   Removed old

diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 1d395bada3b8e43dee72217ba7c4a8df2bbece47..863438c52d85e5a98a8f04cef2102f8aafbb6903 100644 (file)
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX sonata-1.6.2-keep_icons_constant.patch 847 RMD160 e8adabb69f246bb38a392432efd38141573b7c54 SHA1 18e73d04e6e4494b0f8c4cc812cc5081fca2a7c6 SHA256 79ba8b8efb1129a61b387eef21bbffc36f2b37998938c0a59c583cefcba8cad9
 DIST sonata-1.6.2.1.tar.bz2 314333 RMD160 4ca257c0c860804ae3e4cd343d953084b81ea471 SHA1 609452c1672ae01c44988a21f7cc94f0637bad82 SHA256 b0fe8ed37e197c2bd0d65441d43690490f2160e0630bc100d6a848950185b85b
-EBUILD sonata-1.6.2.1.ebuild 918 RMD160 d2d14d24c898ad0307ffc014ef2563ea99e5d81e SHA1 fcf3b1976e42b4dea9ed7552869251e0a14cd410 SHA256 7d2cffaedf841469f2be296828be018662836077e77d7436eab022cd8b7e5f39
-MISC ChangeLog 6712 RMD160 7d725bf135d196f79108bce8cba95363065e0e28 SHA1 356c21f11de76428b0b25106957d79e7752810e3 SHA256 24c342374765df2596f622e16eb4db81c9fb62b33cf41444da957cee5032b21e
+EBUILD sonata-1.6.2.1.ebuild 966 RMD160 7390b6022d3abc6e69dafd288c2a0fd5638ad6b3 SHA1 08302508c6b344610a47cc89a6203fa63dec55d0 SHA256 3a8b12be39253208cd8bec5f40b7c0e60a25108750ef082452b17853729b2723
+MISC ChangeLog 6848 RMD160 aa85b1decdb950a544ccf03485a373a434b9b3d5 SHA1 43c308c53a6576723bf943db1f596e1f0a0e09cf SHA256 1463f5c73bf5496d3088ba6475c90ac1281049cf0c06a655352cdca7baf9de77
 MISC metadata.xml 604 RMD160 b3c6878298e4db65bb63b220331b22a90bb8d124 SHA1 2a260a620992418e1ef8cc984cfae5e9dc91cd2e SHA256 7a89230c369a0e20a8ee39b0f06f952bd186fef3a4c60f97ae15e28f714b8129
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkv8OWMACgkQmWq1bYTyC0OtIQEApIl62rvAsTA74UL7DI/Mo+1Y
+6kDaJw/QLOhCtSGtq+IA/1sp0E2sz1IXN/8v0XDzicbmmUxNHg96QRGJU0InZAjc
+=qwaF
+-----END PGP SIGNATURE-----

diff --git a/media-sound/sonata/sonata-1.6.2.1.ebuild b/media-sound/sonata/sonata-1.6.2.1.ebuild
index fb6ab5561d41f87bb4e956aedffa63e93d66b410..848cd8a70d8aeffb774d3768b327d4dc1dc4690a 100644 (file)
--- a/media-sound/sonata/sonata-1.6.2.1.ebuild
+++ b/media-sound/sonata/sonata-1.6.2.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/sonata-1.6.2.1.ebuild,v 1.3 2009/11/25 22:57:18 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/sonata-1.6.2.1.ebuild,v 1.4 2010/05/25 20:55:53 angelos Exp $
 
 EAPI=2
+PYTHON_DEPEND="2:2.5"
+
 inherit distutils
 
 DESCRIPTION="an elegant GTK+ music client for the Music Player Daemon (MPD)."
@@ -14,8 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
 IUSE="dbus lyrics taglib +trayicon"
 
-RDEPEND=">=virtual/python-2.5
-       >=dev-python/pygtk-2.12
+RDEPEND=">=dev-python/pygtk-2.12
        >=x11-libs/gtk+-2:2[jpeg]
        >=dev-python/python-mpd-0.2.1
        dbus? ( dev-python/dbus-python )
@@ -27,6 +28,10 @@ DEPEND="${RDEPEND}
 
 DOCS="CHANGELOG README TODO TRANSLATORS"
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
 src_install() {
        distutils_src_install
        rm -rf "${D}"/usr/share/sonata