Remove old

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

6 files changed, 11 insertions, 485 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 3c152ea22309..f7db6863411e 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.50 2012/07/10 04:51:17 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.51 2012/07/14 16:22:56 reavertm Exp $
+
+  14 Jul 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  -files/openscenegraph-2.8.3-cmake.patch,
+  -files/openscenegraph-2.8.3-curl.patch,
+  -files/openscenegraph-2.8.3-ffmpeg.patch, -openscenegraph-2.8.3.ebuild:
+  Remove old
 
   10 Jul 2012; Michael Weber <xmw@gentoo.org> openscenegraph-3.0.1.ebuild:
   ppc stable (bug 405665)
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index b09e10e77be4..92cf0f0944ce 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,22 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX openscenegraph-2.8.3-cmake.patch 11939 SHA256 8f29e3e8f41af0b120a16c8763c1e304d481fb52d92d2737fd97d30046d31531 SHA512 5902180a01f2fc8f60861315e300453c94e9c5003b4b1856854add2d60740c0fe55ea3b827ab42c0ae8e62850aa3e6846ca2187625c1112f41146906975c5707 WHIRLPOOL 33e3214a55d175489e3766a7191054d5a68ace1d4178b33c072c6da5251f11a130fa541ffdb288f27d8d59f1e6a7eb6b2fbd66473f9cb52b7a7971e252557647
-AUX openscenegraph-2.8.3-curl.patch 345 SHA256 e3c8a3456620907af99dbd9861d930867d4adf254515435617695c327aff5ead SHA512 8a04467357155fd04133ffe4c5b198ec7586cff4f1191d01e955ed13e2dbf7cb54812b782abebadb0e446c8323cac7d7e2106f30343cd745927b8911fe601aa4 WHIRLPOOL 845e12eb43e3404b0a1a1026921dc62856c0cd7043fc5f447d44587f214d7d0b60170e85047719fce9c10377f1a7dc2100fd7ceab175c1bbec414fb2147ac626
-AUX openscenegraph-2.8.3-ffmpeg.patch 367 SHA256 9adb7f5f1fa1e22130f2aa08b66ff680667f7adc44de4ddddafeaf3c4549277d SHA512 40c52ddcf825f4f348be0b67491500ca66247b21cc77ed5b42ce732446d67fb06b6e37ac4188e37ee849ca06b2409cde86fe75a0fda6d935b5da77b408de1690 WHIRLPOOL cac9fa2234bd43afe25f73459117acacbffc9b8ecbbb7f1e732fcbc17d9bc69192ec815cdf4636241aa32f30d3470ece858cd9514d9e54abf093efe44395b7f6
 AUX openscenegraph-3.0.1-cmake.patch 10551 SHA256 d7c38edfd7987d3a50003090901a3f7732d47ec6724934fb159496c4eb727e19 SHA512 15457f5ecdc1fc626a36f6daf1b15ba26d6e94047b12b6cdde5b8b39ae6f38e96263dd4268aeda63036bbcbb32205b5ec04e742adaa016d5ae3bb9455b36c144 WHIRLPOOL 724d2f4051f60464077bdccba3d7a25dbbc742bf350077c8071989ca05c4dd08688955cb2356ec8fe4722ccc6867dd22281485e465b62a4820e11a2c5c5d2b67
 AUX openscenegraph-3.0.1-libav-0.7.patch 763 SHA256 8e78e9e26aefa640bb020beaa92ebfd29d5cd6ef341568926eb4d34ba5688a75 SHA512 20db7d3b1f9358f5701a9414724f9d8556d6a20bc7b0ed3c904421f71c084cd5eef933695008c25e2ab8f161b6610acdd033425538faab718b36768df2d5f3c8 WHIRLPOOL cdb0e50b0bc410461c153df0856d564f80d1767105baf0c5cc4dbca1232593f7c6bfd3a2f4d74b28508165d8224ec0b378f73144104ac3b0d7d67111261c7438
 AUX openscenegraph-3.0.1-xinelib12x.patch 706 SHA256 1d9baf7ec7cfaac0cdb4a08742e663f12a4fe5a431d8fe25b34a2cb4a0cbd828 SHA512 6c72f814a38628b222c82ccf71c3fa7f66af2b92ce45cbcb8c5a5c368239f9dfd60dbd04a8c9c65bad62e3c3005521531a19f469af9919a75b707b8206408c7b WHIRLPOOL 027427daff13ba6f9efa30ca657130936173b6604b2ddc3f848c544d505a22c99d686bd1f27b3497fc60175517ad80227f6103921308d53da7aaa7d27ae038b3
