Delete deprecation warnings and fix usage of python_mod_cleanup (bug #313447).

(Portage version: HEAD/cvs/Linux x86_64)

6 files changed, 28 insertions, 21 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 233d80d85550..06c1698e366a 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.144 2010/06/22 13:00:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.145 2010/06/23 14:55:34 arfrever Exp $
+
+  23 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gnome-menus-2.20.3.ebuild, gnome-menus-2.24.2.ebuild,
+  gnome-menus-2.26.2.ebuild, gnome-menus-2.28.0.1.ebuild,
+  gnome-menus-2.30.2.ebuild:
+  Delete deprecation warnings and fix usage of python_mod_cleanup (bug #313447).
 
 *gnome-menus-2.30.2 (22 Jun 2010)
 
diff --git a/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild b/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild
index a0601b070d81..4f9ba5c9b1a3 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild
+++ b/gnome-base/gnome-menus/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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild,v 1.12 2010/06/23 14:55:34 arfrever 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 @@ src_unpack() {
 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
 }
diff --git a/gnome-base/gnome-menus/gnome-menus-2.24.2.ebuild b/gnome-base/gnome-menus/gnome-menus-2.24.2.ebuild
index 0496f71ac81d..1a4914d237f6 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.24.2.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.24.2.ebuild
@@ -1,6 +1,6 @@
-# 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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.24.2.ebuild,v 1.9 2010/06/23 14:55:34 arfrever Exp $
 
 inherit eutils gnome2 python
 
@@ -47,14 +47,13 @@ src_unpack() {
 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
 }
diff --git a/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild b/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild
index 9dd728210cf6..e32048b30113 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild
@@ -1,6 +1,6 @@
 # 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.26.2.ebuild,v 1.11 2010/01/17 23:56:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild,v 1.12 2010/06/23 14:55:34 arfrever Exp $
 
 inherit eutils gnome2 python
 
@@ -58,7 +58,6 @@ src_install() {
 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_postinst() {
 
 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
 }
diff --git a/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild
index 061a4c3ceb4b..1c2a7cac75eb 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild
@@ -1,6 +1,6 @@
 # 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.28.0.1.ebuild,v 1.5 2010/06/04 19:36:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild,v 1.6 2010/06/23 14:55:34 arfrever Exp $
 
 inherit eutils gnome2 python
 
@@ -60,7 +60,6 @@ src_install() {
 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_postinst() {
 
 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
 }
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.2.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.2.ebuild
index 71b9ec88b182..740c5053acf4 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.30.2.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # 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.30.2.ebuild,v 1.1 2010/06/22 13:00:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.2.ebuild,v 1.2 2010/06/23 14:55:34 arfrever Exp $
 
 EAPI="2"
 inherit eutils gnome2 python
@@ -68,7 +68,6 @@ src_install() {
 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_postinst() {
 
 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
 }