[gentoo-commits] dev/dev-zero:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/

[Tiziano Müller]

commit:     3b5321e79e2c618b670498a2e197751c6d0ef2d1
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Mon Nov 21 06:16:23 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 06:24:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=3b5321e7

Added live ebuild, readded old version for testing.

---
 dev-games/openscenegraph/Manifest                  |   12 +-
 .../files/openscenegraph-2.9.9-cmake.patch         |  230 +++++++++++++++++++
 .../files/openscenegraph-9999-cmake.patch          |  232 ++++++++++++++++++++
 .../files/openscenegraph-9999-qt.patch             |   20 ++
 ...ph-3.0.1.ebuild => openscenegraph-2.9.9.ebuild} |   26 +--
 .../openscenegraph/openscenegraph-3.0.1.ebuild     |    2 +-
 ...aph-3.0.1.ebuild => openscenegraph-9999.ebuild} |   14 +-
 7 files changed, 509 insertions(+), 27 deletions(-)

diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index aaf9f03..41dc1c3 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,5 +1,11 @@
-MISC ChangeLog 5140 RMD160 7c6865460a7f601451e1be28fc51d2841f613997 SHA1 5c6128306c5df06b7047dfc6c7c410ed1f839ada SHA256 84e117d6bc3c14396347639cffe23cbc202050ce3d71f494645bf6d08f097f2d
+AUX openscenegraph-2.9.9-cmake.patch 8972 RMD160 00b625559fae8f55ae47fe6067058c766c716433 SHA1 9110b4b43b245c5bd20f06c1ee31d0ff14edafdd SHA256 144464ebdd900a0dfafc0beac3b95a01424a45ceb289327c946f3846a1f73e8b
 AUX openscenegraph-3.0.1-cmake.patch 35692 RMD160 a6fa15574216cb17e1b58672871a272378e2d297 SHA1 9087c85958f530b2f216f09856aeabb3d648dff4 SHA256 a354649b5eaefab5e910683cef146514c5459eca3ba354bf5d00e565303f57ca
-MISC metadata.xml 1115 RMD160 ca10b4eb4fdf20ffe7db6fe29ee2d290fda4a695 SHA1 eb1cb05392044f03e8d2a6ee5077d933044cabf9 SHA256 f3ea3669edf3bdc96dc9747d59447433fb9677185764d69a3aea6115b9d58643
-EBUILD openscenegraph-3.0.1.ebuild 3884 RMD160 71b0bf0db398e330c87019b22b2299e9292cd1db SHA1 a7eb58a7d0647acd1038ededaa267a2ae1cce395 SHA256 4233826ded3c53aededb63fe04d9a4e0705eff4615bafe3b2709345a98a1319d
+AUX openscenegraph-9999-cmake.patch 9260 RMD160 018f4dd7082d0d036f68521d5ad6433a10299e9b SHA1 3675b4ce36630dad767f472b79be68f325c31d45 SHA256 ef488f64036ee7cf9139aef66a625c0a3d2b74567c8cb9e1d5a7ebbec0934273
+AUX openscenegraph-9999-qt.patch 537 RMD160 cb320f6f67d46d6662a240d2abc18485b4ee9493 SHA1 d84a7f009f0e18f35dd49da2b3a81802458e159e SHA256 1c956324031e5a70612c0eec9b94470e9561378aa366122665de368c14ff682c
+DIST OpenSceneGraph-2.9.9.zip 6632745 RMD160 62f4cbc72b05cd6d8d622fbf04740fd3f22064c3 SHA1 67732d846b12ed1304f56f9ffe1cf6229d553fa0 SHA256 c7f35b675ad305ed0106151d2832f275543bf28ec25bc52314e9c49e8dce9616
 DIST OpenSceneGraph-3.0.1.zip 6780282 RMD160 54b315c318b7ade2bcc65703cea5f41377e93a71 SHA1 13c7e39f6d62047ad944d8d28a0f0eb60384ce33 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296
