Version bump (bug 497138, thanks Andreas Sturmlechner), drop old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 299 insertions, 245 deletions

diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
index 88b86888f6cf..ec452a5fcae6 100644
--- a/media-libs/oyranos/ChangeLog
+++ b/media-libs/oyranos/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/oyranos
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.24 2014/06/22 20:51:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.25 2014/07/30 22:59:45 xmw Exp $
+
+*oyranos-0.9.5 (30 Jul 2014)
+
+  30 Jul 2014; Michael Weber <xmw@gentoo.org>
+  +files/oyranos-0.9.5-buildsystem-r1.patch, +oyranos-0.9.5.ebuild,
+  -oyranos-0.9.1-r2.ebuild, -oyranos-0.9.4-r1.ebuild:
+  Version bump (bug 497138, thanks  Andreas Sturmlechner), drop old.
 
   22 Jun 2014; Michał Górny <mgorny@gentoo.org> oyranos-0.9.4-r2.ebuild:
   Fix doc install.
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index 6ede7942727c..0f86c3466c09 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -29,31 +29,21 @@ AUX oyranos-0.9.4-fix-typos-and-grammar.patch 43847 SHA256 cea8976e827b168bb474a
 AUX oyranos-0.9.4-omit-profile-with-error.patch 1606 SHA256 06ce34d10e2cb9ca5722cb58f624b7041a8f388b53f9298200ae5a9845b7c825 SHA512 594923ae6dcac9aa8430ea3ccb9c7662c421eb2a99a27cfbf46a1083a0217a0c45aae663a1fc30fc6cf13cd2d7f0e4d63e7456180f623c19487b383f0c5a0c2f WHIRLPOOL 94675dd721df309cc10ace447b613b5eae05c8b2e5242f3443c2dd922d62dd253e308bd72e7eac03b735358b47a5c053f142ce9ac75392be99cd981a024f858a
 AUX oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch 5370 SHA256 3d2f260eb37bee4bbcd65677099076626147f22f17fdc938d26a3b86ceb986b4 SHA512 da7a3c05e161945bab4b8336e6848d06353482351aed45febedcd66f0f1b70276ab42f4a6cbcaff7708fc9ef42d135ec2110550ca66f94aef5c3915a7cf5e176 WHIRLPOOL 89b8264aab7026718694a8f84dfefe5b49af1a912c720165305b6d2d483943c83f5c43d109ffddb90ebfe2133731b87a6fc71ec2f6f4b02c4f705785d68bc2a7
 AUX oyranos-0.9.4-use-more-internal-xrandr-info.patch 1615 SHA256 78d1c45cc18ad555a97d2a6cd50c9ad40cd12c02048f351afc0a3893772c309a SHA512 cf4b42b8e794d19dbbbeab12c97fc80b897bcda26271c943c537f827946ca4a021e818c9fa6971b101aecc10d63e4d12b5781a549b6db62977884fa67134ecbc WHIRLPOOL af3992853631a3464b3ac625628031f63c80cc2da6b0d9b0cbd9f75bc460c4213f6fef5485e55eda8784d1b74c5cc9e7722ed07db10a175654df2b85cabd86ac
+AUX oyranos-0.9.5-buildsystem-r1.patch 6897 SHA256 91b9c94476ac189964c801a30cbb79e348d8a33aa9b38a32091df5175639b406 SHA512 974e1d85a4708591be5b6bed9e9ff0691d6aa606ef90458801332394b68d378f8afc3a519d7ae1ad42b48e2ed2ba1c9b5aa2e4bd6e43d6209ec81ada87816e91 WHIRLPOOL 40286c77fd52f753134c4d1eeef7e0264c5872855d4006b62ba1a71f6c45c1e2386f83ad8397b325f01677931d879e619f8d874c30baa8dc02257328d6adbee1
 AUX oyranos-9999-buildsystem.patch 6014 SHA256 ac565a81408859d78ec005c5dba8da3829a3c11f30d573af07dd630fa3ed3dae SHA512 3fabf52495cb07bd00f00c4cc0f06e935eafda63e7551226682dcecf943ac3ed117d826ab906f03d4d94448811cad621b4ceaa9820c228126a949db3075e0f4c WHIRLPOOL 3f486940ed86a66d75936a607f0041ea38782e7810e5d858f9a075d5149bbcc1dfca1314864a4516f834b3bf705f7b5331ba1da3a4431286ba2ff1075762c613
