--- trunk/include/kde4.sminc	2012/10/29 09:08:25	13883
+++ trunk/include/kde4.sminc	2014/11/11 11:02:38	23332
@@ -1,12 +1,12 @@
 # $Id$
 
-sminclude mtools cmake qt4
+sminclude mtools cmake qt4 dbus
+msetfeature "!check" # no check target in Makefile
 
 ## some global vars ##
 export KDEDIR=/usr
 export KDECONFDIR=/etc/kde4
 export QT_PLUGIN_PATH=${KDEDIR}/$(mlibdir)/kde4/plugins
-export DBUS_SYSTEM_DIR=/usr/share/dbus-1
 
 # fixes some compile issues ala "kde-config: command not found"
 export PATH="${KDEDIR}/bin:${PATH}"
@@ -19,46 +19,54 @@
 
 # some sane default values
 : ${PCAT="kde-base"}
-if [[ ${PVER//.} -ge 483 ]]
+if [[ -z ${SRCFILE} ]]
 then
-	KDE4_TARBALL_EXTENSION="tar.xz"
-else
-	KDE4_TARBALL_EXTENSION="tar.bz2"
+	if [[ ${PVER%%.*} = 0 ]]
+	then
+		KDE4_TARBALL_EXTENSION="tar.bz2"
+	elif [[ ${PVER//.} -ge 483 ]]
+	then
+		KDE4_TARBALL_EXTENSION="tar.xz"
+	else
+		KDE4_TARBALL_EXTENSION="tar.bz2"
+	fi
 fi
 : ${SRCFILE="${PNAME/4/}-${PVER}.${KDE4_TARBALL_EXTENSION}"}
 : ${SRCDIR="${BUILDDIR}/${PNAME/4/}-${PVER}"}
 : ${DESCRIPTION="${PNAME}"}
 : ${HOMEPAGE="http://www.kde.org/"}
 
-if [[ ${PNAME} != oxygen-icons ]]
-then
-	DEPEND="${DEPEND}
-		>= x11-libs/libXt-1
-		>= x11-libs/libXinerama-1
-		>= 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"
-fi
-
-if [[ ${PNAME} != phonon ]] && [[ ${PNAME} != phonon-backend-* ]]
-then
-	DEPEND="${DEPEND}
-		>= virtual/phonon
-		>= virtual/phonon-backend"
-fi
+case ${PNAME} in
+	oxygen-icons|kde-base-artwork|kdeartwork-*) ;; # no common deps required
+	*)
+		DEPEND="${DEPEND}
+			>= x11-libs/libXt-1
+			>= x11-libs/libXinerama-1
+			>= x11-libs/qt4-gui-4.8
+			>= x11-libs/qt4-qt3support-4.8
+			>= x11-libs/qt4-script-4.8
+			>= x11-libs/qt4-sql-4.8
+			>= x11-libs/qt4-svg-4.8
+			>= x11-libs/qt4-test-4.8
+			>= x11-libs/qt4-dbus-4.8
+			>= x11-libs/qt4-opengl-4.8
+			>= x11-libs/qt4-webkit-4.8
+			>= x11-libs/qt4-declarative-4.8"
+		;;
+esac
+
+case ${PNAME} in
+	phonon|phonon-backend-*|oxygen-icons|kde-base-artwork|kdeartwork-*) ;; # no phonon deps required
+	*)
+		DEPEND="${DEPEND}
+			>= virtual/phonon
+			>= virtual/phonon-backend"
+		;;
+esac
 
 SDEPEND="${SDEPEND}
-	>= dev-util/cmake-2.8.5
-	>= dev-util/pkgconfig-0.25
-	>= x11-proto/xf86vidmodeproto-2
-	>= x11-proto/xineramaproto-1"
+	>= dev-util/cmake-2.8.12
+	>= dev-util/pkgconfig-0.25"
 
 if [[ ${PNAME} != automoc4 ]]
 then
@@ -76,6 +84,8 @@
 	mirror://${PNAME}/${SRCFILE}
 )
 
+UP2DATE="updatecmd -listonly http://download.kde.org/stable/ | grep 'stable/[0-9]' | sed -n 's:.*/\([0-9].*\)/:\1:;$ p'"
+
 # exported functions and variables for mage-file
 SPECIAL_VARS="${SPECIAL_VARS} KDEDIR"
 SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kde4_postinstall kde4_postremove"
@@ -95,8 +105,8 @@
 	# add akonadi dbus dir
 	if [[ ${PNAME/4/} = akonadi ]] || [[ ${PNAME/4/} = kdepim-runtime ]]
 	then
-		configure_opts+=" -DAKONADI_DBUS_INTERFACES_DIR=${DBUS_SYSTEM_DIR}/interfaces/"
-		configure_opts+=" -DAKONADI_DBUS_SERVICES_DIR=${DBUS_SYSTEM_DIR}/services/"
+		configure_opts+=" -DAKONADI_DBUS_INTERFACES_DIR=$(mget-dbus-interfaces-dir)"
+		configure_opts+=" -DAKONADI_DBUS_SERVICES_DIR=$(mget-dbus-session-bus-services-dir)"
 	fi
 
 	# add commandline given arguments
@@ -113,10 +123,10 @@
 		-DCMAKE_INSTALL_PREFIX=${KDEDIR} \
 		-DSYSCONF_INSTALL_DIR=${KDECONFDIR} \
 		-DLIB_INSTALL_DIR=${KDEDIR}/$(mlibdir) \
-		-DDBUS_INTERFACES_INSTALL_DIR=${DBUS_SYSTEM_DIR}/interfaces/ \
-		-DDBUS_SERVICES_INSTALL_DIR=${DBUS_SYSTEM_DIR}/services/ \
-		-DKDE4_DBUS_INTERFACES_DIR=${DBUS_SYSTEM_DIR}/interfaces/ \
-		-DKDE4_DBUS_SERVICES_DIR=${DBUS_SYSTEM_DIR}/services/ \
+		-DDBUS_INTERFACES_INSTALL_DIR=$(mget-dbus-interfaces-dir) \
+		-DDBUS_SERVICES_INSTALL_DIR=$(mget-dbus-session-bus-services-dir) \
+		-DKDE4_DBUS_INTERFACES_DIR=$(mget-dbus-interfaces-dir) \
+		-DKDE4_DBUS_SERVICES_DIR=$(mget-dbus-session-bus-services-dir) \
 		-DKDE4_ENABLE_FPIE=ON \
 		-DKDE4_BUILD_TESTS=OFF \
 		-DKDE4_ENABLE_HTMLHANDBOOK=ON \
@@ -153,6 +163,17 @@
 			rm -r ${BINDIR}/${KDEDIR}/share/dbus-1 || die
 		fi
 	fi
+	# or if KDECONFDIR != /etc
+	if [[ ${KDECONFDIR} != /etc ]]
+	then
+		if [[ -d ${BINDIR}/${KDECONFDIR}/dbus-1 ]]
+		then
+			echo -e "${COLYELLOW}Warning: using dbus hotfix, dbus locations should be fixed!${COLDEFAULT}"
+			minstalldir /etc || die
+			cp -R ${BINDIR}/${KDECONFDIR}/dbus-1 ${BINDIR}/etc/ || die
+			rm -r ${BINDIR}/${KDECONFDIR}/dbus-1 || die
+		fi
+	fi
 
 	cd ${SRCDIR}
 	local i