--- oyranos-0.9.4-r2.ebuild	2014-06-22 23:01:24.000000000 +0200
+++ oyranos-0.9.5.ebuild	2014-06-23 00:55:56.586303838 +0200
@@ -8,25 +8,34 @@
 
 DESCRIPTION="colour management system allowing to share various settings across applications and services"
 HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://www.${PN}.org/git/${PN}"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.9/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="X cairo cups doc exif fltk qt4 raw test"
 
-RDEPEND="=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}]
-	>=app-admin/elektra-0.7.1-r5:0[${MULTILIB_USEDEP}]
+RDEPEND="
+	|| (
+		=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}]
+		>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
+	)
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
 	media-libs/icc-profiles-basiccolor-printing2009
-	media-libs/icc-profiles-basiccolor-printing2009
+	media-libs/icc-profiles-openicc
 	|| (
 		>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
 		>=media-libs/lcms-1.19-r1:0[${MULTILIB_USEDEP}]
 	)
 	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
-	>=media-libs/libXcm-0.5.2-r1[${MULTILIB_USEDEP}]
+	>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] )
 	cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] )
 	exif? ( >=media-gfx/exiv2-0.23-r2[${MULTILIB_USEDEP}] )
@@ -38,9 +47,12 @@
 		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
 		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	app-doc/doxygen
-	media-gfx/graphviz"
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
 
+DOCS="AUTHORS ChangeLog README"
 RESTRICT="test"
 
 MULTILIB_CHOST_TOOLS=(
@@ -56,25 +68,7 @@
 	einfo remove bundled libs
 	rm -rf elektra* yajl || die
 
-	epatch "${FILESDIR}/${P}"-buildsystem-r1.patch
-
-	#upstream(ed) fixes, be more verbose, better xrandr handling
-	epatch "${FILESDIR}/${P}"-fix-array-access.patch \
-		"${FILESDIR}/${P}"-fix-oyRankMap-helper-functions-crashes.patch \
-		"${FILESDIR}/${P}"-fix-oyStringSegment-crash.patch \
-		"${FILESDIR}/${P}"-be-more-verbose.patch \
-		"${FILESDIR}/${P}"-use-more-internal-xrandr-info.patch \
-		"${FILESDIR}/${P}"-set-xcalib-to-screen-if-ge-xrandr-12.patch \
-		"${FILESDIR}/${P}"-fix-double-object-release.patch \
-		"${FILESDIR}/${P}"-omit-profile-with-error.patch \
-		"${FILESDIR}/${P}"-fix-typos-and-grammar.patch
-
-	#upstream fix for QA notice, gentoo bug 464254
-	epatch "${FILESDIR}/${P}"-fix-runpaths.patch
-
-	#fix really ugly and prominently visible typo (solved in 0.9.5)
-	sed -e 's/Promt/Prompt/' \
-		-i src/liboyranos_config/oyranos_texts.c po/*.{po,pot} settings/*xml || die
+	epatch "${FILESDIR}/${PN}"-0.9.5-buildsystem-r1.patch
 
 	if use fltk ; then
 		#src/examples does not include fltk flags
@@ -90,11 +84,12 @@
 	local mycmakeargs=(
 		-DLIB_SUFFIX=${libdir#lib}
 
-		$(usex X -DWANT_X11=1 "")
 		$(usex cairo -DWANT_CAIRO=1 "")
 		$(usex cups -DWANT_CUPS=1 "")
+		$(usex doc -DWANT_HTML=1 "")
 		$(usex exif -DWANT_EXIV2=1 "")
 		$(usex raw -DWANT_LIBRAW=1 "")
+		$(usex X -DWANT_X11=1 "")
 
 		# only used in programs
 		$(multilib_native_usex fltk -DWANT_FLTK=1 "")
@@ -103,13 +98,3 @@
 
 	cmake-utils_src_configure
 }
-
-multilib_src_install_all() {
-	if use doc; then
-		mv "${ED%/}"/usr/share/doc/{${PN},${PF}} || die
-	else
-		rm -rf "${ED%/}"/usr/share/doc/${PN} || die
-	fi
-
-	dodoc AUTHORS ChangeLog README
-}