-DIST oyranos-0.9.1.tar.bz2 1481342 SHA256 ab9dd0478b6ca881e2de43a1164816a51843ae1afdfb26943361dc0100152bb9 SHA512 00c391b90fd54e93643260faf34bacc180b6f50c640ee216c4f4cbe189108b4fad22f2c6eb0d4601126cb245b97316d21c7d38d98272dc2d29e7d6b804b1db16 WHIRLPOOL 802075b2cd80aeb26979b5e46bbce6beb3627fc332675f81157d6303c0d449084fd76718086477ad5b9e32a1c25ae493e56bc3b17b03f92b42d69b1558ccd1cf
 DIST oyranos-0.9.4.tar.bz2 1632276 SHA256 6dcf7f8bef0720077ee55484a5b507ba5f049094f21fbbd2752f2ed120c0768a SHA512 23ded5bac4c16aba8a2d4266981e6ad53cfa2ce720d03751625552a873de8311dda721eb8dd732860ae0a0fcdfc7346f92aaeb8bde281ceeb4895f154d6e6c59 WHIRLPOOL 7ec535e326bf102eb0d154ac995b42b4a8b23a606c35417727b54653424807c47c5a4cf7ece6411627dcffd7ca5d8b1ddc588d97d1a02fb079d27d3d20efd2a5
-EBUILD oyranos-0.9.1-r2.ebuild 2772 SHA256 20aac4923628af08fb2cd436889bd72f8facad90fa75ae7fc03688bd91e847d1 SHA512 b5228ca075c83cc6a25a60e223d76ac39fe014930c9f58312555aae89c4dff0ee0d775572508c3fa4f9afa23f08309101692d659954b7997b354c6e35602790e WHIRLPOOL 465ce2f1ca12a5f74195e9f80c51a252acc74e276c3d7f62bc073bb759cc45b1a129eb6ae0559e384a713862b7a2412d66f6cf88c9bc81e85823be984bb4b4e9
-EBUILD oyranos-0.9.4-r1.ebuild 3858 SHA256 4978e1f12209f209c714e7fb639050c2995b8f76f5b7fd57e7a25109b1532618 SHA512 c34d68a462af0549837119ad786c00e42883ac4e24ab8eac17e9fd9ba9b7b6c92cae5c2cfa802c1863c47803cf548951d9397f6a9f9f282ebaea4e51e685d3d3 WHIRLPOOL 1bb154ea1dc6ed13eff420837416cc313056fcf2dfe20a35a94bbc1ee9e4509af5a59852b4e16362c9c98045411f8db125aa94f67a89a23b514137a8b32b76e2
+DIST oyranos-0.9.5.tar.bz2 1800977 SHA256 75c2681e6d95cb969336f1e9bdfe12a85ae6a5bd438573d7d2955b37ea466e40 SHA512 18ab90f6d80db2c3d3fda64f80d01be2c83c9e86f14b3a3310eea5dd921b7376afb894fea987357b573a4247d5c285bc9f6ccc044e21dbe7da92f25373b9fd99 WHIRLPOOL 32440b53b7da82baa8299c570c3456c35cbffb17998836240640011ff5a13981e7219213b00c0d9afc367f74bf35ffb297363285d060bd72f73f8f75a18ed025
 EBUILD oyranos-0.9.4-r2.ebuild 3633 SHA256 fa989e65f25f2b1066ce18813fabb2b07fc41667ba9ae475987b5828e5cff872 SHA512 7daf9a7112e9a8664b57fefdf5294d2ebce7a9806ad556159dd85cf971b907d79411872c207deb554b5633e2c65557aab7a42a54261b57cd20040a7a0415cc5c WHIRLPOOL 8c020d07aedd95a06a4f904d745724049aa8e16f30b5a01c0342cfb3fa6ea4c13ad0c35b57cdb0ae8eb3128e298b076dea53b12fae998ecd3502e59702415aa0
