--- branches/magellan-next/include/kde4.sminc	2012/01/13 19:22:05	9863
+++ trunk/include/kde4.sminc	2014/03/12 16:40:33	21142
@@ -1,6 +1,7 @@
 # $Id$
 
 sminclude mtools cmake qt4
+msetfeature "!check" # no check target in Makefile
 
 ## some global vars ##
 export KDEDIR=/usr
@@ -19,25 +20,38 @@
 
 # some sane default values
 : ${PCAT="kde-base"}
-: ${SRCFILE="${PNAME/4/}-${PVER}.tar.bz2"}
+if [[ -z ${SRCFILE} ]]
+then
+	if [[ ${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/"}
 
-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"
+if [[ ${PNAME} != oxygen-icons ]]
+then
+	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"
+fi
 
-if [[ ${PNAME} != phonon ]] && [[ ${PNAME} != phonon-backend-* ]]
+if [[ ${PNAME} != phonon ]] && [[ ${PNAME} != phonon-backend-* ]] && [[ ${PNAME} != oxygen-icons ]]
 then
 	DEPEND="${DEPEND}
 		>= virtual/phonon
@@ -45,7 +59,7 @@
 fi
 
 SDEPEND="${SDEPEND}
-	>= dev-util/cmake-2.8.5
+	>= dev-util/cmake-2.8.12
 	>= dev-util/pkgconfig-0.25
 	>= x11-proto/xf86vidmodeproto-2
 	>= x11-proto/xineramaproto-1"
@@ -66,6 +80,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"
@@ -143,6 +159,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