media-gfx/blender: 3D mouse support (bug #390427)

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

4 files changed, 19 insertions, 16 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 6e5025996197..47c70061e2ce 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.218 2012/01/23 18:34:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.219 2012/02/06 21:48:17 sping Exp $
+
+  06 Feb 2012; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild,
+  metadata.xml:
+  Introduce support for 3D mouse based on dev-libs/libspnav (bug #390427),
+  co-operation with Anthoine Bourgeois
 
   23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.57-r1.ebuild,
   blender-2.60a.ebuild:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index aa0dd670f3cf..b2398da14a06 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -48,17 +48,13 @@ EBUILD blender-2.48a-r3.ebuild 4044 RMD160 831a9636988fb1a5ca9a406e45e6bf204511b
 EBUILD blender-2.49a.ebuild 4819 RMD160 109229feaf551d5c4829ecad0f4eb7c9cfea8c1e SHA1 3537ea47e3ccb11df14c321580559e04452bb7ee SHA256 67af33393f99caee9c451feb548d98836d2a0d75c714c253ec01416281339ed4
 EBUILD blender-2.49b-r2.ebuild 5050 RMD160 87bba6723e7f083f395666581f568848154c3233 SHA1 105297aa72047f8501775933f1d4b51bf992d60e SHA256 39dec297a537d22f07576adc90211ec8806f8d63c6c30906f58f6e51dc2cc764
 EBUILD blender-2.57-r1.ebuild 13944 RMD160 9454a84cc292579d40ac7eed698b37c721803185 SHA1 5500bbd689e39f2741a9d757df19866bc9184bb4 SHA256 ac0677eea62ded4647e09dacad093148261def41c66893a011d7a1ce4478724f
-EBUILD blender-2.60a.ebuild 14091 RMD160 4f2f78da4d6bd42e03b36fd9b54986ab19aaa398 SHA1 67c02d30183f8dae3362917630bc367bdb6fc267 SHA256 8e0a664d8493a97ee402d9d0afc961d6ec95abe22b4641d9043edf04eee844ab
-MISC ChangeLog 33945 RMD160 1a06aacf7e10f98f429ca23a07352df528af054a SHA1 eeb7215737100709d2e983954a6413016d9682fd SHA256 f36d13f42324860624b9ed64ba8a2e80ed17029735065831047c4f269f839e20
-MISC metadata.xml 1841 RMD160 f52702ab57bb3030f34456aba9439568ff824ac7 SHA1 2a74a8a76662be1d701e267c3039d55b85195139 SHA256 3e6fc8377d3a9244bf0d5a7aef36a5f0b41a275a22382228d22c8ceca4ad53a1
+EBUILD blender-2.60a.ebuild 14046 RMD160 c256bb8e183283489c4495aa075d544f602f5db8 SHA1 27b40ff482bc835fb6e09bae1dfbb07caffc0941 SHA256 517b98643fb281bf9194d6b71ac7b51c6e5258ebbf93c75de92406ac12934140
+MISC ChangeLog 34146 RMD160 5acf2233987f862faf3a6853a7df537400f4155c SHA1 2f5cd8b933a574e673292a5657ca08d43eac363d SHA256 d928e3a2d8bdea57da3c68720c7e40d3dab1b3981860ecbebfd2bbc714280294
+MISC metadata.xml 1965 RMD160 3f48332ec841384161d2377ff0a2e02c37a4a909 SHA1 bf4dce385ef1e309b5d6ac4a8a631463587cf949 SHA256 ec5973923a2cce6ae374f6dfed03b15f401b1c9a05b1e8520440cdd5756a1c39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPHafIAAoJEEdUh39IaPFNczEH/08LiG2uHHxKep1lpLIJ6Tg0
-MbXBEdemev0KCmp1fehc4U3BxexrgOeO2D2S+MMzdahWhGuhB4uIv4crpDGmpvGo
-G+iRj4keq519k50/D8AdZYIqD5zPTlMobudSDHf09BVTXlTtlbeLekRUsCF2Uz7z
-6y5uwMtRH0hwmOV9O1tmzjGBUILY3MkJcQOM9Idap20qJ7CKRhba/pKBdyLO5zjn
-BUVLzHEGqAECBYaVTpNCS5uW4wYp2XiWKYlWhfKmYUP6aEpYXqO2XxflJL5zjLMa
-s2vZd+jmo2tlaAsgPO6Qp/hOdh8GQ7qTfCwZEKDzApHA0S6ZKeEXnlCk/sGonUA=
-=hb4J
+iEYEARECAAYFAk8wSo0ACgkQsAvGakAaFgA5qwCg1IYdqcrwnIFGBCYTgfuVymgD
+rT0An3LH0bYeVkMWMWHa97YfSwVzF7+y
+=JxR8
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index bf8ef34a8022..b81910d96d8f 100644
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.6 2012/01/23 18:34:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.7 2012/02/06 21:48:17 sping Exp $
 
 PYTHON_DEPEND="3:3.2"
 EAPI=4
@@ -12,7 +12,7 @@ fi
 
 inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
 
-IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
+IUSE="3dmouse +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
 	+dds debug doc fftw jack apidoc sndfile lcms tweak-mode sdl sse \
 	redcode +zlib iconv contrib collada verse"
 
@@ -61,6 +61,7 @@ RDEPEND="virtual/jpeg
 	jack? ( media-sound/jack-audio-connection-kit )
 	sndfile? ( media-libs/libsndfile )
 	lcms? ( media-libs/lcms:0 )
+	3dmouse? ( dev-libs/libspnav )
 	collada? ( media-libs/opencollada )"
 
 DEPEND="dev-util/scons
@@ -274,6 +275,7 @@ src_configure() {
 		'redcode' \
 		'zlib' \
 		'collada' \
+		'3dmouse' \
 		'verse' ; do
 		blend_with ${arg}
 	done
@@ -281,9 +283,6 @@ src_configure() {
 	echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
 	echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
 
-	# libspnav not yet packaged (bug #390427)
-	echo 'WITH_BF_3DMOUSE=0' >> "${S}"/user-config.py
-
 	# enable debugging/testing support
 	use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
 	use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index f5b51b70c2df..c280fa81a972 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -16,6 +16,9 @@
 		Available for Windows, Linux, Irix, Sun Solaris, FreeBSD or Mac OS X.
 	</longdescription>
 	<use>
+		<flag name='3dmouse'>
+			Adds support for space navigator devices through package <pkg>dev-libs/libspnav</pkg>.
+		</flag>
 		<flag name='blender-game'>
 			Adds Game Engine support to Blender (2.4* ebuilds).
 		</flag>