+EBUILD oyranos-0.9.5.ebuild 2797 SHA256 c8f8a88104afa3e496365772ea0c657a8baca159d8d0bd89f2be4fe5f3cd2a0a SHA512 51eb269c2efd12fc32b45751e3c16e669ce4ba19900c9afabaf8ac7719c4e746e046106315e64da27b83e4e57e894d15b9715f7c20b16bb00875fad09a5f8c01 WHIRLPOOL 563cdda91da3ec2210016cf16be0031d4d071ba646411b7f120e7f1dc48fae5da28a03dd15877620d98b0e78a4f681a4843028d68dd893396db8bf9ed2966948
 EBUILD oyranos-9999.ebuild 2770 SHA256 bb5a15140f378864d61a2a1f0109f3a39e5977c1b9c59a1db1d0f059fccec302 SHA512 83fa3e803e4a67868bfc9e81f81a1f66e57ace293fac884c968d063153e4a9233069fd8d4d0c8da5d5b690cc5015fc56811ba8505716fa99f7c5b9e15144e234 WHIRLPOOL 447072c653897acf9b644e9a9661feff8a0adcac03e419b6b5fc47f131c7ee1e5d22aa967c52877fd2b891ae1b5ffe01cfd0068c81b38cfbc176ac2a674a83fb
-MISC ChangeLog 5587 SHA256 5af9f4537650b03d48d2f9c5f4ca10f22811ef7c7f03e784be9129900da39705 SHA512 1c12683905b413aceef1ca1923b4801326c67507a6e5a10fae94eb17f1ec37679e4c0950f4e70fc432b72f83b9cbd19aca8d001a75a50442401c2cd95ee7ba7c WHIRLPOOL a0a8188ddd28f803d345c739b86c4ccc0459b42026bfe914f787b5c3501611b89907c95f0679f116a2b13b9d8f903fb0d6ffdab6d54fb20b5379030c44f3239c
+MISC ChangeLog 5852 SHA256 36d484f2635b28cf7e4bb6538a6d676b9482d0b5294b88e32a4e58e50a0adcea SHA512 8fcfa00510df60e0873fc3a3ed8a37455d41be73a7e4dd81011a5b18c06cf1e6955378740acfbd6bd988c5c34fae04a4b6991326af917200d4bd486ec6e06464 WHIRLPOOL 8f5f3c695ea9e7311ecd95a84a108486ded69b3bd9853df9b62e61a18afafe1a5da3ba6f87e3a0bf7d372bf24d8a1970a12ff66708a983b8caaaf5d4394befbf
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTp0HwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOd8MP+QFS0mMoT0+gUzKzwSE6p694
-+Fpp/vIM/mY7ZXr/ZtNKloKPNmC++TvlOA46Xgqhpab466JY1pxwWgOsTXy6Xdrz
-qHeKGJVGcvwFm7VsPSZg1JULyZ/Kdmhgym5R3N0Q7E6FySBApuYAm8DB34mOla4h
-yTojU+u5i41jOVpSHv/T257FmF34J7HQmpClVBvYCoaO+kvRiNBDLAQAOWthJjRm
-G5BmTaxs+CeHOCI+GHFdMU3UrmM9lg1NiboyFy1/o0P/gZ5N7KwEguvxcK6klNvN
-v6U3P1s9uKDvYng038jFSf8Tdkj4fSLkuQFSEM2AbLFuSIT7TmlwG9pIb6HF0EwZ
-JjFah/BsZ2qrjvzVvhjPP7J9EX1ibWGkXwa7susrKAZEJYc6tHC2GHltQU0bkTTc
-TC9bW5niX2gEwb2rfoYOfV9cxIErz1NqNUayXNpBRTiz1qHa5wcikapC2PddsL59
-rwWoUUKHVNrpvtbsGbG8+YDKNo7MA2QDifEEVmAWe1bxd7YI+bJbiNSI2IqRGybu
-3g8sMSBcT67OoL/nMAlT98eteynsNDNRIVQ+1aGJHEiL3MrKmj+dorJG1etEXXew
-VxNd21cm1BQGazvfLQ7YjQ9gXV3yzLBUC3ckgx9CVR0tPCqL6y+9ThScyMrsS3aW
-OP0PHqO+kQLFUz4YZsL5
-=OCVU
+iL4EAREIAGYFAlPZeOVfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JAntAD/XVu7qqSCJP80T4eJU/9loTPx
+/WPT7MJraorIl4Zy3kYA/R2XcmpQq/0k6C9r2oHcst/Zn5oOuYuCkVb4oNQ7VjFN
+=Q7fM
 -----END PGP SIGNATURE-----
