--- kde-misc/kdiff3/kdiff3-0.9.95.ebuild	2009-10-18 14:35:45.000000000 -0400
+++ kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild	2010-01-10 17:31:28.779716383 -0500
@@ -4,6 +4,7 @@
 
 EAPI="2"
 
+KDE_REQUIRED="optional"
 KDE_LINGUAS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb
 nds nl pl pt pt_BR ro ru rw sv ta tg tr uk zh_CN"
 inherit kde4-base
@@ -14,16 +15,31 @@ SRC_URI="mirror://sourceforge/kdiff3/${P
 
 SLOT="1"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug handbook konqueror"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug +kde handbook konqueror"
 
 PATCHES=( "${FILESDIR}/${P}-desktop-entry.patch" )
 
-RDEPEND="konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
+DEPEND=">=x11-libs/qt-core-4.4.0
+	>=x11-libs/qt-gui-4.4.0
+	kde? (
+		konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
+	)"
+RDEPEND="${DEPEND}
 	sys-apps/diffutils
 	!kde-misc/kdiff3:0"
 
+src_prepare() {
+	# Run epatch here. The kde4-base changes the CMakeLists.txt
+	# before it runs epatch, causing the patch to fail (derp!)
+	cd ${S}
+	epatch "${FILESDIR}/${P}-optional-kde.patch"
+
+	kde4-base_src_prepare
+}
+
 src_configure() {
+	mycmakeargs="${mycmakeargs} $(cmake-utils_use_with kde KDE4)"
 	mycmakeargs="${mycmakeargs} $(cmake-utils_use_with konqueror LibKonq)"
 	kde4-base_src_configure
 }