-DIST OpenSceneGraph-2.8.3.zip 6740017 SHA256 3a7b80ea02eeb39c37ded4d07e28ed4071a4a0ceba93f2834d39be7f7487115e SHA512 0004bb317dbd8a5ed1a0bc692f1e74ba62936d1ca5a56511bbcd5c0d668e8aed41eaa8b805dfa67cb6101037e909f6fd2773cfb2543f1bb807fd0d516575327b WHIRLPOOL 30c021d649d2f593a8847088083378e51e03cebeac9ebf1589a5b391c5903d2209efb06b9c1f86e816566061a20f7fbf75fa0766f2b46580dc49109c8c54d109
 DIST OpenSceneGraph-3.0.1.zip 6780282 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296 SHA512 5fbfe9070721f055349a27516c9a20195070d13ab562e0c5109cc1f1d46dfaf09778152a14f5815b72728d315cb80b2d7bab747bfd9be58aea22d600c2c97912 WHIRLPOOL e3e24e2b36fd59a823d43864e7123d3683a8b2ef4e09cae17895d4b15eb4321bdd112cd59a734e1e55924cc9af52198c6152797bd73ab33a91bf17936232a7b0
-EBUILD openscenegraph-2.8.3.ebuild 3908 SHA256 7aff30860dd458162770b87a73cd65eafd356c20cabaca95441548c72fc70a55 SHA512 9eb7b555320fdc0dc3328662a00b4354818797c4844f1432233ddc699c3c96a2dfbb8da4cb66f3dee64a13b073bcfcc47ed890d3b8baaf0ba54689924a43c630 WHIRLPOOL 953b7643a9ac0358304bc28c339fb2307180b4778efa70aa6eb78dddbf0cd7e4d772aa3d1c88f0cf316634daa03b52f1d6aafe74058bc246c8b83d678269cf66
 EBUILD openscenegraph-3.0.1.ebuild 3961 SHA256 56ecbbfdd6d387ecc41788377275eef56d529b2effeb8ad6b9f95e273bc881e9 SHA512 4ab8ba4232b1f4a09bd4dee439b8b76bdcdbc8c9c9b3a149f236c557b303a905a8ecb55c818260750fdd694387989b9c00b5bc22cea568d4875d3d705f31e840 WHIRLPOOL e63e54c5c48b34a69cc7796db71b5092120de8587e79d928c5d44a56b2d529976ce99732b8b543fca152e62866954a692d7e448245e5cd0061108f9d8dc04628
