fix opencolorio dep wrt #515606, fix building with gflags-2.1.1 and adjust dep wrt #517134, add epatch_user

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 355 insertions, 16 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 394956dca4da..61e5dd5dcf59 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.269 2014/06/28 12:05:30 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.270 2014/07/16 15:31:42 hasufell Exp $
+
+*blender-2.71-r1 (16 Jul 2014)
+
+  16 Jul 2014; Julian Ospald <hasufell@gentoo.org> +blender-2.71-r1.ebuild,
+  +files/08-blender-2.71-gflags.patch:
+  fix opencolorio dep wrt #515606, fix building with gflags-2.1.1 and adjust
+  dep wrt #517134, add epatch_user
 
 *blender-2.71 (28 Jun 2014)
 
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 39dc789f20da..6b3a0148e937 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -19,6 +19,7 @@ AUX 06-blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0d
 AUX 07-blender-2.67b-sse2.patch 1622 SHA256 9c8f6a35413b7d6fee235668c78d072850637978905b70b4596b9e0b38f39f6d SHA512 2cb77391c5fc66d0211020db3820e51fff63fba8dce4852f39e18701f42aef0a44b0546042f309350e66d05bcd8b2119123b76a8e9fc1f557d7e9f415a0528b0 WHIRLPOOL a81f7d76091fd36be71b9586a99014929fbedcd65b6e66e4418ad6d0f45d99e4d65f9c7880be129f349642258488ccee9b18bf7d8a1cc5379e14c863d3aee4e8
 AUX 07-blender-2.68-sse2.patch 1622 SHA256 fb5aeba243e4da34a1d5ce3893f6db4b84ee90a1bedd6e89dbbfc8c4d7f47418 SHA512 06bc29c771e1d86813add2225523074b7d5ff622b0db4b2e2653917903abd2039b367d6c9e5a3a17021fc85a59585d518a2d05fb9872b7306589ddfbb9897780 WHIRLPOOL 5a0f0e652596687962720b1e6835fce1d0510c771efa7976deffeb3e35df3d5fbcf1400ad02ca4162cb4deccd46d101272e8514c0f6446f1f87afdf2a07eac24
 AUX 07-blender-2.70-sse2.patch 1421 SHA256 b20d9aba206543e765e147e7740aff48ef968b90620d9d4b902cb6c23b9ba28f SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca WHIRLPOOL c3990dac70078a13ba005da5b649b9b72bdf04313551f2e41d639efc6a666006e1af54f11bb8c82608956df03547297303bf7a8a6e8cd03364d994910bde60c7
+AUX 08-blender-2.71-gflags.patch 2223 SHA256 295c043088854b62da158ff6a445a8cdb0114a2298de32f4221cb483e9eb407a SHA512 efec5beed218ba0ab3c76ec65c47408631753567c31076cb8431923d5ff0df59c91ab1d2d42007944d307c6aba35746c2435eb9318b65fd69b4c2ed280570f87 WHIRLPOOL 4b5721af9fe9bebe4df1f324eb53f25459f454ce28f46b9af703c47660969b9a6dc1e73d544dbdad2738aad3a9ae53cf8d805bf20af8763f8a59b051302435c2
 AUX blender-2.66-cmake.patch 381 SHA256 284c09ec1f0a0fc52123c704c7b89fb8795d83c6c25c7decef44e298343591a5 SHA512 d91f92d7817d2a317ea2328afd120b47d20e475937b8ba478db27f1ebdf6a661b567b15d1e9a1f5e89be0a775181ee8cc0867b261988428e524ea5c82269d5f4 WHIRLPOOL 0b844e49f813044303d94d60fc11b6a3fe8afdbfcc76ce3bd89d16a373fe03c3e6c2629be3599eafed8c7265f4b692f3e8f9bede9ca82e0d57ee5d654463dd6d
 AUX blender-2.66-doxyfile.patch 473 SHA256 4d6f50eb13f71b1ca083d8d8bfc3467660be586fe7d973acc9ce9b8b9d9b3337 SHA512 72e8ce59e485a2bbc4c09b367001fdef9d2a01c7b296bf001c1b708b4984625c40a8dd4ddee2b2ba962aa8f666cc8ed50229803d460ae79a807353080d16d520 WHIRLPOOL 45e0178cc55cd1f2e2e685173abb195367f3e61f07c55e007b44b7e3c14ef53ed0b098335044bca58e16787b738a65b23b223515296c6439e3bdfa9698a35dbf
 AUX blender-2.66-sse2.patch 1255 SHA256 0b7d7374226daec957755364414b4327efdde0430324b011d3e7d1483845e375 SHA512 e658ed4f0d913c599235acfd871f7d1aceda20f17d01e3753683527bf8a659a882d0c83a05f437f55abc9e252099485a1632f2b5842ce57940f747701b709e86 WHIRLPOOL b6cafc4bbdb35f6aeef9229a18db618272ad4a6a40154d9f9e3bc5ab23b51bcf11b5612a4bc0672f1cacb0d37e3a035fad54b0930ef6725f44af3953ba61f97e