+EBUILD openscenegraph-2.9.9.ebuild 3840 RMD160 d25e09685734a90cf49dd9aedf18851395254948 SHA1 ae8d7735393762bfda1440569698136682e4f6fc SHA256 ce424605ae05a25ec43d0713a9d3940b544d83ac2d0b7a36378d4618a2fa0123
+EBUILD openscenegraph-3.0.1.ebuild 3888 RMD160 4dabffcc3961235c0137d364c1c037233fcb7249 SHA1 5aa0940bb702d6428705d559da9030e98fb596ce SHA256 fb05d56f45030cc3da4aa8328a33fe276fb6f50b783380f7bb7d18ce4ea1bbcf
+EBUILD openscenegraph-9999.ebuild 3940 RMD160 3c318fcbecdc7333f49d3c480c26a74404fce9d0 SHA1 0e33ea148af3339a640a2c108dfe4ded75f2c3a3 SHA256 d5f351cdeac27a9afc8bd74e8a5f3d63e6ccb4512d86aafcff46734851807dbb
+MISC ChangeLog 5140 RMD160 7c6865460a7f601451e1be28fc51d2841f613997 SHA1 5c6128306c5df06b7047dfc6c7c410ed1f839ada SHA256 84e117d6bc3c14396347639cffe23cbc202050ce3d71f494645bf6d08f097f2d
+MISC metadata.xml 1115 RMD160 ca10b4eb4fdf20ffe7db6fe29ee2d290fda4a695 SHA1 eb1cb05392044f03e8d2a6ee5077d933044cabf9 SHA256 f3ea3669edf3bdc96dc9747d59447433fb9677185764d69a3aea6115b9d58643

