version bump wrt #520442, patch and ebuild from Émeric Maschino

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

5 files changed, 478 insertions, 7 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 50c730ee8a44..021dedf03b76 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.57 2014/08/20 23:47:19 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.58 2014/10/10 20:17:05 hasufell Exp $
+
+*openscenegraph-3.2.1 (10 Oct 2014)
+
+  10 Oct 2014; Julian Ospald <hasufell@gentoo.org>
+  +openscenegraph-3.2.1.ebuild, +files/openscenegraph-3.2.1-cmake.patch:
+  version bump wrt #520442, patch and ebuild from Émeric Maschino
 
   20 Aug 2014; Maciej Mrozowski <reavertm@gentoo.org> metadata.xml,
   openscenegraph-3.0.1-r1.ebuild:
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index dc2eb320e772..b725586a1999 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -5,14 +5,29 @@ AUX openscenegraph-3.0.1-cmake.patch 11396 SHA256 53ca5a868b5d5d5c7d0dff109bab58
 AUX openscenegraph-3.0.1-libav-0.7.patch 763 SHA256 8e78e9e26aefa640bb020beaa92ebfd29d5cd6ef341568926eb4d34ba5688a75 SHA512 20db7d3b1f9358f5701a9414724f9d8556d6a20bc7b0ed3c904421f71c084cd5eef933695008c25e2ab8f161b6610acdd033425538faab718b36768df2d5f3c8 WHIRLPOOL cdb0e50b0bc410461c153df0856d564f80d1767105baf0c5cc4dbca1232593f7c6bfd3a2f4d74b28508165d8224ec0b378f73144104ac3b0d7d67111261c7438
 AUX openscenegraph-3.0.1-libav-9.patch 11919 SHA256 2efd2bab9d2469c42ec2bf78b2c28f5e71c79d5718b54c817391c777a2e27465 SHA512 71f3411b643bc96f67ff60adc36890392355eb2c78f27eac105a526cb97fdf268069f3f453371a6a4204fdf44a3ccc19d250cc18238d99e65c7bd055b6ec3af5 WHIRLPOOL 21cd313b0c2fc4cf6b0b9fac7aef10a682bed9d12fedabaa84be5d076cac21306db50c13a065963da312bdfd2c567755717bae333ce1968d4c79970b6b3224e8
 AUX openscenegraph-3.0.1-xinelib12x.patch 706 SHA256 1d9baf7ec7cfaac0cdb4a08742e663f12a4fe5a431d8fe25b34a2cb4a0cbd828 SHA512 6c72f814a38628b222c82ccf71c3fa7f66af2b92ce45cbcb8c5a5c368239f9dfd60dbd04a8c9c65bad62e3c3005521531a19f469af9919a75b707b8206408c7b WHIRLPOOL 027427daff13ba6f9efa30ca657130936173b6604b2ddc3f848c544d505a22c99d686bd1f27b3497fc60175517ad80227f6103921308d53da7aaa7d27ae038b3
+AUX openscenegraph-3.2.1-cmake.patch 12197 SHA256 5be8d66fd24d86a895ade16f6b54201194aeb9a5db6d903813b53108e1150d07 SHA512 ca9e827dea0f5e27b5e0ebf1759c9f1d87462a9951c169f133c364aa7e29b835f11afc562000b1df30ed7db35e21d17150274ab584258d4775ff0c723f8dae6a WHIRLPOOL adcdd34f6aaf18046a2fafec7398c439448704bc36b015830e1e67a4f8a5a708bf149e46d6e711850e00f71e7b24528f107e6392ace9c1120632342dd9ae095a
 DIST OpenSceneGraph-3.0.1.zip 6780282 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296 SHA512 5fbfe9070721f055349a27516c9a20195070d13ab562e0c5109cc1f1d46dfaf09778152a14f5815b72728d315cb80b2d7bab747bfd9be58aea22d600c2c97912 WHIRLPOOL e3e24e2b36fd59a823d43864e7123d3683a8b2ef4e09cae17895d4b15eb4321bdd112cd59a734e1e55924cc9af52198c6152797bd73ab33a91bf17936232a7b0
