Magellan Linux

Diff of /trunk/include/kde4.sminc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 15565 by niro, Fri Jan 4 09:40:45 2013 UTC revision 15828 by niro, Thu Jan 10 12:24:26 2013 UTC
# Line 50  then Line 50  then
50   >= x11-libs/qt4-declarative-4.7"   >= x11-libs/qt4-declarative-4.7"
51  fi  fi
52    
53  if [[ ${PNAME} != phonon ]] && [[ ${PNAME} != phonon-backend-* ]]  if [[ ${PNAME} != phonon ]] && [[ ${PNAME} != phonon-backend-* ]] && [[ ${PNAME} != oxygen-icons ]]
54  then  then
55   DEPEND="${DEPEND}   DEPEND="${DEPEND}
56   >= virtual/phonon   >= virtual/phonon
# Line 156  kde4_src_install() Line 156  kde4_src_install()
156   rm -r ${BINDIR}/${KDEDIR}/share/dbus-1 || die   rm -r ${BINDIR}/${KDEDIR}/share/dbus-1 || die
157   fi   fi
158   fi   fi
159     # or if KDECONFDIR != /etc
160     if [[ ${KDECONFDIR} != /etc ]]
161     then
162     if [[ -d ${BINDIR}/${KDECONFDIR}/dbus-1 ]]
163     then
164     echo -e "${COLYELLOW}Warning: using dbus hotfix, dbus locations should be fixed!${COLDEFAULT}"
165     minstalldir /etc || die
166     cp -R ${BINDIR}/${KDECONFDIR}/dbus-1 ${BINDIR}/etc/ || die
167     rm -r ${BINDIR}/${KDECONFDIR}/dbus-1 || die
168     fi
169     fi
170    
171   cd ${SRCDIR}   cd ${SRCDIR}
172   local i   local i

Legend:
Removed from v.15565  
changed lines
  Added in v.15828