diff --git a/dev-games/openscenegraph/files/openscenegraph-2.9.9-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-2.9.9-cmake.patch
new file mode 100644
index 0000000..206fa4b
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-2.9.9-cmake.patch
@@ -0,0 +1,230 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 49f1e3e..cbcaea5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -350,6 +350,7 @@ IF(MSVC)
+                    "${OPENSCENEGRAPH_VERSIONINFO_RC}")
+ ENDIF()
+ 
++INCLUDE(MacroOptionalFindPackage)
+ ################################################################################
+ # Optional build components
+ 
+@@ -366,43 +367,43 @@ IF(WIN32)
+ ENDIF()
+ 
+ # Common to all platforms:
+-FIND_PACKAGE(FreeType)
+-FIND_PACKAGE(Inventor)
+-FIND_PACKAGE(Jasper)
+-FIND_PACKAGE(OpenEXR)
+-FIND_PACKAGE(COLLADA)
+-FIND_PACKAGE(FBX)
+-FIND_PACKAGE(ZLIB)
+-FIND_PACKAGE(Xine)
+-FIND_PACKAGE(OpenVRML)
+-FIND_PACKAGE(Performer)
+-FIND_PACKAGE(GDAL)
+-FIND_PACKAGE(CURL)
+-FIND_PACKAGE(ITK)
+-FIND_PACKAGE(LibVNCServer)
+-FIND_PACKAGE(OurDCMTK)
+-FIND_PACKAGE(OpenAL)
+-FIND_PACKAGE(XUL)
+-FIND_PACKAGE(FFmpeg)
+-FIND_PACKAGE(DirectShow)
+-FIND_PACKAGE(SDL)
++MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
++MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
++MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
++MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
++MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
++MACRO_OPTIONAL_FIND_PACKAGE(FBX)
++MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
++MACRO_OPTIONAL_FIND_PACKAGE(Xine)
++MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
++MACRO_OPTIONAL_FIND_PACKAGE(Performer)
++MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
++MACRO_OPTIONAL_FIND_PACKAGE(CURL)
++MACRO_OPTIONAL_FIND_PACKAGE(ITK)
++MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
++MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
++MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
++MACRO_OPTIONAL_FIND_PACKAGE(XUL)
++MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
++MACRO_OPTIONAL_FIND_PACKAGE(DirectShow)
++MACRO_OPTIONAL_FIND_PACKAGE(SDL)
+ 
+ # To select a specific version of QT define DESIRED_QT_VERSION
+ # via cmake -DDESIRED_QT_VERSION=4
+ IF  (DESIRED_QT_VERSION)
+ 
+     IF  (DESIRED_QT_VERSION MATCHES 4)
+-      FIND_PACKAGE(Qt4)
++      MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+     ELSE()
+-      FIND_PACKAGE(Qt3)
++      MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+     ENDIF()
+ 
+ ELSE()
+ 
+-    FIND_PACKAGE(Qt4)
++    MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+ 
+     IF  (NOT QT4_FOUND)
+-        FIND_PACKAGE(Qt3)
++        MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+     ENDIF()
+ 
+ ENDIF()
+@@ -422,9 +423,13 @@ IF(PKG_CONFIG_FOUND)
+         PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
+     ENDIF()
+ 
+-    PKG_CHECK_MODULES(RSVG librsvg-2.0)
++    IF(WITH_SVG)
++        PKG_CHECK_MODULES(RSVG librsvg-2.0)
++    ENDIF(WITH_SVG)
+     PKG_CHECK_MODULES(CAIRO cairo)
+-    PKG_CHECK_MODULES(POPPLER poppler-glib)
++    IF(WITH_PDF)
++        PKG_CHECK_MODULES(POPPLER poppler-glib)
++    ENDIF(WITH_PDF)
+ 
+ ENDIF()
+ 
+@@ -433,12 +438,12 @@ ENDIF()
+ IF   (BUILD_OSG_EXAMPLES)
+ 
+ 
+-    FIND_PACKAGE(FLTK)
+-    FIND_PACKAGE(GLUT)
+-    FIND_PACKAGE(FOX)
++    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
++    MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
++    MACRO_OPTIONAL_FIND_PACKAGE(FOX)
+ 
+     SET(wxWidgets_USE_LIBS base core gl net)
+-    FIND_PACKAGE(wxWidgets)
++    MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
+ 
+ ENDIF(BUILD_OSG_EXAMPLES)
+ 
+@@ -500,10 +505,10 @@ ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
+ # Image readers/writers depend on 3rd party libraries except for OS X which
+ # can use Quicktime.
+ IF(NOT APPLE)
+-    FIND_PACKAGE(GIFLIB)
+-    FIND_PACKAGE(JPEG)
+-    FIND_PACKAGE(PNG)
+-    FIND_PACKAGE(TIFF)
++    MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
++    MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
++    MACRO_OPTIONAL_FIND_PACKAGE(PNG)
++    MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
+ 
+     # QuickTime is required for OS X, but optional for Windows.
+     IF(WIN32)
+@@ -791,7 +796,7 @@ IF(BUILD_DOCUMENTATION)
+         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
+     )
+     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
++    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
+ 
+     # now set up openthreads documentation generation
+     IF(BUILD_REF_DOCS_TAGFILE)
+@@ -807,7 +812,7 @@ IF(BUILD_DOCUMENTATION)
+         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
+     )
+     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
++    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
+ 
+     # Process our other doxyfiles but don't create targets for these
+     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
+diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
+index 28af637..911aaa4 100644
+--- a/CMakeModules/OsgMacroUtils.cmake
++++ b/CMakeModules/OsgMacroUtils.cmake
+@@ -326,9 +326,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+         SETUP_EXE(${IS_COMMANDLINE_APP})
+         
+         IF(APPLE)
+-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
++            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin )            
+         ELSE(APPLE)
+-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
++            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
+         ENDIF(APPLE)
+ 
+ ENDMACRO(SETUP_EXAMPLE)
+diff --git a/examples/osgviewerFLTK/CMakeLists.txt b/examples/osgviewerFLTK/CMakeLists.txt
+index 43c023b..dd177f0 100644
+--- a/examples/osgviewerFLTK/CMakeLists.txt
++++ b/examples/osgviewerFLTK/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ SET(TARGET_SRC osgviewerFLTK.cpp )
+ 
+-SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
++SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
+ 
+ INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
+ 
+--- ../OpenSceneGraph-2.8.3/CMakeModules/COPYING-CMAKE-SCRIPTS	1970-01-01 01:00:00.000000000 +0100
++++ ./CMakeModules/COPYING-CMAKE-SCRIPTS	2010-01-11 06:29:35.000000000 +0100
+@@ -0,0 +1,22 @@
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++
++1. Redistributions of source code must retain the copyright
++   notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the copyright
++   notice, this list of conditions and the following disclaimer in the
++   documentation and/or other materials provided with the distribution.
++3. The name of the author may not be used to endorse or promote products 
++   derived from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--- ../OpenSceneGraph-2.8.3/CMakeModules/MacroOptionalFindPackage.cmake	1970-01-01 01:00:00.000000000 +0100
++++ ./CMakeModules/MacroOptionalFindPackage.cmake	2010-06-30 02:37:36.494250349 +0200
+@@ -0,0 +1,28 @@
++# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
++# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_<name>, which can be disabled via the cmake GUI.
++# or via -DWITH_<name>=OFF
++# The standard <name>_FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006, Alexander Neundorf, <neundorf@×××.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++   option(WITH_${_name} "Search for ${_name} package" ON)
++   if (WITH_${_name})
++      find_package(${_name} ${ARGN})
++   else (WITH_${_name})
++      set(${_name}_FOUND)
++      set(${_name}_INCLUDE_DIR)
++      set(${_name}_INCLUDES)
++      set(${_name}_LIBRARY)
++      set(${_name}_LIBRARIES)
++   endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
++