@@ -41,25 +42,26 @@ EBUILD blender-2.69.ebuild 7573 SHA256 ad03858313b71ddcaa1eb595d120f2aa41808a673
 EBUILD blender-2.70-r1.ebuild 7570 SHA256 ba50201a638acb6dac73c67e6ed525728929fca1acacfeaa030c7fa8564d5b4b SHA512 119a877bfb6427c695c7d16bc2bcc91448d5e0b13c701fcf46ba62d8f2dfd3206641385e321f540e47ca1638f30d57ecd7c9724500e34b4baf0a520a0e1d9a8d WHIRLPOOL f2c5363905da28ec853ecb7673c176f69a0d82fdcb70e86daaaa783d184f912e40899474b965367ed2abfc9e62a3f28f4f512c6b1dac17c1bb1f40e9a6dce9c7
 EBUILD blender-2.70.ebuild 7767 SHA256 1b77f8daa513629173e70fc766864fe42cd1cc6d664c1214329645623ab54ac9 SHA512 8be39580f04eaa5e2d83d853b93463c6d6f56d4b14088bc65d7670978df71d61aea703f984417cafa260cdda8764fc4510d75ca0ce7fc904cb156c248c6a11de WHIRLPOOL 005bcb8c5534570b7abfeb4bc941ffbf8057eccaf85d4006425f4db033c7b487886ba753203e0e6c694b13aa801306b6d26970bc7c77ab83f2e6ee3a6c06e6bd
 EBUILD blender-2.70a-r3.ebuild 7663 SHA256 a16efb84ee8f89d4248b01fc940cc24c56163ea02311fae9a2943ff0aba3f4bd SHA512 2972f4d9051d22fa7275313b682047c80e8fae697ab3beea08c12e58cc9e8cae0149ac3ec5090d7582bab9a2a1675a4c438ce8718ecc24b4587581525e0879ce WHIRLPOOL f8fe963fcaf7e543e599b2b694c98ce4eeebab37ed6f6d11973f9e106e16e3a347a0831d45f7ddceaf612b46e2c4ad874eb2c788c3dd0986ce3c9be5d9abe81b
+EBUILD blender-2.71-r1.ebuild 7676 SHA256 0a6088249797e7b1e05b135319f73516e80e44b7ed4466bbdcd28f5c8fb53a03 SHA512 fbfeb877dd1eb4d983664e304c772877621c01a2232535710e75039f31aa207b1e9f436635596ab33f9e9dba38bff0baa10faea61b4b0f86c76159ebf2543aad WHIRLPOOL 505c292c467d109d33a632aad73343a08be07250daefc16a3307407c32d4f7b5e484c23f4d24efbc190d44a23e986677a67e68bf62d85067d0b44f18e2f0b811
 EBUILD blender-2.71.ebuild 7584 SHA256 ba1e19cee68ef2e1238aafb4d884e8fc0e344ed6fa0d37b703a3c9d60e32ac1e SHA512 0d64b54f0ad5958a60d9469c453c9de32479ff25288768b109bc71afb7212121c766131654ed7e3dac3524d7e5dcdfcf2131d022627766f87ed701af16215422 WHIRLPOOL d5bde04a0afdfc8bd2822dd04e470a195e6644317cb77784863d6c443bb9ff9e39de317a5473f1aaa6f2b379c56762b0da3f09e38ed9cfbe19716e7fee8ab932
