fix python eclass use, bug #207667

Package-Manager: portage-2.1.4.4

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 5c149edaef3bc1c1f52fe9d70c700e4be0197125..f367851619f024c0b91e6abfeacc539b7499fdc8 100644 (file)
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.103 2008/02/04 04:54:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.104 2008/02/17 23:34:37 eva Exp $
+
+  17 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-menus-2.20.3.ebuild:
+  fix python eclass use, bug #207667
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gnome-menus-2.20.3.ebuild:
   Stable for HPPA (bug #208366).

diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 4e630b5fbdda320060d6f6d2e138d95eaae50222..43caba748683cc8baeb78bbcf019e57a2dd61f3a 100644 (file)
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-menus-2.10.2-legacy_dirs.patch 669 RMD160 970a32433d6311cddd4f1339c3001e23076eb3d6 SHA1 8a9235c02e888df4e450e7deb90934fc9f3b7aba SHA256 791869ce91b9403f9479ac3f1bbdc616cd09b3c529c25c4e48be599f4b7c1d05
 AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 RMD160 302201bbc2a9b4d6a673904d11ce60390268b4b5 SHA1 58880f2807bc6a11a724a15c4f626f7385e650be SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8
 AUX gnome-menus-2.18.3-other_category_fix.patch 869 RMD160 e10c8adc4275028335ef52023dd85a139666a350 SHA1 13c6234154de00c1fd50af2d2d55d9c9b2563027 SHA256 b225a08af45290eedcc3ad0fa63766fdc667a1016addedba74bf3dcd7c2628ee
@@ -8,6 +11,13 @@ DIST gnome-menus-2.20.3.tar.bz2 446966 RMD160 eb1ff84b161d8354b1ee30364cefec91a4
 EBUILD gnome-menus-2.18.2.ebuild 1096 RMD160 ffeb7d76d370d64bf2a936e506cad3290d3f422d SHA1 cfd47aa75907efa7d191194e7a96d70ba57be790 SHA256 218e04d69c45b30cf1394cb4f213ebd356dd9ff57b2cd9e437047ef7e708fd30
 EBUILD gnome-menus-2.18.3-r1.ebuild 1420 RMD160 2be55e9725c05624259c36ef764b15b5fa16919d SHA1 23e2d59fd0cc7ebbae3483f15bb19dfe923e3299 SHA256 992775d625590c43530b8a6434ed416debfb2c7e2496c72c675f163885a8731e
 EBUILD gnome-menus-2.20.1.ebuild 1360 RMD160 1636c1f49c9734b8fe3d2e0e54efc6d344f081cd SHA1 00d9ebfc0ea5cba4ca0df286ac190eb53c117b64 SHA256 f582d8c9aec0385e79e65ad9bde0f8f13c47b9fc0106d33e9d168487f8397043
-EBUILD gnome-menus-2.20.3.ebuild 1360 RMD160 4e30dc95fd4c0e680a945846072128fe8e2030e2 SHA1 8362a55eea760880e6b173c9366acaa7e05d55f1 SHA256 1b3741242c948ea940e1a04d9ff1e24ebe2709d6755e7de2b19b45602f8699a7
-MISC ChangeLog 13253 RMD160 a190891ba29cd0bd778a2ac0e9366f2d4b23fbff SHA1 2338c79dbef36016e62973ffa2335a8af75234c3 SHA256 420da2f8016b6edaa649b65d1b44a80e65a2f68972c661cb28188fc0876b9fbf
+EBUILD gnome-menus-2.20.3.ebuild 1560 RMD160 7129b9e30a7ba85e3c3b3d251f44ff6fa1810ea3 SHA1 30e594a19d4990158dc9d68d9460feb0817bfff3 SHA256 ab3df09a8918fbb7d43f4c1cc7343411ac93cf4e170961082415c4e1e453b6c1
+MISC ChangeLog 13374 RMD160 00ec5d944334de0f84215dcb5895484100d25d41 SHA1 a35fe434bf44c75ed85c9cc9499396dc2d6c4167 SHA256 4b317efa12d5a2c174c2ffefdbcf9a3fe5f306e0c3bfd839d166e2a28358b0bb
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHuMSa1fmVwcYIWAYRAv7vAKCR5H6bOti1r0nBZAp62pAL9PBtZgCdEobt
+cRqEquVMJhMjgT76n5LVOVU=
+=xjws
+-----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 0bce5e541449f4835e0e51bdddb45fe9d21e5b18..b9fbd59971f3a318decc67584b5fe31b94989d1f 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,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-base/gnome-menus/gnome-menus-2.20.3.ebuild,v 1.7 2008/02/04 04:54:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild,v 1.8 2008/02/17 23:34:37 eva Exp $
 
 inherit eutils gnome2 python multilib linux-info
 
@@ -30,21 +30,35 @@ pkg_setup() {
                linux-info_pkg_setup
        fi
 
-       G2CONF="$(use_enable kernel_linux inotify) $(use_enable debug) $(use_enable python)"
+       G2CONF="${G2CONF}
+               $(use_enable kernel_linux inotify)
+               $(use_enable debug)
+               $(use_enable python)"
 }
 
 src_unpack() {
        gnome2_src_unpack
+
        # Don't show KDE standalone settings desktop files in GNOME others menu
        epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
+
+       # disable pyc compiling
+       mv py-compile py-compile.orig
+       ln -s $(type -P true) py-compile
 }
 
 pkg_postinst() {
        gnome2_pkg_postinst
-       use python && python_mod_optimize "${ROOT}"usr/$(get_libdir)/python*/site-packages
+       if use python; then
+               python_version
+               python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/GMenuSimpleEditor
+       fi
 }
 
 pkg_postrm() {
        gnome2_pkg_postrm
-       use python && python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python*/site-packages
+       if use python; then
+               python_version
+               python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/GMenuSimpleEditor
+       fi
 }