Version bump to 3.0.1 Bug #365143

Package-Manager: portage-2.1.10.27/cvs/Linux i686

6 files changed, 457 insertions, 6 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index db5f1a9d8d7f..6ece2e36d07e 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.41 2011/09/24 22:06:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.42 2011/10/14 09:50:30 tupone Exp $
+
+*openscenegraph-3.0.1 (14 Oct 2011)
+
+  14 Oct 2011; Tupone Alfredo <tupone@gentoo.org> openscenegraph-2.8.3.ebuild,
+  +openscenegraph-3.0.1.ebuild, +files/openscenegraph-3.0.1-cmake.patch,
+  metadata.xml:
+  Version bump to 3.0.1 Bug #365143 by Michael Weber
 
   24 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org>
   openscenegraph-2.8.3.ebuild, +files/openscenegraph-2.8.3-curl.patch:
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 5e82f44bbac8..f38e8b747aa8 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openscenegraph-2.8.3-cmake.patch 11939 RMD160 7685d55a3dc62aa373e98631b4589e9926cffb36 SHA1 52b5ca79fe325dc58a89980dd84760dbe09397f0 SHA256 8f29e3e8f41af0b120a16c8763c1e304d481fb52d92d2737fd97d30046d31531
 AUX openscenegraph-2.8.3-curl.patch 345 RMD160 dd156aadfe3c6b368f4515475f800b8dd976ac7a SHA1 3e2082275c85a81dde66b0cf512a20b8b0fea82e SHA256 e3c8a3456620907af99dbd9861d930867d4adf254515435617695c327aff5ead
 AUX openscenegraph-2.8.3-ffmpeg.patch 367 RMD160 d631abecf98c20824b8ee7cb8f0992df92c73d7c SHA1 fe7e574af4fd3bccc9552c35abd8b6ece8e13e3f SHA256 9adb7f5f1fa1e22130f2aa08b66ff680667f7adc44de4ddddafeaf3c4549277d
+AUX openscenegraph-3.0.1-cmake.patch 10551 RMD160 944cb102712dc8e579530ed51e840fdbabf1f07f SHA1 253d324e479994d37b8a43dc5ee806e7ba099ce7 SHA256 d7c38edfd7987d3a50003090901a3f7732d47ec6724934fb159496c4eb727e19
 DIST OpenSceneGraph-2.8.3.zip 6740017 RMD160 40a4988f4aefff7dbb6aab5225204ae41c945277 SHA1 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc SHA256 3a7b80ea02eeb39c37ded4d07e28ed4071a4a0ceba93f2834d39be7f7487115e
