--- a/media-libs/oyranos/oyranos-0.9.1.ebuild	2012-11-23 22:55:30.000000000 +0100
+++ b/media-libs/oyranos/oyranos-0.9.4.ebuild	2013-02-03 19:26:17.272412503 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.1.ebuild,v 1.2 2012/11/23 21:55:30 xmw Exp $
+# $Header: $
 
 EAPI=4
 
@@ -13,7 +13,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X doc static-libs test xinerama"
+IUSE="X debug doc static-libs test xinerama"
 
 RDEPEND="app-admin/elektra
 	dev-libs/libxml2
@@ -41,12 +41,25 @@
 	rm -rf elektra* yajl || die
 	#keep bundled libXNVCtrl
 
-	epatch "${FILESDIR}"/${PN}-0.9.0-buildsystem.patch
+	epatch "${FILESDIR}"/${PN}-0.9.3-buildsystem.patch
+	epatch "${FILESDIR}"/${PN}-0.9.3-fix-flmm_tabs-include.patch
 
-	if ! use X ; then
-		sed -e '/FLTK_GUI =/s:=.*:=:' \
-			-i makefile.in || die
-	fi
+	#sed over wrong fltk include paths
+	sed -e '/^#include/s:FL:fltk-1\/FL:' \
+		-i src/examples/image_display/*.{cpp,h} \
+			src/examples/oyranos_config_fltk.{cxx,h} \
+			FL/Flmm_Tabs.{cxx,H} \
+			src/examples/oforms/*.{cxx,h} \
+			fl_i18n/*.{cxx,h,H} || die
+
+	#sed over wrong fltk decl paths
+	sed -e '/^decl {\\#include/s:FL:fltk-1\/FL:' \
+		-i src/examples/oyranos_config_fltk.fl || die
+
+	#Flmm_Tabs no part of fltk-1.3.x, no flmm package exists in tree
+	#Flmm_Tabs.{cxx,H} comes bundled in FL directory - what to do?
+	sed -e 's/Flmm/Fl/g' \
+		-i src/examples/oyranos_config_fltk.{cxx,fl,h} || die
 
 	if has_version "<app-admin/elektra-0.8.3" ; then
 		sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \
@@ -65,19 +78,23 @@
 		$(use_enable X libXxf86vm) \
 		$(use_enable X fltk) \
 		$(use_enable static-libs static) \
-		$(use_enable xinerama libXinerama)
+		$(use_enable xinerama libXinerama) \
+		$(use_enable debug) \
+		$(use_enable test TESTS)
 }
 
 src_compile() {
 	emake all
 	use X && emake oforms
-	emake docu
+#	emake docu
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${P} install-main
+	emake DESTDIR="${D}" install
 
 	if ! use doc ; then
-		rm -rf "${ED}/usr/share/doc/${P}/html" || die
+		rm -rf "${ED}/usr/share/doc/${PN}" || die
+	else
+		mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 	fi
 }