-MISC ChangeLog 7570 SHA256 d2598e4d6d03f862d5956873d13c62d82ef7bd0e5e81dc7b8960e7b24787dc46 SHA512 b0a600e3db92ee0795970857851dd195b0f9198f13de811154ce99738c5bedee07afceb270a09cb6ef0ed11c3ca6357f0e6ed4319ebf1949703b187f171cd7aa WHIRLPOOL 109c5ad5b2ba4e7d272ec755218eb8fcc484a59f220153e4605967e39cff9f605b0e4b452269e93a200f45b37d648cf1c3a4d2910d4300fc5fd1f3fa42f32c3b
+MISC ChangeLog 7802 SHA256 be94539605139de203f93461b05b57703e78d374dc08c3ca70bcbc37263da77d SHA512 c6c1d6cfeb661543f3556180f0544851aa134575be2522a3558d83460b5b9db6651c1563750b7d8583abd297bb575d001633d47d67869c35ffe626c0528e5051 WHIRLPOOL f6a8b6cd842d55db3b52bc9638aa95787b4e57ec262e8d5cde7119fdfb650d569b35fa9774e99c3e033b4b119d7e68d312a5e16729658de32e1f2f13f1d03b07
 MISC metadata.xml 1272 SHA256 b481215aaefd210da29e865fee328cf6d4bd8eb75a0dcfa1876396fcb16a8a03 SHA512 1edacc984e0376661e31eeb3c7c1735ca8910a82bf28d30b4ae282855dc86a4a3bdcfc4593dbeeb4563fccbf3ae1b4a45125769e911d1cfd0926dcc72dde5716 WHIRLPOOL bb17deea650cc6dce697129d1da7e59b522936f607891c88f2b141045acbce98c3670ebbd3850290e85ae7c0957b5a1d8a710468d8f3b4e048b94c5447663131
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF0EAREIAAYFAk/7tJIACgkQknrdDGLu8JAI2gD44L+iIA63aZfnJRTwd8NuNDmi
-TZ81EedF4HofIzSrMAD6Au4+jJxKixqBHy+izgvZ5/j73pqGnZYssETHuh6d2vc=
-=omT1
+iEYEAREIAAYFAlABnNUACgkQFuHa/bHpVdu5+gCfW6nd+YDzN93LwiQhq+9H11dV
+p1UAoMaSNT4l0L7zsIMK89UJ8euRhyIy
+=mzpi
 -----END PGP SIGNATURE-----
diff --git a/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch
deleted file mode 100644
index 7ae1d4ee4071..000000000000
--- a/dev-games/openscenegraph/files/openscenegraph-2.8.3-cmake.patch
+++ /dev/null
@@ -1,309 +0,0 @@
-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-30 02:37:36.491242970 +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/COPYING-CMAKE-SCRIPTS ./CMakeModules/COPYING-CMAKE-SCRIPTS
---- ../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.
-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-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@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-30 02:37:36.523281953 +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-30 02:37:36.524321902 +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/files/openscenegraph-2.8.3-curl.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.3-curl.patch
deleted file mode 100644
index 7ad1265e3aa1..000000000000
--- a/dev-games/openscenegraph/files/openscenegraph-2.8.3-curl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/osgPlugins/curl/ReaderWriterCURL.cpp b/src/osgPlugins/curl/ReaderWriterCURL.cpp
-index 83aee7b..daf156f 100644
---- a/src/osgPlugins/curl/ReaderWriterCURL.cpp
-+++ b/src/osgPlugins/curl/ReaderWriterCURL.cpp
-@@ -21,7 +21,6 @@
- #include <fstream>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- 
- #include "ReaderWriterCURL.h"
- 
diff --git a/dev-games/openscenegraph/files/openscenegraph-2.8.3-ffmpeg.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.3-ffmpeg.patch
deleted file mode 100644
index 5a2fc6575ce2..000000000000
--- a/dev-games/openscenegraph/files/openscenegraph-2.8.3-ffmpeg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp.old	2011-04-21 16:28:29.026069826 +0200
-+++ src/osgPlugins/ffmpeg/FFmpegHeaders.hpp	2011-04-21 16:29:01.115068086 +0200
-@@ -6,6 +6,7 @@
- extern "C"
- {
- #define __STDC_CONSTANT_MACROS
-+#define FF_API_OLD_SAMPLE_FMT 0
- #include <errno.h>    // for error codes defined in avformat.h
- #include <stdint.h>
- #include <avcodec.h>
diff --git a/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
deleted file mode 100644
index 916fe3ed9eac..000000000000
--- a/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 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.19 2012/05/03 06:35:31 jdhore Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic 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"
-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"
-
-# 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/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 )
-	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
-	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}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-ffmpeg.patch"
-	"${FILESDIR}/${P}-curl.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 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)
-		$(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
-}
-
-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
-}