Update live version buildsystem patch (thanks Andreas Sturmlechner, bug 447246)

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

3 files changed, 169 insertions, 7 deletions

diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
index db57e49ceca7..e094b36ec14a 100644
--- a/media-libs/oyranos/ChangeLog
+++ b/media-libs/oyranos/ChangeLog
@@ -1,6 +1,11 @@
 # 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.15 2013/04/22 17:07:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.16 2013/04/25 11:35:15 xmw Exp $
+
+  25 Apr 2013; Michael Weber <xmw@gentoo.org> oyranos-9999.ebuild,
+  +files/oyranos-9999-buildsystem.patch:
+  Update live version buildsystem patch (thanks Andreas Sturmlechner, bug
+  447246)
 
 *oyranos-9999 (22 Apr 2013)
 *oyranos-0.9.4-r1 (22 Apr 2013)
diff --git a/media-libs/oyranos/files/oyranos-9999-buildsystem.patch b/media-libs/oyranos/files/oyranos-9999-buildsystem.patch
new file mode 100644
index 000000000000..88b367985df6
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-9999-buildsystem.patch
@@ -0,0 +1,161 @@
+--- oyranos-0.9.5/src/CMakeLists.txt
++++ oyranos-0.9.5/src/CMakeLists.txt
+@@ -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} )
+--- oyranos-0.9.5/CMakeLists.txt
++++ oyranos-0.9.5/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-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index b2878fbac9ef..7e02939c1122 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.1 2013/04/22 17:07:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.2 2013/04/25 11:35:15 xmw Exp $
 
 EAPI=5
 
@@ -47,12 +47,8 @@ src_prepare() {
 	einfo remove bundled libs
 	rm -rf elektra* yajl || die
 
-	epatch "${FILESDIR}/${PN}"-0.9.4-buildsystem-r1.patch
+	epatch "${FILESDIR}/${PN}"-9999-buildsystem.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)