diff --git a/dev-games/openscenegraph/files/openscenegraph-9999-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-9999-cmake.patch
new file mode 100644
index 0000000..07e22b7
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-9999-cmake.patch
@@ -0,0 +1,232 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c84a271..f2217e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -108,7 +108,7 @@ IF(OSG_BUILD_PLATFORM_ANDROID)
+ 
+ ENDIF()
+ 
+-
++INCLUDE(MacroOptionalFindPackage)
+ 
+ # Okay, here's the problem: On some platforms, linking against OpenThreads
+ # is not enough and explicit linking to the underlying thread library
+@@ -456,33 +456,33 @@ IF(ANDROID)
+     ANDROID_3RD_PARTY()
+ ELSE()
+ # Common to all platforms except android:
+-    FIND_PACKAGE(FreeType)
+-    FIND_PACKAGE(Inventor)
+-    FIND_PACKAGE(Jasper)
+-    FIND_PACKAGE(OpenEXR)
+-    FIND_PACKAGE(COLLADA)
+-    FIND_PACKAGE(FBX)
+-    FIND_PACKAGE(ZLIB)
+-    FIND_PACKAGE(Xine)
+-    FIND_PACKAGE(OpenVRML)
+-    FIND_PACKAGE(Performer)
+-    FIND_PACKAGE(GDAL)
+-    FIND_PACKAGE(CURL)
+-    FIND_PACKAGE(LibVNCServer)
+-    FIND_PACKAGE(OurDCMTK)
+-    FIND_PACKAGE(OpenAL)
+-    FIND_PACKAGE(FFmpeg)
+-    FIND_PACKAGE(DirectShow)
+-    FIND_PACKAGE(SDL)
+-    FIND_PACKAGE(Poppler-glib)
+-    FIND_PACKAGE(RSVG)
+-    FIND_PACKAGE(GtkGl)
+-    FIND_PACKAGE(DirectInput)
+-    FIND_PACKAGE(NVTT)
++    MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
++    MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
++    MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
++    MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
++    MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
++    MACRO_OPTIONAL_FIND_PACKAGE(FBX)
++    MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
++    MACRO_OPTIONAL_FIND_PACKAGE(Xine)
++    MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
++    MACRO_OPTIONAL_FIND_PACKAGE(Performer)
++    MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
++    MACRO_OPTIONAL_FIND_PACKAGE(CURL)
++    MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
++    MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
++    MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
++    MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
++    MACRO_OPTIONAL_FIND_PACKAGE(DirectShow)
++    MACRO_OPTIONAL_FIND_PACKAGE(SDL)
++    MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
++    MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
++    MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
++    MACRO_OPTIONAL_FIND_PACKAGE(DirectInput)
++    MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
+ ENDIF()
+ 
+ IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+-    FIND_PACKAGE(ITK)
++	MACRO_OPTIONAL_FIND_PACKAGE(ITK)
+ ENDIF()
+ 
+ # Include macro utilities here
+@@ -496,17 +496,17 @@ IF(OSG_USE_QT AND NOT ANDROID)
+     IF  (DESIRED_QT_VERSION)
+ 
+         IF  (DESIRED_QT_VERSION MATCHES 4)
+-              FIND_PACKAGE(Qt4)
++              MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+         ELSE()
+-              FIND_PACKAGE(Qt3)
++              MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+         ENDIF()
+ 
+     ELSE()
+ 
+-        FIND_PACKAGE(Qt4)
++        MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+ 
+         IF  (NOT QT4_FOUND)
+-            FIND_PACKAGE(Qt3)
++            MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+         ENDIF()
+ 
+     ENDIF()
+@@ -516,12 +516,12 @@ ENDIF()
+ IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
+ 
+ 
+-    FIND_PACKAGE(FLTK)
+-    FIND_PACKAGE(GLUT)
+-    FIND_PACKAGE(FOX)
++    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
++    MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
++    MACRO_OPTIONAL_FIND_PACKAGE(FOX)
+ 
+     SET(wxWidgets_USE_LIBS base core gl net)
+-    FIND_PACKAGE(wxWidgets)
++    MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
+ 
+ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+ 
+@@ -542,10 +542,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+ # can use Quicktime.
+ IF(NOT ANDROID)
+     IF(NOT APPLE)
+-        FIND_PACKAGE(GIFLIB)
+-        FIND_PACKAGE(JPEG)
+-        FIND_PACKAGE(PNG)
+-        FIND_PACKAGE(TIFF)
++        MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
++        MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
++        MACRO_OPTIONAL_FIND_PACKAGE(PNG)
++        MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
+ 
+         # QuickTime is required for OS X, but optional for Windows.
+         IF(WIN32)
+@@ -896,7 +896,7 @@ IF(BUILD_DOCUMENTATION)
+         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
+     )
+     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
++    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
+ 
+     # now set up openthreads documentation generation
+     IF(BUILD_REF_DOCS_TAGFILE)
+@@ -912,7 +912,7 @@ IF(BUILD_DOCUMENTATION)
+         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
+     )
+     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
++    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
+ 
+     # Process our other doxyfiles but don't create targets for these
+     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
+diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
+index aa607fa..1308c79 100644
+--- a/CMakeModules/OsgMacroUtils.cmake
++++ b/CMakeModules/OsgMacroUtils.cmake
+@@ -445,9 +445,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
+         
+         IF(APPLE)
+-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
++            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin )            
+         ELSE(APPLE)
+-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
++            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
+         ENDIF(APPLE)
+ 
+ ENDMACRO(SETUP_EXAMPLE)
+diff --git a/examples/osgviewerFLTK/CMakeLists.txt b/examples/osgviewerFLTK/CMakeLists.txt
+index 43c023b..dd177f0 100644
+--- a/examples/osgviewerFLTK/CMakeLists.txt
++++ b/examples/osgviewerFLTK/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ SET(TARGET_SRC osgviewerFLTK.cpp )
+ 
+-SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
++SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
+ 
+ INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
+ 
+--- /dev/null
++++ b/CMakeModules/COPYING-CMAKE-SCRIPTS
+@@ -0,0 +1,22 @@
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++
++1. Redistributions of source code must retain the copyright
++   notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the copyright
++   notice, this list of conditions and the following disclaimer in the
++   documentation and/or other materials provided with the distribution.
++3. The name of the author may not be used to endorse or promote products 
++   derived from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/CMakeModules/MacroOptionalFindPackage.cmake b/CMakeModules/MacroOptionalFindPackage.cmake
+new file mode 100644
+index 0000000..f09952f
+--- /dev/null
++++ b/CMakeModules/MacroOptionalFindPackage.cmake
+@@ -0,0 +1,28 @@
++# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
++# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_<name>, which can be disabled via the cmake GUI.
++# or via -DWITH_<name>=OFF
++# The standard <name>_FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006, Alexander Neundorf, <neundorf@×××.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++   option(WITH_${_name} "Search for ${_name} package" ON)
++   if (WITH_${_name})
++      find_package(${_name} ${ARGN})
++   else (WITH_${_name})
++      set(${_name}_FOUND)
++      set(${_name}_INCLUDE_DIR)
++      set(${_name}_INCLUDES)
++      set(${_name}_LIBRARY)
++      set(${_name}_LIBRARIES)
++   endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
++
+diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
+index aa607fa..1308c79 100644

