python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.

Package-Manager: portage-2.1.5.2

19 files changed, 70 insertions, 54 deletions

diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog
index c4cbdda47bd1..9edb213cc435 100644
--- a/gnome-extra/at-spi/ChangeLog
+++ b/gnome-extra/at-spi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/at-spi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.165 2008/04/10 21:51:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.166 2008/05/29 17:01:51 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> at-spi-1.22.0.ebuild,
+  at-spi-1.22.1.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
 
 *at-spi-1.22.1 (10 Apr 2008)
 
diff --git a/gnome-extra/at-spi/at-spi-1.22.0.ebuild b/gnome-extra/at-spi/at-spi-1.22.0.ebuild
index bd2c1c983979..ff4602ec59d7 100644
--- a/gnome-extra/at-spi/at-spi-1.22.0.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.22.0.ebuild,v 1.2 2008/04/10 21:51:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.22.0.ebuild,v 1.3 2008/05/29 17:01:51 hawking Exp $
 
 inherit virtualx autotools eutils gnome2 python
 
@@ -61,11 +61,10 @@ src_test() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_version
-	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/pyatspi
 }
diff --git a/gnome-extra/at-spi/at-spi-1.22.1.ebuild b/gnome-extra/at-spi/at-spi-1.22.1.ebuild
index 7a576ecf5368..5e0aabaed3da 100644
--- a/gnome-extra/at-spi/at-spi-1.22.1.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.22.1.ebuild,v 1.1 2008/04/10 21:51:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.22.1.ebuild,v 1.2 2008/05/29 17:01:51 hawking Exp $
 
 inherit autotools eutils gnome2 python virtualx
 
@@ -61,11 +61,10 @@ src_test() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_version
-	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/pyatspi
 }
diff --git a/gnome-extra/avant-window-navigator/ChangeLog b/gnome-extra/avant-window-navigator/ChangeLog
index ddc932f6613b..e4a588bd4b97 100644
--- a/gnome-extra/avant-window-navigator/ChangeLog
+++ b/gnome-extra/avant-window-navigator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/avant-window-navigator
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/ChangeLog,v 1.10 2008/05/18 21:14:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/ChangeLog,v 1.11 2008/05/29 17:03:11 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org>
+  avant-window-navigator-0.2.1-r1.ebuild,
+  avant-window-navigator-0.2.6-r1.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
 
   18 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
   avant-window-navigator-0.2.6-r1.ebuild:
diff --git a/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.1-r1.ebuild b/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.1-r1.ebuild
index 51525cc3d927..5f29f43dc2a6 100644
--- a/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.1-r1.ebuild
+++ b/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.1-r1.ebuild,v 1.3 2008/02/18 00:39:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.1-r1.ebuild,v 1.4 2008/05/29 17:03:11 hawking Exp $
 
 inherit gnome2 python
 
@@ -35,6 +35,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/awn
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/awn
 }
diff --git a/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild b/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild
index 4313bbcfc36a..4ef89d4f0292 100644
--- a/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild
+++ b/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild,v 1.6 2008/05/18 21:14:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild,v 1.7 2008/05/29 17:03:11 hawking Exp $
 
 inherit autotools gnome2 python
 
@@ -74,11 +74,10 @@ src_compile() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_version
-	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/awn
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/awn
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/awn
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/awn
 }
diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 7b933d17417d..0fa48308750e 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.83 2008/04/09 21:09:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.84 2008/05/29 17:04:56 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org>
+  deskbar-applet-2.22.1.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
 
 *deskbar-applet-2.22.1 (09 Apr 2008)
 
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild
index 9213f2ca4611..812a57998ed8 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild,v 1.1 2008/04/09 21:09:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild,v 1.2 2008/05/29 17:04:56 hawking Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -56,8 +56,8 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 
 	python_version
-	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/deskbar
-	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/deskbar
+	python_mod_optimize /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
 
 	ebeep 5
 	ewarn "The dictionary plugin in deskbar-applet uses the dictionary from "
@@ -68,7 +68,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/deskbar
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/deskbar
 	python_mod_cleanup /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
 }
diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 813db3a82a9f..8d379ee89f16 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.234 2008/04/11 15:53:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.235 2008/05/29 17:08:09 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> gnome-games-2.22.0.ebuild,
+  gnome-games-2.22.1.ebuild, gnome-games-2.22.1.1.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
 
 *gnome-games-2.22.1.1 (11 Apr 2008)
 
diff --git a/gnome-extra/gnome-games/gnome-games-2.22.0.ebuild b/gnome-extra/gnome-games/gnome-games-2.22.0.ebuild
index 0fafc09980a7..fb85cc13e036 100644
--- a/gnome-extra/gnome-games/gnome-games-2.22.0.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.22.0.ebuild,v 1.1 2008/03/27 23:49:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.22.0.ebuild,v 1.2 2008/05/29 17:08:09 hawking Exp $
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -117,11 +117,10 @@ pkg_postinst() {
 	games_pkg_postinst
 	gnome2_pkg_postinst
 	python_version
-	python_mod_optimize "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
 }
diff --git a/gnome-extra/gnome-games/gnome-games-2.22.1.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.22.1.1.ebuild
index 57d48b4ef7b7..dba12bd612ed 100644
--- a/gnome-extra/gnome-games/gnome-games-2.22.1.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.22.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.22.1.1.ebuild,v 1.1 2008/04/11 15:53:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.22.1.1.ebuild,v 1.2 2008/05/29 17:08:09 hawking Exp $
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -117,11 +117,10 @@ pkg_postinst() {
 	games_pkg_postinst
 	gnome2_pkg_postinst
 	python_version
-	python_mod_optimize "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
 }
