diff options
| author |   Joe Sapp <nixphoeni@gentoo.org> | 2006-05-26 04:14:58 +0000 |
|---|---|---|
| committer | Joe Sapp <nixphoeni@gentoo.org> | 2006-05-26 04:14:58 +0000 |
| commit | b05611064f91b175a015fd91fcd0f277d8957818 (patch) | |
| tree | 7037f8c1416224b8b5418de4026113db30f6e87b /eclass | |
| parent | KDE Meta commits for x86 stable (diff) | |
| download | gentoo-2-b05611064f91b175a015fd91fcd0f277d8957818.tar.gz gentoo-2-b05611064f91b175a015fd91fcd0f277d8957818.tar.bz2 gentoo-2-b05611064f91b175a015fd91fcd0f277d8957818.zip | |
Cleaned up the way that python module compilation is handled and resolved bug 126890
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gdesklets.eclass | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/eclass/gdesklets.eclass b/eclass/gdesklets.eclass index 1eac941b7473..bd0a12565c89 100644 --- a/eclass/gdesklets.eclass +++ b/eclass/gdesklets.eclass @@ -1,6 +1,6 @@ -# Copyright 2004 Gentoo Foundation +# Copyright 2004-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.12 2006/02/17 22:18:20 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.13 2006/05/26 04:14:58 nixphoeni Exp $ # # Authors: Joe Sapp <nixphoeni@gentoo.org> # Mike Gardiner <obz@gentoo.org> @@ -16,7 +16,7 @@ # RDEPEND: *Optional* Set if the desklet requires a minimum version # of gDesklets greater than 0.34 or other packages. -inherit eutils multilib +inherit eutils multilib python MY_P="${DESKLET_NAME}-${PV}" @@ -35,6 +35,12 @@ gdesklets_src_install() { debug-print-function $FUNCNAME $* + # Disable compilation of included python modules (Controls) + python_disable_pyc + + # Do not remove - see bugs 126890 and 128289 + addwrite "${ROOT}/root/.gnome2" + has_version ">=gnome-extra/gdesklets-core-0.33.1" || \ GDESKLETS_INST_DIR="/usr/share/gdesklets" @@ -158,7 +164,7 @@ gdesklets_src_install() { for CTRL in ${CONTROL_INITS[@]}; do cd `dirname ${CTRL}` - CTRL_NAME=$( PYTHON_DONTCOMPILE=1 ${GDESKLETS_INST_DIR}/gdesklets-control-getid `pwd` ) + CTRL_NAME=$( ${GDESKLETS_INST_DIR}/gdesklets-control-getid `pwd` ) einfo "Installing Control ${CTRL_NAME}" # This creates the subdirectory of ${CTRL_NAME} # in the global Controls directory |