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

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

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 233d80d855503f3f8fd29704097e3ba24201f95a..06c1698e366a2b7db5a4e239727bb6cdb4b01eb5 100644 (file)
--- 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/Manifest b/gnome-base/gnome-menus/Manifest
index 2f2d6083af819adb7d4ab7718eaaaa236235614f..7c6ec62896080163497e7be072b8ff167c7536cd 100644 (file)
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10-xdg-menu-gnome 115 RMD160 3e235da94ec1e7f97be144358f105d24ca8144e8 SHA1 f4d0e6dff08acd5b06531973f1f68b5f4a640240 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b
 AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 RMD160 302201bbc2a9b4d6a673904d11ce60390268b4b5 SHA1 58880f2807bc6a11a724a15c4f626f7385e650be SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8
 DIST gnome-menus-2.20.3.tar.bz2 446966 RMD160 eb1ff84b161d8354b1ee30364cefec91a43ff57d SHA1 25c8161f1bb4ecd4a868cbf1b59edcfb06adaa51 SHA256 2ce7a6aabed338ca3f65685e7e46149cdacc80fab0a8701c2d827fcb950a9897
@@ -8,17 +5,10 @@ DIST gnome-menus-2.24.2.tar.bz2 453261 RMD160 f377b2ea6f94a4ecd159e0a095c8a0ea31
 DIST gnome-menus-2.26.2.tar.bz2 438945 RMD160 a3b526d908448c52737edecb8f83c6c99e0d72e9 SHA1 ab914a083ef63bacd960349b3dee3dbd3a005a82 SHA256 c9709695819ffaea92d41647adef8c0a6a408aa9a725e4b2987273bb06115a1c
 DIST gnome-menus-2.28.0.1.tar.bz2 461356 RMD160 9d74e64375c4c14c347dbbbe010035ccb3a7b5b0 SHA1 af3469cc2ffd41aad3e3931176e17e9c91e94a29 SHA256 75e73554cd0b0a8356956e76ccb517def5382eafa7bdb14336499cd271570dbc
 DIST gnome-menus-2.30.2.tar.bz2 464086 RMD160 cbc2f5aaf529e385c835de84d6284803280494a9 SHA1 edbc9b9fc4e86f5cc772011ea768ba9487625d67 SHA256 3cfb41586cda5892aea929ff9b327cbabc37a15971fdc6c6d4334d2488bb3233
