--- a/oyranos-9999.ebuild	2014-06-22 14:38:50.000000000 +0200
+++ b/oyranos-9999.ebuild	2015-05-04 22:46:57.202687480 +0200
@@ -1,32 +1,42 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.5 2014/06/22 12:38:50 mgorny Exp $
+# $Header: $
 
 EAPI=5
 
-inherit eutils flag-o-matic cmake-utils cmake-multilib git-r3
+inherit eutils flag-o-matic cmake-utils cmake-multilib
 
-DESCRIPTION="colour management system allowing to share various settings across applications and services"
+DESCRIPTION="Colour management system allowing to share various settings across applications and services"
 HOMEPAGE="http://www.oyranos.org/"
-EGIT_REPO_URI="git://www.${PN}.org/git/${PN}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 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 +48,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=(
@@ -50,13 +63,13 @@
 	/usr/include/oyranos/oyranos_version.h
 )
 
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindCUPS"
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS"
 
 src_prepare() {
 	einfo remove bundled libs
 	rm -rf elektra* yajl || die
 
-	epatch "${FILESDIR}/${PN}"-9999-buildsystem.patch
+	epatch "${FILESDIR}/${PN}"-0.9.5-buildsystem-r1.patch
 
 	if use fltk ; then
 		#src/examples does not include fltk flags
@@ -72,11 +85,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 "")
@@ -85,11 +99,3 @@
 
 	cmake-utils_src_configure
 }
-
-multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog README
-	if use doc ; then
-		mv "${ED}/usr/share/doc/${PN}/*" "${ED}/usr/share/doc/${P}" || die
-	fi
-	rm -rf "${ED}/usr/share/doc/${PN}" || die
-}