Attachment #172085 for bug #238539




		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"

	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




 --with-vendor=\"Gentoo Foundation\"
--- patches/dev300/apply 
+++ patches/dev300/apply 
@@ -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

Return to bug 238539

Lines 209-232 Link Here

(-)app-office/openoffice/openoffice-3.0.0.ebuild.orig (-18 / +1 lines)
209	fi	209	fi
210	fi	210	fi
211		211
212	if use kde; then
213	ewarn " Please note that this version of OpenOffice.org will NOT build "
214	ewarn " if you have kde-base/kdelibs or kde-base/kdepimlibs 4.1.x installed "
215	ewarn " without kdeprefix"
216	ewarn
217	ewarn " Until this is resolved, either disable the kde-use-flag or "
218	ewarn " rebuild KDE with USE='kdeprefix'. "
219	ewarn
220
221	if has_version kde-base/kdelibs:4.1; then
222	built_with_use kde-base/kdelibs:4.1 kdeprefix \|\| die "rebuild kde-4.1 with USE='kdeprefix'"
223	fi
224
225	if has_version kde-base/kdepimlibs:4.1; then
226	built_with_use kde-base/kdepimlibs:4.1 kdeprefix \|\| die "rebuild kde-4.1 with USE='kdeprefix'"
227	fi
228	fi
229
230	if use nsplugin; then	212	if use nsplugin; then
231	if pkg-config --exists libxul; then	213	if pkg-config --exists libxul; then
232	BRWS="libxul"	214	BRWS="libxul"
Lines 266-271 Link Here
266	epatch "${FILESDIR}/ooo-env_log.diff"	248	epatch "${FILESDIR}/ooo-env_log.diff"
267	cp -f "${FILESDIR}/nojavanostax.diff" "${S}/patches/dev300" \|\| die	249	cp -f "${FILESDIR}/nojavanostax.diff" "${S}/patches/dev300" \|\| die
268	cp -f "${FILESDIR}/hunspell-one-dir-nocrash.diff" "${S}/patches/dev300" \|\| die	250	cp -f "${FILESDIR}/hunspell-one-dir-nocrash.diff" "${S}/patches/dev300" \|\| die
		251	cp -f "${FILESDIR}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/dev300" \|\| die
269		252
270	#Use flag checks	253	#Use flag checks
271	if use java ; then	254	if use java ; then

Lines 40-46 Link Here

(-)app-office/openoffice/files/gentoo-3.0.0.diff.orig (-1 / +11 lines)
40	--with-vendor=\"Gentoo Foundation\"	40	--with-vendor=\"Gentoo Foundation\"
41	--- patches/dev300/apply	41	--- patches/dev300/apply
42	+++ patches/dev300/apply	42	+++ patches/dev300/apply
43	@@ -1425,7 +1425,11 @@	43	@@ -259,6 +259,9 @@
		44	# (happened to me with DirectX SDK)
		45	buildfix-directx-path.diff, i#93333, jholesov
		46
		47	+# workaround for building with KDE when both KDE 3.5 and 4.1 are present
		48	+solenv.workaround-for-the-kde-mess.diff, i#95552, dtardon
		49	+
		50	[ CJK ]
		51	#set default CJK font fontsize as 10.5pt
		52	sw-default-cjk-fontsize.diff i#72010, jianhua
		53	@@ -1425,7 +1428,11 @@
44	SectionOwner => aprosky	54	SectionOwner => aprosky
45		55
46	# system lucene classpath	56	# system lucene classpath