Version bump (bug 450494, thanks Chris Reffett and Andreas Sturmlechner for their contribution), ebuild rewritten from scratch (cudos upstream for nothing), drop old.

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

6 files changed, 258 insertions, 176 deletions

diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
index 904d189ec652..b621bf798cc1 100644
--- a/media-libs/oyranos/ChangeLog
+++ b/media-libs/oyranos/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/oyranos
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.9 2013/02/11 07:46:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.10 2013/03/23 18:17:07 xmw Exp $
+
+*oyranos-0.9.4 (23 Mar 2013)
+
+  23 Mar 2013; Michael Weber <xmw@gentoo.org> -oyranos-0.9.0.ebuild,
+  -oyranos-0.9.1.ebuild, +oyranos-0.9.4.ebuild,
+  +files/oyranos-0.9.4-buildsystem.patch:
+  Version bump (bug 450494, thanks Chris Reffett and Andreas Sturmlechner for
+  their contribution), ebuild rewritten from scratch (cudos upstream for
+  nothing), drop old.
 
 *oyranos-0.9.1-r1 (11 Feb 2013)
 
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index 436a558bb050..efab6e02d87a 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -7,19 +7,19 @@ AUX oyranos-0.9.0-array.patch 1154 SHA256 79d4628cb20f310627f50caa76b383e68ccdbd
 AUX oyranos-0.9.0-buildsystem.patch 4581 SHA256 1b9384c27f72980608940838a08ba7e2c8f1e8835a73b8a77e299dd3482c7931 SHA512 8fa5f782ad4f2e9cc5d4c7d6b1d00944e0bb686191b58660fc4c35fdaf95f09a0e46527700430365dd08aa60777fb5c3149a05b66646030cccc8bcb620060bab WHIRLPOOL 30fd4a8af959b24e6b677e90ddb90e4f1f6eccc5aeb51a9f18bb897b6adae5210477b08f98994cff6b555baeeec6b5e2eb98e88ff2e0dfed723f6fcd1dc49432
 AUX oyranos-0.9.0-png.patch 1194 SHA256 dff9024a3c51a5b1c8df0d3e8955b9d42b992f5bd0622162a3ddf7b053d9ae20 SHA512 bf6bcd3a8668e62e3e6d1385620c93ff94db1bd10b40205dff27a0864c1a555815561df31bda025700cfb7046a430f84c6ab00596417fcab7687b7f5f98b7c4e WHIRLPOOL 236b4b8e58e9dbd59e3b504d596892763b4c6dd76f106c93c0c1726f893d2abc35a228d82ee1e2a9ae26c013e0352a2d4ae7badcb6af2fa81f0b0adcc9deb1ac
 AUX oyranos-0.9.1-buildsystem-2.patch 931 SHA256 0676f2c9fe166f0eaee7d6bbdf5e2ffbd0c6adbd9f0e68c205ffca63a834b377 SHA512 cb6351e1e80b1c60a48b5fb63ce12a9680663619b75a3aa6bc6ca0c07f21e172fc9d383c25dfeca011118b28f52bd718953b7481c4083de850eca57b487ab97e WHIRLPOOL 4149e3902a47d27e3490d114791014a9ee9e11c2c8acdf6277512f057467d81c807a5026e08c2271a2c83a9d529a41da7427060415b1cb7f459ea4c56fa0fedc
+AUX oyranos-0.9.4-buildsystem.patch 6065 SHA256 8588190bfcfd5d3b98b17372f999fcfe51462c23e0cbe22bab2935050af66c09 SHA512 854425d0448cddbc9dc7b268d709521a182d01f506c2168745b5fb3d4303184a6c2a0d0e9aee9461975e985e2669231e510ece1853b28c089db875bcd5c61802 WHIRLPOOL 7d336c1c9513ae1e053487fb8707d921fc546a07b9dcab8d843d522de5b70615a07ae97298edbe6baaa44b2666a7b1487cb31af5a3be8e5dfaa5ae53a4f5d795
 DIST oyranos-0.4.0.tar.bz2 1265839 SHA256 6fcff9d5f8dc1aaeef55e238a30c65df390a9206ed76cf473f7f0ae348c23ed9 SHA512 edd11dfbe3aa5613fdc8b38536e1a9cffd3809e4bd0c179d7c8d55d8546613580ed010942f014ca2c9c5fad7531dd9083529e73c2aacf17e4b54b7cf422b1934 WHIRLPOOL a1a9f16e0a7e3d8b396dc0b56357ae91a4f42132e75cc60ec7bd5ce581c657ff3b3f569bd7b3f2d7c593257597e6199042ae587fc054d365d87af29fbb3a15c3