diff --git a/dev-games/openscenegraph/files/openscenegraph-9999-qt.patch b/dev-games/openscenegraph/files/openscenegraph-9999-qt.patch
new file mode 100644
index 0000000..7b80f0f
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-9999-qt.patch
@@ -0,0 +1,20 @@
+diff --git a/src/osgQt/GraphicsWindowQt.cpp b/src/osgQt/GraphicsWindowQt.cpp
+index df20715..887e612 100644
+--- a/src/osgQt/GraphicsWindowQt.cpp
++++ b/src/osgQt/GraphicsWindowQt.cpp
+@@ -691,13 +691,13 @@ bool GraphicsWindowQt::makeCurrentImplementation()
+ 
+     _widget->makeCurrent();
+ 
+-    return true;
++    return _widget->isValid();
+ }
+ 
+ bool GraphicsWindowQt::releaseContextImplementation()
+ {
+     _widget->doneCurrent();
+-    return true;
++    return !_widget->isValid();
+ }
+ 
+ void GraphicsWindowQt::swapBuffersImplementation()

diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild b/dev-games/openscenegraph/openscenegraph-2.9.9.ebuild
similarity index 90%
copy from dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
copy to dev-games/openscenegraph/openscenegraph-2.9.9.ebuild
index c62848e..9cb718f 100644
--- a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-2.9.9.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild,v 1.10 2010/10/15 13:56:56 ranger Exp $
 
