--- trunk/include/kde4-split-2.sminc	2012/05/16 20:19:14	12340
+++ branches/R11-unstable/include/kde4-split-2.sminc	2014/11/25 02:21:44	24893
@@ -38,6 +38,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
@@ -51,61 +62,6 @@
 	done
 }
 
-#kde4-split_common_dependencies()
-#{
-#	local subpackage
-#	local commondepend
-#
-#	# common dependencies
-#	commondepend=">= x11-libs/qt-4.5
-#		>= x11-libs/libXext-1.1-r1
-#		>= x11-libs/libXt-1
-#		>= x11-libs/libXinerama-1
-#		>= x11-libs/libXxf86vm-1
-#		== kde-base/kdelibs4-${PVER}"
-#
-#	if [[ ${PVER%.*} = 4.3 ]]
-#	then
-#		commondepend+="== kde-base/kdelibs4-experimental-${PVER}"
-#	fi
-#
-#	case ${PNAME/-${subpackage}} in
-#		kdegraphics)
-#			commondepend+="
-#				== kde-base/kdebase4-runtime-${PVER}
-#				>= kde-base/qimageblitz-0.0.4"
-#			;;
-#
-#		kdepim)
-#			commondepend+="
-#				== kde-base/kdebase4-runtime-${PVER}"
-#			;;
-#
-#		kdepim-runtime)
-#			commondepend+="
-#				== kde-base/kdebase4-runtime-${PVER}
-#				>= dev-libs/boost-1.40
-#				== kde-base/kdepimlibs4-${PVER}"
-#			;;
-#
-##		case ${PN} in
-##			akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
-##				IUSE+=" +kontact"
-##				if ! slot_is_at_least 4.4 ${SLOT} || [[ ${SLOT} == 4.4 && ${PV} < 4.3.68 ]]; then
-##					RDEPEND+=" kontact? ( $(add_kdebase_dep kontactinterfaces) )"
-##				fi
-##				;;
-##		esac
-##		;;
-##
-##	kdegames)
-##		if [[ ${PN} != libkdegames ]]; then
-##			COMMONDEPEND+=" $(add_kdebase_dep libkdegames)"
-##		fi
-##		;;
-#	esac
-#}
-
 kde4-split_generate_split_info()
 {
 	local subpackage