diff --git a/gnome-extra/gnome-games/gnome-games-2.22.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.22.1.ebuild
index 07c90a815b4b..8eb0a6121c38 100644
--- a/gnome-extra/gnome-games/gnome-games-2.22.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.22.1.ebuild,v 1.1 2008/04/07 12:03:57 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.22.1.ebuild,v 1.2 2008/05/29 17:08:09 hawking Exp $
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -117,11 +117,10 @@ pkg_postinst() {
 	games_pkg_postinst
 	gnome2_pkg_postinst
 	python_version
-	python_mod_optimize "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
 }
diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 49e62a1ae913..28cc65c0f7ee 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.116 2008/03/22 11:12:32 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.117 2008/05/29 17:10:11 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> libgsf-1.14.3.ebuild,
+  libgsf-1.14.7.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
 
   22 Mar 2008; Rémi Cardona <remi@gentoo.org> libgsf-1.14.3.ebuild,
   libgsf-1.14.7.ebuild:
diff --git a/gnome-extra/libgsf/libgsf-1.14.3.ebuild b/gnome-extra/libgsf/libgsf-1.14.3.ebuild
index 72bf83938f8b..c7b51b7df61e 100644
--- a/gnome-extra/libgsf/libgsf-1.14.3.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.3.ebuild,v 1.12 2008/03/22 11:12:32 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.3.ebuild,v 1.13 2008/05/29 17:10:11 hawking Exp $
 
 inherit eutils gnome2 python multilib
 
@@ -50,7 +50,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	use python && python_mod_optimize "${ROOT}"usr/$(get_libdir)/python*/site-packages/gsf
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gsf
+	fi
 
 	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.1
 	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-gnome-1.so.1
@@ -60,5 +63,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	use python && python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python*/site-packages/gsf
+	use python && python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
 }
diff --git a/gnome-extra/libgsf/libgsf-1.14.7.ebuild b/gnome-extra/libgsf/libgsf-1.14.7.ebuild
index 5dbc00bfb688..945328f9f7f8 100644
--- a/gnome-extra/libgsf/libgsf-1.14.7.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.7.ebuild,v 1.11 2008/04/20 02:10:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.7.ebuild,v 1.12 2008/05/29 17:10:11 hawking Exp $
 
 inherit eutils gnome2 python multilib
 
@@ -71,7 +71,6 @@ pkg_postinst() {
 pkg_postrm() {
 	gnome2_pkg_postrm
 	if use python; then
-		python_version
-		python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/gsf
+		python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
 	fi
 }
diff --git a/gnome-extra/music-applet/ChangeLog b/gnome-extra/music-applet/ChangeLog
index e1ab4007565a..be498ec66e35 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/music-applet/ChangeLog,v 1.13 2008/04/17 20:37:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/music-applet/ChangeLog,v 1.14 2008/05/29 17:11:44 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> music-applet-2.3.0.ebuild,
+  music-applet-2.3.0-r1.ebuild, music-applet-2.3.1.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
 
 *music-applet-2.3.1 (17 Apr 2008)
 
diff --git a/gnome-extra/music-applet/music-applet-2.3.0-r1.ebuild b/gnome-extra/music-applet/music-applet-2.3.0-r1.ebuild
index 5ecf53c83c07..4341f173d8ba 100644
--- a/gnome-extra/music-applet/music-applet-2.3.0-r1.ebuild
+++ b/gnome-extra/music-applet/music-applet-2.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.3.0-r1.ebuild,v 1.1 2008/04/09 04:12:57 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/music-applet/music-applet-2.3.0-r1.ebuild,v 1.2 2008/05/29 17:11:44 hawking Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -50,6 +50,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/musicapplet
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/musicapplet
 }
diff --git a/gnome-extra/music-applet/music-applet-2.3.0.ebuild b/gnome-extra/music-applet/music-applet-2.3.0.ebuild
index f1ab16ec1691..fab310b816f6 100644
--- a/gnome-extra/music-applet/music-applet-2.3.0.ebuild
+++ b/gnome-extra/music-applet/music-applet-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.3.0.ebuild,v 1.2 2008/04/02 08:00:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/music-applet/music-applet-2.3.0.ebuild,v 1.3 2008/05/29 17:11:44 hawking Exp $
 
 inherit gnome2 python
 
@@ -44,6 +44,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/musicapplet
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/musicapplet
 }
diff --git a/gnome-extra/music-applet/music-applet-2.3.1.ebuild b/gnome-extra/music-applet/music-applet-2.3.1.ebuild
index cbe5d0c0d161..1018514a8cf8 100644
--- a/gnome-extra/music-applet/music-applet-2.3.1.ebuild
+++ b/gnome-extra/music-applet/music-applet-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.3.1.ebuild,v 1.1 2008/04/17 20:37:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/music-applet/music-applet-2.3.1.ebuild,v 1.2 2008/05/29 17:11:44 hawking Exp $
 
 inherit gnome2 python eutils autotools
 
@@ -39,11 +39,10 @@ src_unpack() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_version
-	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/musicapplet
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/musicapplet
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/musicapplet
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/musicapplet
 }