--- gnome-menus-2.20.3.ebuild
+++ gnome-menus-2.20.3.ebuild
@@ -1,8 +1,8 @@
-# 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/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild,v 1.11 2009/05/10 18:43:15 eva Exp $
 
-inherit eutils gnome2 python multilib linux-info
+inherit eutils gnome2 python linux-info
 
 DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
 HOMEPAGE="http://www.gnome.org"
@@ -50,14 +50,13 @@
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/GMenuSimpleEditor
+		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
 	fi
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
 	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/GMenuSimpleEditor
+		python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
 	fi
 }
--- gnome-menus-2.24.2.ebuild
+++ gnome-menus-2.24.2.ebuild
@@ -1,4 +1,4 @@
-# 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/gnome-base/gnome-menus/gnome-menus-2.24.2.ebuild,v 1.8 2009/04/27 14:04:51 jer Exp $
 
@@ -47,14 +47,13 @@
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/GMenuSimpleEditor
+		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
 	fi
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
 	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/GMenuSimpleEditor
+		python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
 	fi
 }
--- gnome-menus-2.26.2.ebuild
+++ gnome-menus-2.26.2.ebuild
@@ -58,7 +58,6 @@
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then
-		python_version
 		python_need_rebuild
 		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
 	fi
@@ -71,5 +70,7 @@
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/GMenuSimpleEditor
+	if use python; then
+		python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
+	fi
 }
--- gnome-menus-2.28.0.1.ebuild
+++ gnome-menus-2.28.0.1.ebuild
@@ -60,7 +60,6 @@
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then
-		python_version
 		python_need_rebuild
 		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
 	fi
@@ -73,5 +72,7 @@
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/GMenuSimpleEditor
+	if use python; then
+		python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
+	fi
 }
--- gnome-menus-2.30.0.ebuild
+++ gnome-menus-2.30.0.ebuild
@@ -68,7 +68,6 @@
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then
-		python_version
 		python_need_rebuild
 		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
 	fi
@@ -81,5 +80,7 @@
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/GMenuSimpleEditor
+	if use python; then
+		python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
+	fi
 }