diff --git a/media-libs/oyranos/files/oyranos-0.9.5-buildsystem-r1.patch b/media-libs/oyranos/files/oyranos-0.9.5-buildsystem-r1.patch
new file mode 100644
index 000000000000..ad5581077cb3
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.5-buildsystem-r1.patch
@@ -0,0 +1,182 @@
+--- a/CMakeLists.txt	2014-06-22 23:44:17.666047736 +0200
++++ b/CMakeLists.txt	2014-06-22 23:45:13.656347758 +0200
+@@ -41,7 +41,7 @@
+ 
+ 
+ # detect top level projects
+-FIND_PACKAGE( Yajl )
++FIND_PACKAGE( Yajl REQUIRED )
+ IF( HAVE_YAJL )
+   INCLUDE_DIRECTORIES( ${YAJL_INCLUDE_DIRS} )
+   LINK_DIRECTORIES( ${YAJL_LIBRARY_DIRS} )
+@@ -51,72 +51,16 @@
+   IF( NOT HAVE_YAJL_VERSION_H )
+     INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/yajl/ )
+   ENDIF( NOT HAVE_YAJL_VERSION_H )
+-ELSE( HAVE_YAJL )
+-  IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
+-    include(ExternalProject)
+-    ExternalProject_Add( yajl
+-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yajl
+-    CONFIGURE_COMMAND cmake ${CMAKE_CURRENT_SOURCE_DIR}/yajl
+-    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/yajl
+-    BUILD_COMMAND ${MAKE}
+-    # skip installation
+-    INSTALL_COMMAND echo )
+-    INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/yajl )
+-    LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/yajl )
+-    SET( YAJL_LIBRARIES yajl-static )
+-  ENDIF()
+-  
+ ENDIF( HAVE_YAJL )
+ 
+-FIND_PACKAGE( Elektra )
++FIND_PACKAGE( Elektra REQUIRED )
++SET( HAVE_ELEKTRA 1 )
+ IF(HAVE_ELEKTRA)
+   SET( ELEKTRA_SPEC "Requires: elektra
+ BuildRequires: elektra-devel" )
+   INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} )
+   LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} )
+   STRING(REPLACE ";" " " ELEKTRA_PC_LDFLAGS "${ELEKTRA_STATIC_LDFLAGS}")
+-ELSE(HAVE_ELEKTRA)
+-  SET( ELEKTRA_VERSION elektra-0.7.1 )
+-  MESSAGE( "-- Using internal Elektra: ${ELEKTRA_VERSION}" )
+-  INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/${ELEKTRA_VERSION}/src/include
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/include )
+-  SET( ELEKTRA_LIBRARIES_STATIC
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdb.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhandle.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-key.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyset.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-trie.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhighlevel.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbcapability.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyhelpers.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keymeta.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyname.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keytest.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyvalue.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-serialize.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-split.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-exported_symbols.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libloader/libloader_static_a-kdbLibLoader.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-internal.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-helper.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/backends/filesys/libelektra_filesys_a-filesys.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-kdbtools.o
+-       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-stream.o
+-     )
+-  SET( ELEKTRA_LIBRARIES 
+-       ${LIBXML2_LIBRARIES}
+-     )
+-  IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
+-    include(ExternalProject)
+-    ExternalProject_Add( ${ELEKTRA_VERSION}
+-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}
+-    # GCC flags (-fPIC) will fail on Windows, without we get relocation R_X86_64_32 errors
+-    CONFIGURE_COMMAND CFLAGS=-fPIC ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}/configure --enable-static --enable-shared=false
+-    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${ELEKTRA_VERSION}
+-    BUILD_COMMAND ${MAKE}
+-    # skip installation
+-    INSTALL_COMMAND echo )
+-  ENDIF()
+ ENDIF(HAVE_ELEKTRA)
+ 
+ #now add all directories
+--- a/src/CMakeLists.txt	2013-12-20 00:04:12.319880917 +0100
++++ b/src/CMakeLists.txt	2013-12-20 00:11:33.504365352 +0100
+@@ -100,7 +100,9 @@
+ INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} )
+ LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} )
+ 
+-FIND_PACKAGE( X11 )
++IF(WANT_X11)
++FIND_PACKAGE( X11 REQUIRED )
++ENDIF(WANT_X11)
+ IF(X11_FOUND)
+   INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} )
+   LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} )
+@@ -123,27 +125,36 @@
+   LINK_DIRECTORIES( ${XXF86VM_LIBRARY_DIRS} )
+ ENDIF(X11_FOUND)
+ 
+-FIND_PACKAGE( CUPS )
++IF(WANT_CUPS)
++FIND_PACKAGE( Cups REQUIRED )
++SET( HAVE_CUPS 1 )
++ENDIF(WANT_CUPS)
+ IF(HAVE_CUPS)
+   INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIR} )
+   LINK_DIRECTORIES( ${CUPS_LIBRARYS} )
+ ENDIF(HAVE_CUPS)
+ 
+-FIND_PACKAGE( Cairo )
++IF(WANT_CAIRO)
++FIND_PACKAGE( Cairo REQUIRED)
++ENDIF(WANT_CAIRO)
+ IF(HAVE_CAIRO)
+   INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR}/cairo )
+   INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR} )
+   LINK_DIRECTORIES( ${CAIRO_LIBRARY_DIRS} )
+ ENDIF(HAVE_CAIRO)
+ 
+-FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui)
++IF(WANT_QT4)
++FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
++ENDIF(WANT_QT4)
+ IF(QT_FOUND)
+   SET( HAVE_QT 1 )
+   INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} )
+   LINK_DIRECTORIES( ${QT_LIBRARY_DIRS} )
+ ENDIF(QT_FOUND)
+ 
+-FIND_PACKAGE( Fltk )
++IF(WANT_FLTK)
++FIND_PACKAGE( FLTK REQUIRED)
++ENDIF(WANT_FLTK)
+ IF(FLTK_FOUND)
+   SET( HAVE_FLTK 1 )
+   INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} )
+@@ -159,7 +170,9 @@
+   SET( LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} PARENT_SCOPE)
+ ENDIF(LIBXML2_FOUND)
+ 
+-FIND_PACKAGE( LibRaw )
++IF(WANT_LIBRAW)
++FIND_PACKAGE( LibRaw REQUIRED )
++ENDIF(WANT_LIBRAW)
+ IF( HAVE_LIBRAW )
+ #  TRY_COMPILE(
+ #    HAVE_LIBRAW_REALLY
+@@ -182,7 +195,9 @@
+   MESSAGE( "HAVE_LIBRAW_PLUGIN: ${HAVE_LIBRAW_PLUGIN}" )
+ ENDIF()
+ 
+-FIND_PACKAGE( Exif2 )
++IF(WANT_EXIV2)
++FIND_PACKAGE( Exif2 REQUIRED )
++ENDIF(WANT_EXIV2)
+ IF(HAVE_EXIV2)
+   INCLUDE_DIRECTORIES( ${EXIV2_INCLUDE_DIRS} )
+   LINK_DIRECTORIES( ${EXIV2_LIBRARY_DIRS} )
+--- a/doc/CMakeLists.txt	2014-03-07 09:43:25.000000000 +0100
++++ b/doc/CMakeLists.txt	2014-06-23 00:22:01.256748956 +0200
+@@ -33,7 +33,9 @@
+ INSTALL( FILES ${MAN1_PAGES} DESTINATION share/man/man1 )
+ INSTALL( FILES ${MAN3_PAGES} DESTINATION share/man/man3 )
+ 
+-FIND_PACKAGE( Doxygen )
++IF(WANT_HTML)
++	FIND_PACKAGE( Doxygen REQUIRED )
++ENDIF(WANT_HTML)
+ IF( DOXYGEN_FOUND )
+ 
+   ADD_CUSTOM_COMMAND( OUTPUT html
+@@ -43,5 +45,5 @@
+   ADD_CUSTOM_TARGET( docu ALL
+                      DEPENDS html )
+ 
+-  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PACKAGE_NAME} )
++  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PACKAGE_NAME}-${OYRANOS_VERSION} )
+ ENDIF()
diff --git a/media-libs/oyranos/oyranos-0.9.1-r2.ebuild b/media-libs/oyranos/oyranos-0.9.1-r2.ebuild
deleted file mode 100644
index 2b86e9bae333..000000000000
--- a/media-libs/oyranos/oyranos-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 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-r2.ebuild,v 1.3 2013/04/13 02:23:48 xmw Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc fltk static-libs test xinerama"
-
-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
-	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"
-
-RESTRICT="test"
-REQUIRED_USE="fltk? ( X )"
-
-src_prepare() {
-	einfo remove bundled elektra yajl
-	rm -rf elektra* yajl || die
-	#keep bundled libXNVCtrl
-
-	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 fltk ; then
-		sed -e '/FLTK_GUI =/s:=.*:=:' \
-			-i makefile.in || die
-		sed -e '/all:/s:oyranos-xforms-fltk::' \
-			-i oforms/oyranos_xforms.makefile || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-	econf --prefix=/usr \
-		--enable-verbose \
-		$(use_with X x) \
-		$(use_enable X libX11) \
-		$(use_enable X libXext) \
-		$(use_enable X libXrandr) \
-		$(use_enable X libXxf86vm) \
-		$(use_enable fltk fltk) \
-		$(use_enable static-libs static) \
-		$(use_enable xinerama libXinerama)
-}
-
-src_compile() {
-	emake all
-	use X && emake oforms
-	emake docu
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${P} install-main
-
-	if ! use doc ; then
-		rm -rf "${ED}/usr/share/doc/${P}/html" || die
-	fi
-}
diff --git a/media-libs/oyranos/oyranos-0.9.4-r1.ebuild b/media-libs/oyranos/oyranos-0.9.4-r1.ebuild
deleted file mode 100644
index 33d26473caf9..000000000000
--- a/media-libs/oyranos/oyranos-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.4-r1.ebuild,v 1.6 2014/06/18 19:52:22 mgorny Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic cmake-utils cmake-multilib
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X cairo cups doc exif fltk qt4 raw test"
-
-RDEPEND="=app-admin/elektra-0.7*[${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/libXcm-0.5.2-r1[${MULTILIB_USEDEP}]
-	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-	!amd64? (
-		dev-libs/libxml2
-		cairo? ( x11-libs/cairo )
-		cups? ( net-print/cups )
-		qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-		raw? ( media-libs/libraw )
-		)
-	amd64? (
-		abi_x86_64? (
-			dev-libs/libxml2
-			|| ( media-libs/lcms:0 media-libs/lcms:2 )
-			media-libs/libpng:0
-			cairo? ( x11-libs/cairo )
-			cups? ( net-print/cups )
-			qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-			raw? ( media-libs/libraw )
-		)
-		abi_x86_32? (
-			app-emulation/emul-linux-x86-baselibs
-			cairo? ( app-emulation/emul-linux-x86-gtklibs )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			qt4? ( app-emulation/emul-linux-x86-qtlibs )
-		)
-	)
-	media-gfx/graphviz
-	exif? ( media-gfx/exiv2 )
-	fltk? ( x11-libs/fltk:1 )"
-DEPEND="${RDEPEND}
-	app-doc/doxygen"
-
-RESTRICT="test"
-REQUIRED_USE="amd64? ( exif? ( !abi_x86_32 )
-	raw? ( !abi_x86_32 ) )"
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS"
-
-src_prepare() {
-	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
-
-	if use fltk ; then
-		#src/examples does not include fltk flags
-		append-cflags $(fltk-config --cflags)
-		append-cxxflags $(fltk-confiag --cxxflags)
-	fi
-
-	cmake-utils_src_prepare
-
-	mycmakeargs=(
-		$(usex X -DWANT_X11=1 "")
-		$(usex cairo -DWANT_CAIRO=1 "")
-		$(usex cups -DWANT_CUPS=1 "")
-		$(usex exif -DWANT_EXIV2=1 "")
-		$(usex fltk -DWANT_FLTK=1 "")
-		$(usex qt4 -DWANT_QT4=1 "")
-		$(usex raw -DWANT_LIBRAW=1 "")
-	)
-}
-
-src_configure() {
-	cmake-multilib_src_configure
-
-	if use abi_x86_32 && use abi_x86_64 ; then
-		sed -e 's:lib64:lib32:g' \
-			-i "${S}"-x86/CMakeCache.txt || die
-	fi
-}
-
-src_install() {
-	if use abi_x86_32 && use abi_x86_64 ; then
-		sed -e '/OY_LIBDIR/s:lib32:lib64:'\
-			-i "${S}"-x86/src/include/oyranos_version.h || die
-	fi
-
-	cmake-multilib_src_install
-
-	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
-}
diff --git a/media-libs/oyranos/oyranos-0.9.5.ebuild b/media-libs/oyranos/oyranos-0.9.5.ebuild
new file mode 100644
index 000000000000..c09cb6959dfc
--- /dev/null
+++ b/media-libs/oyranos/oyranos-0.9.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild,v 1.1 2014/07/30 22:59:45 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic cmake-utils cmake-multilib
+
+DESCRIPTION="colour management system allowing to share various settings across applications and services"
+HOMEPAGE="http://www.oyranos.org/"
+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"
+IUSE="X cairo cups doc exif fltk qt4 raw test"
+
+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-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.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}] )
+	fltk? ( x11-libs/fltk:1 )
+	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+DOCS="AUTHORS ChangeLog README"
+RESTRICT="test"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/oyranos-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/oyranos/oyranos_version.h
+)
+
+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}"-0.9.5-buildsystem-r1.patch
+
+	if use fltk ; then
+		#src/examples does not include fltk flags
+		append-cflags $(fltk-config --cflags)
+		append-cxxflags $(fltk-config --cxxflags)
+	fi
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+
+		$(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 "")
+		$(multilib_native_usex qt4 -DWANT_QT4=1 "")
+	)
+
+	cmake-utils_src_configure
+}