summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-02-17 23:34:37 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-02-17 23:34:37 +0000
commit6218ef4025b5ac712ff5c5fe12b9e745390fa324 (patch)
treeba228ff8cdaf955a23f8fbe5d9644d7be99204b7 /gnome-base/gnome-menus
parentremove redundant metadata (diff)
downloadgentoo-2-6218ef4025b5ac712ff5c5fe12b9e745390fa324.tar.gz
gentoo-2-6218ef4025b5ac712ff5c5fe12b9e745390fa324.tar.bz2
gentoo-2-6218ef4025b5ac712ff5c5fe12b9e745390fa324.zip
fix python eclass use, bug #207667
(Portage version: 2.1.4.4)
Diffstat (limited to 'gnome-base/gnome-menus')
-rw-r--r--gnome-base/gnome-menus/ChangeLog6
-rw-r--r--gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild22
2 files changed, 23 insertions, 5 deletions
diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 5c149edaef3b..f367851619f0 100644
--- 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/gnome-menus-2.20.3.ebuild b/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild
index 0bce5e541449..b9fbd59971f3 100644
--- 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
}