--- media-libs/oyranos/oyranos-0.9.1-r1.ebuild	2013-02-11 08:46:50.000000000 +0100
+++ media-libs/oyranos/oyranos-0.9.1-r3.ebuild	2013-04-01 20:12:19.095276603 +0200
@@ -13,26 +13,28 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X doc static-libs test xinerama"
+IUSE="X doc fltk static-libs test xinerama"
 
-RDEPEND="app-admin/elektra
+REQUIRED_USE="fltk? ( X )"
+
+RDEPEND="=app-admin/elektra-0.7.1-r3
 	dev-libs/libxml2
 	dev-libs/yajl
 	media-gfx/exiv2
+	media-libs/icc-profiles-basiccolor-printing2009
+	media-libs/icc-profiles-openicc
 	media-libs/lcms:0
 	media-libs/libpng:0
 	media-libs/libraw
 	>=media-libs/libXcm-0.5.1
-	X? ( x11-libs/fltk:1
-		x11-libs/libXfixes
+	fltk? ( x11-libs/fltk:1 )
+	X? ( x11-libs/libXfixes
 		x11-libs/libXrandr
 		x11-libs/libXxf86vm
 		xinerama? ( x11-libs/libXinerama ) )"
 DEPEND="${RDEPEND}
 	app-doc/doxygen
-	media-gfx/graphviz
-	test? ( media-libs/icc-profiles-basiccolor-printing2009
-		media-libs/icc-profiles-openicc )"
+	media-gfx/graphviz"
 
 RESTRICT="test"
 
@@ -41,17 +43,30 @@
 	rm -rf elektra* yajl || die
 	#keep bundled libXNVCtrl
 
-	epatch "${FILESDIR}"/${PN}-0.9.0-buildsystem.patch
-	epatch "${FILESDIR}"/${PN}-0.9.1-buildsystem-2.patch
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.0-buildsystem.patch \
+		"${FILESDIR}"/${P}-buildsystem-2.patch \
+		"${FILESDIR}"/${P}-fix-real-compiler-warnings.patch \
+		"${FILESDIR}"/${P}-fix-more-compiler-warnings.patch \
+		"${FILESDIR}"/${P}-support-pur-xrandr-without-xinerama.patch \
+		"${FILESDIR}"/${P}-fix-pseq-crash.patch \
+		"${FILESDIR}"/${P}-fix-oyStringSegment-crash.patch \
+		"${FILESDIR}"/${P}-fix-crash-over-missed-output-image.patch \
+		"${FILESDIR}"/${P}-fix-oyRankMap-helper-functions-crashes.patch \
+		"${FILESDIR}"/${P}-initialise-memory-for-strtod.patch \
+		"${FILESDIR}"/${P}-fix-double-object-release.patch \
+		"${FILESDIR}"/${P}-fix-array-access.patch \
+		"${FILESDIR}"/${P}-omit-profile-with-error.patch
+
+	#fix typos
+	sed -e '/^ */s:triffers:triggers:' -i API_generated/*c || die
+	sed -e 's/Promt/Prompt/' -i oyranos_texts.c po/*.{po,pot} settings/*xml || die
 
-	if ! use X ; then
+	if ! use fltk ; then
 		sed -e '/FLTK_GUI =/s:=.*:=:' \
 			-i makefile.in || die
-	fi
-
-	if has_version "<app-admin/elektra-0.8.3" ; then
-		sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \
-			-i test.c test2.cpp oyranos_elektra.c || die
+		sed -e '/all:/s:oyranos-xforms-fltk::' \
+			-i oforms/oyranos_xforms.makefile || die
 	fi
 }
 
@@ -64,7 +79,7 @@
 		$(use_enable X libXext) \
 		$(use_enable X libXrandr) \
 		$(use_enable X libXxf86vm) \
-		$(use_enable X fltk) \
+		$(use_enable fltk fltk) \
 		$(use_enable static-libs static) \
 		$(use_enable xinerama libXinerama)
 }