Further cleanup: remove vestigial svn support; do not build API docs when USE=-doc is disabled (and remove apidoc USE); simplify generation of user-config.py, and in particular handling of C/CXX/LDFLAGS; use more blend_with (and make it local to src_configure); fix building with boost 1.50 (bug #426802).

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

4 files changed, 184 insertions, 231 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 4107fd8646f0..34f3da1c4191 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,14 @@
 # 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.228 2012/07/16 00:53:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.229 2012/07/16 09:28:56 flameeyes Exp $
+
+  16 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> blender-2.63a-r1.ebuild,
+  metadata.xml:
+  Further cleanup: remove vestigial svn support; do not build API docs when
+  USE=-doc is disabled (and remove apidoc USE); simplify generation of user-
+  config.py, and in particular handling of C/CXX/LDFLAGS; use more blend_with
+  (and make it local to src_configure); fix building with boost 1.50 (bug
+  #426802).
 
 *blender-2.63a-r1 (16 Jul 2012)
 
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index cab3d7ff035a..77b8184723d7 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -11,20 +11,20 @@ AUX blender-2.49b-libav-0.7.patch 15251 SHA256 636244001abc882887b7c72f665c751a8
 AUX blender-2.49b-subversion-1.7.patch 477 SHA256 744c7af5f0fdc24c84262748991c397b171c33246bb319ba5d3a54a4eda5da2a SHA512 d145e2c0a8c6d92c834ce11061dcce613f3e4c284038fc3d208621ca6c0cacfacfb35f6d61bc2e6e20896a571e3224bbf1f16f0d07ada1fa009f4a4c0018d3bb WHIRLPOOL d196325348926ad6e73e4935e32c1ad0689d829fa4a75ef60da09c65bf3f5e6fcb876b7db9b1d67b1c036891dd78b8c2ed5e3944a679d655f3a26e7fb3f779e8
 AUX blender.desktop 199 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af313e0d64c4803ad SHA512 f5674f4a9ebe70170e8bcde1fd31cd5bd569ca0f66866a23c5239ae97e9d4d7de083c835e166085848b7420d6778a0469e6868628ff5020b44faac6582ac77d0 WHIRLPOOL b259746b3c412a1101a5bec84eac411dc34dc104053a7e6f09351c4b03b3202a74f1eb5fae9b2d87aa0a91f9ddc6ea274ad2a9ae14da817d30c8dc60d4516747
 DIST blender-2.49b.tar.gz 22918377 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488 SHA512 0e83388849898a61a308584be05307697ef8d0e67c5f161eea0d11f75a29d14c26547aa7b20f356065e70db823082e11a39dc06e59d3d73ef8c87738d2f88460 WHIRLPOOL d8b54b39eb47841c7e93157726f55c855d0930b89e4cbe8f093dcd7110978ed267ca96517281861bd6d62c1108a8068c5a863452d3208b1f4ad3d374f1e74f7d
-DIST blender-2.63a-patches-1.tar.bz2 14394 SHA256 a63bd7b0950eac7d78249c97297fa123926946746bc9ce580f66e19b114dcce9 SHA512 12c71b878ec66e49f14b392133467e55ec4a1d454175e62065b63fc87e8efa12101a94262b1e5af032798131a3a9840ed90037cd74655b2e0544f7e1ec376a52 WHIRLPOOL 996d7e9d77987c7fc0f2a6d06a0d661b325248344b4186978f4bd474a1c609f6945ba49adaf7ff7a538f51f9e80d96a5492cd88ad1e8d67bb1dc5b2fe40b2199
+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 5295 SHA256 fd61820a492e3e32875e998d9e310d3431e380d7ec88c9d20ac13adb48d66554 SHA512 ed5e69f8ee020b15772583900e134fe275657e742dc11f82278d6daaaeb8190a790e726deb0e09943e0ac3e0b09d82ebcb7e5a75bef40a8a43b16d7eec70123c WHIRLPOOL 1c2bc098a3f35eb265f91507835c167a6c42c49b12362dc771477111a70d7b28a14d25d87f20ba31f293b6a402fbdc89daffa835ed53c2be43e3913ea438a912
-EBUILD blender-2.63a-r1.ebuild 10052 SHA256 83e23e5c52334add7fbc3e371e5d47fe0483f57831cfa1c2c040a4e47c2a4633 SHA512 1a07a3348a5a783ca90dcd76e7d6e0cb1b6dc7f719ec16c21bed92d8b83d2f29010ddc6b497890ff4732e8791ba60251b6a9d8829dc1b0ce790cd6882a7e0682 WHIRLPOOL 5df7805cb86ad4168cf32df176806f94e06d1c6c521d21fc9d52934d267063ea1c002a9c1e51a79b03b074ae03c2e862d79e214417a628b7958825cbbae88eac
-MISC ChangeLog 38197 SHA256 3c7b7af8f8552c019679d4cb2e9bb5d6434bc6ccb5e33e5dd9be1f9f4583be87 SHA512 e9c304628ef42fbf986deb2f27442bfb14680aab5e871942e2658470b9b8af60f5b46ae3ef0e01d776a4d858422a17772b60904172c156093926bca8fdcc6983 WHIRLPOOL 64fa4c522153d5f03c9bb282d43b8fc6d716397173af5b2c53c9e4f9bb8caf8e292596b7d29573b295dd109d992657ce631bd03c0a663c229aeecd7f215ed2e7
-MISC metadata.xml 2024 SHA256 5f6d03c152e6f9a0c6db28b4fa50d465ea2f3404c8cafc83cbc1fafbd98e71bd SHA512 d7b6f4c073232e870e7ec8d2d50da6181dc2d3d572f175b9852ae165c889c55eb4ee332d8fac8346ac2b806b4fe91ed19a853b59f7edad8498b55af8bc7b0458 WHIRLPOOL ade3f1e4a2885c501096232226b74c9d993f03af54f287f34a8cfa625fbefd9cb830427b47e9992c58d19513f7d65905b7cd906307df7df02857a4d5037c8130
+EBUILD blender-2.63a-r1.ebuild 7704 SHA256 5c88d637250aa5bd2017cfddbd4128ceecb3a2ed99c688e660b5a505378410ce SHA512 adb90cd651fdec84825c3258018578bcf4e23df353664657f22cb3068273a6708f39a728589c706beeb32fca750a6d1acfc788ec5fe383789c1d4c55143931a8 WHIRLPOOL 7ac76a7e925abd97339d281dbd2ef9a307a7a810d14bbec0023b249c551125ea60e3038074cfac7814b31fcf69b7125cbbc64a0fb5855b5795b1d8976edb154c
+MISC ChangeLog 38612 SHA256 d87544aa452d60d55e9f5786db0292fbb2f390152798264d2a81323bb6e159fb SHA512 384d8e30726966ce7d7ec47dc882698ef9696aacb17d7b93e9a9da3222e032461697c03ad76fd92ddf783090dda398f85297a313f5e4abc95f9200a5afc731fe WHIRLPOOL 69e79d8843a26b28fbea7d85b1379cda6537bed6a5ba57f945734dd90174eaa097797f33ebb9ab4dcb31cf7d855d7049e305cbd152776ff3e285d06dc3674efe
+MISC metadata.xml 2158 SHA256 bff4c3ff97b8c96d1175eec436c9c2f583ec461f1546b1a0edee9767d89641ba SHA512 c0d0b4ff2b886a4a4ab2596e427113caa4379705113197021fab490953520368fa98bef40379dde6c508a3ec57df89a34121dfdef5ffdfbeca608cc3355c05c6 WHIRLPOOL 15ade3751c5017cc4c2f537b65f00d39bec68ccc15a1a0ac81ac8cb904f43bec10abf395d0834071873952391bb33bf2aee00d4c6007b7d8aeb52a599f15f287
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQA2YPAAoJEBzRPIrUMBNCAyMIAKODhZ4xdXcMYJNEq2/SkwhE
-dmps6L+wJXNPKtQ1xKCZ046G6i8bu/QMRMthHcdSxnl6pyr2ppQYu3eXXbLZi2eg
-LnmMVCL0CEZSzm7YRiGFgDID1i83N4OMAHdNER2NcUAtGmOC1BudmWjOTZRE59dJ
-Bn1iyGAUZQCfRdUgkWQoc7PmenfL/R89YeHAviWDaibZ3pNmFPuSLdG8qFN4HsxP
-PusqDHOqdTc6VhSr9kPcofYr+Cv3S3iz22xUyktOZDCVNJbOsXvzIAGi0krLqvMB
-lKpimiq8gp6ofmdrKsxoFc+e7zcmyb79bi1ubFjhobRHNzgdgHKn2d0RzhuFNo4=
-=Wlv/
+iQEcBAEBCAAGBQJQA97rAAoJEBzRPIrUMBNCY1cH/jvpDWY20/5XOF3AelVCEgMg
+KGxl1rC45u/sL89z/2k6zOVD/5GgevxUU4Ht2l7QdFcB6MSCL5ZWcx1NFiZONm8w
+Wvkl+8YGSNsj9MYR5kEfky52eMv73lP9ccUgika6klJoXnDQOMVv/GxSxeX5rQv7
+Kr/mu3J6P9LiPypUjHq+0RJeAA48m16jmwb7MNDLatSKTjGVL1px9/qWDCz3CjjW
+be8YhB0AVX6KlKWXpdy/WHxrMcx2b93YhzDA2Qe91QPR1l7S0vwaf3JwNWHFMDLj
+6UUjCFj+06niAumo6wQP4ks/WmByll+wAQvTD0t7sBOEfdlAymnl4HZxMlgiCSY=
+=YaAG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.63a-r1.ebuild b/media-gfx/blender/blender-2.63a-r1.ebuild
index 6f0276cd1a97..677ca7890f1a 100644
--- a/media-gfx/blender/blender-2.63a-r1.ebuild
+++ b/media-gfx/blender/blender-2.63a-r1.ebuild
@@ -1,23 +1,18 @@
 # 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-r1.ebuild,v 1.1 2012/07/16 00:53:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a-r1.ebuild,v 1.2 2012/07/16 09:28:56 flameeyes Exp $
 
 EAPI=4
 PYTHON_DEPEND="3:3.2"
 
-PATCHSET="1"
+PATCHSET="2"
 
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils check-reqs ${SCM}
+inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils check-reqs
 
 IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal
-	openmp +dds doc fftw jack apidoc sndfile tweak-mode sdl sse redcode
+	openmp +dds fftw jack doc sndfile tweak-mode sdl sse redcode
 	iconv collada 3dmouse debug nls"
-REQUIRED_USE=""
+REQUIRED_USE="player? ( game-engine )"
 
 LANGS="en ar bg ca cs de el es es_ES fa fi fr hr id it ja ky ne pl pt ru sr sr@latin sv tr uk zh_CN zh_TW"
 for X in ${LANGS} ; do
@@ -29,8 +24,6 @@ DESCRIPTION="3D Creation/Animation/Publishing System"
 HOMEPAGE="http://www.blender.org"
 
 case ${PV} in
-	*9999*)
-		SRC_URI="" ;;
 	*_p*)
 		SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
 	*)
