--- app-office/openoffice/openoffice-3.0.0.ebuild.orig	2008-11-17 09:36:56.000000000 +0100
+++ app-office/openoffice/openoffice-3.0.0.ebuild	2008-11-17 09:36:05.000000000 +0100
@@ -209,24 +209,6 @@
 		fi
 	fi
 
-	if use kde; then
-		ewarn " Please note that this version of OpenOffice.org will NOT build "
-		ewarn " if you have kde-base/kdelibs or kde-base/kdepimlibs 4.1.x installed "
-		ewarn " without kdeprefix"
-		ewarn
-		ewarn " Until this is resolved, either disable the kde-use-flag or "
-		ewarn " rebuild KDE with USE='kdeprefix'. "
-		ewarn
-
-		if has_version kde-base/kdelibs:4.1; then
-			built_with_use kde-base/kdelibs:4.1 kdeprefix || die "rebuild kde-4.1 with USE='kdeprefix'"
-		fi
-
-		if has_version kde-base/kdepimlibs:4.1; then
-			built_with_use kde-base/kdepimlibs:4.1 kdeprefix || die "rebuild kde-4.1 with USE='kdeprefix'"
-		fi
-	fi
-
 	if use nsplugin; then
 		if pkg-config --exists libxul; then
 			BRWS="libxul"
@@ -266,6 +248,7 @@
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/nojavanostax.diff" "${S}/patches/dev300" || die
 	cp -f "${FILESDIR}/hunspell-one-dir-nocrash.diff" "${S}/patches/dev300" || die
+	cp -f "${FILESDIR}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/dev300" || die
 
 	#Use flag checks
 	if use java ; then
--- app-office/openoffice/files/gentoo-3.0.0.diff.orig	2008-11-17 09:34:02.000000000 +0100
+++ app-office/openoffice/files/gentoo-3.0.0.diff	2008-11-17 09:34:08.000000000 +0100
@@ -40,7 +40,17 @@
  --with-vendor=\"Gentoo Foundation\"
 --- patches/dev300/apply 
 +++ patches/dev300/apply 
-@@ -1425,7 +1425,11 @@
+@@ -259,6 +259,9 @@
+ # (happened to me with DirectX SDK)
+ buildfix-directx-path.diff, i#93333, jholesov
+ 
++# workaround for building with KDE when both KDE 3.5 and 4.1 are present
++solenv.workaround-for-the-kde-mess.diff, i#95552, dtardon
++
+ [ CJK ]
+ #set default CJK font fontsize as 10.5pt
+ sw-default-cjk-fontsize.diff i#72010, jianhua
+@@ -1425,7 +1428,11 @@
  SectionOwner => aprosky
  
  # system lucene classpath