Let it work when python3 is set as default interpreter.

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

4 files changed, 27 insertions, 17 deletions

diff --git a/gnome-extra/panflute/ChangeLog b/gnome-extra/panflute/ChangeLog
index 94aecc0a76c4..1e1bf6cc4f6f 100644
--- a/gnome-extra/panflute/ChangeLog
+++ b/gnome-extra/panflute/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/panflute
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/ChangeLog,v 1.1 2010/09/18 21:17:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/ChangeLog,v 1.2 2010/12/08 17:44:31 pacho Exp $
+
+  08 Dec 2010; Pacho Ramos <pacho@gentoo.org> panflute-0.6.2.ebuild:
+  Let it work when python3 is set as default interpreter.
 
 *panflute-0.6.2 (18 Sep 2010)
 
diff --git a/gnome-extra/panflute/Manifest b/gnome-extra/panflute/Manifest
index 91c124ce9895..9913e99d3d6f 100644
--- a/gnome-extra/panflute/Manifest
+++ b/gnome-extra/panflute/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST panflute-0.6.2.tar.gz 229268 RMD160 6b068d6abe3880d89f5c3471a6fc7aafcd09b453 SHA1 ca550405a5d2450260b764a576d60cf08328b716 SHA256 b38869e27bb22f9c3ea3d41f7c9cb3626fec49eac176410a5aa27bea9745617f
-EBUILD panflute-0.6.2.ebuild 1525 RMD160 6a995587a35fedab0e628e31aaa374835c747118 SHA1 e7c5d4ee313c041403fa5e82b05f8f7c580312cb SHA256 67291eb5922d7b2ebdeca237780370a8e8f6edfb7698dd7cd2e4a186cabd05d6
-MISC ChangeLog 397 RMD160 17611288b11d47d29869dc8de83d9df882f5c97c SHA1 f112e6b68172844820c25871e03f77b8be6eaf2c SHA256 f575301988eb48aada39fcd8813af189b2fa59db464c5983586609467af2f923
+EBUILD panflute-0.6.2.ebuild 1578 RMD160 7e65cacfc419128fb654b76b006927de7d571df9 SHA1 3960cfb4ffd03602508f34fe11cf32d0a4695016 SHA256 c3ea5adb963e2c1ddaa297549c24d1f1b02bf247887d636982587b2e80d8f6ee
+MISC ChangeLog 527 RMD160 b441536db9e59afa07374851e2547c4782051834 SHA1 1a66323b0bc436e7c38a24603b6c3d38c2c1f067 SHA256 30f4e4e62d92d2424114d1401d970d942d82ce1531ba494ff717d419abf23927
 MISC metadata.xml 239 RMD160 a0461891923f55c7034f2883109d613460489ef3 SHA1 aeca511f0e6c732886b06a50884c83de3c83df60 SHA256 cb07c9587f4637ec96982b5487883f7a2d3326cc2e55906e2c52ba13e0897980
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEUEARECAAYFAkyVLHEACgkQ1fmVwcYIWAZOmACgwMzjv8t9xBkfbzIw5ImaA40x
-eBsAl1D6OkUvOOpYXDQq85qZW9MU1ZY=
-=ZHHJ
+iEYEARECAAYFAkz/xAQACgkQCaWpQKGI+9Qe8QCePe0DA+caf7esdMbiv9yCdXdI
+M6QAnA6MrCEU8o/JYFCg3wwFdwNfUeLB
+=ia8m
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/panflute/panflute-0.6.2.ebuild b/gnome-extra/panflute/panflute-0.6.2.ebuild
index 872553f5fc49..9f17bc821e3a 100644
--- a/gnome-extra/panflute/panflute-0.6.2.ebuild
+++ b/gnome-extra/panflute/panflute-0.6.2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/panflute-0.6.2.ebuild,v 1.1 2010/09/18 21:17:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/panflute-0.6.2.ebuild,v 1.2 2010/12/08 17:44:31 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
 
 inherit gnome2 python eutils versionator
 
