Version bump 2.8.3, fixes bug 316919 and 263839, ebuild submitted by me.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 436 insertions, 9 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 66fb3b6d1995..4be54ff344a1 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.23 2010/06/25 11:57:20 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.24 2010/06/28 19:57:46 reavertm Exp $
+
+*openscenegraph-2.8.3 (25 Jun 2010)
+
+  25 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +openscenegraph-2.8.3.ebuild, +files/openscenegraph-2.8.3-cmake.patch,
+  metadata.xml:
+  Version bump 2.8.3, fixes bug 316919 and 263839, ebuild by me.
 
   25 Jun 2010; Tupone Alfredo <tupone@gentoo.org>
   openscenegraph-2.8.2.ebuild:
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 941436e5f6aa..be070072f315 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,6 +1,9 @@
 AUX openscenegraph-2.8.2-libpng14.patch 1076 RMD160 f4f5351da534df37e6279416ad31133226f16fe7 SHA1 6a2ab90a528ccd1ecac4da850632c08ca48371c8 SHA256 632d18877b39e731c4800475431a673e06f5d16e66c149dc74abc04c4f115b37
 AUX openscenegraph-2.8.2-magicoff.patch 2947 RMD160 1356636b0cda89bf30c2430d2c2b45ec6abc8431 SHA1 29a086b58934285f2a327490aeab1bac7f83ef6c SHA256 e0aa057cfad117fc209f309b5bb0e8a225ad312cc4b5a3154c2386abfaf0d9c6
+AUX openscenegraph-2.8.3-cmake.patch 10291 RMD160 8d9506d0ac8954086bbf400c2bf19a1fee1e9fcf SHA1 c466301486a373c1351e5480830c50d691a47533 SHA256 414d6fa5a0aa2e0f1afdb35dadfb0fa18a910e5b2817b045eb92bac24597d741
 DIST OpenSceneGraph-2.8.2.zip 6472487 RMD160 3933b2395e36950c870f32db2fcddc7cc220e228 SHA1 f2f0a3285a022640345a81f536459f37f3f38d01 SHA256 0903e3a29eba07856c563d1b313f6b803bee702e9145a27677d8dcab57db98ab
+DIST OpenSceneGraph-2.8.3.zip 6740017 RMD160 40a4988f4aefff7dbb6aab5225204ae41c945277 SHA1 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc SHA256 3a7b80ea02eeb39c37ded4d07e28ed4071a4a0ceba93f2834d39be7f7487115e
 EBUILD openscenegraph-2.8.2.ebuild 1821 RMD160 bf17906ce2e1c8ebce962abb7e96d72024c28360 SHA1 ad0d49ef7cd9cfdf929aa3e41313ccfde2093d84 SHA256 57d0ae41ab51ceaff5f20f09c79aa3fe15ad5b7522bfa2014de866122e7c01c0
-MISC ChangeLog 3590 RMD160 9b9467f1cfc11d37bf0355e8f69c74005e1e8b12 SHA1 3517aa89f927cee28c9d29481975abb60aa7f373 SHA256 edb8a308ff1452f06ef02070877439bcdc95dac126445671201fa1aa484d0be7
-MISC metadata.xml 990 RMD160 091b926c8d1090d525aa8b2ad17dbc0e4c26dbc3 SHA1 de97430589e954944ddcc304083b384daf072bcf SHA256 4f0618471f177284a088d8c4b4d8b87a434552a491a50ee261dd2887945072e5
+EBUILD openscenegraph-2.8.3.ebuild 3635 RMD160 8fc936d355b7b761ea69110d91518d52ccc66b27 SHA1 90c788bf18e1e3d43f6d26147827dcc383fdeead SHA256 d18a4ca588ddc58678ddf471db83c5269b84d1b2c04d4757dcd4dc09a63c9f39
+MISC ChangeLog 3838 RMD160 b3f5cc43fbc349207b5fb56545971d0c1787a3c1 SHA1 93fc93b855dfa36f3e70aeab6726f6f807e2f1b1 SHA256 a4a9cf3304ae6ef9751fe38e16e94079d6ef943933e7426bca6f603de0dd05d3
+MISC metadata.xml 1203 RMD160 febccdfa11283592b6b30bf88115e9ff4beeb16e SHA1 e45564f9497fb753ac1c761fd707966ead33f435 SHA256 2267d4c86c41e9f3c5bbaba610574c90d4e12cd693334f8a12100b38a1d826d6
diff --git a/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch
new file mode 100644
index 000000000000..22b0417e45d1
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch
@@ -0,0 +1,283 @@
+diff -ruN ../OpenSceneGraph-2.8.3/CMakeLists.txt ./CMakeLists.txt
+--- ../OpenSceneGraph-2.8.3/CMakeLists.txt	2010-04-01 11:02:54.000000000 +0200
++++ ./CMakeLists.txt	2010-06-25 17:28:40.905021853 +0200
+@@ -27,6 +27,7 @@
+ endif(COMMAND cmake_policy)

