Avoid sandbox violation by disabling audio correctly (fixes bug #426950, thanks to Weihua Zhou for the report). Also move the remaining doc generation to src_compile instead of install.

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

3 files changed, 26 insertions, 17 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index c8d0e05a94eb..8d568dd5b07f 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.232 2012/07/17 06:33:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.233 2012/07/17 10:53:02 flameeyes Exp $
+
+  17 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> blender-2.63a-r2.ebuild:
+  Avoid sandbox violation by disabling audio correctly (fixes bug #426950,
+  thanks to Weihua Zhou for the report). Also move the remaining doc generation
+  to src_compile instead of install.
 
   17 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org>
   +files/blender-2.49b-linux-3.patch, blender-2.49b-r2.ebuild:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 044e677c6a8d..e73c130bdc79 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -15,13 +15,17 @@ DIST blender-2.49b.tar.gz 22918377 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d
 DIST blender-2.63a-patches-2.tar.bz2 14736 SHA256 4e7d61e0dd9c1d2995d5e049bfeae580395d187d4beaf7148efaee61e3bfb698 SHA512 fd95af280671f6c930fc48dcb6c6aa74f02e5ff2d22c4339ec21155653cb7a66ed98f02d4314f3e6d9460d763bf1a4415f93e2b4c850d635397ba15ed5244c9a WHIRLPOOL eef287dbdfd006e729c41e79105c8937adc6d6139c056bb953937f3e760bc011c881ff03ad1d7c60c6e89ff5fcf63350b0af0cba91a7c2b5614756182305b14c
 DIST blender-2.63a.tar.gz 26759658 SHA256 c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a SHA512 86abf813153da2b0c9974d35bb794ea6df4f933559abf99ffefcffce429d2304c0e04ce91f576f0c8b3394fd4bed05d465602b39f2b0081c62b5ba4e7073b297 WHIRLPOOL 08f26def3c4ede3c50c71c59bccae0ab2fef91e123e31acddb7f2ee42ffed7a6e4c6ac96ad8f66f6e57720c49d35d0ec6d4534bbe486449d1c39eb5eaa379ec2
 EBUILD blender-2.49b-r2.ebuild 5293 SHA256 265de7fa127c96afba644e2f2c4a1924bdeb866896e9d7d40a16615484183249 SHA512 7b1642db685e64d947f91b47e48cb4256f1d1119bdb91d2340e0924cfcd07a28d0274b2626ff462451e5e0cda4bf890e3c76722c3899e06053868261bf05687f WHIRLPOOL 8695e2ef82579f2029709035db0c53df754e9c793174549b4cfaad9d52a9d91b035721d518d9538b58b258c151b2f328fced96487e329a2bc8a6bc677a7a5d6f
-EBUILD blender-2.63a-r2.ebuild 7795 SHA256 1c9634e08c5c006abcfdc0809882582d5050be1f0edeb0f6440048390102a4d7 SHA512 d0829a4eb586fc4e8e20048003dab95a219272c6b76e2151066d873ca0524539f3db0f38051de7e7f7f97a23cab6c2131eba67d1ed7669b49aa5cecf5c9c479d WHIRLPOOL 457cf7d3acb963597168758833d4d4033f326d30e23b7e3e46ea527d60cf8b9c9d9eb87c50dfa86210f797c2a99ff8b967238ed841c7f43c443c2ab4ff99e6ef
-MISC ChangeLog 39268 SHA256 eb84672620ca1ac164a9386a188eabc423fe0b8d9192643b653b64624949b796 SHA512 7624a4ae1fbabb1decbbf1734c486dd83188f87fb556a98e2889c8fa317e930f50615b59437810c7e5794639b11646f8921332978f79dc1321578c825147e207 WHIRLPOOL bd23e6c5d5df7b5dc9b3b86e316810e71480544c44955a4acf2fabea23fb46a32319de7365ab7dfef6391b538affc19ee4080b9a04a19c825f950eba09a18bbe
+EBUILD blender-2.63a-r2.ebuild 7769 SHA256 ef313594633977a07d0af13569473fbeb99f551c56f19f616521b68d49966261 SHA512 d741308647e63a8f84cc5353b0c19092cbf9bd7ad227d9a42c5cbb426dbfc8b4225cc9437ec458fa3a791c60b600fd68ca9a1c2245364b89a340cdcdcbdc4157 WHIRLPOOL 46b4d7c818a9f128ad06cf948cf52074fd3abbaf0e3fe389980e56cd951d3051316104c9ed2838d0b264aac19115c3933bf9e56c9277eb97cdd91a56ae9b20bb
+MISC ChangeLog 39545 SHA256 ac065a18bc01c4599f186cb3e7acd1f70b581fe633ee7123ef0676eac5a77f2a SHA512 d3c2630493dd38d7d6a1fb6e89775592bf8cc885ad81f201f2b3f59e29b8114e6743621077e4938b7981987f5953f49139e5b62f4215919fee4ba39272259f9d WHIRLPOOL 4468f73f7873ce6d809123a5b0d35758081e5529b24a34381630a287f956e098cccb519d8f9b5fc64cda16e705d9619a096823621934c563451902f7b881d2f8
 MISC metadata.xml 2158 SHA256 bff4c3ff97b8c96d1175eec436c9c2f583ec461f1546b1a0edee9767d89641ba SHA512 c0d0b4ff2b886a4a4ab2596e427113caa4379705113197021fab490953520368fa98bef40379dde6c508a3ec57df89a34121dfdef5ffdfbeca608cc3355c05c6 WHIRLPOOL 15ade3751c5017cc4c2f537b65f00d39bec68ccc15a1a0ac81ac8cb904f43bec10abf395d0834071873952391bb33bf2aee00d4c6007b7d8aeb52a599f15f287
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAFBzsACgkQcaHudmEf86piIQCgg7Ank5bYLbUUOS/ssCWzrV2r
-ZGoAnim3BkKhIMllFo73KZ+6GRyHRJra
-=Ms/s
+iQEcBAEBCAAGBQJQBURtAAoJEBzRPIrUMBNCxgQIAJAFoMDzCvHUnXotlyBgZubV
+CHeLGY/Kezd1FJnWRIeBlj+EjpH+GZZiKEVzUpQnjkLvhap/g3TDTY9Jd4Srygo4
+pk/9UI1jHvTz52fW0ntUzBRVUsvql6HE89KCenNypmRDQOKOKjCdRqWGMZH0luGS
+O2xSzNIrXZfSSR0iLSPnnTqNmehBvMy38xQa5p5NI2BbuxJE5GTkk+4jde4UZlfx
+b/djG2Fy5SOIV2MuihwRVZJ2nwxzfk5GPhVDEPCIgkR501Dri/ucrG8qWywoTGLa
+Yb5OWqUuldKtCPB28jfbtJ5CIvcA3PmPL6BQr/zh7E67f+qYK4CbLtPf8rcYD2s=
+=hVaY
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.63a-r2.ebuild b/media-gfx/blender/blender-2.63a-r2.ebuild
index d5b4affe34f3..440bab3a50c3 100644
--- a/media-gfx/blender/blender-2.63a-r2.ebuild
+++ b/media-gfx/blender/blender-2.63a-r2.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.63a-r2.ebuild,v 1.1 2012/07/16 12:05:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a-r2.ebuild,v 1.2 2012/07/17 10:53:02 flameeyes Exp $
 
 EAPI=4
 PYTHON_DEPEND="3:3.2"
@@ -223,9 +223,16 @@ EOF
 
 	if use doc; then
 		einfo "Generating Blender C/C++ API docs ..."
-		cd "${WORKDIR}"/${P}/doc/doxygen
+		cd "${S}"/doc/doxygen
 		doxygen -u Doxyfile
 		doxygen || die "doxygen failed to build API docs."
+
+		cd "${S}"
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${WORKDIR}"/install/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed."
+
+		cd "${S}"/doc/python_api
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
 	fi
 }
 
@@ -252,18 +259,11 @@ src_install() {
 	dodoc -r "${WORKDIR}"/${P}/doc/guides/*
 
 	if use doc; then
-		#einfo "Generating (BPY) Blender Python API docs ..."
-		"${D}"/usr/bin/blender --background --python doc/python_api/sphinx_doc_gen.py --noaudio || 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/*
+		dohtml -r "${S}"/doc/python_api/BPY_API/*
 
 		docinto "API/blender"
-		dohtml -r "${WORKDIR}"/${P}/doc/doxygen/html/*
+		dohtml -r "${S}"/doc/doxygen/html/*
 	fi
 
 	# final cleanup