Adding use based dep on poppler bindings. Should fix bug #261575 by Andrey Sh.

Adding pdf use flag to eventually disable poppler usage.
Adding further dependency
Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 37 insertions, 9 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index e94bc2f19f33..2f47dafff0a0 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.5 2009/03/03 07:56:36 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.6 2009/03/08 20:08:59 tupone Exp $
+
+  08 Mar 2009; Tupone Alfredo <tupone@gentoo.org>
+  files/openscenegraph-2.8.0-magicoff.patch, openscenegraph-2.8.0.ebuild:
+  Adding use based dep on poppler bindings. Should fix bug #261575 by Andrey Sh.
+  Adding pdf use flag to eventually disable poppler usage.
+  Adding further dependency
 
   03 Mar 2009; Alfredo Tupone <tupone@gentoo.org>
   openscenegraph-2.8.0.ebuild:
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 618ae8b84486..942fcd068efb 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,5 +1,5 @@
-AUX openscenegraph-2.8.0-magicoff.patch 564 RMD160 84b2e25a42667eac835194206c1627219b420b1d SHA1 ef1ecbdad2c8b9a335452728551ba2970a5597f6 SHA256 dc49a046529b66a0ac88d9ae5785777eda4bda88237a7852a364415bbc6aa38d
+AUX openscenegraph-2.8.0-magicoff.patch 1137 RMD160 dca4cbeee37ae4c9089eb94f1143091e7ec639af SHA1 220c4c927e6f80d545b21c82d123c1a48c6fd896 SHA256 6704df2ff5db3d7cc966714d6f40249538ae9050a8ccb095a0c6ebd765743ef1
 DIST OpenSceneGraph-2.8.0.zip 6456765 RMD160 b5a3542fa1c94f7b11ee91b7b3c9914af08c3c54 SHA1 5af8b1ec1f927c88a7392e07ad7b29bee37937aa SHA256 c776dbaa06510ad395ef075f2a9e08e1ae07dba9543b7c75f6842080335953e6
-EBUILD openscenegraph-2.8.0.ebuild 1264 RMD160 4354b7dab0ee04821a63ad6002f3c410519dfcc4 SHA1 d71711b796f00e3808f14a5a06daacf9f7084886 SHA256 4a4127123dda2c1818c790005412ff0438d29de67ea76efa96eba89bf20ac194
-MISC ChangeLog 1031 RMD160 abdf7d2393f89fe0bf30d6471a3ac5215405a117 SHA1 6978ae91b78df60b9ab27f8ed53990f097323ad6 SHA256 aa50f8fa4e847f71b27847c46e64573bfeb51e79b07a51c387487e87f016b099
+EBUILD openscenegraph-2.8.0.ebuild 1436 RMD160 0fee22016a47e3c85472a3fb143006d09de27812 SHA1 28ef9b47e777558a560a1b5dd89445842a8db3f4 SHA256 25dd63c06dc487486af75b5e1981c67713ad971b5b82dd6e32930ac317b8a36c
+MISC ChangeLog 1324 RMD160 aa229fa80a8dc04f2974821c5f50ad98d1926208 SHA1 de3eff198caefb70931e9c138a719629f5664881 SHA256 7e6f5e1f1ff47f3d726e0311e5259138647520b1532da5b91d7f6a9a32cb4806
 MISC metadata.xml 905 RMD160 82a3e7d0d4d356ef7f50013a877ca71132721825 SHA1 815b14a51157cd4c580924b3b1c1eb351ecc8479 SHA256 fb8609aff998c41cdf36fa2820aa00d45ce6299e0d984c72044fb669332e3d2d
diff --git a/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
index 18ffd9c0270f..bc12e74a438d 100644
--- a/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
@@ -1,10 +1,11 @@
 --- CMakeLists.txt.old  2009-02-25 10:26:47.000000000 +0100
 +++ CMakeLists.txt      2009-02-25 10:33:07.000000000 +0100
-@@ -287,6 +287,8 @@
+@@ -287,6 +287,9 @@
      INCLUDE(Find3rdPartyDependencies)
  ENDIF(WIN32)
  
 +OPTION(ENABLE_XUL "Enable plugin gecko if xulrunner is available" ON)
++OPTION(ENABLE_PDF "Enable plugin pdf if poppler-glib and cairo are available" ON)
 +
  # Common to all platforms:
  FIND_PACKAGE(FreeType)
@@ -19,3 +20,17 @@
  
  #use pkg-config to find various modues
  INCLUDE(FindPkgConfig OPTIONAL)
+--- src/osgPlugins/CMakeLists.txt.old	2009-03-08 17:02:24.000000000 +0100
++++ src/osgPlugins/CMakeLists.txt	2009-03-08 17:02:56.000000000 +0100
+@@ -211,9 +211,9 @@
+     ADD_SUBDIRECTORY(svg)
+ ENDIF(RSVG_FOUND AND CAIRO_FOUND)
+ 
+-IF   (POPPLER_FOUND AND CAIRO_FOUND)
++IF(ENABLE_PDF AND POPPLER_FOUND AND CAIRO_FOUND)
+     ADD_SUBDIRECTORY(pdf)
+-ENDIF(POPPLER_FOUND AND CAIRO_FOUND)
++ENDIF(ENABLE_PDF AND POPPLER_FOUND AND CAIRO_FOUND)
+ 
+ IF   (LIBVNCSERVER_FOUND)
+     ADD_SUBDIRECTORY(vnc)
diff --git a/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild
index a172f28d9ea5..39181bf50299 100644
--- a/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild,v 1.5 2009/03/03 07:56:36 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild,v 1.6 2009/03/08 20:08:59 tupone Exp $
 
 EAPI=2
 inherit eutils versionator cmake-utils
@@ -16,7 +16,7 @@ SRC_URI="http://www.openscenegraph.org/downloads/stable_releases/${MY_P_MAJOR}/s
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="osgapps xulrunner"
+IUSE="osgapps pdf xulrunner"
 
 RDEPEND="virtual/opengl
 	virtual/glu
@@ -26,8 +26,14 @@ RDEPEND="virtual/opengl
 	media-libs/jpeg
 	media-libs/giflib
 	media-libs/tiff
-	app-text/poppler-bindings"
-
+	media-libs/jasper
+	media-libs/xine-lib
+	pdf? (
+		|| (
+			app-text/poppler-bindings[gtk]
+			app-text/poppler-bindings[cairo]
+		)
+	)"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
@@ -45,5 +51,6 @@ src_configure() {
 		mycmakeargs="${mycmakeargs} -DBUILD_OSG_APPLICATIONS=OFF"
 	fi
 	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable xulrunner XUL)"
+	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable pdf PDF)"
 	cmake-utils_src_configure
 }