+ 

+ PROJECT(OpenSceneGraph)

++
+ 

+ SET(OPENSCENEGRAPH_MAJOR_VERSION 2)

+ SET(OPENSCENEGRAPH_MINOR_VERSION 8)

+@@ -276,6 +277,7 @@
+ # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")

+ 

+ 

++INCLUDE(MacroOptionalFindPackage)
+ ################################################################################

+ # Optional build components

+ 

+@@ -292,24 +294,24 @@
+ ENDIF(WIN32)

+ 

+ # 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)

++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)

+ 

+ #use pkg-config to find various modues

+ INCLUDE(FindPkgConfig OPTIONAL)

+@@ -318,6 +320,7 @@
+ 

+     INCLUDE(FindPkgConfig)

+ 

++    IF(WITH_GTK)
+     PKG_CHECK_MODULES(GTK gtk+-2.0)

+ 

+     IF(WIN32)

+@@ -325,10 +328,15 @@
+     ELSE(WIN32)

+         PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)

+     ENDIF(WIN32)

++    ENDIF(WITH_GTK)
+ 

+-    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(PKG_CONFIG_FOUND)

+ 

+@@ -336,30 +344,30 @@
+ IF   (BUILD_OSG_EXAMPLES)

+ 

+ 

+-    FIND_PACKAGE(FLTK)

+-    FIND_PACKAGE(GLUT)

+-    FIND_PACKAGE(SDL)

+-    FIND_PACKAGE(FOX)

++    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)

++    MACRO_OPTIONAL_FIND_PACKAGE(GLUT)

++    MACRO_OPTIONAL_FIND_PACKAGE(SDL)

++    MACRO_OPTIONAL_FIND_PACKAGE(FOX)

+ 

+     SET(wxWidgets_USE_LIBS base core gl net)

+-    FIND_PACKAGE(wxWidgets)

++    MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)

+ 

+     # 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(DESIRED_QT_VERSION MATCHES 4)

+-          FIND_PACKAGE(Qt3)

++          MACRO_OPTIONAL_FIND_PACKAGE(Qt3)

+         ENDIF(DESIRED_QT_VERSION MATCHES 4)

+ 

+     ELSE(DESIRED_QT_VERSION)

+ 

+-        FIND_PACKAGE(Qt4)

++        MACRO_OPTIONAL_FIND_PACKAGE(Qt4)

+ 

+         IF  (NOT QT4_FOUND)

+-            FIND_PACKAGE(Qt3)

++            MACRO_OPTIONAL_FIND_PACKAGE(Qt3)

+         ENDIF(NOT QT4_FOUND)

+ 

+     ENDIF(DESIRED_QT_VERSION)

+@@ -424,10 +432,10 @@
+ # 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)

+@@ -722,7 +730,7 @@
+         ${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)

+@@ -738,7 +746,7 @@
+         ${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 -ruN ../OpenSceneGraph-2.8.3/CMakeModules/FindFLTK.cmake ./CMakeModules/FindFLTK.cmake
+--- ../OpenSceneGraph-2.8.3/CMakeModules/FindFLTK.cmake	2010-03-13 11:40:00.000000000 +0100
++++ ./CMakeModules/FindFLTK.cmake	1970-01-01 01:00:00.000000000 +0100
+@@ -1,60 +0,0 @@
+-# Locate gdal

+-# This module defines

+-# FLTK_LIBRARY

+-# FLTK_FOUND, if false, do not try to link to gdal 

+-# FLTK_INCLUDE_DIR, where to find the headers

+-#

+-# $FLTK_DIR is an environment variable that would

+-# correspond to the ./configure --prefix=$FLTK_DIR

+-#

+-# Created by Robert Osfield. 

+-

+-FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h

+-    $ENV{FLTK_DIR}/include

+-    $ENV{FLTK_DIR}

+-    $ENV{OSGDIR}/include

+-    $ENV{OSGDIR}

+-    $ENV{OSG_ROOT}/include

+-    ~/Library/Frameworks

+-    /Library/Frameworks

+-    /usr/local/include

+-    /usr/include

+-    /sw/include # Fink

+-    /opt/local/include # DarwinPorts

+-    /opt/csw/include # Blastwave

+-    /opt/include

+-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include

+-    /usr/freeware/include

+-)

+-

+-MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)

+-

+-    FIND_LIBRARY(${MYLIBRARY}

+-        NAMES ${MYLIBRARYNAME}

+-        PATHS

+-        $ENV{FLTK_DIR}/lib

+-        $ENV{FLTK_DIR}

+-        $ENV{OSGDIR}/lib

+-        $ENV{OSGDIR}

+-        $ENV{OSG_ROOT}/lib

+-        ~/Library/Frameworks

+-        /Library/Frameworks

+-        /usr/local/lib

+-        /usr/lib

+-        /sw/lib

+-        /opt/local/lib

+-        /opt/csw/lib

+-        /opt/lib

+-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib

+-        /usr/freeware/lib64

+-    )