@@ -61,7 +54,7 @@ RDEPEND="virtual/jpeg
 	sys-libs/zlib
 	cycles? (
 		media-libs/openimageio
-		dev-libs/boost
+		>=dev-libs/boost-1.44
 	)
 	iconv? ( virtual/libiconv )
 	sdl? ( media-libs/libsdl[audio,joystick] )
@@ -77,31 +70,13 @@ RDEPEND="virtual/jpeg
 	3dmouse? ( dev-libs/libspnav )"
 
 DEPEND="dev-util/scons
-	apidoc? (
+	doc? (
 		dev-python/sphinx
 		app-doc/doxygen[-nodot(-),dot(+)]
 	)
 	nls? ( sys-devel/gettext )
 	${RDEPEND}"
 
-blend_with() {
-	local UWORD="$2"
-	[ -z "${UWORD}" ] && UWORD="$1"
-	if use $1; then
-		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	else
-		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	fi
-}
-
-if [[ ${PV} == *9999 ]] ; then
-	src_unpack() {
-		subversion_fetch
-	}
-fi
-
 pkg_pretend() {
 	if use openmp && ! tc-has-openmp; then
 		eerror "You are using gcc built without 'openmp' USE."
@@ -109,7 +84,7 @@ pkg_pretend() {
 		die "Need openmp"
 	fi
 
-	if use apidoc; then
+	if use doc; then
 		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
 	fi
 }
@@ -136,28 +111,77 @@ src_prepare() {
 }
 
 src_configure() {
-	# add system openjpeg into Scons build options.
-	cat <<- EOF >> "${S}"/user-config.py
-		BF_OPENJPEG="/usr"
-		BF_OPENJPEG_INC="/usr/include"
-		BF_OPENJPEG_LIB="openjpeg"
-	EOF
-
-	# add system sci-physic/bullet into Scons build options.
-	cat <<- EOF >> "${S}"/user-config.py
-		WITH_BF_BULLET=1
-		BF_BULLET="/usr/include"
-		BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
-		BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
-	EOF
-
-	# add system sci-libs/colamd into Scons build options.
-	cat <<- EOF >> "${S}"/user-config.py
-		WITH_BF_COLAMD=1
-		BF_COLAMD="/usr"
-		BF_COLAMD_INC="/usr/include"
-		BF_COLAMD_LIB="colamd"
-	EOF
+	blend_with() {
+		echo "WITH_BF_${2:-$1}=$(usex $1 1 0)" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	}
+
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	local mycflags=$(printf "'%s'," ${CPPFLAGS} ${CFLAGS} | sed -e 's:,$::')
+	local mycxxflags=$(printf "'%s'," ${CPPFLAGS} ${CXXFLAGS} | sed -e 's:,$::')
+	local myldflags=$(printf "'%s'," ${LDFLAGS} | sed -e 's:,$::')
+
+	cat << EOF >> "${S}"/user-config.py
+CC="$(tc-getCC)"
+CXX="$(tc-getCXX)"
+CFLAGS=[${mycflags}]
+CXXFLAGS=[${mycxxflags}]
+BGE_CXXFLAGS=[${mycxxflags}]
+LINKFLAGS=[${myldflags}]
+PLATFORM_LINKFLAGS=[${myldflags}]
+CCFLAGS=[]
+REL_CFLAGS=[]
+REL_CXXFLAGS=[]
+REL_CCFLAGS=[]
+C_WARN=[]
+CC_WARN=[]
+CXX_WARN=[]
+
+BF_OPENJPEG="/usr"
+BF_OPENJPEG_INC="/usr/include"
+BF_OPENJPEG_LIB="openjpeg"
+
+WITH_BF_BULLET=1
+BF_BULLET="/usr/include"
+BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
+BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
+
+WITH_BF_COLAMD=1
+BF_COLAMD="/usr"
+BF_COLAMD_INC="/usr/include"
+BF_COLAMD_LIB="colamd"
+
+BF_OPENCOLLADA_INC="/usr/include/opencollada/"
+BF_OPENCOLLADA_LIBPATH="/usr/$(get_libdir)/opencollada/"
+
+BF_OIIO="/usr"
+BF_OIIO_INC="/usr/include"
+BF_OIIO_LIB="OpenImageIO"
+
+BF_BOOST="/usr"
+BF_BOOST_INC="/usr/include/boost"
+
+BF_TWEAK_MODE=$(usex tweak-mode 1 0)
+BF_DEBUG=$(usex debug 1 0)
+
+BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
+BF_INSTALLDIR="../install"
+WITH_PYTHON_SECURITY=1
+WITHOUT_BF_PYTHON_INSTALL=1
+BF_PYTHON="/usr"
+BF_PYTHON_VERSION="3.2"
+BF_PYTHON_ABI_FLAGS=""
+BF_BUILDINFO=0
+BF_QUIET=0
+BF_LINE_OVERWRITE=0
+WITH_BF_FHS=1
+WITH_BF_BINRELOC=0
+WITH_BF_STATICOPENGL=0
+EOF
 
 	#add iconv into Scons build options.
 	if use !elibc_glibc && use !elibc_uclibc && use iconv; then
@@ -167,125 +191,46 @@ src_configure() {
 		EOF
 	fi
 
-	# configure internationalization optionally
-	use nls || echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
-	# Ocean sim system needs fftw
-	use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
-
-	# configure Tweak Mode
-	use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
-	# FIX: Game Engine module needs to be active to build the Blender Player
-	if ! use game-engine && use player; then
-		elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
-		echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
-	else
-		blend_with game-engine gameengine
-	fi
-
-	# set CFLAGS used in /etc/make.conf correctly
-	echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
-		| sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# set CXXFLAGS used in /etc/make.conf correctly
-	local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
-	echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-	echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# reset general options passed to the C/C++ compilers (useless hardcoded flags)
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
-	# set LDFLAGS used in /etc/make.conf correctly
-	local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
-	echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-	echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# reset REL_*/*_WARN variables (useless hardcoded flags)
-	cat <<- EOF >> "${S}"/user-config.py
-		REL_CFLAGS=[]
-		REL_CXXFLAGS=[]
-		REL_CCFLAGS=[]
-		C_WARN=[]
-		CC_WARN=[]
-		CXX_WARN=[]
-	EOF
-
-	# generic settings which differ from the defaults from linux2-config.py
-	cat <<- EOF >> "${S}"/user-config.py
-		BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
-		BF_INSTALLDIR="../install"
-		WITH_PYTHON_SECURITY=1
-		WITHOUT_BF_PYTHON_INSTALL=1
-		BF_PYTHON="/usr"
-		BF_PYTHON_VERSION="3.2"
-		BF_PYTHON_ABI_FLAGS=""
-		BF_BUILDINFO=0
-		BF_QUIET=0
-		BF_LINE_OVERWRITE=0
-		WITH_BF_FHS=1
-		WITH_BF_BINRELOC=0
-		WITH_BF_STATICOPENGL=0
-		WITH_BF_OPENMP=$(usex openmp 1 0)
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-	EOF
-
 	# configure WITH_BF* Scons build options
 	for arg in \
-		'elbeem fluid' \
-		'sdl' \
-		'apidoc docs' \
-		'jack' \
-		'sndfile' \
-		'openexr' \
+		'3dmouse' \
+		'collada' \
+		'cycles boost' \
+		'cycles oiio' \
+		'cycles' \
 		'dds' \
+		'doc docs' \
+		'elbeem fluid' \
+		'ffmpeg ogg' \
+		'ffmpeg' \
 		'fftw fftw3' \
+		'fftw oceansim' \
+		'game-engine gameengine' \
+		'jack' \
 		'jpeg2k openjpeg' \
+		'nls international' \
 		'openal'\
-		'ffmpeg' \
-		'ffmpeg ogg' \
+		'openexr' \
+		'openmp' \
 		'player' \
-		'sse rayoptimization' \
 		'redcode' \
-		'collada' \
-		'3dmouse' ; do
+		'sdl' \
+		'sndfile' \
+		'sse rayoptimization' \
+		; do
 		blend_with ${arg}
 	done
-
-	# add system media-libs/opencollada into Scons build options.
-	echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
-	echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${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
-
-	# enables Cycles render engine
-	if use cycles; then
-		cat <<- EOF >> "${S}"/user-config.py
-			WITH_BF_CYCLES=1
-			WITH_BF_OIIO=1
-			BF_OIIO="/usr"
-			BF_OIIO_INC="/usr/include"
-			BF_OIIO_LIB="OpenImageIO"
-			WITH_BF_BOOST=1
-			BF_BOOST="/usr"
-			BF_BOOST_INC="/usr/include/boost"
-		EOF
-	fi
-
 }
 
 src_compile() {
 	escons
 
-	einfo "Generating Blender C/C++ API docs ..."
-	cd "${WORKDIR}"/${P}/doc/doxygen
-	doxygen -u Doxyfile
-	doxygen || die "doxygen failed to build API docs."
+	if use doc; then
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${WORKDIR}"/${P}/doc/doxygen
+		doxygen -u Doxyfile
+		doxygen || die "doxygen failed to build API docs."
+	fi
 }
 
 src_install() {
@@ -308,9 +253,9 @@ src_install() {
 
 	# install docs
 	doman "${WORKDIR}"/${P}/doc/manpage/blender.1
-	use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
+	dodoc -r "${WORKDIR}"/${P}/doc/guides/*
 
-	if use apidoc; then
+	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."
 
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 9f421ef9f4cd..755c971c1869 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
+  <herd>graphics</herd>
+
+  <maintainer>
+    <email>lu_zero@gentoo.org</email>
+    <name>Luca Barbato</name>
+  </maintainer>
 
-	<herd>graphics</herd>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
 
-	<maintainer>
-		<email>lu_zero@gentoo.org</email>
-		<name>Luca Barbato</name>
-	</maintainer>
+  <longdescription>
+    Blender, the open source software for 3D modeling, animation,
+    rendering, post-production, interactive creation and playback.
+  </longdescription>
 
-	<longdescription>
-		Blender, the open source software for 3D modeling, animation,
-		rendering, post-production, interactive creation and playback.
-		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>
-		<flag name='game-engine'>
-			Adds Game Engine support to Blender (2.5* ebuilds).
-		</flag>
-		<flag name='contrib'>
-			Install contrib scripts.
-		</flag>
-		<flag name='collada'>
-			Add support for Collada interchange format through <pkg>media-libs/opencollada</pkg>.
-		</flag>
-		<flag name='cycles'>
-			Build cycles renderer.
-		</flag>
-		<flag name='verse'>
-			Adds verse clustering features to Blender.
-		</flag>
-		<flag name='dds'>
-			Adds DDS textures support to Blender.
-		</flag>
-		<flag name='player'>
-			Build the Blender Player.
-		</flag>
-		<flag name='elbeem'>
-			Adds surface fluid simulation to Blender using El'Beem library.
-		</flag>
-		<flag name="apidoc">
-			Build GameEngine/Python/C API documentation directly from the source
-			code using tools epydoc (dev-python/epydoc) and doxygen
-			(app-doc/doxygen).
-		</flag>
-		<flag name="tweak-mode">
-			This flag allows you to model without confirming each translation,
-			in particular it lets you grab with left mouse button (LMB) and not
-			having to confirm by another click. Blender 'Tweak Mode' is similar
-			to the 'Tweak Mode' of the Wings modeller (<pkg>media-gfx/wings</pkg>).
-		</flag>
-		<flag name="redcode">
-			This flag add support for RED CODE camera digital format (5K HD
-			images *.r3d) - EXPERIMENTAL.
-		</flag>
-	</use>
+  <use>
+    <flag name='3dmouse'>
+      Adds support for space navigator devices through package
+      <pkg>dev-libs/libspnav</pkg>.
+    </flag>
+    <flag name='blender-game' restrict='&lt;media-gfx/blender-2.50'>
+      Adds Game Engine support to Blender.
+    </flag>
+    <flag name='game-engine' restrict='&gt;=media-gfx/blender-2.50'>
+      Adds Game Engine support to Blender.
+    </flag>
+    <flag name='collada'>
+      Add support for Collada interchange format through
+      <pkg>media-libs/opencollada</pkg>.
+    </flag>
+    <flag name='cycles'>
+      Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and
+      <pkg>dev-libs/boost</pkg>).
+    </flag>
+    <flag name='verse'>
+      Adds verse clustering features to Blender.
+    </flag>
+    <flag name='dds'>
+      Adds DDS textures support to Blender.
+    </flag>
+    <flag name='player'>
+      Build the Blender Player. THis requires the Game engine.
+    </flag>
+    <flag name='elbeem'>
+      Adds surface fluid simulation to Blender using El'Beem library.
+    </flag>
+    <flag name="doc">
+      Build C and Python API documentation directly from the source code.
+    </flag>
+    <flag name="tweak-mode">
+      This flag allows you to model without confirming each translation,
+      in particular it lets you grab with left mouse button (LMB) and not
+      having to confirm by another click. Blender 'Tweak Mode' is similar
+      to the 'Tweak Mode' of the Wings modeller (<pkg>media-gfx/wings</pkg>).
+    </flag>
+    <flag name="redcode">
+      This flag add support for RED CODE camera digital format (5K HD
+      images *.r3d) - EXPERIMENTAL.
+    </flag>
+  </use>
 </pkgmetadata>