blender: Fix apidoc and metadata.xml

3 files changed, 33 insertions, 23 deletions

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index e50f586..bd33585 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -10,5 +10,5 @@ AUX blender-2.60a-insecure.desktop 495 RMD160 b1c0610f828df44355dad5c0aab13d662a
 AUX blender-2.60a-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
 AUX blender-desktop.patch 641 RMD160 5be612d2836005e51e1bcfed10959e75315f201f SHA1 b0f99cdefc6c1a21b32ea97a237e214b22e5f9e6 SHA256 f52bc6f42eb07e693bfbe578747cf126b242b04273cbcd78a8ee4879eae8b514
 DIST blender-2.60a.tar.gz 25679123 RMD160 74434c4e748872322386971cf6021255b0bfa1c8 SHA1 f23551e6ed661626c61de4a758d9ff67e0f27529 SHA256 7d788599ab46dac37f630dec026d06f7e3d73508f243eeb4ade8bcdcb661f124
-EBUILD blender-2.60a.ebuild 13318 RMD160 dbb73f56e03e46a85a0a09e15df021fab7e4cb66 SHA1 2a09e210c701db9e8d8102eecea5bd046880cf1b SHA256 912061cf09e37922579d706211035e6b1a2b5514bf3cfd95f8ea124dbe4bdc4c
-MISC metadata.xml 1953 RMD160 d34820d0ff77c323156115939aa16575c4d08130 SHA1 220ede2f65489b3ce59c8b79a714b4984d91f5b2 SHA256 6189d779179d2c30e4f99b91fcc09f7cf4e09d41b80312c33455df7ce24eee73
+EBUILD blender-2.60a.ebuild 13702 RMD160 f55de0e142e299fa315fe9f1a5070c9826d28e60 SHA1 e38f310f8c0ec733c6b8df1cd50d16c87dda0e24 SHA256 fd780ee77b2fb3230dda3efcc8dc72aab5c95a37692e60a93bdc1af6759b1b58
+MISC metadata.xml 2030 RMD160 e0ad1191e983fb32112e2c5a997ac00896725d41 SHA1 aff5d7831e667d1347f98908ef442f64b791fe4f SHA256 2edc933d4b22020293f8bdcd5b847b30fa2c4ae6f8aac61d368667dca1dab948
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index 4c8e22c..8fae307 100644
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.ebuild
@@ -61,15 +61,14 @@ RDEPEND="virtual/jpeg
 	jack? ( media-sound/jack-audio-connection-kit )
 	sndfile? ( media-libs/libsndfile )
 	lcms? ( media-libs/lcms )
-	collada? ( media-libs/opencollada )
 	3dmouse? ( app-misc/libspnav )"
 
-DEPEND=">=dev-util/scons-0.98
+DEPEND="dev-util/scons
 	apidoc? (
 		dev-python/sphinx
-		>=app-doc/doxygen-1.5.7[-nodot]
+		app-doc/doxygen[-nodot]
+		game-engine? ( dev-python/epydoc )
 	)
-	x11-base/xorg-server
 	${RDEPEND}"
 
 # configure internationalization only if LINGUAS have more
@@ -286,7 +285,9 @@ src_configure() {
 }
 
 src_compile() {
-	escons
+	escons || die \
+		'!!! Please add "${S}/scons.config" when filing bugs reports \
+		to bugs.gentoo.org'
 
 	einfo "Building plugins ..."
 	# FIX: plugins are built without respecting user's LDFLAGS
@@ -361,21 +362,28 @@ src_install() {
 	if use apidoc; then
 
 		einfo "Generating (BGE) Blender Game Engine API docs ..."
-		docinto "API/BGE_API"
-		dohtml -r "${WORKDIR}"/${P}/doc/*
-#		rm -r "${WORKDIR}"/blender/doc
-
-#		einfo "Generating (BPY) Blender Python API docs ..."
-#		epydoc source/blender/python/doc/*.py -v \
-#			-o doc/BPY_API \
-#			--quiet --quiet --quiet \
-#			--simple-term \
-#			--inheritance=included \
-#			--graph=all \
-#			--dotpath /usr/bin/dot \
-#			|| die "epydoc failed."
-#		docinto "API/python"
-#		dohtml -r doc/BPY_API/*
+		epydoc source/gameengine/PyDoc/*.py -v \
+			-o doc/BGE_API \
+			--quiet --quiet --quiet \
+			--simple-term \
+			--url "http://www.blender.org" \
+			--top API_intro \
+			--name "Blender GameEngine" \
+			 --no-private --no-sourcecode \
+			--inheritance=included \
+			--graph=all \
+			--dotpath /usr/bin/dot \
+			|| die "epydoc failed."
+		docinto "API/gameengine"
+		dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
+
+		#einfo "Generating (BPY) Blender Python API docs ..."
+		"${D}"/usr/bin/blender-bin-2.60 --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
+		pushd doc/python_api > /dev/null
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+		popd > /dev/null
+		docinto "API/python"
+		dohtml -r doc/python_api/BPY_API/*
 
 		einfo "Generating Blender C/C++ API docs ..."
 		pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
@@ -393,7 +401,6 @@ src_install() {
 	insinto /usr/share/${PN}/${SLOT}
 	doins -r "${WORKDIR}"/install/${SLOT}/*
 
-
 	# FIX: making all python scripts readable only by group 'users',
 	#	  so nobody can modify scripts apart root user, but python
 	#	  cache (*.pyc) can be written and shared across the users.
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 51b6c0d..d56f1a5 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -21,6 +21,9 @@
 		Available for Windows, Linux, Irix, Sun Solaris, FreeBSD or Mac OS X.
 	</longdescription>
 	<use>
+		<flag name="3dmouse">
+			Support 3D mouse (<pkg>libspnav</pkg>).
+		</flag>
 		<flag name="game-engine">
 			Adds Game Engine support to Blender (2.5* ebuilds).
 		</flag>