@@ -39,7 +41,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 "
 
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README THANKS"
+	python_set_active_version 2
+}
 
 src_prepare() {
 	gnome2_src_prepare
@@ -47,14 +52,16 @@ 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)/panflute
+	python_mod_optimize panflute
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/panflute
+	python_mod_cleanup panflute
 }
diff --git a/gnome-extra/quick-lounge-applet/Manifest b/gnome-extra/quick-lounge-applet/Manifest
index 1b0c51c0b791..6f5153e5fbe3 100644
--- a/gnome-extra/quick-lounge-applet/Manifest
+++ b/gnome-extra/quick-lounge-applet/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX quick-lounge-applet-2.14.0-fix-make-3.82.patch 681 RMD160 40fdd0569f4a123f88d485eb7b32da144978bf8e SHA1 4a58349a4330264136d993274baf3a6456afcbbe SHA256 df994e180c7d77a1edbfaac88747b5afe05cfdeeb5fef42985f58e1d73ed6db5
 DIST quick-lounge-applet-2.14.0.tar.bz2 396628 RMD160 f0e987cc3d15423294d6106b012215e4c40cd67f SHA1 fe9b79ba9c14f4b79d5ddaf92ac55e00770f9f62 SHA256 44fa9f1a80316b8ccc4835bc3ad9b9ab6185ae2cc48c418a17926758e1bb67f8
 DIST quick-lounge-applet-2.14.1.tar.bz2 411560 RMD160 093e854c58ad0ed9d03712d9ce305d66987e0cbc SHA1 f2b7f51cf2ecd8e63ae435cf63e9f2db596f9d40 SHA256 852d7027e688228a0d2052cd6181d633e573cd799f8fc9526ea09eab6d743812
-EBUILD quick-lounge-applet-2.14.0.ebuild 1031 RMD160 ac86f9cd339681b7659a0e7d95894a57e9e20197 SHA1 26a908886270893580a17999df25e2d75804b25e SHA256 acad29cbe8c017cef2ebae1f031dd75c84de8b0c86c2e9af1de79742632ab8eb
-EBUILD quick-lounge-applet-2.14.1.ebuild 781 RMD160 bb2c185688a747718e8d8af1ebb8603660477cb0 SHA1 f62523ae9005f9537e09c0d73c861ef7ddc39ec5 SHA256 42f6660ee273665d8cd962b6ea843527445bbf7f048384d7affc73db07676353
-MISC ChangeLog 5592 RMD160 04bf361f62c6a0517a5d057c8e5586b3e956c998 SHA1 6b8246c620e6f2c7bb739a278eca9282d7f94cc6 SHA256 d1192f758895c39db8035155b92ed41258de7f1cf1319ebd70d62796acdbf5e5
+EBUILD quick-lounge-applet-2.14.0.ebuild 1069 RMD160 0336c8f804a003679bc07c28bdf25c30ed4effe1 SHA1 9e4bd6ead80301ddec5adace664dbf70519a37e2 SHA256 ad3c1afe9c6cddfe8efa6ea09230ddb084acea61e1a98f6e02febd7c4da7ea6d
+EBUILD quick-lounge-applet-2.14.1.ebuild 819 RMD160 4fe04514e9203787feefe6110f0a2dc9f147a075 SHA1 5e4bf3759596d544264cac61a8c76785de9858e3 SHA256 e0784158938ad24789d98d28bec00345b9bba81d3d8960ae44553f4e21db9ae9
+MISC ChangeLog 5752 RMD160 572ef9620b4aff2e07d6fad0635696bdd14d9c7d SHA1 8c65ddaf08d8fe53ffd7e609083a632210294b1f SHA256 4d88e7f32345229952d0c80a846c87be392449461e3c4dfe707f6d1b765b432d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkz0FpEACgkQCaWpQKGI+9R0SACeMbbLT77yliYUbEYXbfkvEyng
-48sAn3DF6eJOAf5v6hMCBvYUF634QnoM
-=3O6A
+iEYEARECAAYFAkz/xLgACgkQCaWpQKGI+9QauACeJQMyUhp7lbIQQVvivRqVR47Y
+Q1UAn1JSNrFGmGCPEyZ3JvOKs6PBvmd2
+=F4m1
 -----END PGP SIGNATURE-----