+-

+-ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME)

+-

+-FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk)

+-FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl)

+-

+-SET(FLTK_FOUND "NO")

+-IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)

+-    SET(FLTK_FOUND "YES")

+-ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)

+diff -ruN ../OpenSceneGraph-2.8.3/CMakeModules/MacroOptionalFindPackage.cmake ./CMakeModules/MacroOptionalFindPackage.cmake
+--- ../OpenSceneGraph-2.8.3/CMakeModules/MacroOptionalFindPackage.cmake	1970-01-01 01:00:00.000000000 +0100
++++ ./CMakeModules/MacroOptionalFindPackage.cmake	2010-06-16 14:27:36.000000000 +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@kde.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 -ruN ../OpenSceneGraph-2.8.3/CMakeModules/OsgMacroUtils.cmake ./CMakeModules/OsgMacroUtils.cmake
+--- ../OpenSceneGraph-2.8.3/CMakeModules/OsgMacroUtils.cmake	2010-03-13 11:40:02.000000000 +0100
++++ ./CMakeModules/OsgMacroUtils.cmake	2010-06-25 09:03:22.295913047 +0200
+@@ -305,9 +305,9 @@
+         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 -ruN ../OpenSceneGraph-2.8.3/examples/osgviewerFLTK/CMakeLists.txt ./examples/osgviewerFLTK/CMakeLists.txt
+--- ../OpenSceneGraph-2.8.3/examples/osgviewerFLTK/CMakeLists.txt	2010-03-13 11:40:18.000000000 +0100
++++ ./examples/osgviewerFLTK/CMakeLists.txt	2010-06-25 16:39:50.863920026 +0200
+@@ -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} )

+ 

diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index b8674a6264a6..884e87dcab7c 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -10,11 +10,10 @@
 The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries.
 </longdescription>
   <use>
-    <flag name="osgapps">
-	  Build osg applications
-	</flag>
-    <flag name="xrandr">
-	  Enable support for the X xrandr extension
-	</flag>
+    <flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
+    <flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
+    <flag name="openinventor">Build OpenInventor plugin</flag>
+    <flag name="osgapps">Build osg applications</flag>
+    <flag name="xrandr">Enable support for the X xrandr extension</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
new file mode 100644
index 000000000000..1129871b8780
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild,v 1.1 2010/06/28 19:57:46 reavertm Exp $
+
+EAPI=2
+
+inherit eutils versionator cmake-utils
+
+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/stable_releases/${MY_P}/source/${MY_P}.zip"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
+openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype vnc
+wxwidgets xine xrandr zlib"
+
+# NOTE: OpenAL (support missing)
+# TODO: COLLADA, FBX, OpenVRML, Performer, ITK, DCMTK
+# 	xulrunner? ( only 1.8 supported for now, ignore it
+#		net-libs/xulrunner:1.8
+#		x11-libs/gtk+:2
+#	)
+RDEPEND="
+	x11-libs/libSM
+	x11-libs/libXext
+	virtual/glu
+	virtual/opengl
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1.1[opengl] )
+		fox? ( x11-libs/fox[opengl] )
+		glut? ( virtual/glut )
+		gtk? ( x11-libs/gtkglext )
+		qt4? (
+			x11-libs/qt-core:4
+			x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+		)
+		sdl? ( media-libs/libsdl )
+		wxwidgets? ( x11-libs/wxGTK[opengl,X] )
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	gdal? ( sci-libs/gdal )
+	gif? ( media-libs/giflib )
+	jpeg? ( media-libs/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	openinventor? (
+		|| (
+			media-libs/coin
+			media-libs/openinventor
+		)
+	)
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0 )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xine? ( media-libs/xine-lib )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/pkgconfig
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xrandr? ( x11-proto/randrproto )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+)
+
+src_configure() {
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	mycmakeargs=(
+		-DWITH_OpenAL=OFF # Commented out in buildsystem
+		-DWITH_XUL=OFF # Supports only xulrunner 1.8
+		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
+		$(cmake-utils_use_with curl)
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use_build examples OSG_APPLICATIONS)
+		$(cmake-utils_use_build examples OSG_EXAMPLES)
+		$(cmake-utils_use_with ffmpeg FFmpeg)
+		$(cmake-utils_use_with fltk)
+		$(cmake-utils_use_with fox)
+		$(cmake-utils_use_with gdal)
+		$(cmake-utils_use_with gif GIFLIB)
+		$(cmake-utils_use_with glut)
+		$(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)
+		$(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)
+		$(cmake-utils_use_with tiff)
+		$(cmake-utils_use_with truetype FreeType)
+		$(cmake-utils_use_with vnc LibVNCServer)
+		$(cmake-utils_use_with wxwidgets wxWidgets)
+		$(cmake-utils_use_with xine)
+		$(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR)
+		$(cmake-utils_use_with zlib)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
+}