Include support for bullet library

Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 30 insertions, 8 deletions

diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index 8771535bb553..f33a2ad97f80 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/crystalspace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.44 2010/06/19 19:25:13 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.45 2010/06/20 16:53:01 tupone Exp $
+
+  20 Jun 2010; Tupone Alfredo <tupone@gentoo.org> crystalspace-1.4.0.ebuild,
+  +files/crystalspace-1.4.0-bullet.patch, metadata.xml:
+  Include support for bullet library
 
   19 Jun 2010; Tupone Alfredo <tupone@gentoo.org> crystalspace-1.4.0.ebuild:
   Using x11-libs/wxGTK:2.8 (before was 2.6). Enabling parallel make
diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index 7fd5c11ee166..c23710426a6f 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -1,7 +1,8 @@
 AUX crystalspace-1.2.1-libpng14.patch 450 RMD160 f9fe8361b5b3f01d03f6b0b15dae2775d1e3a775 SHA1 4e6f0ef4bf93df569ad29bb1b2d83da5f83ec0cc SHA256 7b2178396d6b729955d85e2e7563862cec1af36c8b1ba1e4383b8978d79c5f2e
+AUX crystalspace-1.4.0-bullet.patch 501 RMD160 8a5c37029c5c1470d1c73b5e0b38df0936e2a85a SHA1 d65deefa25dc49a6e4b7f3d641b9f8ab36565368 SHA256 0dc5ecb64d9a9a07a3da9e89c51080952beb1a4daed40e6b3eccc64ab9e4677f
 DIST crystalspace-src-1.2.1.tar.bz2 47313388 RMD160 0f6582a9c68694189811a574bc63b5ce1a6a1166 SHA1 0f1b5604b217dfd9f65f54caeef5362d0ab92203 SHA256 23312a5a0330b281f517555207fed151e3d08c1096bb0cc9dd72dcabdced1b10
 DIST crystalspace-src-1.4.0.tar.bz2 45670477 RMD160 af89e74a96bac7f55079a6cdad7fd938a38af602 SHA1 10f4dd50c654ad9292602a91189a0ee78a8fe353 SHA256 a8e1bfc9328470121bfbc6cf98f2c310a34f6998978065aa2f6df7e02a0101ba
 EBUILD crystalspace-1.2.1.ebuild 3403 RMD160 1269f0e0b83fbb5abad0594854e414f051c66e16 SHA1 1e7d3a10e630ed6858e29cbd26281bb61d9f1a91 SHA256 62a51af9706cd00625406917e73bd0f73a22e0e2855183c1852779f19ace357f
-EBUILD crystalspace-1.4.0.ebuild 3388 RMD160 0e8b49318a2b59580bcb2cd1b293cf68547aa426 SHA1 1db4661fafdb7e4deb4699dcd76c012e9a27d0f5 SHA256 dd9043b59dc438103675e8d9096ee8d396d69c5d06725a0eaafdfd386df75b3c
-MISC ChangeLog 6912 RMD160 46370ea39e3e4e18ceca26626821b2c5f3fe7b7d SHA1 c2a9d236f47e3f19d5ad056ab569f7970dfb20ae SHA256 9009ccbc67a9818d58514a2c5d61f03229ac963998e0684e836b925583e709dc
-MISC metadata.xml 1243 RMD160 1f23863f3940b9349b19a701d80f0888cc7b2242 SHA1 71931e463e50c1ab0af385a3c4d10d6ad5ed960a SHA256 f7125504551e256f5ceb9385b20e945f3717a1cda3dcf6f3ff5e9f88850025b0
+EBUILD crystalspace-1.4.0.ebuild 3514 RMD160 3897595ff2813ff4686e9d8d405d1100bd144188 SHA1 bc3f84c556ce5542e9d02f4256fddcf13f03a7c4 SHA256 167a334461d6d5665a00749e580b8739288adb3e983aa58210612ff50de66817
+MISC ChangeLog 7083 RMD160 a2157de7267249e2d010ebd0b540be9f51de6424 SHA1 6a77f515b6065bab65ed9a53fe1bfd74096dcf54 SHA256 872293189fe685a90f7d265bbe5c6165a416889811ce568943c0413a54cd9f57
+MISC metadata.xml 1309 RMD160 4ec4d408ea75402333583b2b19d91dcd95b2be9c SHA1 4ed88885584d54c8dd3ddaad2ae7aefb972b180b SHA256 94be39659027a6759ea4645650771553d5982ee01253f860bc526270e83cc283
diff --git a/dev-games/crystalspace/crystalspace-1.4.0.ebuild b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
index 35eb2a5e5e18..9087c3ba529a 100644
--- a/dev-games/crystalspace/crystalspace-1.4.0.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.3 2010/06/19 19:25:13 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.4 2010/06/20 16:53:01 tupone Exp $
 
 EAPI=2
