--- branches/magellan-next/include/kde4.sminc 2010/09/22 18:58:22 6839 +++ branches/magellan-next/include/kde4.sminc 2010/09/24 13:19:11 6918 @@ -61,7 +61,7 @@ # exported functions and variables for mage-file SPECIAL_VARS="${SPECIAL_VARS} KDEDIR" -SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kde4_buildsycoca kde4_postinstall kde4_postremove" +SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kde4_postinstall kde4_postremove" kde4_configure() { @@ -149,45 +149,4 @@ done } -kde4_buildsycoca() -{ - if [[ -x ${KDEDIR}/bin/kbuildsycoca4 ]] && - [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]] - then - # install services dir with right permissions - install -m0755 -o root -g root -d ${MROOT}/usr/share/services - - # kbuildsycoco4 needs a dbus session, but should not use the users session. - # so we start an own session here - - # export everything the be able to kill the session - echo "Starting dbus session for kbuildsycoca4 ..." - local i - for i in $(dbus-launch) - do - export "$i" - done - - echo "Running kbuildsycoca4 to build global database ..." - XDG_DATA_DIRS="${MROOT}/usr/share:${MROOT}${KDEDIR}/share:${MROOT}/usr/local/share" - ${MROOT}${KDEDIR}/bin/kbuildsycoca4 --global --noincremental &> /dev/null - - echo "Killing dbus session for kbuildsycoca4 ..." - kill ${DBUS_SESSION_BUS_PID} - unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID - fi -} - -kde4_postinstall() -{ - # rebuild system konfiguration cache - kde4_buildsycoca -} - -kde4_postremove() -{ - # rebuild system konfiguration cache - kde4_buildsycoca -} - export_inherits kde4 src_prepare src_compile src_install postinstall postremove