-EBUILD gnome-menus-2.20.3.ebuild 1483 RMD160 08b88755ce455ff66d87032eb04f7bbe024af6b1 SHA1 bf09bad4d3e913fe65146d2c09592910e02d936a SHA256 e86d99cf81b0b31e9bd05baf662104fdf4b89dc7cddd9675468e44c59c0f0c90
-EBUILD gnome-menus-2.24.2.ebuild 1531 RMD160 73d211c4e9f9f723b424ffdee9c05842e31ad99c SHA1 d1d09a742d5f5c583007f46db8f4d0e7213b9f74 SHA256 5e20e5b98f98ff4921d4ddfdfea0d5c40aebcd33cf529265ae4a0d5f18816de2
-EBUILD gnome-menus-2.26.2.ebuild 2096 RMD160 95b0248bcae453cf224ac5dec885282b277352af SHA1 677af8cf788e6ad8a150430eb0652faa09abb8cf SHA256 19cb6f0d9d462f941ca02425ad33ad434c3cbc00d66fd22a76295bcd07658c8b
-EBUILD gnome-menus-2.28.0.1.ebuild 2174 RMD160 0125f93a59adf5b83e2813c1bf74a6ba911ccef7 SHA1 573c79f125e043db6aedb616b60a57c1b211c994 SHA256 5aa084979c93feef9acf15f350d52f0e65e353b0f61ee6f8284052a291e4cb37
-EBUILD gnome-menus-2.30.2.ebuild 2361 RMD160 348cf48cc1a1b0905414b3a63caf4bb5a0d51f6c SHA1 52885bc1b0280c232760ee81166f8539fb82d053 SHA256 5730d990b8424f2b049feaf3417e921e007ffcc914faee32765ebaebceef10c2
-MISC ChangeLog 18911 RMD160 ec42231d47956a9af1de5602ad5abf4cc790f4f6 SHA1 49d9592149b2328dd4a86fdbb8c0f454c38c994c SHA256 cc4a7ac12041b86a34d2e751db982543383a025d67a22656d534df2eab604e50
+EBUILD gnome-menus-2.20.3.ebuild 1417 RMD160 32cb3a0b3bdf6a4bfeab7144ac7e67e29300fa00 SHA1 5f4c51957bb79500bad2b73e5db4cfef2995cda9 SHA256 db4c0fa16fa8d1f27f46adff62128a3c725f835174bc272f5cf3cd2d69ea8b6b
+EBUILD gnome-menus-2.24.2.ebuild 1474 RMD160 d7433377abdde9a72ed62d393ae080f499c5f19c SHA1 0e404c844c19c7d81b8ffa561ab7a68fa5942722 SHA256 02968c54ee9f76b6fa9519c9aadb7ec284c1fc6b24fc5d60bc47a4e0f2122f71
+EBUILD gnome-menus-2.26.2.ebuild 2091 RMD160 2402e0bde5e783b6d5e59ceb0d038b7d81338925 SHA1 f9fe365396d34120a6012d50c8ef80d7c6dd4c0e SHA256 074b4f5e308e168daa8770f1921dabbb3fe0962b4eca7ce4c7a5e96db60bfcff
+EBUILD gnome-menus-2.28.0.1.ebuild 2166 RMD160 3d9cde1976d0b5ef0b4639d10afffc50c9cfbf2f SHA1 c94b12a948aeadb181bffbaefca6553086019959 SHA256 2b96f07c8733e24f52d557d193d2e0c76a6dabb3afa6c460e65c7b1692c8de20
+EBUILD gnome-menus-2.30.2.ebuild 2354 RMD160 39d06952d50d4f10e3f8bbd11512024efcd87a23 SHA1 f09a9edb9c850c8035ed7ab8c1b434c1b4d928b1 SHA256 bb6d17fa3bdc6dd09c95a4120b2256d3c347f58c20d03a4307ebb94648f48128
+MISC ChangeLog 19212 RMD160 1852b76c23d7b28d8ffe618da4e24d945207fd9c SHA1 e85a47a3776ee4906461735b9177d1ac7c6c62e5 SHA256 40cdf7d55a3aac74059c9ec0d4e6948e16e5ef0b10ac9e5e2312a8f9d1a1268e
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwgs+cACgkQCaWpQKGI+9S/bgCfexTzXTbIeEMSCBO10S4w3p3F
-Y1gAn2TqPgshqptqhPl1Ceox7Gr94V7B
-=bNGj
------END PGP SIGNATURE-----

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 a0601b070d813cd6f3d5ca52fb8e5a7baefb3ebb..4f9ba5c9b1a3559a85b29f1da20765b0d30f46ee 100644 (file)
--- 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 0496f71ac81df1c4db984226479be706fe135a93..1a4914d237f6f71a83f431f4a3a7373b45e22650 100644 (file)
--- 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 9dd728210cf6abd38c156de4db9ed8f739abcfbc..e32048b30113996bfca4f7e556eeb494d58bf0ed 100644 (file)
--- 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 061a4c3ceb4b5b0167ee0a92263b12f2ddade1ef..1c2a7cac75ebacda86ec6bce75e85077b13ad09d 100644 (file)
--- 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 71b9ec88b1828b4627dcfe92514586ccac7ab886..740c5053acf4d0720ede31ea5b6ed32f69dea532 100644 (file)
--- 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
 }