-MISC ChangeLog 47430 SHA256 e859a93de9f3c06d1273a941fe05a6ee9049bfe33bc1aadbb99ab00cfbcf81f6 SHA512 4919903f8ac0f37b475dda9388c72bd25a76629d9f8fb6bbe9ba7f00145867a147c03029af1bfc3fa7849e9c7560e39e0579eae72198a6de10fd635f2d2c67cf WHIRLPOOL 27e9906539c1fdedeb68821d5b68a33e8709729aa1949e2ec1b0c4abe627d12a11d298f6149c75b02f85e23097c78dba0164df618e1f3ac52ac22a399c72bc4f
+MISC ChangeLog 47690 SHA256 2e271fb37bba385d0ee07c60b8239cc962f7da6364b2a6adb221dfad0fe2cc53 SHA512 aba5c3bdd470560b1445438dfac3661c4338b2068731f7de60414db8fe8c050cd1b33c2ff1cbd4760ef4ddfe6ba3d2ca91a08db0052740a08ca6ffffdd85b246 WHIRLPOOL 7b0dfe89964d8ba3d1f84dfc3d4fabbb0a4469e6b82a12d23a4e0d28a95622e6b5837f587fd5de712b1337dc95c3509d2a879eaeb16ac7c1c65560d26d51c8ec
 MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTrq+NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTxprhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgdXQP/0ejcL2K7hMUW9yeU15HQdNp