-DIST oyranos-0.9.0.tar.bz2 1476759 SHA256 9279ba03ce0efcbda4e6a37726714261c24b3b518a07a2dea255a1dcf840caa0 SHA512 89f2160958da792fe093159b0c3ad12d043fc2073b546a61aa884ed69a11f66da430dc90cfe9b249af5b6b75a7f755940239a1ea5cdcdf50770bda228978c6f8 WHIRLPOOL bc17f9a742d605b5e672512be623dfc005a54af0f6f1ee585a0a0ebe41aa4cb4be5f59484dbbfee5af81e6e995510a9e96bbf7b59e1e8de0cae9be0290c3de82
 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.4.0-r1.ebuild 2040 SHA256 1b986befbd164a2d23e6fe40635221c05d6cfb3df3f12e654005f4a6818e1c59 SHA512 4e263d128b140b142833b34596a9bd005453640afe43de81325e4d8deda316f72c6f179220aa4c680c9efe348cd98831e86e69df98071bed5c9d775fcd21c45a WHIRLPOOL db1229b690d7c3790b2ec72dd9d63c800d829cba94cf45289806ad807d3dd4645190b7d9f10b96a9eb568e68b30204465efa3c38fab1556e357a3b70165cef2f
-EBUILD oyranos-0.9.0.ebuild 2032 SHA256 d7c123bd03710de8b1eb7ed264a80235a568554175965d609f220f1c7cb7fc71 SHA512 b1a3fa383aa5fe4ce1bda5654ae1011ca9b956a6e6f350410e84973b60b780630297ee8c23393533cae119ac64afae05b5bb914c52e62372d7c3bbc79dfddf74 WHIRLPOOL f718a702950a44437c9d9c77f7ba2c9c7a5ec9a924e4fccda49af1cf619eed6c40af68afe06c4cf23cf4e50370bd912f960c93c363847a2fd0a16beb3710b37e
 EBUILD oyranos-0.9.1-r1.ebuild 2020 SHA256 b7f816d86e01937bd8d1ceb76635276776b542d4dd62b7d8af9e83ef11c1d3e5 SHA512 2eed9cd49a1745f0275d2ac63a2b25c1804aaf76040e535aed3244b23172f4e6ba5e183ebd93f789431b2205552f2894458da5935e5710d642323f641bbce3f9 WHIRLPOOL 2a326408d8fb8288f3750f61cb802dd72cbc5b617e337bef0b1e7f0a4f10b571408ed1f44e3196cc873ed3d3d41d1cea1f762575c8931d0944cbb5f08de2372b
