--- branches/magellan-next/include/kde4.sminc 2010/09/29 10:38:34 7127 +++ trunk/include/kde4.sminc 2012/05/15 13:12:16 12279 @@ -18,7 +18,7 @@ export KDEDIRS=${KDEDIR} # some sane default values -: ${PCATEGORIE="kde-base"} +: ${PCAT="kde-base"} : ${SRCFILE="${PNAME/4/}-${PVER}.tar.bz2"} : ${SRCDIR="${BUILDDIR}/${PNAME/4/}-${PVER}"} : ${DESCRIPTION="${PNAME}"} @@ -27,28 +27,36 @@ DEPEND="${DEPEND} >= x11-libs/libXt-1 >= x11-libs/libXinerama-1 - >= x11-libs/qt4-gui-4.5 - >= x11-libs/qt4-qt3support-4.5 - >= x11-libs/qt4-script-4.5 - >= x11-libs/qt4-sql-4.5 - >= x11-libs/qt4-svg-4.5 - >= x11-libs/qt4-test-4.5 - >= x11-libs/qt4-dbus-4.5 - >= x11-libs/qt4-opengl-4.5 - >= x11-libs/qt4-webkit-4.5" + >= x11-libs/qt4-gui-4.7 + >= x11-libs/qt4-qt3support-4.7 + >= x11-libs/qt4-script-4.7 + >= x11-libs/qt4-sql-4.7 + >= x11-libs/qt4-svg-4.7 + >= x11-libs/qt4-test-4.7 + >= x11-libs/qt4-dbus-4.7 + >= x11-libs/qt4-opengl-4.7 + >= x11-libs/qt4-webkit-4.7 + >= x11-libs/qt4-declarative-4.7" -if [[ ${PNAME} != phonon ]] +if [[ ${PNAME} != phonon ]] && [[ ${PNAME} != phonon-backend-* ]] then DEPEND="${DEPEND} - >= virtual/phonon" + >= virtual/phonon + >= virtual/phonon-backend" fi SDEPEND="${SDEPEND} - >= dev-util/cmake-2.4.7 - >= dev-util/pkgconfig-0.20 + >= dev-util/cmake-2.8.5 + >= dev-util/pkgconfig-0.25 >= x11-proto/xf86vidmodeproto-2 >= x11-proto/xineramaproto-1" +if [[ ${PNAME} != automoc4 ]] +then + SDEPEND="${SDEPEND} + >= kde-base/automoc4-0.9.88" +fi + # small hack to fix kdemirrors [[ ${KDE_MIRROR_UNSTABLE} = 1 ]] && KDE_MIRRORS=$(echo ${KDE_MIRRORS} | sed "s:/stable:/unstable:g")