-Ewz/jyrhUIKvXU9vSRvY4lx84t35RINMEGIdCOJRz725rGjPG5+5dAkAcE16evuZ
-7kA83whYf0xdWFEVtSvTYKlWCu3idtQpXijah/vvJPFvPtuXAyM0oyx6hPHMJEs+
-i/OoYcyk7c0Q2S+SUoYwNUl6CgvZR8rZ8v55bmB/DZ+wObFasYd9AEhQX2mIPJTf
-swJ3KdwW17ggEa/Y9rqFPG0cPy+UNgmT4EBihA4DMLO0jrcQe0foUcXCycyp9wCB
-3hY0Rve7X2SetUdlr/cclioiOKUIThXXtF6YX3NnI1cXWnEHVH4tSfNXJaBrUius
-4cZEaQwKMe15/Zd9FOEShCx/K8fauoCKvciyJ+A8rBnx8sFofB/ZGYa8CX/XLMmz
-a7OPzvufMUc89udqzgYXaOcrXkYv3ww0KD7DQi9UiBT3dylYd6CcL/94TDrgVBkf
-4P0elgdXHBNlnOpgCi1KHVoea88e7XfObsohMkdrryoAM+x3SH+rqxZ+r5CbG3oM
-plQnsIWIzIu/PnYjW75j71VNmQlxLaWbMj9oEgo5RG7Ita3uj0rqnnU5MNUKPhnM
-qVdBNnePPXksN9/9T3vCozrDiMk8faM+Ds3QIEbHSO7WrCAPvNmDsFG4RjqxohaH
-hRiI2P2tb8Wv+LhI5n3H
-=qLoB
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg87UP/01pmT9g8DULqIw0fHSbt8K6
+43/DxNoUil8A6iVpybSU2DkCTPH2FKPZTBGs/rIiK5cT6OEr80AeJOCieZPusPv/
+0blh1e8ZATBQlkGShdCetl+Adtgn4ABd0WyU+6yDZD1kUEQ+7fulgRaQdMwEer8g
+dUyI9aFukqfI/WcrVIQJDkK2Xi5Kht2ykqcc2L4CtqawC4CwpBAZ3T5UYCPDUeiZ
+//Wm8TpVMzK6NiMmYNBNPU9MXxyOqypWOvFAyihmAdIiD6V1BqVtnH5NY0yBQWG7
+GDtwZkfxrEg0TVeHXOQzsh3SbbcA7hKnK/qYLjmbnvS92dpprDzppH92eg1pP2Mb
+Xs5juybQII680JA7pZ2FU3K3n0DqG0LowymINUdx1666ZrRlpWfIJ9sheS9VsQ6v
+U03N3oI2xDQL04dXZuahzP/2hqzozsWeiRfI0LN2GpmG2juLUpin1GR+L7rbplas
+CZqUIwu2zPBlSMYIj9x6HIV0YOe3HDWuTKt4CpdF8Ej5PD6lgJBDGDir69awcWix
+2oEE8/gNU9gWu9DlRlgK93IlHa7VgPkkn4LbzHu75bk3Xcx89bR3KFFbIjmEr49i
+64XYuAD1ZD4+Fv11BX7MTnqnDbfvbr3lIm0cRnoFqYU8dFQ/KrHZNvY2URqgnkrs
+T0OhSWHSFey3SCUPSM3X
+=sLhZ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.71-r1.ebuild b/media-gfx/blender/blender-2.71-r1.ebuild
new file mode 100644
index 000000000000..0cfd19146911
--- /dev/null
+++ b/media-gfx/blender/blender-2.71-r1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.71-r1.ebuild,v 1.1 2014/07/16 15:31:42 hasufell Exp $
+
+# TODO:
+#   bundled-deps: bullet is modified
+#   multiple python abi?
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+#PATCHSET="1"
+
+inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org"
+
+case ${PV} in
+	*_p*)
+		SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
+	*)
+		SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;;
+esac
+
+if [[ -n ${PATCHSET} ]]; then
+	SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+fi
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	player? ( game-engine )
+	redcode? ( jpeg2k ffmpeg )
+	cycles? ( boost openexr tiff )
+	nls? ( boost )
+	game-engine? ( boost )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-cpp/gflags-2.1.1-r1
+	>=dev-cpp/glog-0.3.3-r1[gflags]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=media-libs/freetype-2.0
+	media-libs/glew
+	media-libs/libpng:0
+	media-libs/libsamplerate
+	sci-libs/colamd
+	sci-libs/ldl
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libX11
+	boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] )
+	collada? ( media-libs/opencollada )
+	colorio? ( <=media-libs/opencolorio-1.0.9 )
+	cycles? (
+		media-libs/openimageio
+	)
+	ffmpeg? (
+		|| (
+			>=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?]
+			>=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?]
+		)
+	)
+	fftw? ( sci-libs/fftw:3.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( >=media-libs/openal-1.6.372 )
+	openimageio? ( media-libs/openimageio )
+	openexr? ( media-libs/openexr )
+	sdl? ( media-libs/libsdl[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0 )"
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-3.1.3:3
+	doc? (
+		app-doc/doxygen[-nodot(-),dot(+)]
+		dev-python/sphinx
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_pretend() {
+	if use openmp && ! tc-has-openmp; then
+		eerror "You are using gcc built without 'openmp' USE."
+		eerror "Switch CXX to an OpenMP capable compiler."
+		die "Need openmp"
+	fi
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \
+		"${FILESDIR}"/02-${PN}-2.71-unbundle-colamd.patch \
+		"${FILESDIR}"/04-${PN}-2.71-unbundle-glog.patch \
+		"${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \
+		"${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \
+		"${FILESDIR}"/07-${PN}-2.70-sse2.patch \
+		"${FILESDIR}"/08-${PN}-2.71-gflags.patch
+
+	epatch_user
+
+	# remove some bundled deps
+	rm -r \
+		extern/Eigen3 \
+		extern/libopenjpeg \
+		extern/glew \
+		extern/colamd \
+		extern/libmv/third_party/{glog,gflags} \
+		|| die
+
+	# we don't want static glew, but it's scattered across
+	# thousand files
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	sed -i \
+		-e '/-DGLEW_STATIC/d' \
+		$(find . -type f -name "CMakeLists.txt") || die
+
+	ewarn "$(echo "Remaining bundled dependencies:";
+			( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')"
+
+	# linguas cleanup
+	local i
+	if ! use nls; then
+		rm -r "${S}"/release/datafiles/locale || die
+	else
+		if [[ -n "${LINGUAS+x}" ]] ; then
+			cd "${S}"/release/datafiles/locale/po
+			for i in *.po ; do
+				mylang=${i%.po}
+				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
+			done
+		fi
+	fi
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	# WITH_PYTHON_SECURITY
+	# WITH_PYTHON_SAFETY
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DWITH_INSTALL_PORTABLE=OFF
+		$(cmake-utils_use_with boost BOOST)
+		$(cmake-utils_use_with cycles CYCLES)
+		$(cmake-utils_use_with collada OPENCOLLADA)
+		$(cmake-utils_use_with dds IMAGE_DDS)
+		$(cmake-utils_use_with elbeem MOD_FLUID)
+		$(cmake-utils_use_with ffmpeg CODEC_FFMPEG)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fftw MOD_OCEANSIM)
+		$(cmake-utils_use_with game-engine GAMEENGINE)
+		$(cmake-utils_use_with nls INTERNATIONAL)
+		$(cmake-utils_use_with jack JACK)
+		$(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG)
+		$(cmake-utils_use_with openimageio OPENIMAGEIO)
+		$(cmake-utils_use_with openal OPENAL)
+		$(cmake-utils_use_with openexr IMAGE_OPENEXR)
+		$(cmake-utils_use_with openmp OPENMP)
+		$(cmake-utils_use_with opennl OPENNL)
+		$(cmake-utils_use_with player PLAYER)
+		$(cmake-utils_use_with redcode IMAGE_REDCODE)
+		$(cmake-utils_use_with sdl SDL)
+		$(cmake-utils_use_with sndfile CODEC_SNDFILE)
+		$(cmake-utils_use_with sse RAYOPTIMIZATION)
+		$(cmake-utils_use_with sse2 SSE2)
+		$(cmake-utils_use_with bullet BULLET)
+		$(cmake-utils_use_with tiff IMAGE_TIFF)
+		$(cmake-utils_use_with colorio OPENCOLORIO)
+		$(cmake-utils_use_with ndof INPUT_NDOF)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_PYTHON_INSTALL_NUMPY=OFF
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_OPENJPEG=ON
+		-DWITH_SYSTEM_BULLET=OFF
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() { :; }
+
+src_install() {
+	local i
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
+
+	if use doc; then
+		docinto "API/python"
+		dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
+
+		docinto "API/blender"
+		dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/*
+	fi
+
+	# fucked up cmake will relink binary for no reason
+	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
+
+	# fix doc installdir
+	dohtml "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -rf "${ED%/}"/usr/share/doc/blender
+
+	python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py
+	python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherit risks with running unknown python scripting."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/blender/files/08-blender-2.71-gflags.patch b/media-gfx/blender/files/08-blender-2.71-gflags.patch
new file mode 100644
index 000000000000..9718398ef03d
--- /dev/null
+++ b/media-gfx/blender/files/08-blender-2.71-gflags.patch
@@ -0,0 +1,59 @@
+--- ./CMakeLists.txt	2014-07-15 17:30:36.608718963 -0400
++++ ./CMakeLists.txt	2014-07-15 17:25:24.940615350 -0400
+@@ -116,6 +116,7 @@
+ # Check for some modules
+ if(UNIX)
+   find_package(PkgConfig)
++  find_package(gflags REQUIRED)
+   pkg_check_modules(_PC_EIGEN3 eigen3)
+   pkg_check_modules(_PC_GFLAGS libgflags)
+   pkg_check_modules(_PC_GLOG libglog)
+--- extern/libmv/CMakeLists.txt	2014-07-15 17:30:36.565719500 -0400
++++ extern/libmv/CMakeLists.txt	2014-07-15 17:25:06.388847279 -0400
+@@ -208,7 +208,7 @@
+ 
+ include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS})
+ blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
+-target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES})
++target_link_libraries(extern_libmv ${gflags_LIBRARIES} ${_PC_GLOG_LIBRARIES})
+ 
+
+ if(WITH_LIBMV)
+--- extern/libmv/libmv-capi.cc	2014-06-25 16:43:52.000000000 -0400
++++ extern/libmv/libmv-capi.cc	2014-07-15 09:29:04.332922116 -0400
+@@ -112,18 +112,18 @@
+ 	         google::GLOG_FATAL);
+ 
+ 	google::InitGoogleLogging(argv0);
+-	google::SetCommandLineOption("logtostderr", "1");
+-	google::SetCommandLineOption("v", "0");
+-	google::SetCommandLineOption("stderrthreshold", severity_fatal);
+-	google::SetCommandLineOption("minloglevel", severity_fatal);
++	gflags::SetCommandLineOption("logtostderr", "1");
++	gflags::SetCommandLineOption("v", "0");
++	gflags::SetCommandLineOption("stderrthreshold", severity_fatal);
++	gflags::SetCommandLineOption("minloglevel", severity_fatal);
+ }
+ 
+ void libmv_startDebugLogging(void)
+ {
+-	google::SetCommandLineOption("logtostderr", "1");
+-	google::SetCommandLineOption("v", "2");
+-	google::SetCommandLineOption("stderrthreshold", "1");
+-	google::SetCommandLineOption("minloglevel", "0");
++	gflags::SetCommandLineOption("logtostderr", "1");
++	gflags::SetCommandLineOption("v", "2");
++	gflags::SetCommandLineOption("stderrthreshold", "1");
++	gflags::SetCommandLineOption("minloglevel", "0");
+ }
+ 
+ void libmv_setLoggingVerbosity(int verbosity)
+@@ -131,7 +131,7 @@
+ 	char val[10];
+ 	snprintf(val, sizeof(val), "%d", verbosity);
+ 
+-	google::SetCommandLineOption("v", val);
++	gflags::SetCommandLineOption("v", val);
+ }
+ 
+ /* ************ Planar tracker ************ */