Use correct libdir, bug 500716

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

3 files changed, 55 insertions, 43 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 2cba29a5ccd4..87a440633bfe 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/openscenegraph
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.55 2013/06/15 20:09:37 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.56 2014/02/13 21:22:42 reavertm Exp $
+
+  13 Feb 2014; Maciej Mrozowski <reavertm@gentoo.org>
+  files/openscenegraph-3.0.1-cmake.patch:
+  Use correct libdir, bug 500716
 
   15 Jun 2013; Pacho Ramos <pacho@gentoo.org> openscenegraph-3.0.1-r1.ebuild:
   media-libs/openinventor will be dropped
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 70b2ec2649c2..d3724b9172ac 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX openscenegraph-3.0.1-cmake.patch 10551 SHA256 d7c38edfd7987d3a50003090901a3f7732d47ec6724934fb159496c4eb727e19 SHA512 15457f5ecdc1fc626a36f6daf1b15ba26d6e94047b12b6cdde5b8b39ae6f38e96263dd4268aeda63036bbcbb32205b5ec04e742adaa016d5ae3bb9455b36c144 WHIRLPOOL 724d2f4051f60464077bdccba3d7a25dbbc742bf350077c8071989ca05c4dd08688955cb2356ec8fe4722ccc6867dd22281485e465b62a4820e11a2c5c5d2b67
+AUX openscenegraph-3.0.1-cmake.patch 11396 SHA256 53ca5a868b5d5d5c7d0dff109bab58869b90f7d0e2e4060c8a81b7bb45871f25 SHA512 2219a6413a596dde196715ed27a7858c61919bde2dbc8926a78c6193a386ac995d9b99f7b06ce1b1bc98e91b4776b103a1e0f7d688fc04cad960c4e6d96c1601 WHIRLPOOL 5295c3ec6c1c01bf523ee3de02db9f85994dbaf1666eac11e0591b9034886b4caeb94c9378066e446b756069a9e66820c2574a9771247e55eb849772741d0bb3
 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
 DIST OpenSceneGraph-3.0.1.zip 6780282 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296 SHA512 5fbfe9070721f055349a27516c9a20195070d13ab562e0c5109cc1f1d46dfaf09778152a14f5815b72728d315cb80b2d7bab747bfd9be58aea22d600c2c97912 WHIRLPOOL e3e24e2b36fd59a823d43864e7123d3683a8b2ef4e09cae17895d4b15eb4321bdd112cd59a734e1e55924cc9af52198c6152797bd73ab33a91bf17936232a7b0
 EBUILD openscenegraph-3.0.1-r1.ebuild 3695 SHA256 f41291242233fb57966b76942c86783a2cbc889246ec4e2245dd1cd8ce925de4 SHA512 9d71287ba34178b585cf7f4382fd7e3ce43b0ef029560309a6626eb83ee7f47d25b68387d147b624d44d078e176ca790920dd92989bed5d0f03c963b3b6290ff WHIRLPOOL 83c9b6f0746af7446c9c43af1a6937bb4f04a57c91c34dc8875ebe54171d575225e1892d808cf7183402fbf5509897dbb5720810c9ad420f2c9885fe30fc3e1b
-MISC ChangeLog 8524 SHA256 21120160f6445a641615ac31d2ef0cc62139feaff06273b6938aa5116737a9cb SHA512 24f2d35217d3bcdb2b33ee302df3ec6eaa77214c3b82e943ffe3f39340bd7225e7675b5fbe79521bc15625e9d25c0ee87ef86ce3fe5812dadbcf0e28c8da8391 WHIRLPOOL a0fbf26e268a630fa28353abe7d39d17d8f37add73beba4336539186894cbada9cac209122856dd84fbd7fa35d6b6656d1352672fadac8af3e2a5a7336d90c53
+MISC ChangeLog 8657 SHA256 041cbc323c303d7f4b0396a98ca89337030763c1b28a08c4c37de46afb7b6a91 SHA512 f7c5b0d5f2a9d15dcb1a34c57165e69ca8a3e3c7888c05b191f8228d324a4c043c73a9b5b09a07d84298aa06ed181d47ecc861669f791528cec4152f6adc573e WHIRLPOOL 74710e6415929b45cc4f7df7272f4b894e6bf1e14e2a234e480fb7d52483d8ea84e8cff08df1a96b224f47c73e63137dd19fe095ca086e275326b07ad607425a
 MISC metadata.xml 1272 SHA256 b481215aaefd210da29e865fee328cf6d4bd8eb75a0dcfa1876396fcb16a8a03 SHA512 1edacc984e0376661e31eeb3c7c1735ca8910a82bf28d30b4ae282855dc86a4a3bdcfc4593dbeeb4563fccbf3ae1b4a45125769e911d1cfd0926dcc72dde5716 WHIRLPOOL bb17deea650cc6dce697129d1da7e59b522936f607891c88f2b141045acbce98c3670ebbd3850290e85ae7c0957b5a1d8a710468d8f3b4e048b94c5447663131
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlG8ygIACgkQCaWpQKGI+9QbiwCcCdJTwho5amzHJU+9r+LiXnnK
-gwUAmwb9UTt4L0mNkH+7OY0f184qlkhZ
-=OXpP
+iEYEAREIAAYFAlL9N7wACgkQFuHa/bHpVduw4gCffXawfERO0YfAgIi/sKWaI0lM
+dZQAnjILZKV0uKQlr8aYBkVtVWZHNTRk
+=4yeg
 -----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