-EBUILD oyranos-0.9.1.ebuild 1963 SHA256 49d63c22bf6ef1d978d159cbf0e66418fbf627fe32796a8833e281998865394e SHA512 b66cc4128c0ffb6ae5980b35833f4b7948930fd155b9f48d219b144eb783a725fc7316e8b4770e422697a731d2e90d0d2aab778049bd6c52bf7483cf6fa257c7 WHIRLPOOL fe8934536220a0f4f205541fa068f6a87a739d9f11e0087de20a7fdc7b3763ecd29c8e30c42bdc9257095b00d16276f8e011b0296ac1a81e7b44210cffd7d7e6
-MISC ChangeLog 1843 SHA256 2dc4570b45fef2794c0f1cc7925241550837f1b00fb7b6c8718f1e9f0448499f SHA512 de187c0475b3978fa1e6d88ac2034e0f812f75f9d8b28c7978fff4dbae5866ff2dfed956334f119b44d225cc13419b9edf6d0a912dae4fd37b2116dea75c8be6 WHIRLPOOL 27c41a1614a77b48124104e744142e5bfaf6e8fac886a48d4df88b2d464ea49c7b0cf4ce7dc97587c03984bf618ee6014fc270d76274186d6bd0ceebb6aa0f0c
+EBUILD oyranos-0.9.4.ebuild 2084 SHA256 65af4fddad4297a959e339a03d731587b439af0732a9f287895defc586b27ba4 SHA512 5713efc25f8025f4f5ca5870489f3f251dea9ecf99839ffcdf73ba2fb88264eb1522b928ca41a8e53ed3c75817fa3979bead622f2acf6cfd693b526b5329d02f WHIRLPOOL 7eba68f0294c2a8db95d2cf39046bbc82c0524ed1961bc626821af61a3e95fc4fc30d007b238fc8dc109f23a36013c5a7ff4b3e276a19c60a7ab575dfe6edcbc
+MISC ChangeLog 2207 SHA256 6e6976d80b6b4301bd35ddd78b5041f4bbb9da1a9098e7a3becbbaf30babbde2 SHA512 073542e6aef9cfe3b305189a3bba3836d4d1448b1cd00ac26283fa59a2e0b33dc2bd9585eac4596cb9da34c11d46a0469e459a5d06a861977a22e28798b95329 WHIRLPOOL 0f2943b76a7736a8988184a68b687f44f12a801cb91541088c3bb70768b6aaa98a97576e403e5d12c4ca8e439aa1366ea63949b86a5c36e99d526ada5d435325
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEYpakACgkQknrdDGLu8JAdfwEAjjHaF21FYJFh23PSoO4cpR54
-h5UcRnGC3adn/ynDKCgA/iuWG9G+55TZPb0VgKZnURRRulXxtDV3Z5Z7X2nMg0GY
-=9DhD
+iF4EAREIAAYFAlFN8b4ACgkQknrdDGLu8JCMgQEAlO/c6wXksTS3uMpxtCTOj0SZ
+7zLMfX38YSR9jae9JSEBAIXBFOUm5w9ncPfIbF4J12NmUU3l7+rr+K2uQFzHZ3Xd
+=Kijb
 -----END PGP SIGNATURE-----
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-buildsystem.patch b/media-libs/oyranos/files/oyranos-0.9.4-buildsystem.patch
new file mode 100644
index 000000000000..ed864eac1612
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.4-buildsystem.patch
@@ -0,0 +1,162 @@
+--- oyranos-0.9.4/src/CMakeLists.txt
++++ oyranos-0.9.4/src/CMakeLists.txt
+@@ -100,7 +100,9 @@
+ INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} )
+ LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} )
+ 
+-FIND_PACKAGE( X11 )
++IF(X11_WANT)
++FIND_PACKAGE( X11 REQUIRED )
++ENDIF(X11_WANT)
+ IF(X11_FOUND)
+   INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} )
+   LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} )
+@@ -123,27 +125,35 @@
+   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_DIRS} )
+-  LINK_DIRECTORIES( ${CUPS_LIBRARY_DIRS} )
++  INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIR} )
+ 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 +169,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 +194,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} )
+--- oyranos-0.9.4/CMakeLists.txt
++++ oyranos-0.9.4/CMakeLists.txt
+@@ -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,71 +51,15 @@
+   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 0.7
+ BuildRequires: elektra-devel" )
+   INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} )
+   LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} )
+-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
diff --git a/media-libs/oyranos/oyranos-0.9.0.ebuild b/media-libs/oyranos/oyranos-0.9.0.ebuild
deleted file mode 100644
index 4ed347a1c5ba..000000000000
--- a/media-libs/oyranos/oyranos-0.9.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.0.ebuild,v 1.3 2012/11/23 21:55:30 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 static-libs test xinerama"
-
-RDEPEND="app-admin/elektra
-	dev-libs/libxml2
-	dev-libs/yajl
-	media-gfx/exiv2
-	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
-		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 )"
-
-RESTRICT="test"
-
-src_prepare() {
-	einfo remove bundled elektra yajl
-	rm -rf elektra* yajl || die
-	#keep bundled libXNVCtrl
-
-	epatch "${FILESDIR}"/${P}-buildsystem.patch
-	epatch "${FILESDIR}"/${P}-png.patch
-	epatch "${FILESDIR}"/${P}-array.patch
-
-	if ! use X ; 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
-	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 X 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.1.ebuild b/media-libs/oyranos/oyranos-0.9.1.ebuild
deleted file mode 100644
index 9304ea0c72c3..000000000000
--- a/media-libs/oyranos/oyranos-0.9.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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 $
-
-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 static-libs test xinerama"
-
-RDEPEND="app-admin/elektra
-	dev-libs/libxml2
-	dev-libs/yajl
-	media-gfx/exiv2
-	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
-		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 )"
-
-RESTRICT="test"
-
-src_prepare() {
-	einfo remove bundled elektra yajl
-	rm -rf elektra* yajl || die
-	#keep bundled libXNVCtrl
-
-	epatch "${FILESDIR}"/${PN}-0.9.0-buildsystem.patch
-
-	if ! use X ; 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
-	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 X 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.ebuild b/media-libs/oyranos/oyranos-0.9.4.ebuild
new file mode 100644
index 000000000000..cfcfc6b91149
--- /dev/null
+++ b/media-libs/oyranos/oyranos-0.9.4.ebuild
@@ -0,0 +1,79 @@
+# 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.4.ebuild,v 1.1 2013/03/23 18:17:07 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/"
+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.8.3-r1
+	dev-libs/libxml2
+	dev-libs/yajl
+	media-gfx/exiv2
+	|| ( media-libs/lcms:0 media-libs/lcms:2 )
+	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
+		x11-libs/libXinerama )
+	cairo? ( x11-libs/cairo )
+	cups? (	net-print/cups )
+	exif? ( media-gfx/exiv2 )
+	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	raw? ( media-libs/libraw )"
+DEPEND="${RDEPEND}
+	app-doc/doxygen
+	media-gfx/graphviz
+	test? ( media-libs/icc-profiles-basiccolor-printing2009
+		media-libs/icc-profiles-openicc )"
+
+#RESTRICT="test"
+
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindElektra FindXcm FindCUPS"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}"-buildsystem.patch
+
+	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
+
+	einfo remove bundled libs
+	rm -rf elektra* yajl || die
+
+	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_install() {
+	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
+}