--- trunk/include/kde4.sminc	2012/10/29 09:08:25	13883
+++ trunk/include/kde4.sminc	2013/01/10 12:24:26	15828
@@ -19,11 +19,14 @@
 
 # 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//.} -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}"}
@@ -47,7 +50,7 @@
 		>= x11-libs/qt4-declarative-4.7"
 fi
 
-if [[ ${PNAME} != phonon ]] && [[ ${PNAME} != phonon-backend-* ]]
+if [[ ${PNAME} != phonon ]] && [[ ${PNAME} != phonon-backend-* ]] && [[ ${PNAME} != oxygen-icons ]]
 then
 	DEPEND="${DEPEND}
 		>= virtual/phonon
@@ -153,6 +156,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