diff options
| author | Jonathan Callen <abcd@gentoo.org> | 2009-09-15 16:27:13 -0400 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-09-15 16:27:13 -0400 |
| commit | cb1d883a71bd032324ea1d201bfd07669b1e187c (patch) | |
| tree | 0817a58b32ca67ae7647abb908a0c54fd4946586 /eclass/kde4-functions.eclass | |
| parent | 9d71ba52df7d6d483cfad68789e71c79e4a0dddf (diff) | |
| download | kde-cb1d883a71bd032324ea1d201bfd07669b1e187c.tar.gz kde-cb1d883a71bd032324ea1d201bfd07669b1e187c.tar.bz2 kde-cb1d883a71bd032324ea1d201bfd07669b1e187c.zip | |
[eclass] Drop calls to kbuildsycoca4, no longer required
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 1417509bddc..d02292f352f 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -84,26 +84,7 @@ buildsycoca() { eend $? fi - if [[ -z ${EROOT%%/} && -x "${KDEDIR}"/bin/kbuildsycoca4 ]]; then - # Make sure tha cache file exists, writable by root and readable by - # others. Otherwise kbuildsycoca4 will fail. - touch "${KDEDIR}/share/kde4/services/ksycoca4" - chmod 644 "${KDEDIR}/share/kde4/services/ksycoca4" - - # We have to unset DISPLAY and DBUS_SESSION_BUS_ADDRESS, the ones - # in the user's environment (through su [without '-']) may cause - # kbuildsycoca4 to hang. - - ebegin "Running kbuildsycoca4 to build global database" - # This is needed because we support multiple kde versions installed together. - # Lookup in order - local, KDEDIR, /usr, do not duplicate entries btw. - local KDEDIRS="${EROOT}usr/share" - [[ ${KDEDIR} != "${EROOT}usr" ]] && KDEDIRS="${KDEDIR}/share:${KDEDIRS}" - XDG_DATA_DIRS="${EROOT}usr/local/share:${KDEDIRS}" \ - DISPLAY="" DBUS_SESSION_BUS_ADDRESS="" \ - "${KDEDIR}"/bin/kbuildsycoca4 --global --noincremental &> /dev/null - eend $? - fi + # We no longer need to run kbuildsycoca4, as kded does that automatically, as needed # fix permission for some directories for x in share/{config,kde4}; do |