--- /usr/portage/eclass/kde-functions.eclass	2008-10-04 17:37:46.000000000 +0200
+++ /usr/local/portage/reavertm/eclass/kde-functions.eclass	2008-11-26 15:26:06.000000000 +0100
@@ -717,18 +717,11 @@
 	if [[ -n "$KDEPREFIX" ]]; then
 		export PREFIX="$KDEPREFIX"
 	else
-		if [[ -z "$KDEBASE" ]]; then
-			case $PN in
-				libkipi|libkdcraw|libkexiv2) export PREFIX="/usr/kde/3.5";;
-				*) export PREFIX="/usr";;
-			esac
-		else
-			case $KDEMAJORVER.$KDEMINORVER in
-				3.5) export PREFIX="/usr/kde/3.5";;
-				5.0) export PREFIX="/usr/kde/svn";;
-				*) die "failed to set PREFIX";;
-			esac
-		fi
+		case $KDEMAJORVER.$KDEMINORVER in
+			3*) export PREFIX="/usr/kde/3.5";;
+			5.0) export PREFIX="/usr/kde/svn";;
+			*) die "failed to set PREFIX";;
+		esac
 	fi
 
 	# kdelibs location
@@ -748,7 +741,7 @@
 		else
 			# kde-base ebuilds must always use the exact version of kdelibs they came with
 			case $KDEMAJORVER.$KDEMINORVER in
-				3.5) export KDEDIR="/usr/kde/3.5";;
+				3*) export KDEDIR="/usr/kde/3.5";;
 				5.0) export KDEDIR="/usr/kde/svn";;
 				*) die "failed to set KDEDIR";;
 			esac