+DIST OpenSceneGraph-3.2.1.zip 7219212 SHA256 d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d SHA512 f7bd9aedd3a1f48094a0ad95d267c2f2c946b042f7459d6b33e6038a4b16aeda9cfd69f339ea0a2a478dadadf1875313a4132564b8fcade5ad93511ecd8c1a9e WHIRLPOOL ef47a41a316fae86341cdebecaeceb41cf56b5f11fdf93e8218bb9aa9eaa28fc2fc9122efbeb8dce69fa01d8c8b6a2460fab69190714ca53abfa5d347a0ae1bc
 EBUILD openscenegraph-3.0.1-r1.ebuild 3662 SHA256 ee7b72ef5d022d5ee1bc2118c6c67a8b9ae43e750e940497dfce1d4c1b5dbeb7 SHA512 1a3839c6144334c6e2a225183ddf4119283e01be3d12ed7ec6face82baacf20a1f6d632d602bd0bb7216812eff4f3d035f1ece4a9c7b1f2a1dec95e928bc442d WHIRLPOOL b863538a473e07e593d78257de194de8e794dd2cca7971184acba8761c14a19bbf4c48ac33cb12cd783fee6504a614355a2176aecf08bc03b95a9630dd14f47d
-MISC ChangeLog 8818 SHA256 5b67ee744ef2deb13ef77d4ef6f0ee83abf5ff6a82be6539bf41c256af17fa58 SHA512 36c8b08ceac0eeca3cec4fdc833f4e253c56e9982f8775aef330dd396fa864c5f456dc2adc65e02ce07b0f344b82ae3e6bec90fa035c2e63b07039db4497711d WHIRLPOOL 4db17d8c5c5107d0ae71653b1e7396a7d9d09210488003e6cbf333f281952c379457fa7a7dc41e380f5e5e716b9090a35b29ba2d5478a609e4ca60f7c91db85f
-MISC metadata.xml 1209 SHA256 7c09aa51d7a91a5df457433acf5e629e72df24b1f9a5d3103248440e902e582c SHA512 e90f9ccaa4c4f2d1ba5e10c23cd118560690cd26eac62309cd63495d7868c941e138e07edc4620af66fc0dca0dc9041d45c6eed60121cbb219e75c2477371530 WHIRLPOOL 73ea6afc5a7bcd4c758e8271f10b3aa8512dfcf46d81b9539b2ad20d02c79c19ff4339211d4669daa362eb78062d9321ebf9c54e8b85dc3a830ee9e6d7670175
+EBUILD openscenegraph-3.2.1.ebuild 3503 SHA256 c4d1b381a46965a0349650e99867345feda49e92a81455b7d3750ab5444af594 SHA512 05de7a5ef0c6eeef6758d5a888cf13404639bbab04e1340317b3f7d124185eee82665b09db485503da58268be202a3f3223a249e4d6629e35f9250d61158b9aa WHIRLPOOL 934b93c744b3eb9fedff4f599c1aa7e721f5a70f3e0590e7834687501e56116d5f3a98ca1f31e2e3fcd0b0dc6a07f13d8a3756a21937a8e7739976104f5b955c
+MISC ChangeLog 9047 SHA256 e7be1c698f58395fbf98054830ec41a2a4cb3743c2040d99e1b1c6f59572c8c9 SHA512 d32fc95b726e49b15bc27d077ccf95f6a5fd628887f2a940c009a417e5cdb82f8b7dd559429c0fdada8d2ab84c4cc3ebc8d8213f9d91e3ac8a217b8f18d3f350 WHIRLPOOL b5572479fb9438d476190eac4cfa589aaef1dcdc51f842a40019382718587c490157c95a62d09c02812f1f5041df36545171c2f6039bb9032186e99c93fd48d9
+MISC metadata.xml 1289 SHA256 d681ed8d7d4c8393f9fea6af276e50e8a93063a2860ca36012779de27705ecd7 SHA512 864cd81ae0b7e87a4599d8cb0910512e6b1c9ad5e953f560fff501734d368f5434edb6a681867e948cd9cbc2fb363ecf59948cf8c0dcc26c296a32840dbb8108 WHIRLPOOL 34a648e86d06762c417fa7dd977ddc5db426e2f5558c672d6eb3a3581cc0f63a4a5415d8cf2c5d93760bce6021c747e48816b9f3d591b7527515e74a9edd2491
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlP1M6MACgkQFuHa/bHpVdsi+wCfetvZEoxmKi+/1uW/lfz2Nqd+
-IRcAoKakWqPtSRU5p8PkDLSYhPeIzp/y
-=ubNt
+iQJ8BAEBCABmBQJUOD7KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgNDQQANEM5pyFLKOulYo69FOGS3BJ
+oyFfH7TJFypBiuraes3DtfbOQkN81pLOBtUm+AArpxCLqtHC3g5tx4wQxICxpuh1
+Ltg+8nOXW1spM3TlbiVFtaBQdQWf/2zzxGCATkP5hDFm0t9n8xKydnDX6tPPLgtH
+Osc82BiyuQbrQDQnH4sRcrcceQfpfBGOnfMVEsXCcjFc5BGA40HjZeFp/nX99EnJ
+ZxX8qIq08g77UEkxa2G9hLdvymQhaWRERuuHKARunlXqwi7E1xKps/NgkOGcdytw
+rJXlYTzQ2oL8gBsvFjdNwKdegAZsZ6CBxjJV/lZefUrJ1O1+wiDpoBx2tWPg9p/w
+/GRAlStBI1nj707D7IfLiTLVt9svQ9fa3Mfpc1zP8SHcTrz97V1nBiUoN2JXVklM
+MMW8LhPLgZOnq93mOZIjEayCff/rn+AbCBNLE42WB9eHA5VA1/j8XQ/mslcKysZo
+2OOkBgG9RnCSMKlzK4qXn/ec4KGOkVU4QT8zoV/fQa8et6D6MtXrEJ23Zbzz5Nrf
+XQRpxJFnhapn0VILst4FIMuEqfVlDu/FYmhgN0nJfveE2K3CeQRoat36CYo5dQot
+xqMRf8CKtbmiUiCbfuFTx1Y+FUg0LYSFPfXl/nXUFdaeqL4cWbPx8HaOlBJYQxgr
+eg95I3pqKTSuuFV95xS+
+=GXy7
 -----END PGP SIGNATURE-----
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch
new file mode 100644
index 000000000000..84649e5f3d61
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch
@@ -0,0 +1,318 @@
+diff -ruN OpenSceneGraph-3.2.1/CMakeLists.txt new/CMakeLists.txt
+--- OpenSceneGraph-3.2.1/CMakeLists.txt	2014-07-04 13:29:02.000000000 +0200
++++ new/CMakeLists.txt	2014-08-20 00:45:08.857600038 +0200
+@@ -486,6 +486,7 @@
+ 
+ # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
+ 
++INCLUDE(MacroOptionalFindPackage)
+ 
+ ################################################################################
+ # Set Version Info resource file
+@@ -515,37 +516,37 @@
+     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(GTA)
+-    FIND_PACKAGE(CURL)
+-    FIND_PACKAGE(LibVNCServer)
+-    FIND_PACKAGE(OurDCMTK)
+-    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(GTA)
++    MACRO_OPTIONAL_FIND_PACKAGE(CURL)
++    MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
++    MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
++    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)
+     IF (NOT WIN32)
+-        FIND_PACKAGE(Asio)
++        MACRO_OPTIONAL_FIND_PACKAGE(Asio)
+     ENDIF()
+     FIND_PACKAGE(ZeroConf)
+ 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
+@@ -560,16 +561,16 @@
+ 
+     IF  (DESIRED_QT_VERSION)
+         IF  (DESIRED_QT_VERSION MATCHES 5)
+-              FIND_PACKAGE(Qt5Widgets)
++              MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets)
+         ELSEIF (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(Qt5Widgets QUIET)
++        MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets QUIET)
+ 
+         IF ( Qt5Widgets_FOUND )
+             # CMake 2.8.8 or greater required
+@@ -585,17 +586,17 @@
+         ENDIF( )
+ 
+         IF ( NOT Qt5Widgets_FOUND )
+-            FIND_PACKAGE(Qt4)
++            MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+ 
+             IF (NOT QT4_FOUND)
+-                FIND_PACKAGE(Qt3)
++                MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+             ENDIF()
+         ENDIF()
+     ENDIF()
+ 
+     #If we have found Qt5, let's try to top off by getting the webkit as well
+     IF ( Qt5Widgets_FOUND )
+-        FIND_PACKAGE(Qt5WebKitWidgets QUIET)
++        MACRO_OPTIONAL_FIND_PACKAGE(Qt5WebKitWidgets QUIET)
+     ENDIF()
+ 
+ ENDIF()
+@@ -604,12 +605,12 @@
+ 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)
+ 
+@@ -630,10 +631,10 @@
+ # 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)
+             FIND_PACKAGE(QuickTime)
+@@ -689,15 +690,7 @@
+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ ENDIF()
+ 
+-IF(UNIX AND NOT WIN32 AND NOT APPLE)
+-  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+-      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
+-      MARK_AS_ADVANCED(LIB_POSTFIX)
+-  ENDIF()
+-ENDIF()
+-IF(NOT DEFINED LIB_POSTFIX)
+-    SET(LIB_POSTFIX "")
+-ENDIF()
++SET(LIB_POSTFIX ${LIB_SUFFIX})
+ 
+ # Here we apparantly do some funky stuff with making the bin/ and lib/
+ # folders which is probably needed to work around a very old CMake bug?
+@@ -1001,7 +994,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)
+@@ -1017,7 +1010,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-3.2.1/CMakeModules/COPYING-CMAKE-SCRIPTS new/CMakeModules/COPYING-CMAKE-SCRIPTS
+--- OpenSceneGraph-3.2.1/CMakeModules/COPYING-CMAKE-SCRIPTS	1970-01-01 01:00:00.000000000 +0100
++++ new/CMakeModules/COPYING-CMAKE-SCRIPTS	2014-08-20 00:27:15.371715620 +0200
+@@ -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 -ruN OpenSceneGraph-3.2.1/CMakeModules/FindFLTK.cmake new/CMakeModules/FindFLTK.cmake
+--- OpenSceneGraph-3.2.1/CMakeModules/FindFLTK.cmake	2010-11-11 17:51:46.000000000 +0100
++++ new/CMakeModules/FindFLTK.cmake	2014-08-20 00:29:31.229439251 +0200
+@@ -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 -ruN OpenSceneGraph-3.2.1/CMakeModules/MacroOptionalFindPackage.cmake new/CMakeModules/MacroOptionalFindPackage.cmake
+--- OpenSceneGraph-3.2.1/CMakeModules/MacroOptionalFindPackage.cmake	1970-01-01 01:00:00.000000000 +0100
++++ new/CMakeModules/MacroOptionalFindPackage.cmake	2014-08-20 00:32:02.142858484 +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-3.2.1/CMakeModules/OsgMacroUtils.cmake new/CMakeModules/OsgMacroUtils.cmake
+--- OpenSceneGraph-3.2.1/CMakeModules/OsgMacroUtils.cmake	2014-04-13 18:03:17.000000000 +0200
++++ new/CMakeModules/OsgMacroUtils.cmake	2014-08-20 07:31:10.261828759 +0200
+@@ -453,7 +453,7 @@
+         IF(APPLE)
+             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/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-3.2.1/examples/osgviewerFLTK/CMakeLists.txt new/examples/osgviewerFLTK/CMakeLists.txt
+--- OpenSceneGraph-3.2.1/examples/osgviewerFLTK/CMakeLists.txt	2007-06-25 10:35:06.000000000 +0200
++++ new/examples/osgviewerFLTK/CMakeLists.txt	2014-08-20 00:40:48.620538012 +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 9daa7d7fd705..99260e6b9652 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -10,6 +10,7 @@
 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="asio">Enable support for <pkg>dev-cpp/asio</pkg> library</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>
diff --git a/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild
new file mode 100644
index 000000000000..cbff9feba38b
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild,v 1.1 2014/10/10 20:17:05 hasufell Exp $
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic 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/developer_releases/${MY_P}.zip"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
+openexr openinventor osgapps pdf png qt4 sdl svg tiff truetype vnc wxwidgets
+xine xrandr zlib"
+
+# TODO: COLLADA, FBX, GTA, ITK, OpenVRML, Performer, DCMTK
+RDEPEND="
+	x11-libs/libSM
+	x11-libs/libXext
+	virtual/glu
+	virtual/opengl
+	asio? ( dev-cpp/asio )
+	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? (
+			dev-qt/qtcore:4
+			dev-qt/qtgui:4
+			dev-qt/qtopengl:4
+		)
+		sdl? ( media-libs/libsdl )
+		wxwidgets? ( x11-libs/wxGTK[opengl,X] )
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	gdal? ( sci-libs/gdal )
+	gif? ( media-libs/giflib )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	openinventor? ( media-libs/coin )
+	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
+	virtual/pkgconfig
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xrandr? ( x11-proto/randrproto )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-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=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DWITH_ITK=OFF
+		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
+		$(cmake-utils_use_with asio)
+		$(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 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_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
+}