Adding use flags: jpeg2k svg xine

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 53 insertions, 27 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 2f47dafff0a0..ce076cc757c4 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,10 @@
 # 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.6 2009/03/08 20:08:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.7 2009/03/10 15:32:07 tupone Exp $
+
+  10 Mar 2009; Alfredo Tupone <tupone@gentoo.org>
+  files/openscenegraph-2.8.0-magicoff.patch, openscenegraph-2.8.0.ebuild:
+  Adding use flags: jpeg2k svg xine
 
   08 Mar 2009; Tupone Alfredo <tupone@gentoo.org>
   files/openscenegraph-2.8.0-magicoff.patch, openscenegraph-2.8.0.ebuild:
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 942fcd068efb..8b4e62e7b480 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,5 +1,5 @@
-AUX openscenegraph-2.8.0-magicoff.patch 1137 RMD160 dca4cbeee37ae4c9089eb94f1143091e7ec639af SHA1 220c4c927e6f80d545b21c82d123c1a48c6fd896 SHA256 6704df2ff5db3d7cc966714d6f40249538ae9050a8ccb095a0c6ebd765743ef1
+AUX openscenegraph-2.8.0-magicoff.patch 1299 RMD160 5a55e2597f62f36484d0276ca3c5396a4f4b77a7 SHA1 257747d4186d0b4f2a60b50a5a463f67d9e90903 SHA256 1bbef8e677547659dd4986aafe1e2842b55e1dab21bb394290aadd12ba04e245
 DIST OpenSceneGraph-2.8.0.zip 6456765 RMD160 b5a3542fa1c94f7b11ee91b7b3c9914af08c3c54 SHA1 5af8b1ec1f927c88a7392e07ad7b29bee37937aa SHA256 c776dbaa06510ad395ef075f2a9e08e1ae07dba9543b7c75f6842080335953e6
-EBUILD openscenegraph-2.8.0.ebuild 1436 RMD160 0fee22016a47e3c85472a3fb143006d09de27812 SHA1 28ef9b47e777558a560a1b5dd89445842a8db3f4 SHA256 25dd63c06dc487486af75b5e1981c67713ad971b5b82dd6e32930ac317b8a36c
-MISC ChangeLog 1324 RMD160 aa229fa80a8dc04f2974821c5f50ad98d1926208 SHA1 de3eff198caefb70931e9c138a719629f5664881 SHA256 7e6f5e1f1ff47f3d726e0311e5259138647520b1532da5b91d7f6a9a32cb4806
+EBUILD openscenegraph-2.8.0.ebuild 1759 RMD160 f46c2843cd0ef28da0862e434c8e5356f8bce4e1 SHA1 8040415c801a1a8bd2b3ea749d18f02ebdf7ef51 SHA256 bfcde25dc5c5e7d548bc88a411f4fc946db305020eac2ede56617c106c5a48a8
+MISC ChangeLog 1485 RMD160 77c6f396d5e4d913fb5c7aec6154986547a228be SHA1 f436900e13cac98548ac767962692cca73c4a94d SHA256 223238a00174cb0fcd0331a6a4026a0e39215a56b9cd1a647faf1e7c16ca326b
 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 bc12e74a438d..b01393f1a3e7 100644
--- a/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
@@ -1,16 +1,31 @@
 --- CMakeLists.txt.old  2009-02-25 10:26:47.000000000 +0100
 +++ CMakeLists.txt      2009-02-25 10:33:07.000000000 +0100
-@@ -287,6 +287,9 @@
+@@ -287,14 +287,24 @@
      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)
++OPTION(ENABLE_XUL "Enable gecko plugin" ON)
++OPTION(ENABLE_PDF "Enable pdf plugin" ON)
++OPTION(ENABLE_XINE "Enable xine plugin" ON)
++OPTION(ENABLE_JPEG2K "Enable jp2 plugin" ON)
++OPTION(ENABLE_SVG "Enable svg plugin" ON)
 +
  # Common to all platforms:
  FIND_PACKAGE(FreeType)
  FIND_PACKAGE(Inventor)
-@@ -302,7 +304,9 @@
++IF(ENABLE_JPEG2K)
+ FIND_PACKAGE(Jasper)
++ENDIF(ENABLE_JPEG2K)
+ FIND_PACKAGE(OpenEXR)
+ FIND_PACKAGE(COLLADA)
+ FIND_PACKAGE(ZLIB)
++IF(ENABLE_XINE)
+ FIND_PACKAGE(Xine)
++ENDIF(ENABLE_XINE)
+ FIND_PACKAGE(OpenVRML)
+ FIND_PACKAGE(Performer)
+ FIND_PACKAGE(GDAL)
+@@ -302,7 +312,9 @@
  FIND_PACKAGE(ITK)
  FIND_PACKAGE(LibVNCServer)
  FIND_PACKAGE(OurDCMTK)
@@ -20,17 +35,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)
+@@ -319,9 +331,13 @@
+         KG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
+     ENDIF(WIN32)
  
--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(ENABLE_SVG)
+     PKG_CHECK_MODULES(RSVG librsvg-2.0)
++    ENDIF(ENABLE_SVG)
+     PKG_CHECK_MODULES(CAIRO cairo)
++    IF(ENABLE_PDF)
+     PKG_CHECK_MODULES(POPPLER poppler-glib)
++    ENDIF(ENABLE_PDF)
  
- IF   (LIBVNCSERVER_FOUND)
-     ADD_SUBDIRECTORY(vnc)
+ ENDIF(PKG_CONFIG_FOUND)
+
diff --git a/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild
index 39181bf50299..e62efe7a3f0a 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.6 2009/03/08 20:08:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild,v 1.7 2009/03/10 15:32:07 tupone Exp $
 
 EAPI=2
 inherit eutils versionator cmake-utils
@@ -16,18 +16,22 @@ 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 pdf xulrunner"
+IUSE="jpeg2k osgapps pdf svg xine xulrunner"
 
 RDEPEND="virtual/opengl
 	virtual/glu
-	net-misc/curl
-	xulrunner? ( net-libs/xulrunner )
-	gnome-base/librsvg
+	media-libs/libpng
 	media-libs/jpeg
 	media-libs/giflib
 	media-libs/tiff
-	media-libs/jasper
-	media-libs/xine-lib
+	media-libs/freetype
+	x11-libs/libSM
+	x11-libs/libXrandr
+	net-misc/curl
+	xulrunner? ( net-libs/xulrunner )
+	svg? ( gnome-base/librsvg )
+	jpeg2k? ( media-libs/jasper )
+	xine? ( media-libs/xine-lib )
 	pdf? (
 		|| (
 			app-text/poppler-bindings[gtk]
@@ -52,5 +56,8 @@ src_configure() {
 	fi
 	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable xulrunner XUL)"
 	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable pdf PDF)"
+	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable xine XINE)"
+	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable jpeg2k JPEG2K)"
+	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable svg SVG)"
 	cmake-utils_src_configure
 }