Making xulrunner an optional dependency. Bug #260187

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

4 files changed, 45 insertions, 8 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 9a50b632b54f..16633a978624 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.1 2009/02/24 13:26:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.2 2009/02/25 14:00:49 tupone Exp $
+
+  25 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/openscenegraph-2.8.0-magicoff.patch, openscenegraph-2.8.0.ebuild:
+  Making xulrunner an optional dependency. Bug #260187 by Christian Schmitt
 
 *openscenegraph-2.8.0 (24 Feb 2009)
 
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index b83d3fed2bcc..bba0facc21b7 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,4 +1,5 @@
+AUX openscenegraph-2.8.0-magicoff.patch 564 RMD160 84b2e25a42667eac835194206c1627219b420b1d SHA1 ef1ecbdad2c8b9a335452728551ba2970a5597f6 SHA256 dc49a046529b66a0ac88d9ae5785777eda4bda88237a7852a364415bbc6aa38d
 DIST OpenSceneGraph-2.8.0.zip 6456765 RMD160 b5a3542fa1c94f7b11ee91b7b3c9914af08c3c54 SHA1 5af8b1ec1f927c88a7392e07ad7b29bee37937aa SHA256 c776dbaa06510ad395ef075f2a9e08e1ae07dba9543b7c75f6842080335953e6
-EBUILD openscenegraph-2.8.0.ebuild 935 RMD160 88ff057a30e3db0e66e8fa10d3865638a08594fd SHA1 d7395f9ffb4a3318f1db35f777505259fb2ee65b SHA256 9e1bf9d384b707299f14cc1a5d19d4e472512174496ce3a32c0d5af736868c03
-MISC ChangeLog 412 RMD160 049f531b57463d48bb9880daf0c0520c21e4a70f SHA1 392a1bef778fe14186cb3f343d8f3e71802d81f6 SHA256 509d6fb3e98bf6f4eea07639ab0f713ba89d2a5127f277eb2d64bccdcea34af7
+EBUILD openscenegraph-2.8.0.ebuild 1182 RMD160 67823cccf3c59b85cdcab1dacb4ffa7cc333a789 SHA1 33d09a079cb94b81e6a3da913d603c9146c91efb SHA256 ea1aeeeb8d1177f0a3141e177b3154e90802d0ed97ab25cc6392c3d90b149189
+MISC ChangeLog 614 RMD160 f7b80f6bd16c932f0a0d350b30af272140492f94 SHA1 1f3033e92c96a45ef413be29b3258d17c83af74e SHA256 02d3ec8738389872a02d0956693419ad88eb66d241d07f1cf780533ae464bd10
 MISC metadata.xml 833 RMD160 f2bb4ae4961b8aeccf9d1b013ffe2b47bd1b4f26 SHA1 892a4ee3cc3f7069ad42c7f838b78b8d2ec83c6d SHA256 ae0c253251244b65b20d0b3158901f7d5d538ed620c1ec56557967ebba6ec630
diff --git a/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
new file mode 100644
index 000000000000..18ffd9c0270f
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch
@@ -0,0 +1,21 @@
+--- 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 @@
+     INCLUDE(Find3rdPartyDependencies)
+ ENDIF(WIN32)
+ 
++OPTION(ENABLE_XUL "Enable plugin gecko if xulrunner is available" ON)
++
+ # Common to all platforms:
+ FIND_PACKAGE(FreeType)
+ FIND_PACKAGE(Inventor)
+@@ -302,7 +304,9 @@
+ FIND_PACKAGE(ITK)
+ FIND_PACKAGE(LibVNCServer)
+ FIND_PACKAGE(OurDCMTK)
++IF(ENABLE_XUL)
+ FIND_PACKAGE(XUL)
++ENDIF(ENABLE_XUL)
+ 
+ #use pkg-config to find various modues
+ INCLUDE(FindPkgConfig OPTIONAL)
diff --git a/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild
index 69bf031de8f1..d95799336f56 100644
--- a/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild
@@ -1,9 +1,9 @@
 # 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.1 2009/02/24 13:26:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild,v 1.2 2009/02/25 14:00:49 tupone Exp $
 
 EAPI=2
-inherit cmake-utils versionator
+inherit eutils versionator cmake-utils
 
 MY_PN="OpenSceneGraph"
 MY_P=${MY_PN}-${PV}
@@ -16,14 +16,16 @@ SRC_URI="http://www.openscenegraph.org/downloads/stable_releases/${MY_P_MAJOR}/s
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="xulrunner"
 
 RDEPEND="virtual/opengl
 	virtual/glu
 	net-misc/curl
-	net-libs/xulrunner
+	xulrunner? ( net-libs/xulrunner )
 	gnome-base/librsvg
 	media-libs/jpeg
+	media-libs/giflib
+	media-libs/tiff
 	app-text/poppler-bindings"
 
 DEPEND="${RDEPEND}
@@ -31,5 +33,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-mycmakeargs="-DBUILD_OSG_APPLICATIONS=OFF"
 DOCS="AUTHORS.txt ChangeLog NEWS.txt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-magicoff.patch
+}
+
+src_configure() {
+	mycmakeargs="-DBUILD_OSG_APPLICATIONS=OFF"
+	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable xulrunner XUL)"
+	cmake-utils_src_configure
+}