index 2bcccc320291..9cc4f4e103c6 100644
--- a/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch
@@ -1,8 +1,7 @@
-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"
+diff -ruN OpenSceneGraph-3.0.1/CMakeLists.txt new/CMakeLists.txt
+--- OpenSceneGraph-3.0.1/CMakeLists.txt	2011-07-31 09:50:34.000000000 +0200
++++ new/CMakeLists.txt	2014-02-11 23:12:54.360448879 +0100
+@@ -421,6 +421,7 @@
  
  # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
  
@@ -10,7 +9,7 @@ index 6858e70..3bddcf2 100644
  
  ################################################################################
  # Set Version Info resource file
-@@ -450,30 +451,30 @@ IF(ANDROID)
+@@ -450,30 +451,30 @@
      ANDROID_3RD_PARTY()
  ELSE()
  # Common to all platforms except android:
@@ -63,7 +62,7 @@ index 6858e70..3bddcf2 100644
  ENDIF()
  
  # Include macro utilities here
-@@ -485,17 +486,17 @@ IF(NOT ANDROID)
+@@ -485,17 +486,17 @@
      IF  (DESIRED_QT_VERSION)
  
          IF  (DESIRED_QT_VERSION MATCHES 4)
@@ -85,7 +84,7 @@ index 6858e70..3bddcf2 100644
          ENDIF()
  
      ENDIF()
-@@ -504,12 +506,12 @@ ENDIF(NOT ANDROID)
+@@ -504,12 +505,12 @@
  IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
  
  
@@ -102,7 +101,7 @@ index 6858e70..3bddcf2 100644
  
  ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
  
-@@ -530,10 +532,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+@@ -530,10 +531,10 @@
  # can use Quicktime.
  IF(NOT ANDROID)
      IF(NOT APPLE)
@@ -117,7 +116,24 @@ index 6858e70..3bddcf2 100644
  
          # QuickTime is required for OS X, but optional for Windows.
          IF(WIN32)
-@@ -884,7 +886,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -586,15 +587,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?
+@@ -884,7 +877,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)
@@ -126,7 +142,7 @@ index 6858e70..3bddcf2 100644
  
      # now set up openthreads documentation generation
      IF(BUILD_REF_DOCS_TAGFILE)
-@@ -900,7 +902,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -900,7 +893,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)
@@ -135,11 +151,9 @@ index 6858e70..3bddcf2 100644
  
      # 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
+diff -ruN OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS new/CMakeModules/COPYING-CMAKE-SCRIPTS
+--- OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS	1970-01-01 01:00:00.000000000 +0100
++++ new/CMakeModules/COPYING-CMAKE-SCRIPTS	2014-02-11 23:12:31.241449702 +0100
 @@ -0,0 +1,22 @@
 +Redistribution and use in source and binary forms, with or without
 +modification, are permitted provided that the following conditions
@@ -163,11 +177,9 @@ index 0000000..4b41776
 +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
+diff -ruN OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake new/CMakeModules/FindFLTK.cmake
+--- OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake	2010-11-11 17:51:46.000000000 +0100
++++ new/CMakeModules/FindFLTK.cmake	1970-01-01 01:00:00.000000000 +0100
 @@ -1,52 +0,0 @@
 -# Locate FLTK
 -# This module defines
@@ -221,11 +233,9 @@ index e376b78..0000000
 -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
+diff -ruN OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake new/CMakeModules/MacroOptionalFindPackage.cmake
+--- OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake	1970-01-01 01:00:00.000000000 +0100
++++ new/CMakeModules/MacroOptionalFindPackage.cmake	2014-02-11 23:12:31.256449701 +0100
 @@ -0,0 +1,28 @@
 +# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
 +# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
@@ -255,11 +265,10 @@ index 0000000..f09952f
 +   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)
+diff -ruN OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake new/CMakeModules/OsgMacroUtils.cmake
+--- OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake	2011-04-21 19:16:27.000000000 +0200
++++ new/CMakeModules/OsgMacroUtils.cmake	2014-02-11 23:12:31.280449700 +0100
+@@ -445,9 +445,9 @@
          SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
          
          IF(APPLE)
@@ -271,10 +280,9 @@ index aa607fa..8f3771c 100644
          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
+diff -ruN OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt new/examples/osgviewerFLTK/CMakeLists.txt
+--- OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt	2007-06-25 10:35:06.000000000 +0200
++++ new/examples/osgviewerFLTK/CMakeLists.txt	2014-02-11 23:12:31.331449698 +0100
 @@ -1,6 +1,6 @@
  SET(TARGET_SRC osgviewerFLTK.cpp )