-EAPI=4
+EAPI=2
 
 inherit eutils flag-o-matic versionator cmake-utils
 
 MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV/_/-}
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Open source high performance 3D graphics toolkit"
 HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
 SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
 openexr openinventor pdf png qt4 sdl static-libs svg tiff truetype vnc
@@ -106,17 +106,17 @@ src_configure() {
 		$(cmake-utils_use_with gdal)
 		$(cmake-utils_use_with gif GIFLIB)
 		$(cmake-utils_use_with glut)
-		$(cmake-utils_use_with gtk GtkGl)
+		$(cmake-utils_use_with gtk)
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with jpeg2k Jasper)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with openinventor Inventor)
-		$(cmake-utils_use_with pdf Poppler-glib)
+		$(cmake-utils_use_with pdf)
 		$(cmake-utils_use_with png)
 		$(cmake-utils_use_with qt4)
 		$(cmake-utils_use !static-libs DYNAMIC_OPENSCENEGRAPH)
 		$(cmake-utils_use_with sdl)
-		$(cmake-utils_use_with svg RSVG)
+		$(cmake-utils_use_with svg)
 		$(cmake-utils_use_with tiff)
 		$(cmake-utils_use_with truetype FreeType)
 		$(cmake-utils_use_with vnc LibVNCServer)
@@ -133,16 +133,6 @@ src_compile() {
 	use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
 }
 
-src_install() {
-	cmake-utils_src_install
-
-	cd "${S}"
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
 pkg_postinst() {
 	if has_version 'dev-games/simgear'; then
 		ewarn "dev-games/simgear has been detected and may need to be rebuilt now."

diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
index c62848e..e317000 100644
--- a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
 SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
 openexr openinventor pdf png qt4 sdl static-libs svg tiff truetype vnc

diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild b/dev-games/openscenegraph/openscenegraph-9999.ebuild
similarity index 93%
copy from dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
copy to dev-games/openscenegraph/openscenegraph-9999.ebuild
index c62848e..be9daf0 100644
--- a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-9999.ebuild
@@ -4,17 +4,17 @@
 
 EAPI=4
 
-inherit eutils flag-o-matic versionator cmake-utils
+inherit eutils flag-o-matic versionator cmake-utils subversion
 
 MY_PN="OpenSceneGraph"
 MY_P=${MY_PN}-${PV/_/-}
 
 DESCRIPTION="Open source high performance 3D graphics toolkit"
 HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
-SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
+ESVN_REPO_URI="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="-*"
 SLOT="0"
 IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
 openexr openinventor pdf png qt4 sdl static-libs svg tiff truetype vnc
@@ -80,14 +80,18 @@ DEPEND="${RDEPEND}
 	xrandr? ( x11-proto/randrproto )
 "
 
-S=${WORKDIR}/${MY_P}
-
 DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
 
 PATCHES=(
 	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-qt.patch"
 )
 
+src_prepare() {
+	subversion_src_prepare
+	base_src_prepare
+}
+
 src_configure() {
 	# Needed by FFmpeg
 	append-cppflags -D__STDC_CONSTANT_MACROS