Needs gnome-panel with bonobo support, let it work when python3 is set as main interpreter.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

3 files changed, 32 insertions, 9 deletions

diff --git a/gnome-extra/music-applet/ChangeLog b/gnome-extra/music-applet/ChangeLog
index 70cea9e667c8..28d80c49bb74 100644
--- a/gnome-extra/music-applet/ChangeLog
+++ b/gnome-extra/music-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/music-applet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/music-applet/ChangeLog,v 1.25 2010/06/23 15:06:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/music-applet/ChangeLog,v 1.26 2010/12/08 16:57:23 pacho Exp $
+
+  08 Dec 2010; Pacho Ramos <pacho@gentoo.org> music-applet-2.5.1.ebuild:
+  Needs gnome-panel with bonobo support, let it work when python3 is set as
+  main interpreter.
 
   23 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   music-applet-2.5.1.ebuild:
diff --git a/gnome-extra/music-applet/Manifest b/gnome-extra/music-applet/Manifest
index 1d3ef50687df..9aaf0806d07c 100644
--- a/gnome-extra/music-applet/Manifest
+++ b/gnome-extra/music-applet/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST music-applet-2.5.1.tar.gz 430468 RMD160 32a8b3e7711d7fc669ff352bc4131ce199045788 SHA1 0b0ba604418da8e49e781de20472e457f11c13ec SHA256 1d9f5af015e74b72e6f906cc08ea03caba0cfd046d1477dd2e84e30c942a29d4
-EBUILD music-applet-2.5.1.ebuild 1368 RMD160 fe703e1bab595661266879654b83927b394ab550 SHA1 7cbb3afdff70f55c447da2a3ea73cb010734f973 SHA256 9fb4e51002fb0135bcbeefaf44742f3062b23e6c75ba57d33aac7911cf776b53
-MISC ChangeLog 4694 RMD160 44ba7c09a10001a13c4c06b29f620e99fbe22fe6 SHA1 c1b57952c9356341441ace88280286975a74b24d SHA256 5e371760747b879ee5db538ba684b5319614435f415144c9fb81913ec38d137e
+EBUILD music-applet-2.5.1.ebuild 1451 RMD160 aa45f6bdb3df81bda33b2fabc97211c7d9a73a35 SHA1 bb4c71f073e5c34a95c62622d046bb5b2f69bb2f SHA256 7014242d498d137042f0dd953c4888655f8136e40b7f8980983324c455dcda56
+MISC ChangeLog 4861 RMD160 feef41167960fc5c072d951e3a5866227eb35846 SHA1 559ef76bd5cdc1bf2fc9eeea4dcfec09e854dc72 SHA256 2b9436267d0b4efcbfb2a2d856be84660c5f4d97e25f221c905cba487bf18c2a
 MISC metadata.xml 239 RMD160 a0461891923f55c7034f2883109d613460489ef3 SHA1 aeca511f0e6c732886b06a50884c83de3c83df60 SHA256 cb07c9587f4637ec96982b5487883f7a2d3326cc2e55906e2c52ba13e0897980
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz/uPkACgkQCaWpQKGI+9R00QCdE03cpMOLWnj3CiHfo8dwKtlS
+9isAn3hlnoTuKaaTO4u6ZyjH1lbjYXgC
+=Nv89
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/music-applet/music-applet-2.5.1.ebuild b/gnome-extra/music-applet/music-applet-2.5.1.ebuild
index a764aa5ccab5..4d5f4e984b68 100644
--- a/gnome-extra/music-applet/music-applet-2.5.1.ebuild
+++ b/gnome-extra/music-applet/music-applet-2.5.1.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/music-applet/music-applet-2.5.1.ebuild,v 1.4 2010/06/23 15:06:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/music-applet/music-applet-2.5.1.ebuild,v 1.5 2010/12/08 16:57:23 pacho Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit gnome2 python eutils
 
@@ -18,7 +21,7 @@ IUSE="libnotify mpd"
 RDEPEND=">=x11-libs/gtk+-2.6
 	>=x11-libs/pango-1.6
 	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-panel-2
+	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
 	>=dev-python/gconf-python-2.14
 	>=dev-python/gnome-keyring-python-2.14
 	>=dev-python/gnome-applets-python-2.14
@@ -31,20 +34,26 @@ RDEPEND=">=x11-libs/gtk+-2.6
 DEPEND="dev-util/pkgconfig
 	dev-util/intltool"
 
-src_unpack() {
-	gnome2_src_unpack
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	gnome2_src_prepare
 
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+
+	python_convert_shebangs -r 2 .
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_mod_optimize $(python_get_sitedir)/musicapplet
+	python_mod_optimize musicapplet
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/musicapplet
+	python_mod_cleanup musicapplet
 }