-inherit eutils flag-o-matic multilib wxwidgets
+inherit eutils flag-o-matic multilib autotools wxwidgets
 
 MY_P=${PN}-src-${PV}
 DESCRIPTION="Portable 3D Game Development Kit written in C++"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="3ds alsa cal3d cegui cg doc jpeg mng ode png python
+IUSE="3ds alsa bullet cal3d cegui cg doc jpeg mng ode png python
 sdl speex truetype vorbis wxwidgets"
 
 RDEPEND="virtual/opengl
@@ -24,6 +24,7 @@ RDEPEND="virtual/opengl
 	ode? ( dev-games/ode )
 	cal3d? ( >=media-libs/cal3d-0.11 )
 	jpeg? ( media-libs/jpeg )
+	bullet? ( sci-physics/bullet )
 	sdl? ( media-libs/libsdl )
 	vorbis? ( media-libs/libvorbis )
 	speex? ( media-libs/libogg
@@ -51,6 +52,9 @@ src_prepare() {
 		Jamfile.in \
 		docs/Jamfile \
 		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-bullet.patch
+	AT_M4DIR=mk/autoconf
+	eautoreconf
 }
 
 src_configure() {
@@ -66,11 +70,11 @@ src_configure() {
 		--disable-separate-debug-info \
 		--without-lcms \
 		--without-caca \
-		--without-bullet \
 		--without-jackasyn \
 		--without-perl \
 		--without-java \
 		--disable-make-emulation \
+		$(use_with bullet) \
 		$(use_with python) \
 		$(use_with png) \
 		$(use_with jpeg) \
diff --git a/dev-games/crystalspace/files/crystalspace-1.4.0-bullet.patch b/dev-games/crystalspace/files/crystalspace-1.4.0-bullet.patch
new file mode 100644
index 000000000000..2fd0f207e503
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-1.4.0-bullet.patch
@@ -0,0 +1,12 @@
+--- configure.ac.old	2010-06-19 21:50:21.000000000 +0200
++++ configure.ac	2010-06-19 22:00:50.000000000 +0200
+@@ -1318,8 +1318,7 @@
+       btDefaultCollisionConfiguration* c;
+       btDynamicsWorld* world = new btDiscreteDynamicsWorld (d, b, s, c)])],
+     [], [C++], [], [],
+-    [], [], [-lbulletdynamics -lbulletcollision -lbulletmath],
+-    [bulletdynamics])
++    [])
+ 
+ AS_IF([test $cs_cv_libbullet = yes],
+     [CS_CHECK_BUILD([if bullet is sufficiently recent (>=2.68)], [cs_cv_bullet_recent],
diff --git a/dev-games/crystalspace/metadata.xml b/dev-games/crystalspace/metadata.xml
index 5fbad1502cdd..fa20e72de5ce 100644
--- a/dev-games/crystalspace/metadata.xml
+++ b/dev-games/crystalspace/metadata.xml
@@ -18,6 +18,7 @@ extensive list of features for more details.
 </longdescription>
   <use>
     <flag name="3ds">Enables support for .3DS files in CrystalSpace</flag>
+    <flag name="bullet">include support for Bullet library</flag>
     <flag name="cal3d">include support for skeleton animation</flag>
     <flag name="cegui">include support for Crazy Eddie GUI</flag>
     <flag name="cg">NVIDIA toolkit plugin</flag>