-EBUILD openscenegraph-2.8.3.ebuild 3912 RMD160 13a24147e35670fd2f4a41bd0205162064da4d85 SHA1 336b29a780391fa10b4c81ddf2dfe585fbf86bd7 SHA256 83ded21eb9e4525eda70cae21fc88efbf487c4338d922820ffa640ccd2676849
-MISC ChangeLog 6134 RMD160 cd503d2ab9cc763988ced83c65a31cf34e90e5b6 SHA1 10b3d934e811104afae0e222bad8d9bab38d6c90 SHA256 a5547e8671759714f79fc4fac67d7810eb081e6c703f13c74ec78af73f2c7f5c
-MISC metadata.xml 1115 RMD160 ca10b4eb4fdf20ffe7db6fe29ee2d290fda4a695 SHA1 eb1cb05392044f03e8d2a6ee5077d933044cabf9 SHA256 f3ea3669edf3bdc96dc9747d59447433fb9677185764d69a3aea6115b9d58643
+DIST OpenSceneGraph-3.0.1.zip 6780282 RMD160 54b315c318b7ade2bcc65703cea5f41377e93a71 SHA1 13c7e39f6d62047ad944d8d28a0f0eb60384ce33 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296
+EBUILD openscenegraph-2.8.3.ebuild 3909 RMD160 0e46a2005edf541551285fa60c27c9655d173127 SHA1 fd6c16f408b1ceb8543cfefbfc9090cca7e1334f SHA256 440ab1d413973bee30147586d1e8b6309cc7f249da34ec4fb53d8c8740d5f335
+EBUILD openscenegraph-3.0.1.ebuild 3861 RMD160 ddf19d8a9d726eb650a615101dae94c6ada4466f SHA1 e8ddd94ba93380b9e73eaf522c8d78a199c0e359 SHA256 a6b12b060f8352cd71eb30696ac95db38492d68bae86386b69f3895e1ea41747
+MISC ChangeLog 6390 RMD160 ba7faa787af060ee9e07c9bd4303b4f142ed3c37 SHA1 b90acc54736ebdda4ecc54b31d88d256a4c01405 SHA256 5925b9bde89eddc67c16a4bcb56f0f0fe7557c995885dad53308a761eddfb28c
+MISC metadata.xml 1178 RMD160 45302bbfff6e0fd2157af297afccfc3989b3723d SHA1 5384f2af9834dee8698cf669884ee196044b0327 SHA256 748466e3ef2ecc7bd8463b8f830537ea7c06df41d4ade686d13fc7c84662bdc5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk6YBiIACgkQIY77eQFFFC1cmwCeNzceXPu0pOUe126tFE2LwOK+
+TNoAnRFv1udSvabmDl+YEvbVghkdavWX
+=y+qU
+-----END PGP SIGNATURE-----
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch
new file mode 100644
index 000000000000..2bcccc320291
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch
@@ -0,0 +1,285 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6858e70..3bddcf2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -421,6 +421,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
+ 
+ # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
+ 
++INCLUDE(MacroOptionalFindPackage)
+ 
+ ################################################################################
+ # Set Version Info resource file
+@@ -450,30 +451,30 @@ 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(ITK)
+-    FIND_PACKAGE(LibVNCServer)
+-    FIND_PACKAGE(OurDCMTK)
+-    FIND_PACKAGE(OpenAL)
+-    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(FFmpeg)
+     FIND_PACKAGE(DirectShow)
+-    FIND_PACKAGE(SDL)
+-    FIND_PACKAGE(Poppler-glib)
+-    FIND_PACKAGE(RSVG)
+-    FIND_PACKAGE(GtkGl)
++MACRO_OPTIONAL_FIND_PACKAGE(SDL)
++MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
++MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
++MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
+     FIND_PACKAGE(DirectInput)
+-    FIND_PACKAGE(NVTT)
++MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
+ ENDIF()
+ 
+ # Include macro utilities here
+@@ -485,17 +486,17 @@ IF(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()
+@@ -504,12 +506,12 @@ ENDIF(NOT ANDROID)
+ 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)
+ 
+@@ -530,10 +532,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)
+@@ -884,7 +886,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)
+@@ -900,7 +902,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/COPYING-CMAKE-SCRIPTS b/CMakeModules/COPYING-CMAKE-SCRIPTS
+new file mode 100644
+index 0000000..4b41776
+--- /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/FindFLTK.cmake b/CMakeModules/FindFLTK.cmake
+deleted file mode 100644
+index e376b78..0000000
+--- a/CMakeModules/FindFLTK.cmake
++++ /dev/null
+@@ -1,52 +0,0 @@
+-# Locate FLTK
+-# 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}
+-    ~/Library/Frameworks
+-    /Library/Frameworks
+-    /usr/local/include
+-    /usr/include
+-    /sw/include # Fink
+-    /opt/local/include # DarwinPorts
+-    /opt/csw/include # Blastwave
+-    /opt/include
+-    /usr/freeware/include
+-)
+-
+-MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)
+-
+-    FIND_LIBRARY(${MYLIBRARY}
+-        NAMES ${MYLIBRARYNAME}
+-        PATHS
+-        $ENV{FLTK_DIR}/lib
+-        $ENV{FLTK_DIR}
+-        ~/Library/Frameworks
+-        /Library/Frameworks
+-        /usr/local/lib
+-        /usr/lib
+-        /sw/lib
+-        /opt/local/lib
+-        /opt/csw/lib
+-        /opt/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 --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@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 --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
+index aa607fa..8f3771c 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} )
+ 
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index 8bc0717fe77a..c2a2408c46c3 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -8,6 +8,7 @@ The OpenSceneGraph is an open source high performance 3D graphics toolkit, used
   <use>
     <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="itk">Build <pkg>dev-tcltk/itk</pkg> plugin</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>
diff --git a/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
index d0a228f8bd78..d103069f655a 100644
--- a/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.17 2011/09/24 22:06:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild,v 1.18 2011/10/14 09:50:30 tupone Exp $
 
 EAPI=2
 
@@ -14,8 +14,8 @@ 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 x86"
 SLOT="0"
+KEYWORDS="amd64 ppc x86"
 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"
diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
new file mode 100644
index 000000000000..38c5d5698dfc
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild,v 1.1 2011/10/14 09:50:30 tupone Exp $
+
+EAPI=3
+
+inherit eutils cmake-utils wxwidgets
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk itk 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, DCMTK
+RDEPEND="
+	x11-libs/libSM
+	x11-libs/libXext
+	virtual/glu
+	virtual/opengl
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		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? ( virtual/ffmpeg )
+	gdal? ( sci-libs/gdal )
+	gif? ( media-libs/giflib )
+	itk? ( dev-tcltk/itk )
+	jpeg? ( virtual/jpeg )
+	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() {
+	if use examples && use wxwidgets; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	mycmakeargs=(
+		-DWITH_OpenAL=OFF # Commented out in buildsystem
+		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
+		$(cmake-utils_use_with curl)
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use_build osgapps 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 GtkGl)
+		$(cmake-utils_use_with itk)
+		$(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 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 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
+}
+
+pkg_postinst() {
+	if has_version 'dev-games/simgear'; then
+		ewarn "dev-games/simgear has been detected and may need to be rebuilt now."
+		ewarn "Please run the following:"
+		ewarn "  # emerge -1 dev-games/simgear"
+	fi
+}